From 26eef35f07698d23aafae90e1c230b52e100a334 Mon Sep 17 00:00:00 2001 From: James Young Date: Sat, 29 Feb 2020 12:00:00 -0800 Subject: 2020 February 29 Breaking Changes Update (#8064) --- keyboards/acheron/austin/chconf.h | 202 ++++++++- keyboards/acheron/austin/halconf.h | 265 +++++++++-- keyboards/amj40/keymaps/fabian/keymap.c | 10 +- keyboards/amj40/keymaps/myee/keymap.c | 27 +- .../660m/boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../660m/boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/at_at/660m/chconf.h | 202 ++++++++- keyboards/at_at/660m/halconf.h | 265 +++++++++-- .../bpiphany/frosty_flake/keymaps/QFR_JM/keymap.c | 6 +- .../boards/ST_STM32F072B_DISCOVERY/board.c | 177 +++++++- keyboards/candybar/chconf.h | 202 ++++++++- keyboards/candybar/halconf.h | 266 ++++++++++-- .../an_c/boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../an_c/boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/an_c/chconf.h | 202 ++++++++- keyboards/cannonkeys/an_c/halconf.h | 265 +++++++++-- keyboards/cannonkeys/bluepill/ws2812.c | 1 + .../boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/chimera65/chconf.h | 202 ++++++++- keyboards/cannonkeys/chimera65/halconf.h | 265 +++++++++-- .../boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/instant60/chconf.h | 202 ++++++++- keyboards/cannonkeys/instant60/halconf.h | 265 +++++++++-- .../iron165/boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../iron165/boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/iron165/chconf.h | 202 ++++++++- keyboards/cannonkeys/iron165/halconf.h | 265 +++++++++-- keyboards/cannonkeys/ortho48/chconf.h | 202 ++++++++- keyboards/cannonkeys/ortho48/halconf.h | 266 ++++++++++-- keyboards/cannonkeys/ortho60/chconf.h | 202 ++++++++- keyboards/cannonkeys/ortho60/halconf.h | 266 ++++++++++-- keyboards/cannonkeys/ortho75/chconf.h | 202 ++++++++- keyboards/cannonkeys/ortho75/halconf.h | 266 ++++++++++-- keyboards/cannonkeys/practice60/chconf.h | 202 ++++++++- keyboards/cannonkeys/practice60/halconf.h | 266 ++++++++++-- keyboards/cannonkeys/practice65/chconf.h | 202 ++++++++- keyboards/cannonkeys/practice65/halconf.h | 266 ++++++++++-- .../boards/ST_STM32F072B_DISCOVERY/board.c | 177 +++++++- .../boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/satisfaction75/chconf.h | 202 ++++++++- keyboards/cannonkeys/satisfaction75/halconf.h | 265 +++++++++-- keyboards/cannonkeys/satisfaction75/i2c_master.c | 8 +- keyboards/cannonkeys/satisfaction75/mcuconf.h | 187 ++++---- .../boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/savage65/chconf.h | 202 ++++++++- keyboards/cannonkeys/savage65/halconf.h | 265 +++++++++-- keyboards/cannonkeys/stm32f072/ws2812.c | 1 + .../tmov2/boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../tmov2/boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/cannonkeys/tmov2/chconf.h | 202 ++++++++- keyboards/cannonkeys/tmov2/halconf.h | 265 +++++++++-- keyboards/cheshire/curiosity/chconf.h | 206 ++++++++- keyboards/cheshire/curiosity/halconf.h | 266 ++++++++++-- keyboards/clueboard/60/chconf.h | 202 ++++++++- keyboards/clueboard/60/halconf.h | 241 ++++++++--- keyboards/clueboard/60/mcuconf.h | 62 ++- keyboards/clueboard/66/rev4/chconf.h | 202 ++++++++- keyboards/clueboard/66/rev4/halconf.h | 241 ++++++++--- keyboards/clueboard/66/rev4/mcuconf.h | 62 ++- keyboards/clueboard/66_hotswap/gen1/chconf.h | 202 ++++++++- keyboards/clueboard/66_hotswap/gen1/halconf.h | 241 ++++++++--- keyboards/clueboard/66_hotswap/gen1/mcuconf.h | 62 ++- keyboards/converter/siemens_tastatur/chconf.h | 202 ++++++++- keyboards/converter/siemens_tastatur/halconf.h | 266 ++++++++++-- keyboards/converter/siemens_tastatur/matrix.c | 89 ++-- .../usb_usb/keymaps/coloneljesus/keymap.c | 4 +- keyboards/ergodox_infinity/board_is31fl3731c.h | 2 +- keyboards/ergodox_infinity/chconf.h | 236 +++++++++- keyboards/ergodox_infinity/halconf.h | 266 ++++++++++-- keyboards/ergodox_stm32/chconf.h | 202 ++++++++- keyboards/ergodox_stm32/halconf.h | 266 ++++++++++-- keyboards/gh60/revc/keymaps/robotmaxtron/keymap.c | 18 +- keyboards/gon/nerd60/config.h | 35 ++ keyboards/gon/nerd60/info.json | 78 ++++ keyboards/gon/nerd60/keymaps/default/keymap.c | 20 + keyboards/gon/nerd60/keymaps/default/readme.md | 3 + keyboards/gon/nerd60/keymaps/mauin/keymap.c | 108 +++++ keyboards/gon/nerd60/keymaps/mauin/readme.md | 5 + keyboards/gon/nerd60/keymaps/mauin/rules.mk | 20 + keyboards/gon/nerd60/nerd60.c | 1 + keyboards/gon/nerd60/nerd60.h | 22 + keyboards/gon/nerd60/readme.md | 27 ++ keyboards/gon/nerd60/rules.mk | 36 ++ keyboards/gon/nerdtkl/config.h | 35 ++ keyboards/gon/nerdtkl/info.json | 104 +++++ keyboards/gon/nerdtkl/keymaps/default/keymap.c | 24 + keyboards/gon/nerdtkl/keymaps/default/readme.md | 3 + keyboards/gon/nerdtkl/keymaps/gam3cat/config.h | 10 + keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c | 269 ++++++++++++ keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md | 114 +++++ keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk | 26 ++ keyboards/gon/nerdtkl/nerdtkl.c | 1 + keyboards/gon/nerdtkl/nerdtkl.h | 24 + keyboards/gon/nerdtkl/readme.md | 27 ++ keyboards/gon/nerdtkl/rules.mk | 36 ++ keyboards/gon/readme.md | 9 + keyboards/gonnerd/config.h | 38 -- keyboards/gonnerd/gonnerd.c | 1 - keyboards/gonnerd/gonnerd.h | 42 -- keyboards/gonnerd/info.json | 18 - keyboards/gonnerd/keymaps/default/keymap.c | 22 - keyboards/gonnerd/keymaps/default/rules.mk | 18 - keyboards/gonnerd/keymaps/gam3cat/config.h | 10 - keyboards/gonnerd/keymaps/gam3cat/keymap.c | 269 ------------ keyboards/gonnerd/keymaps/gam3cat/readme.md | 114 ----- keyboards/gonnerd/keymaps/gam3cat/rules.mk | 24 - keyboards/gonnerd/keymaps/mauin/keymap.c | 108 ----- keyboards/gonnerd/keymaps/mauin/readme.md | 5 - keyboards/gonnerd/keymaps/mauin/rules.mk | 18 - keyboards/gonnerd/keymaps/tkl/keymap.c | 27 -- keyboards/gonnerd/keymaps/tkl/rules.mk | 18 - keyboards/gonnerd/readme.md | 28 -- keyboards/gonnerd/rules.mk | 33 -- keyboards/hadron/ver3/chconf.h | 202 ++++++++- keyboards/hadron/ver3/halconf.h | 241 ++++++++--- keyboards/hadron/ver3/mcuconf.h | 62 ++- keyboards/handwired/bluepill/bluepill70/chconf.h | 202 ++++++++- keyboards/handwired/bluepill/bluepill70/halconf.h | 267 ++++++++++-- keyboards/handwired/ck4x4/chconf.h | 202 ++++++++- keyboards/handwired/ck4x4/halconf.h | 266 ++++++++++-- keyboards/handwired/co60/rev6/chconf.h | 202 ++++++++- keyboards/handwired/co60/rev6/halconf.h | 241 ++++++++--- keyboards/handwired/co60/rev6/mcuconf.h | 62 ++- keyboards/handwired/co60/rev7/chconf.h | 202 ++++++++- keyboards/handwired/co60/rev7/halconf.h | 241 ++++++++--- keyboards/handwired/co60/rev7/mcuconf.h | 62 ++- .../ms_sculpt_mobile/keymaps/milestogo/keymap.c | 12 +- keyboards/handwired/onekey/bluepill/chconf.h | 202 ++++++++- keyboards/handwired/onekey/bluepill/halconf.h | 266 ++++++++++-- keyboards/handwired/onekey/stm32f0_disco/chconf.h | 202 ++++++++- keyboards/handwired/onekey/stm32f0_disco/halconf.h | 266 ++++++++++-- keyboards/handwired/onekey/teensy_32/chconf.h | 202 ++++++++- keyboards/handwired/onekey/teensy_32/halconf.h | 267 ++++++++++-- keyboards/handwired/onekey/teensy_lc/chconf.h | 202 ++++++++- keyboards/handwired/onekey/teensy_lc/halconf.h | 267 ++++++++++-- keyboards/handwired/steamvan/rev1/chconf.h | 202 ++++++++- keyboards/handwired/steamvan/rev1/halconf.h | 241 ++++++++--- keyboards/handwired/steamvan/rev1/mcuconf.h | 62 ++- keyboards/hhkb/keymaps/shela/keymap.c | 9 +- keyboards/hs60/v2/chconf.h | 202 ++++++++- keyboards/hs60/v2/halconf.h | 241 ++++++++--- keyboards/hs60/v2/mcuconf.h | 62 ++- keyboards/infinity60/chconf.h | 202 ++++++++- keyboards/infinity60/halconf.h | 266 ++++++++++-- keyboards/infinity60/led_controller.c | 10 +- keyboards/jd45/keymaps/mjt6u/keymap.c | 12 +- keyboards/jm60/chconf.h | 202 ++++++++- keyboards/jm60/halconf.h | 266 ++++++++++-- keyboards/k_type/chconf.h | 202 ++++++++- keyboards/k_type/halconf.h | 266 ++++++++++-- keyboards/katana60/keymaps/rominronin/keymap.c | 22 - .../keebio/nyquist/keymaps/DivergeJM/keymap.c | 9 +- keyboards/kinesis/keymaps/milestogo/keymap.c | 14 +- keyboards/lets_split/keymaps/adam/keymap.c | 9 +- keyboards/matrix/noah/boards/noah_bd/board.c | 157 ++++++- keyboards/matrix/noah/chconf.h | 209 ++++++++- keyboards/matrix/noah/config.h | 7 +- keyboards/matrix/noah/halconf.h | 241 ++++++++--- keyboards/matrix/noah/noah.c | 3 +- keyboards/matrix/noah/rules.mk | 2 +- keyboards/matrix/noah/ws2812_f4.c | 272 ------------ keyboards/matrix/noah/ws2812_f4.h | 102 ----- keyboards/nk65/chconf.h | 202 ++++++++- keyboards/nk65/halconf.h | 241 ++++++++--- keyboards/nk65/mcuconf.h | 62 ++- .../ixora/boards/GENERIC_STM32_F042X6/board.c | 187 +++++++- keyboards/peiorisboards/ixora/chconf.h | 205 ++++++++- keyboards/peiorisboards/ixora/halconf.h | 271 ++++++++++-- keyboards/planck/keymaps/ab/keymap.c | 62 ++- keyboards/planck/keymaps/alexey/keymap.c | 41 +- keyboards/planck/keymaps/altgr/beakl.h | 482 ++++++++++----------- keyboards/planck/keymaps/altgr/colemak.h | 96 ++-- .../planck/keymaps/altgr/common/chord_layout.h | 24 +- .../keymaps/altgr/common/number_fkey_layout.h | 52 +-- .../planck/keymaps/altgr/common/steno_layout.h | 24 +- .../keymaps/altgr/common/symbol_guifn_layout.h | 48 +- .../planck/keymaps/altgr/common/toggle_layout.h | 62 +-- keyboards/planck/keymaps/altgr/keymap.c | 27 +- keyboards/planck/keymaps/altgr/qwerty.h | 48 +- keyboards/planck/keymaps/andylikescandy/keymap.c | 112 +++-- keyboards/planck/keymaps/angerthosenear/keymap.c | 50 +-- keyboards/planck/keymaps/austin/keymap.c | 50 +-- keyboards/planck/keymaps/aviator/keymap.c | 64 ++- keyboards/planck/keymaps/basic/keymap.c | 39 +- keyboards/planck/keymaps/bone2planck/keymap.c | 80 ++-- keyboards/planck/keymaps/brandon/keymap.c | 113 +++-- keyboards/planck/keymaps/cbbrowne/keymap.c | 70 ++- keyboards/planck/keymaps/chance/keymap.c | 107 +++-- keyboards/planck/keymaps/charlie/keymap.c | 38 +- keyboards/planck/keymaps/circuit/keymap.c | 80 ++-- keyboards/planck/keymaps/coloneljesus/keymap.c | 88 ++-- keyboards/planck/keymaps/corvec/keymap.c | 16 +- keyboards/planck/keymaps/daniel/keymap.c | 50 +-- keyboards/planck/keymaps/danielhklein/keymap.c | 52 ++- keyboards/planck/keymaps/david/keymap.c | 50 +-- keyboards/planck/keymaps/dbroqua/keymap.c | 75 ++-- keyboards/planck/keymaps/dc/keymap.c | 67 ++- keyboards/planck/keymaps/dcompact/keymap.c | 88 ++-- keyboards/planck/keymaps/dlaroe/keymap.c | 92 ++-- keyboards/planck/keymaps/dodger/keymap.c | 76 ++-- keyboards/planck/keymaps/dr0ck/keymap.c | 100 +++-- keyboards/planck/keymaps/dudeofawesome/keymap.c | 101 +++-- keyboards/planck/keymaps/dzobert/keymap.c | 50 +-- keyboards/planck/keymaps/emilyh/keymap.c | 92 ++-- keyboards/planck/keymaps/espynn/keymap.c | 62 ++- keyboards/planck/keymaps/experimental/keymap.c | 105 +++-- keyboards/planck/keymaps/gabriel/keymap.c | 51 ++- keyboards/planck/keymaps/grahampheath/keymap.c | 101 +++-- keyboards/planck/keymaps/gunp/keymap.c | 160 ++++--- .../planck/keymaps/handwired_binaryplease/keymap.c | 92 ++-- .../planck/keymaps/hiea/common/chord_layout.h | 24 +- .../keymaps/hiea/common/number_fkey_layout.h | 26 +- .../planck/keymaps/hiea/common/steno_layout.h | 24 +- .../keymaps/hiea/common/symbol_guifn_layout.h | 24 +- .../planck/keymaps/hiea/common/toggle_layout.h | 62 +-- keyboards/planck/keymaps/hiea/config.h | 2 +- keyboards/planck/keymaps/hiea/hiea.h | 50 +-- keyboards/planck/keymaps/hiea/keymap.c | 27 +- .../planck/keymaps/hieax/common/chord_layout.h | 24 +- .../keymaps/hieax/common/number_fkey_layout.h | 26 +- .../planck/keymaps/hieax/common/steno_layout.h | 24 +- .../keymaps/hieax/common/symbol_guifn_layout.h | 24 +- .../planck/keymaps/hieax/common/toggle_layout.h | 62 +-- keyboards/planck/keymaps/hieax/config.h | 2 +- keyboards/planck/keymaps/hieax/hiea.h | 72 +-- keyboards/planck/keymaps/hieax/keymap.c | 27 +- keyboards/planck/keymaps/impossible/keymap.c | 80 ++-- keyboards/planck/keymaps/jacob/keymap.c | 43 +- keyboards/planck/keymaps/jeebak/keymap.c | 116 +++-- keyboards/planck/keymaps/jeremy-dev/keymap.c | 65 ++- keyboards/planck/keymaps/jhenahan/config.h | 1 + keyboards/planck/keymaps/jhenahan/keymap.c | 92 ++-- keyboards/planck/keymaps/jirgn/keymap.c | 76 ++-- keyboards/planck/keymaps/joe/keymap.c | 91 ++-- keyboards/planck/keymaps/johannes/keymap.c | 51 ++- keyboards/planck/keymaps/kelorean/keymap.c | 88 ++-- keyboards/planck/keymaps/khord/keymap.c | 52 ++- keyboards/planck/keymaps/kloki/keymap.c | 64 ++- keyboards/planck/keymaps/kmontag42/keymap.c | 64 ++- keyboards/planck/keymaps/kyle/keymap.c | 50 +-- keyboards/planck/keymaps/lae3/keymap.c | 92 ++-- keyboards/planck/keymaps/leo/keymap.c | 50 +-- keyboards/planck/keymaps/lucas/keymap.c | 92 ++-- keyboards/planck/keymaps/lukas/keymap.c | 42 +- keyboards/planck/keymaps/luke/keymap.c | 111 +++-- keyboards/planck/keymaps/mason/keymap.c | 51 ++- keyboards/planck/keymaps/matrixman/keymap.c | 78 ++-- keyboards/planck/keymaps/max/keymap.c | 50 +-- keyboards/planck/keymaps/mitch/keymap.c | 39 +- keyboards/planck/keymaps/mjt/keymap.c | 80 ++-- keyboards/planck/keymaps/mjtnumsym/keymap.c | 80 ++-- keyboards/planck/keymaps/mollat/keymap.c | 75 ++-- keyboards/planck/keymaps/myoung34/config.h | 1 + keyboards/planck/keymaps/myoung34/keymap.c | 54 ++- keyboards/planck/keymaps/neo2planck/keymap.c | 54 ++- keyboards/planck/keymaps/nico/keymap.c | 72 ++- keyboards/planck/keymaps/not-quite-neo/keymap.c | 63 ++- keyboards/planck/keymaps/originerd/keymap.c | 56 ++- keyboards/planck/keymaps/paget/keymap.c | 40 +- keyboards/planck/keymaps/palleiko/keymap.c | 112 +++-- keyboards/planck/keymaps/pete/keymap.c | 126 +++--- keyboards/planck/keymaps/phreed/keymap.c | 76 ++-- keyboards/planck/keymaps/piemod/keymap.c | 135 +++--- keyboards/planck/keymaps/pok3r/keymap.c | 100 +++-- keyboards/planck/keymaps/premek/keymap.c | 94 ++-- keyboards/planck/keymaps/pvc/keymap.c | 78 ++-- keyboards/planck/keymaps/rai-suta/keymap.c | 39 +- keyboards/planck/keymaps/rodhaene/keymap.c | 64 ++- keyboards/planck/keymaps/sdothum/beakl.h | 434 +++++++++---------- keyboards/planck/keymaps/sdothum/colemak.h | 98 ++--- .../planck/keymaps/sdothum/common/chord_layout.h | 24 +- .../keymaps/sdothum/common/number_fkey_layout.h | 52 +-- .../planck/keymaps/sdothum/common/steno_layout.h | 24 +- .../keymaps/sdothum/common/symbol_guifn_layout.h | 48 +- .../planck/keymaps/sdothum/common/toggle_layout.h | 62 +-- keyboards/planck/keymaps/sdothum/config.h | 2 +- keyboards/planck/keymaps/sdothum/keymap.c | 27 +- keyboards/planck/keymaps/sdothum/qwerty.h | 48 +- keyboards/planck/keymaps/sean/keymap.c | 113 +++-- keyboards/planck/keymaps/sgoodwin/keymap.c | 68 ++- keyboards/planck/keymaps/smt/keymap.c | 80 ++-- keyboards/planck/keymaps/steno/keymap.c | 88 ++-- keyboards/planck/keymaps/tak3over/keymap.c | 66 ++- keyboards/planck/keymaps/tehwalris/keymap.c | 76 ++-- keyboards/planck/keymaps/that_canadian/keymap.c | 68 ++- keyboards/planck/keymaps/thermal_printer/keymap.c | 92 ++-- keyboards/planck/keymaps/tong92/keymap.c | 89 ++-- keyboards/planck/keymaps/unicode/keymap.c | 92 ++-- keyboards/planck/keymaps/yale/keymap.c | 54 ++- keyboards/planck/keymaps/yang/keymap.c | 84 ++-- keyboards/planck/keymaps/zach/keymap.c | 75 ++-- keyboards/planck/keymaps/zrichard/keymap.c | 78 ++-- .../alice/boards/ST_STM32F072B_DISCOVERY/board.c | 179 +++++++- .../alice/boards/ST_STM32F072B_DISCOVERY/board.h | 26 +- keyboards/projectkb/alice/chconf.h | 202 ++++++++- keyboards/projectkb/alice/halconf.h | 264 +++++++++-- keyboards/retro_75/chconf.h | 206 ++++++++- keyboards/retro_75/halconf.h | 266 ++++++++++-- .../sentraq/s60_x/keymaps/ansi_qwertz/keymap.c | 4 +- keyboards/sentraq/s60_x/keymaps/hasu/keymap.c | 9 +- keyboards/sentraq/s60_x/keymaps/jpec/keymap.c | 9 +- keyboards/sentraq/s60_x/keymaps/spacefn/keymap.c | 5 +- keyboards/sentraq/s65_x/keymaps/kelorean/keymap.c | 7 +- keyboards/sentraq/s65_x/keymaps/nall/keymap.c | 3 +- .../thevankeyboards/minivan/keymaps/mjt/keymap.c | 9 +- .../minivan/keymaps/tong92/keymap.c | 9 +- .../vinta/boards/GENERIC_STM32_F042X6/board.c | 187 +++++++- keyboards/vinta/chconf.h | 205 ++++++++- keyboards/vinta/halconf.h | 271 ++++++++++-- keyboards/wete/chconf.h | 202 ++++++++- keyboards/wete/halconf.h | 265 +++++++++-- keyboards/whitefox/board_is31fl3731c.h | 2 +- keyboards/whitefox/chconf.h | 202 ++++++++- keyboards/whitefox/halconf.h | 266 ++++++++++-- keyboards/xiaomi/mk02/chconf.h | 206 ++++++++- keyboards/xiaomi/mk02/halconf.h | 265 +++++++++-- 319 files changed, 26659 insertions(+), 8758 deletions(-) create mode 100644 keyboards/gon/nerd60/config.h create mode 100644 keyboards/gon/nerd60/info.json create mode 100644 keyboards/gon/nerd60/keymaps/default/keymap.c create mode 100644 keyboards/gon/nerd60/keymaps/default/readme.md create mode 100644 keyboards/gon/nerd60/keymaps/mauin/keymap.c create mode 100644 keyboards/gon/nerd60/keymaps/mauin/readme.md create mode 100644 keyboards/gon/nerd60/keymaps/mauin/rules.mk create mode 100644 keyboards/gon/nerd60/nerd60.c create mode 100644 keyboards/gon/nerd60/nerd60.h create mode 100644 keyboards/gon/nerd60/readme.md create mode 100644 keyboards/gon/nerd60/rules.mk create mode 100644 keyboards/gon/nerdtkl/config.h create mode 100644 keyboards/gon/nerdtkl/info.json create mode 100644 keyboards/gon/nerdtkl/keymaps/default/keymap.c create mode 100644 keyboards/gon/nerdtkl/keymaps/default/readme.md create mode 100644 keyboards/gon/nerdtkl/keymaps/gam3cat/config.h create mode 100644 keyboards/gon/nerdtkl/keymaps/gam3cat/keymap.c create mode 100644 keyboards/gon/nerdtkl/keymaps/gam3cat/readme.md create mode 100644 keyboards/gon/nerdtkl/keymaps/gam3cat/rules.mk create mode 100644 keyboards/gon/nerdtkl/nerdtkl.c create mode 100644 keyboards/gon/nerdtkl/nerdtkl.h create mode 100644 keyboards/gon/nerdtkl/readme.md create mode 100644 keyboards/gon/nerdtkl/rules.mk create mode 100644 keyboards/gon/readme.md delete mode 100644 keyboards/gonnerd/config.h delete mode 100644 keyboards/gonnerd/gonnerd.c delete mode 100644 keyboards/gonnerd/gonnerd.h delete mode 100644 keyboards/gonnerd/info.json delete mode 100644 keyboards/gonnerd/keymaps/default/keymap.c delete mode 100644 keyboards/gonnerd/keymaps/default/rules.mk delete mode 100644 keyboards/gonnerd/keymaps/gam3cat/config.h delete mode 100644 keyboards/gonnerd/keymaps/gam3cat/keymap.c delete mode 100644 keyboards/gonnerd/keymaps/gam3cat/readme.md delete mode 100644 keyboards/gonnerd/keymaps/gam3cat/rules.mk delete mode 100644 keyboards/gonnerd/keymaps/mauin/keymap.c delete mode 100644 keyboards/gonnerd/keymaps/mauin/readme.md delete mode 100644 keyboards/gonnerd/keymaps/mauin/rules.mk delete mode 100644 keyboards/gonnerd/keymaps/tkl/keymap.c delete mode 100644 keyboards/gonnerd/keymaps/tkl/rules.mk delete mode 100644 keyboards/gonnerd/readme.md delete mode 100644 keyboards/gonnerd/rules.mk delete mode 100644 keyboards/matrix/noah/ws2812_f4.c delete mode 100644 keyboards/matrix/noah/ws2812_f4.h mode change 100755 => 100644 keyboards/nk65/chconf.h mode change 100755 => 100644 keyboards/nk65/halconf.h mode change 100755 => 100644 keyboards/nk65/mcuconf.h (limited to 'keyboards') diff --git a/keyboards/acheron/austin/chconf.h b/keyboards/acheron/austin/chconf.h index 89388dd5a3..4640ff5332 100644 --- a/keyboards/acheron/austin/chconf.h +++ b/keyboards/acheron/austin/chconf.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ /** - * @file templates/chconf.h + * @file rt/templates/chconf.h * @brief Configuration file template. * @details A copy of this file must be placed in each project directory, it * contains the application specific kernel settings. @@ -29,6 +29,7 @@ #define CHCONF_H #define _CHIBIOS_RT_CONF_ +#define _CHIBIOS_RT_CONF_VER_6_0_ /*===========================================================================*/ /** @@ -41,14 +42,34 @@ * @brief System time counter resolution. * @note Allowed values are 16 or 32 bits. */ +#if !defined(CH_CFG_ST_RESOLUTION) #define CH_CFG_ST_RESOLUTION 32 +#endif /** * @brief System tick frequency. * @details Frequency of the system timer that drives the system ticks. This * setting also defines the system tick time unit. */ +#if !defined(CH_CFG_ST_FREQUENCY) #define CH_CFG_ST_FREQUENCY 10000 +#endif + +/** + * @brief Time intervals data size. + * @note Allowed values are 16, 32 or 64 bits. + */ +#if !defined(CH_CFG_INTERVALS_SIZE) +#define CH_CFG_INTERVALS_SIZE 32 +#endif + +/** + * @brief Time types data size. + * @note Allowed values are 16 or 32 bits. + */ +#if !defined(CH_CFG_TIME_TYPES_SIZE) +#define CH_CFG_TIME_TYPES_SIZE 32 +#endif /** * @brief Time delta constant for the tick-less mode. @@ -58,7 +79,9 @@ * The value one is not valid, timeouts are rounded up to * this value. */ +#if !defined(CH_CFG_ST_TIMEDELTA) #define CH_CFG_ST_TIMEDELTA 2 +#endif /** @} */ @@ -81,7 +104,9 @@ * @note The round robin preemption is not supported in tickless mode and * must be set to zero in that case. */ +#if !defined(CH_CFG_TIME_QUANTUM) #define CH_CFG_TIME_QUANTUM 0 +#endif /** * @brief Managed RAM size. @@ -94,7 +119,9 @@ * provide the @p __heap_base__ and @p __heap_end__ symbols. * @note Requires @p CH_CFG_USE_MEMCORE. */ +#if !defined(CH_CFG_MEMCORE_SIZE) #define CH_CFG_MEMCORE_SIZE 0 +#endif /** * @brief Idle thread automatic spawn suppression. @@ -103,7 +130,9 @@ * function becomes the idle thread and must implement an * infinite loop. */ +#if !defined(CH_CFG_NO_IDLE_THREAD) #define CH_CFG_NO_IDLE_THREAD FALSE +#endif /** @} */ @@ -122,7 +151,9 @@ * @note This is not related to the compiler optimization options. * @note The default is @p TRUE. */ +#if !defined(CH_CFG_OPTIMIZE_SPEED) #define CH_CFG_OPTIMIZE_SPEED FALSE +#endif /** @} */ @@ -140,7 +171,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_TM) #define CH_CFG_USE_TM FALSE +#endif /** * @brief Threads registry APIs. @@ -148,7 +181,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_REGISTRY) #define CH_CFG_USE_REGISTRY TRUE +#endif /** * @brief Threads synchronization APIs. @@ -157,7 +192,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_WAITEXIT) #define CH_CFG_USE_WAITEXIT TRUE +#endif /** * @brief Semaphores APIs. @@ -165,7 +202,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_SEMAPHORES) #define CH_CFG_USE_SEMAPHORES TRUE +#endif /** * @brief Semaphores queuing mode. @@ -176,7 +215,9 @@ * requirements. * @note Requires @p CH_CFG_USE_SEMAPHORES. */ +#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY) #define CH_CFG_USE_SEMAPHORES_PRIORITY FALSE +#endif /** * @brief Mutexes APIs. @@ -184,7 +225,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_MUTEXES) #define CH_CFG_USE_MUTEXES TRUE +#endif /** * @brief Enables recursive behavior on mutexes. @@ -194,7 +237,9 @@ * @note The default is @p FALSE. * @note Requires @p CH_CFG_USE_MUTEXES. */ +#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE) #define CH_CFG_USE_MUTEXES_RECURSIVE FALSE +#endif /** * @brief Conditional Variables APIs. @@ -204,7 +249,9 @@ * @note The default is @p TRUE. * @note Requires @p CH_CFG_USE_MUTEXES. */ +#if !defined(CH_CFG_USE_CONDVARS) #define CH_CFG_USE_CONDVARS TRUE +#endif /** * @brief Conditional Variables APIs with timeout. @@ -214,7 +261,9 @@ * @note The default is @p TRUE. * @note Requires @p CH_CFG_USE_CONDVARS. */ +#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT) #define CH_CFG_USE_CONDVARS_TIMEOUT FALSE +#endif /** * @brief Events Flags APIs. @@ -222,7 +271,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_EVENTS) #define CH_CFG_USE_EVENTS TRUE +#endif /** * @brief Events Flags APIs with timeout. @@ -232,7 +283,9 @@ * @note The default is @p TRUE. * @note Requires @p CH_CFG_USE_EVENTS. */ +#if !defined(CH_CFG_USE_EVENTS_TIMEOUT) #define CH_CFG_USE_EVENTS_TIMEOUT TRUE +#endif /** * @brief Synchronous Messages APIs. @@ -241,7 +294,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_MESSAGES) #define CH_CFG_USE_MESSAGES TRUE +#endif /** * @brief Synchronous Messages queuing mode. @@ -252,7 +307,9 @@ * requirements. * @note Requires @p CH_CFG_USE_MESSAGES. */ +#if !defined(CH_CFG_USE_MESSAGES_PRIORITY) #define CH_CFG_USE_MESSAGES_PRIORITY FALSE +#endif /** * @brief Mailboxes APIs. @@ -262,7 +319,9 @@ * @note The default is @p TRUE. * @note Requires @p CH_CFG_USE_SEMAPHORES. */ +#if !defined(CH_CFG_USE_MAILBOXES) #define CH_CFG_USE_MAILBOXES TRUE +#endif /** * @brief Core Memory Manager APIs. @@ -271,7 +330,9 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_MEMCORE) #define CH_CFG_USE_MEMCORE FALSE +#endif /** * @brief Heap Allocator APIs. @@ -283,7 +344,9 @@ * @p CH_CFG_USE_SEMAPHORES. * @note Mutexes are recommended. */ +#if !defined(CH_CFG_USE_HEAP) #define CH_CFG_USE_HEAP FALSE +#endif /** * @brief Memory Pools Allocator APIs. @@ -292,7 +355,31 @@ * * @note The default is @p TRUE. */ +#if !defined(CH_CFG_USE_MEMPOOLS) #define CH_CFG_USE_MEMPOOLS FALSE +#endif + +/** + * @brief Objects FIFOs APIs. + * @details If enabled then the objects FIFOs APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#if !defined(CH_CFG_USE_OBJ_FIFOS) +#define CH_CFG_USE_OBJ_FIFOS FALSE +#endif + +/** + * @brief Pipes APIs. + * @details If enabled then the pipes APIs are included + * in the kernel. + * + * @note The default is @p TRUE. + */ +#if !defined(CH_CFG_USE_PIPES) +#define CH_CFG_USE_PIPES FALSE +#endif /** * @brief Dynamic Threads APIs. @@ -303,7 +390,80 @@ * @note Requires @p CH_CFG_USE_WAITEXIT. * @note Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS. */ +#if !defined(CH_CFG_USE_DYNAMIC) #define CH_CFG_USE_DYNAMIC FALSE +#endif + +/** @} */ + +/*===========================================================================*/ +/** + * @name Objects factory options + * @{ + */ +/*===========================================================================*/ + +/** + * @brief Objects Factory APIs. + * @details If enabled then the objects factory APIs are included in the + * kernel. + * + * @note The default is @p FALSE. + */ +#if !defined(CH_CFG_USE_FACTORY) +#define CH_CFG_USE_FACTORY FALSE +#endif + +/** + * @brief Maximum length for object names. + * @details If the specified length is zero then the name is stored by + * pointer but this could have unintended side effects. + */ +#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH) +#define CH_CFG_FACTORY_MAX_NAMES_LENGTH 8 +#endif + +/** + * @brief Enables the registry of generic objects. + */ +#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY) +#define CH_CFG_FACTORY_OBJECTS_REGISTRY FALSE +#endif + +/** + * @brief Enables factory for generic buffers. + */ +#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS) +#define CH_CFG_FACTORY_GENERIC_BUFFERS FALSE +#endif + +/** + * @brief Enables factory for semaphores. + */ +#if !defined(CH_CFG_FACTORY_SEMAPHORES) +#define CH_CFG_FACTORY_SEMAPHORES FALSE +#endif + +/** + * @brief Enables factory for mailboxes. + */ +#if !defined(CH_CFG_FACTORY_MAILBOXES) +#define CH_CFG_FACTORY_MAILBOXES FALSE +#endif + +/** + * @brief Enables factory for objects FIFOs. + */ +#if !defined(CH_CFG_FACTORY_OBJ_FIFOS) +#define CH_CFG_FACTORY_OBJ_FIFOS FALSE +#endif + +/** + * @brief Enables factory for Pipes. + */ +#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__) +#define CH_CFG_FACTORY_PIPES FALSE +#endif /** @} */ @@ -319,7 +479,9 @@ * * @note The default is @p FALSE. */ +#if !defined(CH_DBG_STATISTICS) #define CH_DBG_STATISTICS FALSE +#endif /** * @brief Debug option, system state check. @@ -328,7 +490,9 @@ * * @note The default is @p FALSE. */ +#if !defined(CH_DBG_SYSTEM_STATE_CHECK) #define CH_DBG_SYSTEM_STATE_CHECK FALSE +#endif /** * @brief Debug option, parameters checks. @@ -337,7 +501,9 @@ * * @note The default is @p FALSE. */ +#if !defined(CH_DBG_ENABLE_CHECKS) #define CH_DBG_ENABLE_CHECKS FALSE +#endif /** * @brief Debug option, consistency checks. @@ -347,7 +513,9 @@ * * @note The default is @p FALSE. */ +#if !defined(CH_DBG_ENABLE_ASSERTS) #define CH_DBG_ENABLE_ASSERTS FALSE +#endif /** * @brief Debug option, trace buffer. @@ -355,14 +523,18 @@ * * @note The default is @p CH_DBG_TRACE_MASK_DISABLED. */ +#if !defined(CH_DBG_TRACE_MASK) #define CH_DBG_TRACE_MASK CH_DBG_TRACE_MASK_DISABLED +#endif /** * @brief Trace buffer entries. * @note The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is * different from @p CH_DBG_TRACE_MASK_DISABLED. */ +#if !defined(CH_DBG_TRACE_BUFFER_SIZE) #define CH_DBG_TRACE_BUFFER_SIZE 128 +#endif /** * @brief Debug option, stack checks. @@ -374,7 +546,9 @@ * @note The default failure mode is to halt the system with the global * @p panic_msg variable set to @p NULL. */ +#if !defined(CH_DBG_ENABLE_STACK_CHECK) #define CH_DBG_ENABLE_STACK_CHECK FALSE +#endif /** * @brief Debug option, stacks initialization. @@ -384,7 +558,9 @@ * * @note The default is @p FALSE. */ +#if !defined(CH_DBG_FILL_THREADS) #define CH_DBG_FILL_THREADS FALSE +#endif /** * @brief Debug option, threads profiling. @@ -395,7 +571,9 @@ * @note This debug option is not currently compatible with the * tickless mode. */ +#if !defined(CH_DBG_THREADS_PROFILING) #define CH_DBG_THREADS_PROFILING FALSE +#endif /** @} */ @@ -406,6 +584,22 @@ */ /*===========================================================================*/ +/** + * @brief System structure extension. + * @details User fields added to the end of the @p ch_system_t structure. + */ +#define CH_CFG_SYSTEM_EXTRA_FIELDS \ + /* Add threads custom fields here.*/ + +/** + * @brief System initialization hook. + * @details User initialization code added to the @p chSysInit() function + * just before interrupts are enabled globally. + */ +#define CH_CFG_SYSTEM_INIT_HOOK() { \ + /* Add threads initialization code here.*/ \ +} + /** * @brief Threads descriptor structure extension. * @details User fields added to the end of the @p thread_t structure. @@ -415,9 +609,9 @@ /** * @brief Threads initialization hook. - * @details User initialization code added to the @p chThdInit() API. + * @details User initialization code added to the @p _thread_init() function. * - * @note It is invoked from within @p chThdInit() and implicitly from all + * @note It is invoked from within @p _thread_init() and implicitly from all * the threads creation APIs. */ #define CH_CFG_THREAD_INIT_HOOK(tp) { \ diff --git a/keyboards/acheron/austin/halconf.h b/keyboards/acheron/austin/halconf.h index 38743e0904..adb1a90715 100644 --- a/keyboards/acheron/austin/halconf.h +++ b/keyboards/acheron/austin/halconf.h @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -25,8 +25,11 @@ * @{ */ -#ifndef _HALCONF_H_ -#define _HALCONF_H_ +#ifndef HALCONF_H +#define HALCONF_H + +#define _CHIBIOS_HAL_CONF_ +#define _CHIBIOS_HAL_CONF_VER_7_0_ #include "mcuconf.h" @@ -34,140 +37,181 @@ * @brief Enables the PAL subsystem. */ #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) -#define HAL_USE_PAL TRUE +#define HAL_USE_PAL TRUE #endif /** * @brief Enables the ADC subsystem. */ #if !defined(HAL_USE_ADC) || defined(__DOXYGEN__) -#define HAL_USE_ADC FALSE +#define HAL_USE_ADC FALSE #endif /** * @brief Enables the CAN subsystem. */ #if !defined(HAL_USE_CAN) || defined(__DOXYGEN__) -#define HAL_USE_CAN FALSE +#define HAL_USE_CAN FALSE #endif /** - * @brief Enables the DAC subsystem. + * @brief Enables the cryptographic subsystem. */ -#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) -#define HAL_USE_DAC FALSE +#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__) +#define HAL_USE_CRY FALSE #endif /** - * @brief Enables the EXT subsystem. + * @brief Enables the DAC subsystem. */ -#if !defined(HAL_USE_EXT) || defined(__DOXYGEN__) -#define HAL_USE_EXT FALSE +#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__) +#define HAL_USE_DAC FALSE #endif /** * @brief Enables the GPT subsystem. */ #if !defined(HAL_USE_GPT) || defined(__DOXYGEN__) -#define HAL_USE_GPT FALSE +#define HAL_USE_GPT FALSE #endif /** * @brief Enables the I2C subsystem. */ #if !defined(HAL_USE_I2C) || defined(__DOXYGEN__) -#define HAL_USE_I2C TRUE +#define HAL_USE_I2C TRUE #endif /** * @brief Enables the I2S subsystem. */ #if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) -#define HAL_USE_I2S FALSE +#define HAL_USE_I2S FALSE #endif /** * @brief Enables the ICU subsystem. */ #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) -#define HAL_USE_ICU FALSE +#define HAL_USE_ICU FALSE #endif /** * @brief Enables the MAC subsystem. */ #if !defined(HAL_USE_MAC) || defined(__DOXYGEN__) -#define HAL_USE_MAC FALSE +#define HAL_USE_MAC FALSE #endif /** * @brief Enables the MMC_SPI subsystem. */ #if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__) -#define HAL_USE_MMC_SPI FALSE +#define HAL_USE_MMC_SPI FALSE #endif /** * @brief Enables the PWM subsystem. */ #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM TRUE +#define HAL_USE_PWM TRUE #endif /** * @brief Enables the RTC subsystem. */ #if !defined(HAL_USE_RTC) || defined(__DOXYGEN__) -#define HAL_USE_RTC FALSE +#define HAL_USE_RTC FALSE #endif /** * @brief Enables the SDC subsystem. */ #if !defined(HAL_USE_SDC) || defined(__DOXYGEN__) -#define HAL_USE_SDC FALSE +#define HAL_USE_SDC FALSE #endif /** * @brief Enables the SERIAL subsystem. */ #if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL FALSE +#define HAL_USE_SERIAL FALSE #endif /** * @brief Enables the SERIAL over USB subsystem. */ #if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__) -#define HAL_USE_SERIAL_USB FALSE +#define HAL_USE_SERIAL_USB FALSE +#endif + +/** + * @brief Enables the SIO subsystem. + */ +#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__) +#define HAL_USE_SIO FALSE #endif /** * @brief Enables the SPI subsystem. */ #if !defined(HAL_USE_SPI) || defined(__DOXYGEN__) -#define HAL_USE_SPI TRUE +#define HAL_USE_SPI TRUE +#endif + +/** + * @brief Enables the TRNG subsystem. + */ +#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__) +#define HAL_USE_TRNG FALSE #endif /** * @brief Enables the UART subsystem. */ #if !defined(HAL_USE_UART) || defined(__DOXYGEN__) -#define HAL_USE_UART FALSE +#define HAL_USE_UART FALSE #endif /** * @brief Enables the USB subsystem. */ #if !defined(HAL_USE_USB) || defined(__DOXYGEN__) -#define HAL_USE_USB TRUE +#define HAL_USE_USB TRUE #endif /** * @brief Enables the WDG subsystem. */ #if !defined(HAL_USE_WDG) || defined(__DOXYGEN__) -#define HAL_USE_WDG FALSE +#define HAL_USE_WDG FALSE +#endif + +/** + * @brief Enables the WSPI subsystem. + */ +#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__) +#define HAL_USE_WSPI FALSE +#endif + +/*===========================================================================*/ +/* PAL driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__) +#define PAL_USE_CALLBACKS FALSE +#endif + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__) +#define PAL_USE_WAIT FALSE #endif /*===========================================================================*/ @@ -179,7 +223,7 @@ * @note Disabling this option saves both code and data space. */ #if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__) -#define ADC_USE_WAIT TRUE +#define ADC_USE_WAIT TRUE #endif /** @@ -187,7 +231,7 @@ * @note Disabling this option saves both code and data space. */ #if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define ADC_USE_MUTUAL_EXCLUSION TRUE +#define ADC_USE_MUTUAL_EXCLUSION TRUE #endif /*===========================================================================*/ @@ -198,7 +242,56 @@ * @brief Sleep mode related APIs inclusion switch. */ #if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__) -#define CAN_USE_SLEEP_MODE TRUE +#define CAN_USE_SLEEP_MODE TRUE +#endif + +/** + * @brief Enforces the driver to use direct callbacks rather than OSAL events. + */ +#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__) +#define CAN_ENFORCE_USE_CALLBACKS FALSE +#endif + +/*===========================================================================*/ +/* CRY driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables the SW fall-back of the cryptographic driver. + * @details When enabled, this option, activates a fall-back software + * implementation for algorithms not supported by the underlying + * hardware. + * @note Fall-back implementations may not be present for all algorithms. + */ +#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__) +#define HAL_CRY_USE_FALLBACK FALSE +#endif + +/** + * @brief Makes the driver forcibly use the fall-back implementations. + */ +#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__) +#define HAL_CRY_ENFORCE_FALLBACK FALSE +#endif + +/*===========================================================================*/ +/* DAC driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__) +#define DAC_USE_WAIT TRUE +#endif + +/** + * @brief Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define DAC_USE_MUTUAL_EXCLUSION TRUE #endif /*===========================================================================*/ @@ -209,7 +302,7 @@ * @brief Enables the mutual exclusion APIs on the I2C bus. */ #if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define I2C_USE_MUTUAL_EXCLUSION TRUE +#define I2C_USE_MUTUAL_EXCLUSION TRUE #endif /*===========================================================================*/ @@ -217,17 +310,17 @@ /*===========================================================================*/ /** - * @brief Enables an event sources for incoming packets. + * @brief Enables the zero-copy API. */ #if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__) -#define MAC_USE_ZERO_COPY FALSE +#define MAC_USE_ZERO_COPY FALSE #endif /** * @brief Enables an event sources for incoming packets. */ #if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__) -#define MAC_USE_EVENTS TRUE +#define MAC_USE_EVENTS TRUE #endif /*===========================================================================*/ @@ -243,7 +336,7 @@ * use a DMA channel and heavily loads the CPU. */ #if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__) -#define MMC_NICE_WAITING TRUE +#define MMC_NICE_WAITING TRUE #endif /*===========================================================================*/ @@ -255,7 +348,7 @@ * @note Attempts are performed at 10mS intervals. */ #if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__) -#define SDC_INIT_RETRY 100 +#define SDC_INIT_RETRY 100 #endif /** @@ -264,7 +357,7 @@ * at @p FALSE. */ #if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__) -#define SDC_MMC_SUPPORT FALSE +#define SDC_MMC_SUPPORT FALSE #endif /** @@ -274,7 +367,21 @@ * lower priority, this may slow down the driver a bit however. */ #if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__) -#define SDC_NICE_WAITING TRUE +#define SDC_NICE_WAITING TRUE +#endif + +/** + * @brief OCR initialization constant for V20 cards. + */ +#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__) +#define SDC_INIT_OCR_V20 0x50FF8000U +#endif + +/** + * @brief OCR initialization constant for non-V20 cards. + */ +#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__) +#define SDC_INIT_OCR 0x80100000U #endif /*===========================================================================*/ @@ -287,18 +394,18 @@ * default configuration. */ #if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__) -#define SERIAL_DEFAULT_BITRATE 38400 +#define SERIAL_DEFAULT_BITRATE 38400 #endif /** * @brief Serial buffers size. * @details Configuration parameter, you can change the depth of the queue * buffers depending on the requirements of your application. - * @note The default is 64 bytes for both the transmission and receive + * @note The default is 16 bytes for both the transmission and receive * buffers. */ #if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_BUFFERS_SIZE 16 +#define SERIAL_BUFFERS_SIZE 16 #endif /*===========================================================================*/ @@ -309,11 +416,19 @@ * @brief Serial over USB buffers size. * @details Configuration parameter, the buffer size must be a multiple of * the USB data endpoint maximum packet size. - * @note The default is 64 bytes for both the transmission and receive + * @note The default is 256 bytes for both the transmission and receive * buffers. */ #if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__) -#define SERIAL_USB_BUFFERS_SIZE 1 +#define SERIAL_USB_BUFFERS_SIZE 1 +#endif + +/** + * @brief Serial over USB number of buffers. + * @note The default is 2 buffers. + */ +#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__) +#define SERIAL_USB_BUFFERS_NUMBER 2 #endif /*===========================================================================*/ @@ -325,17 +440,53 @@ * @note Disabling this option saves both code and data space. */ #if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__) -#define SPI_USE_WAIT TRUE +#define SPI_USE_WAIT TRUE +#endif + +/** + * @brief Enables circular transfers APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__) +#define SPI_USE_CIRCULAR FALSE #endif + /** * @brief Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs. * @note Disabling this option saves both code and data space. */ #if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) -#define SPI_USE_MUTUAL_EXCLUSION TRUE +#define SPI_USE_MUTUAL_EXCLUSION TRUE +#endif + +/** + * @brief Handling method for SPI CS line. + * @note Disabling this option saves both code and data space. + */ +#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__) +#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD +#endif + +/*===========================================================================*/ +/* UART driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__) +#define UART_USE_WAIT FALSE #endif +/** + * @brief Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define UART_USE_MUTUAL_EXCLUSION FALSE +#endif /*===========================================================================*/ /* USB driver related settings. */ @@ -346,9 +497,29 @@ * @note Disabling this option saves both code and data space. */ #if !defined(USB_USE_WAIT) || defined(__DOXYGEN__) -#define USB_USE_WAIT TRUE +#define USB_USE_WAIT TRUE +#endif + +/*===========================================================================*/ +/* WSPI driver related settings. */ +/*===========================================================================*/ + +/** + * @brief Enables synchronous APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__) +#define WSPI_USE_WAIT TRUE +#endif + +/** + * @brief Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs. + * @note Disabling this option saves both code and data space. + */ +#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__) +#define WSPI_USE_MUTUAL_EXCLUSION TRUE #endif -#endif /* _HALCONF_H_ */ +#endif /* HALCONF_H */ /** @} */ diff --git a/keyboards/amj40/keymaps/fabian/keymap.c b/keyboards/amj40/keymaps/fabian/keymap.c index 360424f300..a35337a4e2 100755 --- a/keyboards/amj40/keymaps/fabian/keymap.c +++ b/keyboards/amj40/keymaps/fabian/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { HPR_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, \ CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ - KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, F(0), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ + KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LT(_LOWER, KC_SPC), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ ), /* Colemak @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC, \ CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, \ SFT_BSP, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_ENT, \ - KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, F(0), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ + KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LT(_LOWER, KC_SPC), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ ), /* Dvorak @@ -110,7 +110,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC, \ CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH, \ SFT_BSP, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, SFT_ENT, \ - KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, F(0), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ + KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LT(_LOWER, KC_SPC), RAISE, KC_RGUI, KC_RALT, KC_RCTL \ ), /* Lower @@ -168,10 +168,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), -}; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case QWERTY: diff --git a/keyboards/amj40/keymaps/myee/keymap.c b/keyboards/amj40/keymaps/myee/keymap.c index 7642ede34d..ec8cdd87db 100644 --- a/keyboards/amj40/keymaps/myee/keymap.c +++ b/keyboards/amj40/keymaps/myee/keymap.c @@ -13,7 +13,9 @@ #define _RAISE 2 #define _ADJUST 3 - +#define LOW_SPC LT(_LOWER, KC_SPC) +#define RSE_SPC LT(_RAISE, KC_SPC) +#define ADJ_TAB LT(ADJUST, KC_TAB) enum custom_keycodes { QWERTY = SAFE_RANGE, @@ -26,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_QWERTY] = LAYOUT( \ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,\ - F(2), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ + ADJ_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, \ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, \ - KC_LCTL, KC_LGUI,KC_LALT, F(0), F(1), KC_RGUI,KC_RALT, KC_RCTL \ + KC_LCTL, KC_LGUI,KC_LALT, LOW_SPC, RSE_SPC, KC_RGUI,KC_RALT, KC_RCTL \ ), [_LOWER] = LAYOUT( \ @@ -54,25 +56,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; -enum function_id { - LAUNCH, - RGBLED_TOGGLE, -}; - -const uint16_t PROGMEM fn_actions[] = { - [0] = ACTION_LAYER_TAP_KEY(_LOWER, KC_SPC), - [1] = ACTION_LAYER_TAP_KEY(_RAISE, KC_SPC), - [2] = ACTION_LAYER_TAP_KEY(_ADJUST,KC_TAB), - -}; - -const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) -{ - // MACRODOWN only works in this function - - return MACRO_NONE; -}; - bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { diff --git a/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.c b/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.c index 9d10fbd754..7c09bd997c 100644 --- a/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.c +++ b/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.c @@ -1,5 +1,5 @@ /* - ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -20,14 +20,76 @@ */ #include "hal.h" +#include "stm32_gpio.h" + +/*===========================================================================*/ +/* Driver local definitions. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver exported variables. */ +/*===========================================================================*/ + +/*===========================================================================*/ +/* Driver local variables and types. */ +/*===========================================================================*/ + +/** + * @brief Type of STM32 GPIO port setup. + */ +typedef struct { + uint32_t moder; + uint32_t otyper; + uint32_t ospeedr; + uint32_t pupdr; + uint32_t odr; + uint32_t afrl; + uint32_t afrh; +} gpio_setup_t; + +/** + * @brief Type of STM32 GPIO initialization data. + */ +typedef struct { +#if STM32_HAS_GPIOA || defined(__DOXYGEN__) + gpio_setup_t PAData; +#endif +#if STM32_HAS_GPIOB || defined(__DOXYGEN__) + gpio_setup_t PBData; +#endif +#if STM32_HAS_GPIOC || defined(__DOXYGEN__) + gpio_setup_t PCData; +#endif +#if STM32_HAS_GPIOD || defined(__DOXYGEN__) + gpio_setup_t PDData; +#endif +#if STM32_HAS_GPIOE || defined(__DOXYGEN__) + gpio_setup_t PEData; +#endif +#if STM32_HAS_GPIOF || defined(__DOXYGEN__) + gpio_setup_t PFData; +#endif +#if STM32_HAS_GPIOG || defined(__DOXYGEN__) + gpio_setup_t PGData; +#endif +#if STM32_HAS_GPIOH || defined(__DOXYGEN__) + gpio_setup_t PHData; +#endif +#if STM32_HAS_GPIOI || defined(__DOXYGEN__) + gpio_setup_t PIData; +#endif +#if STM32_HAS_GPIOJ || defined(__DOXYGEN__) + gpio_setup_t PJData; +#endif +#if STM32_HAS_GPIOK || defined(__DOXYGEN__) + gpio_setup_t PKData; +#endif +} gpio_config_t; -#if HAL_USE_PAL || defined(__DOXYGEN__) /** - * @brief PAL setup. - * @details Digital I/O ports static configuration as defined in @p board.h. - * This variable is used by the HAL when initializing the PAL driver. + * @brief STM32 GPIO static initialization data. */ -const PALConfig pal_default_config = { +static const gpio_config_t gpio_default_config = { #if STM32_HAS_GPIOA {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR, VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH}, @@ -62,23 +124,118 @@ const PALConfig pal_default_config = { #endif #if STM32_HAS_GPIOI {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR, - VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH} + VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH}, +#endif +#if STM32_HAS_GPIOJ + {VAL_GPIOJ_MODER, VAL_GPIOJ_OTYPER, VAL_GPIOJ_OSPEEDR, VAL_GPIOJ_PUPDR, + VAL_GPIOJ_ODR, VAL_GPIOJ_AFRL, VAL_GPIOJ_AFRH}, +#endif +#if STM32_HAS_GPIOK + {VAL_GPIOK_MODER, VAL_GPIOK_OTYPER, VAL_GPIOK_OSPEEDR, VAL_GPIOK_PUPDR, + VAL_GPIOK_ODR, VAL_GPIOK_AFRL, VAL_GPIOK_AFRH} #endif }; + +/*===========================================================================*/ +/* Driver local functions. */ +/*===========================================================================*/ + +static void gpio_init(stm32_gpio_t *gpiop, const gpio_setup_t *config) { + + gpiop->OTYPER = config->otyper; + gpiop->OSPEEDR = config->ospeedr; + gpiop->PUPDR = config->pupdr; + gpiop->ODR = config->odr; + gpiop->AFRL = config->afrl; + gpiop->AFRH = config->afrh; + gpiop->MODER = config->moder; +} + +static void stm32_gpio_init(void) { + + /* Enabling GPIO-related clocks, the mask comes from the + registry header file.*/ + rccResetAHB(STM32_GPIO_EN_MASK); + rccEnableAHB(STM32_GPIO_EN_MASK, true); + + /* Initializing all the defined GPIO ports.*/ +#if STM32_HAS_GPIOA + gpio_init(GPIOA, &gpio_default_config.PAData); +#endif +#if STM32_HAS_GPIOB + gpio_init(GPIOB, &gpio_default_config.PBData); #endif +#if STM32_HAS_GPIOC + gpio_init(GPIOC, &gpio_default_config.PCData); +#endif +#if STM32_HAS_GPIOD + gpio_init(GPIOD, &gpio_default_config.PDData); +#endif +#if STM32_HAS_GPIOE + gpio_init(GPIOE, &gpio_default_config.PEData); +#endif +#if STM32_HAS_GPIOF + gpio_init(GPIOF, &gpio_default_config.PFData); +#endif +#if STM32_HAS_GPIOG + gpio_init(GPIOG, &gpio_default_config.PGData); +#endif +#if STM32_HAS_GPIOH + gpio_init(GPIOH, &gpio_default_config.PHData); +#endif +#if STM32_HAS_GPIOI + gpio_init(GPIOI, &gpio_default_config.PIData); +#endif +#if STM32_HAS_GPIOJ + gpio_init(GPIOJ, &gpio_default_config.PJData); +#endif +#if STM32_HAS_GPIOK + gpio_init(GPIOK, &gpio_default_config.PKData); +#endif +} + +/*===========================================================================*/ +/* Driver interrupt handlers. */ +/*===========================================================================*/ -void enter_bootloader_mode_if_requested(void); +/*===========================================================================*/ +/* Driver exported functions. */ +/*===========================================================================*/ /** * @brief Early initialization code. - * @details This initialization must be performed just after stack setup - * and before any other initialization. + * @details GPIO ports and system clocks are initialized before everything + * else. */ void __early_init(void) { + extern void enter_bootloader_mode_if_requested(void); enter_bootloader_mode_if_requested(); + stm32_gpio_init(); stm32_clock_init(); } +#if HAL_USE_SDC || defined(__DOXYGEN__) +/** + * @brief SDC card detection. + */ +bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { + + (void)sdcp; + /* TODO: Fill the implementation.*/ + return true; +} + +/** + * @brief SDC card write protection detection. + */ +bool sdc_lld_is_write_protected(SDCDriver *sdcp) { + + (void)sdcp; + /* TODO: Fill the implementation.*/ + return false; +} +#endif /* HAL_USE_SDC */ + #if HAL_USE_MMC_SPI || defined(__DOXYGEN__) /** * @brief MMC_SPI card detection. @@ -106,4 +263,6 @@ bool mmc_lld_is_write_protected(MMCDriver *mmcp) { * @todo Add your board-specific code, if any. */ void boardInit(void) { + SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; + SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP); } diff --git a/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.h b/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.h index de3a93d1ce..57636d1f12 100644 --- a/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.h +++ b/keyboards/at_at/660m/boards/ST_STM32F072B_DISCOVERY/board.h @@ -22,6 +22,10 @@ #ifndef BOARD_H #define BOARD_H +/*===========================================================================*/ +/* Driver constants. */ +/*===========================================================================*/ + /* * Setup for ST STM32F072B-Discovery board. */ @@ -166,11 +170,9 @@ #define LINE_USB_DP PAL_LINE(GPIOA, 12U) #define LINE_SWDIO PAL_LINE