aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--builddefs/common_features.mk5
-rw-r--r--data/mappings/info_config.hjson1
-rw-r--r--data/mappings/info_rules.hjson2
-rw-r--r--data/mappings/keyboard_aliases.hjson129
-rw-r--r--data/schemas/keyboard.jsonschema1
-rw-r--r--docs/ChangeLog/20250831/PR25414.md5
-rw-r--r--docs/config_options.md2
-rw-r--r--docs/feature_advanced_keycodes.md60
-rw-r--r--docs/features/led_matrix.md21
-rw-r--r--docs/features/pointing_device.md32
-rw-r--r--docs/features/rgb_matrix.md21
-rw-r--r--docs/keycodes.md70
-rw-r--r--docs/mod_tap.md6
-rw-r--r--docs/reference_info_json.md3
-rw-r--r--drivers/sensors/adns5050.c6
-rw-r--r--drivers/sensors/adns5050.h4
-rw-r--r--drivers/sensors/adns9800.c11
-rw-r--r--drivers/sensors/adns9800.h4
-rw-r--r--drivers/sensors/analog_joystick.c4
-rw-r--r--drivers/sensors/analog_joystick.h4
-rw-r--r--drivers/sensors/azoteq_iqs5xx.c100
-rw-r--r--drivers/sensors/azoteq_iqs5xx.h4
-rw-r--r--drivers/sensors/cirque_pinnacle.c7
-rw-r--r--drivers/sensors/cirque_pinnacle.h4
-rw-r--r--drivers/sensors/cirque_pinnacle_i2c.c21
-rw-r--r--drivers/sensors/cirque_pinnacle_spi.c41
-rw-r--r--drivers/sensors/paw3204.c16
-rw-r--r--drivers/sensors/paw3204.h4
-rw-r--r--drivers/sensors/pimoroni_trackball.c7
-rw-r--r--drivers/sensors/pimoroni_trackball.h4
-rw-r--r--drivers/sensors/pmw3320.c6
-rw-r--r--drivers/sensors/pmw3320.h4
-rw-r--r--drivers/sensors/pmw3389.c2
-rw-r--r--drivers/sensors/pmw33xx_common.c6
-rw-r--r--drivers/sensors/pmw33xx_common.h4
-rw-r--r--keyboards/1upkeyboards/pi50/config.h1
-rw-r--r--keyboards/1upkeyboards/pi50/pi50.c45
-rw-r--r--keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c4
-rw-r--r--keyboards/40percentclub/ut47/keymaps/default/keymap.c2
-rw-r--r--keyboards/40percentclub/ut47/keymaps/rgb/keymap.c2
-rw-r--r--keyboards/adpenrose/akemipad/keyboard.json3
-rw-r--r--keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c10
-rw-r--r--keyboards/ai/keyboard.json3
-rw-r--r--keyboards/ai03/orbit/keymaps/default/keymap.c6
-rw-r--r--keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c2
-rw-r--r--keyboards/akko/5087/keyboard.json8
-rw-r--r--keyboards/akko/5108/keyboard.json8
-rw-r--r--keyboards/akko/acr87/keyboard.json8
-rw-r--r--keyboards/akko/top40/keyboard.json8
-rw-r--r--keyboards/aleblazer/zodiark/keyboard.json3
-rw-r--r--keyboards/alpha/keyboard.json3
-rw-r--r--keyboards/amjkeyboard/amj84/keyboard.json8
-rw-r--r--keyboards/aplyard/aplx6/rev1/keyboard.json3
-rw-r--r--keyboards/aplyard/aplx6/rev2/keyboard.json3
-rw-r--r--keyboards/arabica37/rev1/keyboard.json3
-rw-r--r--keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c4
-rw-r--r--keyboards/arrowmechanics/wings/keymaps/default/keymap.c4
-rw-r--r--keyboards/ashwing66/keymaps/default/keymap.c4
-rw-r--r--keyboards/atlantis/ak81_ve/keyboard.json8
-rw-r--r--keyboards/atomic/keymaps/default/keymap.c6
-rw-r--r--keyboards/atreus62/keyboard.json3
-rw-r--r--keyboards/atreyu/rev1/rev1.c4
-rw-r--r--keyboards/atreyu/rev2/rev2.c4
-rw-r--r--keyboards/avalanche/v1/keyboard.json3
-rw-r--r--keyboards/avalanche/v2/keyboard.json3
-rw-r--r--keyboards/avalanche/v3/keyboard.json3
-rw-r--r--keyboards/avalanche/v4/keyboard.json3
-rw-r--r--keyboards/aya/keymaps/default/keymap.c10
-rw-r--r--keyboards/b_sides/rev41lp/keyboard.json3
-rw-r--r--keyboards/bajjak/bajjak.c4
-rw-r--r--keyboards/bajjak/bajjak.h6
-rw-r--r--keyboards/bajjak/keymaps/5x6/keymap.c6
-rw-r--r--keyboards/bajjak/keymaps/default/keymap.c6
-rw-r--r--keyboards/balloondogcaps/tr90pm/keyboard.json3
-rw-r--r--keyboards/bandominedoni/keyboard.json3
-rw-r--r--keyboards/basekeys/slice/rev1/keyboard.json3
-rw-r--r--keyboards/basekeys/slice/rev1_rgb/keyboard.json3
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/config.h29
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h19
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json19
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h19
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk8
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/config.h5
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/info.json18
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c84
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.json26
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/promicro/keyboard.json15
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/promicro/rules.mk1
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/config.h37
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h21
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json22
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h23
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk7
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/3x5_3.c2
-rw-r--r--keyboards/bastardkb/dilemma/4x6_4/4x6_4.c2
-rw-r--r--keyboards/bastardkb/dilemma/dilemma.c16
-rw-r--r--keyboards/bastardkb/dilemma/readme.md26
-rw-r--r--keyboards/bastardkb/readme.md19
-rw-r--r--keyboards/bastardkb/scylla/blackpill/config.h33
-rw-r--r--keyboards/bastardkb/scylla/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/scylla/blackpill/keyboard.json42
-rw-r--r--keyboards/bastardkb/scylla/blackpill/mcuconf.h23
-rw-r--r--keyboards/bastardkb/scylla/blackpill/rules.mk5
-rw-r--r--keyboards/bastardkb/scylla/info.json97
-rw-r--r--keyboards/bastardkb/scylla/keymaps/default/keymap.c51
-rw-r--r--keyboards/bastardkb/scylla/keymaps/default/keymap.json31
-rw-r--r--keyboards/bastardkb/scylla/promicro/keyboard.json15
-rw-r--r--keyboards/bastardkb/scylla/readme.md36
-rw-r--r--keyboards/bastardkb/scylla/scylla.c63
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/config.h22
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/scylla/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/config.h21
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/scylla/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/config.h31
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json32
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_2/rules.mk3
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/config.h31
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json32
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/scylla/v2/splinky_3/rules.mk3
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/config.h38
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/halconf.h23
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/keyboard.json34
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h29
-rw-r--r--keyboards/bastardkb/scylla/v2/stemcell/rules.mk3
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/config.h33
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/keyboard.json42
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/mcuconf.h23
-rw-r--r--keyboards/bastardkb/skeletyl/blackpill/rules.mk5
-rw-r--r--keyboards/bastardkb/skeletyl/info.json71
-rw-r--r--keyboards/bastardkb/skeletyl/keymaps/default/keymap.c70
-rw-r--r--keyboards/bastardkb/skeletyl/keymaps/default/keymap.json26
-rw-r--r--keyboards/bastardkb/skeletyl/promicro/keyboard.json15
-rw-r--r--keyboards/bastardkb/skeletyl/readme.md36
-rw-r--r--keyboards/bastardkb/skeletyl/skeletyl.c81
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/config.h22
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/skeletyl/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/config.h21
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/skeletyl/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/config.h31
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json32
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk3
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/config.h31
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json32
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk3
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/config.h38
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h23
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json34
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h29
-rw-r--r--keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk3
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/config.h33
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/halconf.h21
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/keyboard.json42
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/mcuconf.h23
-rw-r--r--keyboards/bastardkb/tbkmini/blackpill/rules.mk5
-rw-r--r--keyboards/bastardkb/tbkmini/info.json79
-rw-r--r--keyboards/bastardkb/tbkmini/keymaps/default/keymap.c69
-rw-r--r--keyboards/bastardkb/tbkmini/keymaps/default/keymap.json25
-rw-r--r--keyboards/bastardkb/tbkmini/promicro/keyboard.json15
-rw-r--r--keyboards/bastardkb/tbkmini/readme.md36
-rw-r--r--keyboards/bastardkb/tbkmini/tbkmini.c61
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/config.h22
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/tbkmini/v1/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/config.h21
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json31
-rw-r--r--keyboards/bastardkb/tbkmini/v2/elitec/rules.mk1
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/config.h31
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json32
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md5
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk3
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/config.h31
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json32
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md5
-rw-r--r--keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk3
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/config.h38
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h23
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json34
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h29
-rw-r--r--keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk3
-rw-r--r--keyboards/bbrfkr/dynamis/dynamis.c4
-rw-r--r--keyboards/bbrfkr/dynamis/keymaps/default/keymap.c2
-rw-r--r--keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c2
-rw-r--r--keyboards/beatervan/keyboard.json3
-rw-r--r--keyboards/biacco42/ergo42/rev1/keyboard.json3
-rw-r--r--keyboards/biacco42/meishi/keyboard.json3
-rw-r--r--keyboards/biacco42/meishi2/keyboard.json3
-rw-r--r--keyboards/binepad/bnr1/keymaps/default/keymap.c2
-rw-r--r--keyboards/binepad/kn01/keymaps/default/keymap.json4
-rw-r--r--keyboards/binepad/pixie/keymaps/default/keymap.c2
-rw-r--r--keyboards/blockey/keyboard.json3
-rw-r--r--keyboards/bluebell/swoop/keyboard.json3
-rw-r--r--keyboards/bt66tech/bt66tech60/keyboard.json8
-rw-r--r--keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c6
-rw-r--r--keyboards/bthlabs/geekpad/keyboard.json3
-rw-r--r--keyboards/bubble75/hotswap/keyboard.json6
-rw-r--r--keyboards/buzzard/keymaps/default/keymap.c10
-rw-r--r--keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c4
-rw-r--r--keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c4
-rw-r--r--keyboards/cannonkeys/satisfaction75/rules.mk2
-rw-r--r--keyboards/catch22/keyboard.json3
-rw-r--r--keyboards/cest73/tkm/keyboard.json8
-rw-r--r--keyboards/chaos65/keyboard.json8
-rw-r--r--keyboards/checkerboards/quark_plus/quark_plus.c4
-rw-r--r--keyboards/checkerboards/snop60/snop60.c4
-rw-r--r--keyboards/cheshire/curiosity/keymaps/default/keymap.c4
-rw-r--r--keyboards/chocofly/v1/keyboard.json3
-rw-r--r--keyboards/chosfox/cf81/keyboard.json6
-rw-r--r--keyboards/ckeys/handwire_101/keyboard.json3
-rwxr-xr-xkeyboards/ckeys/handwire_101/keymaps/default/keymap.c8
-rwxr-xr-xkeyboards/ckeys/thedora/keymaps/default/keymap.c8
-rw-r--r--keyboards/clawsome/coupe/keyboard.json3
-rw-r--r--keyboards/clawsome/doodle/keyboard.json3
-rw-r--r--keyboards/clawsome/fightpad/keyboard.json3
-rw-r--r--keyboards/clawsome/gamebuddy/v1_0/keyboard.json3
-rw-r--r--keyboards/clawsome/gamebuddy/v1_m/keyboard.json3
-rw-r--r--keyboards/clawsome/numeros/keyboard.json3
-rw-r--r--keyboards/clawsome/roadster/keyboard.json3
-rw-r--r--keyboards/clueboard/2x1800/2019/2019.c32
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c2
-rw-r--r--keyboards/clueboard/2x1800/2021/2021.c8
-rw-r--r--keyboards/coban/pad9a/keymaps/default/keymap.c2
-rw-r--r--keyboards/contra/keyboard.json3
-rw-r--r--keyboards/converter/adb_usb/rules.mk2
-rw-r--r--keyboards/converter/sun_usb/rules.mk2
-rw-r--r--keyboards/converter/usb_usb/rules.mk2
-rw-r--r--keyboards/cornia/keymaps/fire/keymap.c6
-rw-r--r--keyboards/cradio/keymaps/default/keymap.c6
-rw-r--r--keyboards/craftwalk/keymaps/default/keymap.c2
-rw-r--r--keyboards/crbn/keyboard.json3
-rw-r--r--keyboards/custommk/elysian/keyboard.json8
-rw-r--r--keyboards/custommk/elysian/keymaps/default/keymap.c2
-rw-r--r--keyboards/custommk/evo70/evo70.c4
-rw-r--r--keyboards/cybergear/macro25/keyboard.json3
-rw-r--r--keyboards/dailycraft/bat43/info.json3
-rw-r--r--keyboards/dailycraft/claw44/rev1/keyboard.json3
-rw-r--r--keyboards/dailycraft/sandbox/rev1/keyboard.json3
-rw-r--r--keyboards/dailycraft/sandbox/rev2/keyboard.json3
-rw-r--r--keyboards/dailycraft/wings42/rev1/keyboard.json3
-rw-r--r--keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json3
-rw-r--r--keyboards/dailycraft/wings42/rev2/keyboard.json3
-rw-r--r--keyboards/delikeeb/flatbread60/keyboard.json3
-rw-r--r--keyboards/delikeeb/vaneela/keyboard.json3
-rw-r--r--keyboards/delikeeb/vaneelaex/keyboard.json3
-rw-r--r--keyboards/deltasplit75/v2/keyboard.json3
-rw-r--r--keyboards/dm9records/ergoinu/keyboard.json3
-rw-r--r--keyboards/doio/kb16/info.json8
-rw-r--r--keyboards/doio/kb38/kb38.c4
-rw-r--r--keyboards/doio/kb3x/keymaps/default/keymap.c6
-rw-r--r--keyboards/doodboard/duckboard/keyboard.json3
-rw-r--r--keyboards/doodboard/duckboard_r2/keyboard.json3
-rw-r--r--keyboards/dotmod/dymium65/keyboard.json8
-rw-r--r--keyboards/draculad/keyboard.json3
-rw-r--r--keyboards/draculad/keymaps/default/keymap.c6
-rw-r--r--keyboards/drhigsby/bkf/keyboard.json3
-rw-r--r--keyboards/drhigsby/dubba175/keyboard.json3
-rw-r--r--keyboards/drhigsby/ogurec/info.json3
-rw-r--r--keyboards/drhigsby/packrat/keyboard.json3
-rw-r--r--keyboards/ducky/one2mini/1861st/keyboard.json8
-rw-r--r--keyboards/ducky/one2mini/keymaps/ansi/keymap.c4
-rw-r--r--keyboards/ducky/one2mini/keymaps/ansi_tsangan/keymap.c4
-rw-r--r--keyboards/ducky/one2mini/keymaps/default/keymap.c4
-rw-r--r--keyboards/ducky/one2mini/keymaps/iso/keymap.c4
-rw-r--r--keyboards/ducky/one2sf/1967st/keyboard.json8
-rw-r--r--keyboards/ducky/one2sf/keymaps/default/keymap.c4
-rw-r--r--keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c4
-rw-r--r--keyboards/ducky/one2sf/keymaps/default_iso/keymap.c4
-rw-r--r--keyboards/dumbo/keyboard.json3
-rw-r--r--keyboards/dumbpad/v0x/keyboard.json3
-rw-r--r--keyboards/dumbpad/v0x/keymaps/default/keymap.c6
-rw-r--r--keyboards/dumbpad/v0x/v0x.c4
-rw-r--r--keyboards/dumbpad/v0x_dualencoder/keyboard.json3
-rw-r--r--keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c4
-rw-r--r--keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c4
-rw-r--r--keyboards/dumbpad/v0x_right/keyboard.json3
-rw-r--r--keyboards/dumbpad/v0x_right/keymaps/default/keymap.c6
-rw-r--r--keyboards/dumbpad/v0x_right/v0x_right.c4
-rw-r--r--keyboards/dumbpad/v1x/keyboard.json3
-rw-r--r--keyboards/dumbpad/v1x/keymaps/default/keymap.c6
-rw-r--r--keyboards/dumbpad/v1x/v1x.c4
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/keyboard.json3
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c6
-rw-r--r--keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c4
-rw-r--r--keyboards/dumbpad/v1x_oled/keyboard.json3
-rw-r--r--keyboards/dumbpad/v1x_right/keyboard.json3
-rw-r--r--keyboards/dumbpad/v1x_right/keymaps/default/keymap.c6
-rw-r--r--keyboards/dumbpad/v1x_right/v1x_right.c4
-rw-r--r--keyboards/dumbpad/v3x/keyboard.json3
-rw-r--r--keyboards/durgod/dgk6x/rules.mk2
-rw-r--r--keyboards/dz60/keymaps/iso_split-spacebar/keymap.c4
-rw-r--r--keyboards/earth_rover/keyboard.json3
-rw-r--r--keyboards/eason/aeroboard/keyboard.json8
-rw-r--r--keyboards/eason/meow65/keyboard.json8
-rw-r--r--keyboards/eason/void65h/keyboard.json8
-rw-r--r--keyboards/eco/info.json3
-rw-r--r--keyboards/elephant42/keyboard.json3
-rw-r--r--keyboards/emajesty/eiri/keyboard.json3
-rw-r--r--keyboards/emptystring/nqg/keyboard.json3
-rw-r--r--keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c2
-rw-r--r--keyboards/epomaker/tide65/keyboard.json6
-rw-r--r--keyboards/ergodox_ez/glow/keymaps/default/keymap.c8
-rw-r--r--keyboards/ergodox_ez/keymaps/default/keymap.c8
-rw-r--r--keyboards/ergodox_ez/keymaps/default_osx/keymap.c8
-rw-r--r--keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c8
-rw-r--r--keyboards/ergodox_ez/keymaps/testing/keymap.c4
-rw-r--r--keyboards/ergodox_ez/rules.mk2
-rw-r--r--keyboards/ergodox_ez/util/keymap_beautifier/README.md4
-rw-r--r--keyboards/ergoslab/keymaps/default/keymap.c6
-rw-r--r--keyboards/ergoslab/rev1/keyboard.json3
-rw-r--r--keyboards/ergotravel/rev1/keyboard.json3
-rw-r--r--keyboards/etiennecollin/wave/keymaps/default/keymap.c8
-rw-r--r--keyboards/evancookaudio/sleepingdinosaur/keyboard.json3
-rw-r--r--keyboards/evancookaudio/tenpad/keyboard.json3
-rw-r--r--keyboards/evyd13/ta65/keymaps/default/keymap.c4
-rw-r--r--keyboards/fancytech/fancyalice66/keyboard.json6
-rw-r--r--keyboards/ferris/0_2/rules.mk2
-rw-r--r--keyboards/ferris/keymaps/default/keymap.json8
-rw-r--r--keyboards/ffkeebs/puca/keyboard.json3
-rw-r--r--keyboards/flehrad/numbrero/keyboard.json3
-rw-r--r--keyboards/flehrad/snagpad/keyboard.json3
-rw-r--r--keyboards/flehrad/tradestation/keyboard.json3
-rw-r--r--keyboards/for_science/keyboard.json3
-rw-r--r--keyboards/fr4/southpaw75/keyboard.json3
-rw-r--r--keyboards/fr4/unix60/keyboard.json3
-rw-r--r--keyboards/fractal/keyboard.json3
-rw-r--r--keyboards/free_willy/keyboard.json3
-rw-r--r--keyboards/frobiac/blackbowl/keymaps/default/keymap.c6
-rw-r--r--keyboards/frobiac/blackflat/keymaps/default/keymap.c6
-rw-r--r--keyboards/frobiac/hypernano/keymaps/default/keymap.c6
-rw-r--r--keyboards/frobiac/redtilt/keymaps/default/keymap.c6
-rw-r--r--keyboards/fungo/keymaps/default/keymap.c6
-rw-r--r--keyboards/fungo/rev1/keyboard.json3
-rw-r--r--keyboards/funky40/keyboard.json3
-rw-r--r--keyboards/gboards/butterstick/keyboard.json8
-rw-r--r--keyboards/gboards/butterstick/keymaps/default/keymap.c4
-rw-r--r--keyboards/gboards/combos/germ-mouse-keys.def4
-rw-r--r--keyboards/gboards/georgi/keyboard.json8
-rw-r--r--keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c4
-rw-r--r--keyboards/gboards/georgi/keymaps/default-flipped/keymap.c4
-rw-r--r--keyboards/gboards/georgi/keymaps/default/keymap.c4
-rw-r--r--keyboards/gboards/georgi/keymaps/minimal/keymap.c4
-rw-r--r--keyboards/gboards/georgi/keymaps/norman/keymap.c4
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/keymap.c6
-rw-r--r--keyboards/gboards/gergo/keymaps/default/keymap.c6
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/keymap.c6
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/keymap.c6
-rw-r--r--keyboards/gboards/gergoplex/keymaps/colemak-dhm/gergoplex.def4
-rw-r--r--keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c6
-rw-r--r--keyboards/gboards/gergoplex/keymaps/default/keymap.c6
-rw-r--r--keyboards/gl516/a52gl/keyboard.json3
-rw-r--r--keyboards/gl516/j73gl/keyboard.json3
-rw-r--r--keyboards/gl516/n51gl/keyboard.json3
-rw-r--r--keyboards/gopolar/gg86/keyboard.json6
-rw-r--r--keyboards/gowla/keyboard.json3
-rw-r--r--keyboards/green_keys/gravity_45/keymaps/default/keymap.c2
-rw-r--r--keyboards/gregandcin/teaqueen/keymaps/default/keymap.c4
-rw-r--r--keyboards/h0oni/deskpad/deskpad.c8
-rw-r--r--keyboards/h0oni/deskpad/keymaps/default/keymap.c2
-rw-r--r--keyboards/hadron/ver2/keymaps/default/keymap.c10
-rw-r--r--keyboards/hadron/ver2/keymaps/side_numpad/keymap.c10
-rw-r--r--keyboards/hadron/ver3/keymaps/default/keymap.c10
-rw-r--r--keyboards/halfcliff/halfcliff.c8
-rw-r--r--keyboards/halfcliff/keyboard.json3
-rw-r--r--keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c2
-rw-r--r--keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c2
-rw-r--r--keyboards/handwired/42/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/acacia/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/arrow_pad/keyboard.json8
-rw-r--r--keyboards/handwired/chiron/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/cmd60/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/concertina/64key/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/dactyl/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dactyl/keymaps/dvorak/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_cc/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c12
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c12
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c12
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json34
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json34
-rw-r--r--keyboards/handwired/dactyl_manuform_pi_pico/keymaps/default/keymap.c10
-rw-r--r--keyboards/handwired/dactyl_maximus/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_rah/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_rah/keymaps/right/keymap.c6
-rw-r--r--keyboards/handwired/dactylmacropad/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/datahand/keyboard.json8
-rw-r--r--keyboards/handwired/datahand/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dmote/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/dqz11n1g/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/dygma/raise/rules.mk2
-rw-r--r--keyboards/handwired/elrgo_s/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/ergocheap/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/fivethirteen/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/floorboard/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/franky36/keyboard.json4
-rw-r--r--keyboards/handwired/frenchdev/keymaps/default/keymap.c22
-rw-r--r--keyboards/handwired/k8split/keymaps/left/keymap.c4
-rw-r--r--keyboards/handwired/kbod/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/mutepad/keyboard.json8
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/ortho5x14/keymaps/2u/keymap.c8
-rw-r--r--keyboards/handwired/ortho5x14/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/ortho5x14/keymaps/split1/keymap.c6
-rw-r--r--keyboards/handwired/petruziamini/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/pilcrow/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/pterodactyl/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/pytest/basic/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/pytest/has_community/keymaps/default/keymap.c7
-rw-r--r--keyboards/handwired/retro_refit/keyboard.json8
-rw-r--r--keyboards/handwired/riblee_f401/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/riblee_f411/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/sick68/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/snatchpad/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/snatchpad/snatchpad.c8
-rw-r--r--keyboards/handwired/sono1/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/space_oddity/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/split_cloud/keyboard.json8
-rw-r--r--keyboards/handwired/t111/keymaps/oleg/keymap.c6
-rw-r--r--keyboards/handwired/terminus_mini/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/tkk/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/trackpoint/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/traveller/keymaps/default/keymap.c40
-rw-r--r--keyboards/handwired/tsubasa/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/twadlee/tp69/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/twig/twig50/keyboard.json8
-rw-r--r--keyboards/handwired/twig/twig50/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/videowriter/keymaps/default/keymap.c4
-rw-r--r--keyboards/handwired/videowriter/keymaps/oleg/keymap.c4
-rw-r--r--keyboards/handwired/wulkan/keyboard.json8
-rw-r--r--keyboards/handwired/wulkan/keymaps/default/keymap.c6
-rw-r--r--keyboards/handwired/wwa/soyuz/keyboard.json10
-rw-r--r--keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c10
-rw-r--r--keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk1
-rw-r--r--keyboards/handwired/wwa/soyuz/readme.md2
-rw-r--r--keyboards/handwired/xealous/rev1/keyboard.json8
-rw-r--r--keyboards/hardwareabstraction/handwire/handwire.c2
-rw-r--r--keyboards/helix/beta/beta.c77
-rw-r--r--keyboards/helix/beta/config.h5
-rw-r--r--keyboards/helix/beta/keyboard.json (renamed from keyboards/helix/rev2/info.json)118
-rw-r--r--keyboards/helix/beta/keymaps/default/keymap.json28
-rw-r--r--keyboards/helix/pico/back/keyboard.json1
-rw-r--r--keyboards/helix/pico/back/rules.mk1
-rw-r--r--keyboards/helix/pico/base/keyboard.json1
-rw-r--r--keyboards/helix/pico/config.h97
-rw-r--r--keyboards/helix/pico/keyboard.json (renamed from keyboards/helix/pico/info.json)55
-rw-r--r--keyboards/helix/pico/keymaps/default/config.h42
-rw-r--r--keyboards/helix/pico/keymaps/default/keymap.c329
-rw-r--r--keyboards/helix/pico/keymaps/default/keymap.json25
-rw-r--r--keyboards/helix/pico/keymaps/default/readme.md137
-rw-r--r--keyboards/helix/pico/keymaps/default/readme_jp.md138
-rw-r--r--keyboards/helix/pico/keymaps/default/rules.mk11
-rw-r--r--keyboards/helix/pico/override_helix_options.mk-maintenance42
-rw-r--r--keyboards/helix/pico/pico.c37
-rw-r--r--keyboards/helix/pico/pico.h24
-rw-r--r--keyboards/helix/pico/post_config.h7
-rw-r--r--keyboards/helix/pico/post_rules.mk77
-rw-r--r--keyboards/helix/pico/qmk_conf/config.h28
-rw-r--r--keyboards/helix/pico/qmk_conf/keyboard.json6
-rw-r--r--keyboards/helix/pico/rules.mk7
-rw-r--r--keyboards/helix/pico/sc/keyboard.json1
-rw-r--r--keyboards/helix/pico/sc/rules.mk1
-rw-r--r--keyboards/helix/pico/under/keyboard.json1
-rw-r--r--keyboards/helix/pico/under/rules.mk1
-rw-r--r--keyboards/helix/rev2/back/keyboard.json1
-rw-r--r--keyboards/helix/rev2/back/rules.mk1
-rw-r--r--keyboards/helix/rev2/base/keyboard.json1
-rw-r--r--keyboards/helix/rev2/config.h78
-rw-r--r--keyboards/helix/rev2/keymaps/default/config.h38
-rw-r--r--keyboards/helix/rev2/keymaps/default/keymap.c341
-rw-r--r--keyboards/helix/rev2/keymaps/default/oled_display.c138
-rw-r--r--keyboards/helix/rev2/keymaps/default/readme.md154
-rw-r--r--keyboards/helix/rev2/keymaps/default/readme_jp.md127
-rw-r--r--keyboards/helix/rev2/keymaps/default/rules.mk23
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/config.h58
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c410
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/readme.md150
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/readme_jp.md173
-rw-r--r--keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk19
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/README.md27
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/config.h41
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/keymap.c341
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/led_test_init.c6
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/oled_display.c1
-rw-r--r--keyboards/helix/rev2/keymaps/led_test/rules.mk25
-rw-r--r--keyboards/helix/rev2/local_features.mk90
-rw-r--r--keyboards/helix/rev2/override_helix_options.mk-maintenance46
-rw-r--r--keyboards/helix/rev2/post_config.h7
-rw-r--r--keyboards/helix/rev2/post_rules.mk3
-rw-r--r--keyboards/helix/rev2/qmk_conf/keyboard.json1
-rw-r--r--keyboards/helix/rev2/qmk_conf/rules.mk4
-rw-r--r--keyboards/helix/rev2/readme.md13
-rw-r--r--keyboards/helix/rev2/rev2.c76
-rw-r--r--keyboards/helix/rev2/rev2.h36
-rw-r--r--keyboards/helix/rev2/rules.mk11
-rw-r--r--keyboards/helix/rev2/sc/keyboard.json1
-rw-r--r--keyboards/helix/rev2/sc/rules.mk1
-rw-r--r--keyboards/helix/rev2/serial_config_simpleapi.h4
-rw-r--r--keyboards/helix/rev2/under/keyboard.json1
-rw-r--r--keyboards/helix/rev2/under/rules.mk1
-rw-r--r--keyboards/helix/rev3_5rows/keymaps/default/keymap.c6
-rw-r--r--keyboards/helix/rules.mk2
-rw-r--r--keyboards/hfdkb/ac001/keyboard.json8
-rw-r--r--keyboards/hhkb/yang/keymaps/kanru/keymap.c6
-rw-r--r--keyboards/hifumi/keyboard.json3
-rw-r--r--keyboards/hnahkb/vn66/keymaps/default/keymap.c4
-rw-r--r--keyboards/horizon/keyboard.json3
-rw-r--r--keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json8
-rw-r--r--keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json8
-rw-r--r--keyboards/horrortroll/handwired_k552/keyboard.json8
-rw-r--r--keyboards/horrortroll/lemon40/keyboard.json8
-rw-r--r--keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c4
-rw-r--r--keyboards/horrortroll/paws60/keyboard.json8
-rw-r--r--keyboards/hotdox/keymaps/default/keymap.c8
-rw-r--r--keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c8
-rw-r--r--keyboards/ibm/model_m/mschwingen/rules.mk2
-rw-r--r--keyboards/ibnuda/alicia_cook/keyboard.json3
-rw-r--r--keyboards/ibnuda/gurindam/keyboard.json3
-rw-r--r--keyboards/ibnuda/squiggle/rev1/keyboard.json3
-rw-r--r--keyboards/idank/spankbd/keymaps/default/keymap.json12
-rw-r--r--keyboards/idank/sweeq/keymaps/default/keymap.json8
-rw-r--r--keyboards/idobao/id42/keyboard.json8
-rw-r--r--keyboards/inland/kb83/keyboard.json8
-rw-r--r--keyboards/inland/mk47/keyboard.json6
-rw-r--r--keyboards/inland/v83p/keyboard.json6
-rw-r--r--keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c8
-rw-r--r--keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c8
-rw-r--r--keyboards/input_club/infinity60/keymaps/hasu/keymap.c14
-rw-r--r--keyboards/ivndbt/late9/rev1/keyboard.json3
-rwxr-xr-xkeyboards/ivndbt/neopad/rev1/keyboard.json3
-rwxr-xr-xkeyboards/ivndbt/neopad/rev1/keymaps/default/keymap.c12
-rw-r--r--keyboards/jacky_studio/piggy60/keymaps/default/keymap.c4
-rw-r--r--keyboards/jiran/info.json3
-rw-r--r--keyboards/jorne/rev1/keyboard.json3
-rw-r--r--keyboards/junco/keymaps/default/keymap.c2
-rw-r--r--keyboards/k34/keymaps/default/keymap.c4
-rw-r--r--keyboards/kabedon/kabedon98e/keyboard.json8
-rw-r--r--keyboards/kakunpc/angel17/info.json3
-rw-r--r--keyboards/kakunpc/rabbit_capture_plan/keyboard.json3
-rw-r--r--keyboards/kapcave/paladin64/keymaps/default/keymap.c4
-rw-r--r--keyboards/kapl/rev1/keyboard.json3
-rw-r--r--keyboards/kb_elmo/gamehand/keyboard.json8
-rw-r--r--keyboards/kbdclack/kaishi65/keymaps/default/keymap.c4
-rw-r--r--keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c4
-rw-r--r--keyboards/kbdfans/kbd75hs/keyboard.json8
-rw-r--r--keyboards/keaboard/rev1/keyboard.json3
-rw-r--r--keyboards/keebformom/keyboard.json3
-rw-r--r--keyboards/keebformom/keymaps/default/keymap.c2
-rw-r--r--keyboards/keebio/bdn9/rev1/keyboard.json3
-rw-r--r--keyboards/keebio/bfo9000/keyboard.json3
-rw-r--r--keyboards/keebio/dilly/keyboard.json3
-rw-r--r--keyboards/keebio/fourier/keyboard.json3
-rw-r--r--keyboards/keebio/iris/rev1/keyboard.json3
-rw-r--r--keyboards/keebio/iris/rev1_led/keyboard.json3
-rw-r--r--keyboards/keebio/iris/rev2/keyboard.json3
-rw-r--r--keyboards/keebio/laplace/keyboard.json3
-rw-r--r--keyboards/keebio/levinson/info.json3
-rw-r--r--keyboards/keebio/nyquist/rev1/keyboard.json3
-rw-r--r--keyboards/keebio/nyquist/rev2/keyboard.json3
-rw-r--r--keyboards/keebio/quefrency/rev1/keyboard.json8
-rw-r--r--keyboards/keebio/rorschach/rev1/keyboard.json3
-rw-r--r--keyboards/keebio/stick/keyboard.json3
-rw-r--r--keyboards/keebio/tragicforce68/keyboard.json3
-rw-r--r--keyboards/keebio/tukey/keyboard.json3
-rw-r--r--keyboards/keebio/viterbi/info.json3
-rw-r--r--keyboards/keebio/wavelet/keyboard.json3
-rw-r--r--keyboards/keybage/radpad/keyboard.json3
-rw-r--r--keyboards/keyboardio/model01/keymaps/default/keymap.c6
-rw-r--r--keyboards/keycapsss/o4l_5x12/keyboard.json3
-rw-r--r--keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c6
-rw-r--r--keyboards/keychron/c2_pro_v2/ansi/rgb/keymaps/default/keymap.c2
-rw-r--r--keyboards/keychron/c3_pro/c3_pro.c71
-rw-r--r--keyboards/keychron/q0/info.json6
-rw-r--r--keyboards/keychron/q1v1/info.json6
-rw-r--r--keyboards/keyhive/ergosaurus/keyboard.json3
-rw-r--r--keyboards/keyhive/maypad/keyboard.json3
-rw-r--r--keyboards/keyhive/navi10/rev0/keyboard.json3
-rw-r--r--keyboards/keyhive/navi10/rev2/keyboard.json3
-rw-r--r--keyboards/keyhive/navi10/rev3/keyboard.json3
-rw-r--r--keyboards/keyhive/opus/keyboard.json3
-rw-r--r--keyboards/keyhive/opus/keymaps/default/keymap.c2
-rw-r--r--keyboards/keyhive/ut472/keymaps/default/keymap.c2
-rw-r--r--keyboards/keyprez/unicorn/keyboard.json3
-rw-r--r--keyboards/keysofkings/twokey/keyboard.json3
-rw-r--r--keyboards/keyspensory/kp60/keyboard.json8
-rw-r--r--keyboards/kikoslab/kl90/keymaps/default/keymap.c4
-rw-r--r--keyboards/kin80/keymaps/default/keymap.c8
-rw-r--r--keyboards/kinesis/keymaps/dvorak/keymap.c6
-rw-r--r--keyboards/kinesis/kint32/keyboard.json2
-rw-r--r--keyboards/kingly_keys/little_foot/keyboard.json11
-rw-r--r--keyboards/kingly_keys/romac/keyboard.json3
-rw-r--r--keyboards/kingly_keys/romac_plus/keyboard.json3
-rw-r--r--keyboards/kingly_keys/ropro/keymaps/default/keymap.c4
-rw-r--r--keyboards/kingly_keys/smd_milk/keyboard.json8
-rw-r--r--keyboards/kingly_keys/soap/keymaps/default/keymap.c4
-rw-r--r--keyboards/kiserdesigns/madeline/keymaps/default/keymap.c2
-rw-r--r--keyboards/knobgoblin/keyboard.json3
-rw-r--r--keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json8
-rw-r--r--keyboards/kprepublic/cstc40/daughterboard/keyboard.json6
-rw-r--r--keyboards/kprepublic/cstc40/info.json170
-rw-r--r--keyboards/kprepublic/cstc40/readme.md31
-rw-r--r--keyboards/kprepublic/cstc40/rev1/config.h (renamed from keyboards/kprepublic/cstc40/config.h)0
-rw-r--r--keyboards/kprepublic/cstc40/rev1/halconf.h (renamed from keyboards/kprepublic/cstc40/halconf.h)2
-rw-r--r--keyboards/kprepublic/cstc40/rev1/keyboard.json63
-rw-r--r--keyboards/kprepublic/cstc40/rev1/mcuconf.h (renamed from keyboards/kprepublic/cstc40/mcuconf.h)2
-rw-r--r--keyboards/kprepublic/cstc40/rev1/readme.md27
-rw-r--r--keyboards/kprepublic/cstc40/rev1/rev1.c (renamed from keyboards/kprepublic/cstc40/single_pcb/single_pcb.c)2
-rw-r--r--keyboards/kprepublic/cstc40/rev2/config.h9
-rw-r--r--keyboards/kprepublic/cstc40/rev2/halconf.h20
-rw-r--r--keyboards/kprepublic/cstc40/rev2/keyboard.json63
-rw-r--r--keyboards/kprepublic/cstc40/rev2/mcuconf.h21
-rw-r--r--keyboards/kprepublic/cstc40/rev2/readme.md29
-rw-r--r--keyboards/kprepublic/cstc40/rev2/rev2.c (renamed from keyboards/kprepublic/cstc40/daughterboard/daughterboard.c)2
-rw-r--r--keyboards/kprepublic/cstc40/rev3/keyboard.json67
-rw-r--r--keyboards/kprepublic/cstc40/rev3/readme.md27
-rw-r--r--keyboards/kprepublic/cstc40/single_pcb/keyboard.json6
-rw-r--r--keyboards/kradoindustries/kousa/keymaps/default/keymap.c2
-rw-r--r--keyboards/kradoindustries/krado66/keymaps/default/keymap.c6
-rw-r--r--keyboards/kradoindustries/promenade_rp24s/keymaps/default/keymap.c2
-rw-r--r--keyboards/kraken_jones/pteron56/keymaps/default/keymap.c4
-rw-r--r--keyboards/ktec/ergodone/keyboard.json3
-rw-r--r--keyboards/ktec/ergodone/keymaps/default/keymap.c8
-rwxr-xr-xkeyboards/ktec/staryu/keymaps/default/keymap.c4
-rw-r--r--keyboards/kumaokobo/kudox/columner/keyboard.json3
-rw-r--r--keyboards/kumaokobo/kudox/rev1/keyboard.json3
-rw-r--r--keyboards/kumaokobo/kudox/rev2/keyboard.json3
-rw-r--r--keyboards/kumaokobo/kudox/rev3/keyboard.json3
-rw-r--r--keyboards/kumaokobo/kudox_full/rev1/keyboard.json3
-rw-r--r--keyboards/kumaokobo/kudox_game/info.json3
-rw-r--r--keyboards/kumaokobo/pico/65keys/keyboard.json3
-rw-r--r--keyboards/kumaokobo/pico/70keys/keyboard.json3
-rw-r--r--keyboards/kv/revt/keymaps/default/keymap.c4
-rw-r--r--keyboards/latincompass/latinpad/keyboard.json3
-rw-r--r--keyboards/lendunistus/rpneko65/rev1/keyboard.json6
-rw-r--r--keyboards/lets_split/info.json3
-rw-r--r--keyboards/lily58/glow_enc/keyboard.json3
-rw-r--r--keyboards/lily58/light/keyboard.json3
-rw-r--r--keyboards/lily58/rev1/keyboard.json3
-rw-r--r--keyboards/lime/rev1/keyboard.json3
-rw-r--r--keyboards/linworks/dolice/keyboard.json8
-rw-r--r--keyboards/linworks/fave87/keyboard.json8
-rw-r--r--keyboards/linworks/whale75/keyboard.json8
-rw-r--r--keyboards/littlealby/mute/keymaps/default/keymap.c2
-rw-r--r--keyboards/littlealby/mute/keymaps/ms_teams/keymap.c2
-rw-r--r--keyboards/machkeyboards/mach3/keyboard.json3
-rw-r--r--keyboards/macroflow_original/keymaps/default/keymap.c2
-rw-r--r--keyboards/magic_force/mf17/keyboard.json6
-rw-r--r--keyboards/magic_force/mf34/keyboard.json8
-rw-r--r--keyboards/makeymakey/keymaps/default/keymap.c4
-rw-r--r--keyboards/makrosu/keyboard.json3
-rw-r--r--keyboards/manta60/keyboard.json3
-rw-r--r--keyboards/maple_computing/6ball/keyboard.json3
-rw-r--r--keyboards/maple_computing/christmas_tree/v2017/keyboard.json3
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h18
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c76
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md41
-rw-r--r--keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk1
-rw-r--r--keyboards/maple_computing/launchpad/rev1/keyboard.json3
-rw-r--r--keyboards/maple_computing/minidox/keymaps/bepo/keymap.c4
-rw-r--r--keyboards/maple_computing/minidox/rev1/keyboard.json3
-rw-r--r--keyboards/marcopad/keymaps/backlit/keymap.c20
-rw-r--r--keyboards/marksard/leftover30/keyboard.json3
-rw-r--r--keyboards/marksard/leftover30/keymaps/default/keymap.c6
-rw-r--r--keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c6
-rw-r--r--keyboards/marksard/rhymestone/keymaps/default/keymap.c4
-rw-r--r--keyboards/marksard/rhymestone/rev1/keyboard.json3
-rw-r--r--keyboards/marksard/treadstone32/keymaps/default/keymap.c4
-rw-r--r--keyboards/marksard/treadstone48/keymaps/default/keymap.c8
-rw-r--r--keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c8
-rw-r--r--keyboards/maxipad/promicro/keyboard.json3
-rw-r--r--keyboards/maxr1998/phoebe/keymaps/default/keymap.c4
-rw-r--r--keyboards/mechanickeys/undead60m/undead60m.c4
-rw-r--r--keyboards/mechllama/g35/info.json8
-rw-r--r--keyboards/mechstudio/chapter1/keymaps/default/keymap.c2
-rw-r--r--keyboards/mechwild/bbs/keyboard.json6
-rw-r--r--keyboards/mechwild/mercutio/keyboard.json337
-rw-r--r--keyboards/mechwild/mercutio/keymaps/default/keymap.c24
-rw-r--r--keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c10
-rw-r--r--keyboards/mechwild/mokulua/mirrored/keyboard.json3
-rw-r--r--keyboards/mechwild/mokulua/standard/keyboard.json3
-rw-r--r--keyboards/mechwild/murphpad/keyboard.json3
-rw-r--r--keyboards/mechwild/puckbuddy/keymaps/default/keymap.c4
-rw-r--r--keyboards/mechwild/sugarglider/info.json6
-rw-r--r--keyboards/mechwild/sugarglider/keymaps/default/keymap.c4
-rw-r--r--keyboards/mechwild/sugarglider/rules.mk2
-rw-r--r--keyboards/mechwild/sugarglider/sugarglider.c4
-rw-r--r--keyboards/mechwild/sugarglider/wide_oled/rules.mk2
-rw-r--r--keyboards/meow48/keyboard.json3
-rw-r--r--keyboards/merge/uc1/keyboard.json3
-rw-r--r--keyboards/miiiw/blackio83/rev_0100/keyboard.json6
-rw-r--r--keyboards/millipad/keyboard.json8
-rw-r--r--keyboards/minimacro5/keyboard.json3
-rw-r--r--keyboards/mint60/keyboard.json3
-rw-r--r--keyboards/misonoworks/chocolatebar/keyboard.json8
-rw-r--r--keyboards/misonoworks/karina/keyboard.json8
-rw-r--r--keyboards/mixi/keyboard.json3
-rw-r--r--keyboards/ml/gas75/keyboard.json8
-rw-r--r--keyboards/mlego/m65/keymaps/default/keymap.c12
-rw-r--r--keyboards/mlego/m65/keymaps/uk/keymap.c12
-rw-r--r--keyboards/mmkeyboard/class60/soldered/keyboard.json6
-rw-r--r--keyboards/mmkzoo65/keyboard.json6
-rwxr-xr-xkeyboards/molecule/keymaps/default/keymap.c4
-rw-r--r--keyboards/monsgeek/m1/keyboard.json6
-rw-r--r--keyboards/monsgeek/m3/keyboard.json8
-rw-r--r--keyboards/monsgeek/m5/keyboard.json8
-rw-r--r--keyboards/monsgeek/m6/keyboard.json6
-rw-r--r--keyboards/montsinger/rewind/keyboard.json3
-rw-r--r--keyboards/moon/config.h22
-rw-r--r--keyboards/moon/keyboard.json10
-rw-r--r--keyboards/moon/keymaps/default/keymap.c2
-rw-r--r--keyboards/moon/keymaps/default_tkl_ansi/keymap.c2
-rw-r--r--keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c2
-rw-r--r--keyboards/moon/keymaps/default_tkl_iso/keymap.c2
-rw-r--r--keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c2
-rw-r--r--keyboards/moon/matrix.c107
-rw-r--r--keyboards/moon/rules.mk2
-rw-r--r--keyboards/morizon/keyboard.json3
-rw-r--r--keyboards/mountainblocks/mb17/keyboard.json3
-rw-r--r--keyboards/mss_studio/m63_rgb/keyboard.json8
-rw-r--r--keyboards/mss_studio/m64_rgb/keyboard.json8
-rw-r--r--keyboards/mt/mt40/keymaps/default/keymap.c6
-rw-r--r--keyboards/mwstudio/alicekk/keyboard.json8
-rw-r--r--keyboards/mwstudio/mw660/keyboard.json8
-rw-r--r--keyboards/nacly/sodium42/keyboard.json3
-rw-r--r--keyboards/nacly/sodium50/keyboard.json3
-rw-r--r--keyboards/nacly/sodium62/keyboard.json3
-rw-r--r--keyboards/nacly/splitreus62/keyboard.json3
-rw-r--r--keyboards/nacly/ua62/keyboard.json3
-rw-r--r--keyboards/newgame40/keyboard.json3
-rw-r--r--keyboards/nightly_boards/n9/keyboard.json3
-rw-r--r--keyboards/nightly_boards/ph_arisu/keyboard.json3
-rwxr-xr-xkeyboards/novelkeys/nk65/config.h87
-rw-r--r--keyboards/novelkeys/nk65/halconf.h32
-rwxr-xr-xkeyboards/novelkeys/nk65/info.json124
-rwxr-xr-xkeyboards/novelkeys/nk65/keymaps/default/keymap.c57
-rwxr-xr-xkeyboards/novelkeys/nk65/keymaps/default/readme.md6
-rw-r--r--keyboards/novelkeys/nk65/mcuconf.h43
-rwxr-xr-xkeyboards/novelkeys/nk65/nk65.c257
-rwxr-xr-xkeyboards/novelkeys/nk65/nk65.h20
-rwxr-xr-xkeyboards/novelkeys/nk65/readme.md40
-rwxr-xr-xkeyboards/novelkeys/nk65/rules.mk15
-rw-r--r--keyboards/novelkeys/nk65/v1/keyboard.json (renamed from keyboards/novelkeys/nk65/base/keyboard.json)0
-rwxr-xr-xkeyboards/novelkeys/nk65/v1_4/readme.md38
-rw-r--r--keyboards/np12/keyboard.json3
-rw-r--r--keyboards/numatreus/keyboard.json3
-rw-r--r--keyboards/numatreus/keymaps/like_jis/keymap.c8
-rw-r--r--keyboards/obosob/arch_36/keyboard.json3
-rw-r--r--keyboards/obosob/steal_this_keyboard/keyboard.json3
-rw-r--r--keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c6
-rw-r--r--keyboards/ocean/addon/keyboard.json3
-rw-r--r--keyboards/ocean/gin_v2/keyboard.json3
-rw-r--r--keyboards/ocean/slamz/keyboard.json3
-rw-r--r--keyboards/ocean/stealth/keyboard.json3
-rw-r--r--keyboards/ocean/sus/keyboard.json3
-rw-r--r--keyboards/ocean/wang_ergo/keyboard.json3
-rw-r--r--keyboards/ocean/wang_v2/keyboard.json3
-rw-r--r--keyboards/ocean/yuri/keyboard.json3
-rw-r--r--keyboards/oddball/keymaps/default/keymap.c6
-rw-r--r--keyboards/oddball/keymaps/pmw3360/keymap.c6
-rw-r--r--keyboards/oddball/oddball.c10
-rw-r--r--keyboards/om60/keyboard.json3
-rw-r--r--keyboards/omkbd/ergodash/info.json3
-rw-r--r--keyboards/omkbd/runner3680/info.json3
-rw-r--r--keyboards/omnikeyish/keyboard.json8
-rw-r--r--keyboards/opendeck/32/info.json8
-rw-r--r--keyboards/org60/keymaps/default/keymap.c2
-rw-r--r--keyboards/orthodox/rev1/keyboard.json3
-rw-r--r--keyboards/orthodox/rev3/keyboard.json3
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/keyboard.json8
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/keyboard.json8
-rw-r--r--keyboards/owlab/spring/keyboard.json8
-rw-r--r--keyboards/owlab/suit80/ansi/keyboard.json8
-rw-r--r--keyboards/owlab/suit80/iso/keyboard.json8
-rw-r--r--keyboards/owlab/voice65/hotswap/keyboard.json8
-rw-r--r--keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c4
-rw-r--r--keyboards/owlab/voice65/soldered/keyboard.json8
-rw-r--r--keyboards/owlab/voice65/soldered/keymaps/default/keymap.c4
-rw-r--r--keyboards/p3d/spacey/keymaps/default/keymap.c4
-rw-r--r--keyboards/p3d/synapse/synapse.c4
-rw-r--r--keyboards/pabile/p18/keyboard.json3
-rw-r--r--keyboards/pabile/p18/keymaps/default/keymap.c4
-rw-r--r--keyboards/pabile/p20/ver1/keyboard.json3
-rw-r--r--keyboards/pabile/p20/ver1/keymaps/default/keymap.c10
-rw-r--r--keyboards/pabile/p20/ver2/keyboard.json3
-rw-r--r--keyboards/pabile/p40/keyboard.json3
-rw-r--r--keyboards/pabile/p40/keymaps/default/keymap.c6
-rw-r--r--keyboards/pabile/p40_ortho/keyboard.json3
-rw-r--r--keyboards/pabile/p40_ortho/keymaps/default/keymap.c6
-rw-r--r--keyboards/pabile/p42/keyboard.json3
-rw-r--r--keyboards/pabile/p42/keymaps/default/keymap.c6
-rw-r--r--keyboards/palette1202/keymaps/default/keymap.c6
-rw-r--r--keyboards/peej/tripel/info.json3
-rw-r--r--keyboards/peranekofactory/tone/rev1/keyboard.json3
-rw-r--r--keyboards/peranekofactory/tone/rev2/keyboard.json3
-rw-r--r--keyboards/phentech/rpk_001/keyboard.json6
-rw-r--r--keyboards/phoenix/keymaps/default/keymap.c6
-rw-r--r--keyboards/pica40/rev1/keyboard.json3
-rw-r--r--keyboards/pimentoso/paddino02/rev1/keyboard.json3
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev1/keymaps/default/keymap.c2
-rw-r--r--keyboards/pimentoso/paddino02/rev2/left/keyboard.json3
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/left/keymaps/default/keymap.c2
-rw-r--r--keyboards/pimentoso/paddino02/rev2/right/keyboard.json3
-rwxr-xr-xkeyboards/pimentoso/paddino02/rev2/right/keymaps/default/keymap.c2
-rw-r--r--keyboards/pimentoso/touhoupad/keyboard.json3
-rw-r--r--keyboards/pinky/3/keyboard.json3
-rw-r--r--keyboards/pinky/4/keyboard.json3
-rw-r--r--keyboards/planck/keymaps/default/keymap.c4
-rw-r--r--keyboards/ploopyco/madromys/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/mouse/keymaps/default/keymap.c2
-rw-r--r--keyboards/ploopyco/ploopyco.c5
-rw-r--r--keyboards/ploopyco/trackball/keymaps/default/keymap.c4
-rw-r--r--keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c4
-rw-r--r--keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c2
-rw-r--r--keyboards/pluckey/keymaps/default/keymap.c6
-rw-r--r--keyboards/pluckey/keymaps/default_ergo/keymap.c6
-rw-r--r--keyboards/pluckey/pluckey.c4
-rw-r--r--keyboards/plum47/keyboard.json3
-rw-r--r--keyboards/polycarbdiet/s20/keyboard.json8
-rw-r--r--keyboards/proteus67/keymaps/default/keymap.c4
-rw-r--r--keyboards/prototypist/oceanographer/keymaps/default/keymap.c2
-rw-r--r--keyboards/prototypist/oceanographer/keymaps/default_625/keymap.c2
-rw-r--r--keyboards/prototypist/oceanographer/keymaps/split_225_2/keymap.c2
-rw-r--r--keyboards/psuieee/pluto12/keyboard.json3
-rw-r--r--keyboards/pteron36/keyboard.json3
-rw-r--r--keyboards/qck75/v1/v1.c8
-rw-r--r--keyboards/qpockets/eggman/keymaps/default/keymap.c4
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c4
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c4
-rw-r--r--keyboards/qpockets/space_space/rev2/rev2.c4
-rw-r--r--keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c4
-rw-r--r--keyboards/qpockets/wanten/keymaps/625_bar/keymap.c4
-rw-r--r--keyboards/qpockets/wanten/keymaps/default/keymap.c4
-rw-r--r--keyboards/qvex/lynepad/keymaps/default/keymap.c14
-rw-r--r--keyboards/qwertykeys/qk65/hotswap/keyboard.json8
-rw-r--r--keyboards/qwertykeys/qk65/solder/keyboard.json8
-rw-r--r--keyboards/qwertyydox/keymaps/default/keymap.c6
-rw-r--r--keyboards/rainkeebs/rainkeeb/keyboard.json3
-rw-r--r--keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c8
-rw-r--r--keyboards/rainkeebs/trailmix/keymaps/default/keymap.c6
-rw-r--r--keyboards/rainkeebs/trailmix/trailmix.c16
-rw-r--r--keyboards/rart/rart4x4/keyboard.json3
-rw-r--r--keyboards/rart/rart4x4/keymaps/default/keymap.c4
-rw-r--r--keyboards/rart/rart67m/keyboard.json3
-rw-r--r--keyboards/rart/rartlite/keyboard.json3
-rw-r--r--keyboards/rart/rartpad/keyboard.json3
-rw-r--r--keyboards/rart/rartpad/keymaps/default/keymap.c4
-rw-r--r--keyboards/rate/pistachio/info.json8
-rw-r--r--keyboards/rate/pistachio/keymaps/default/keymap.c2
-rw-r--r--keyboards/rate/pistachio_mp/keyboard.json11
-rw-r--r--keyboards/recompile_keys/choco60/rev1/keyboard.json3
-rw-r--r--keyboards/recompile_keys/cocoa40/keyboard.json3
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c4
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md4
-rw-r--r--keyboards/recompile_keys/nomu30/rev1/keyboard.json3
-rw-r--r--keyboards/rect44/keyboard.json3
-rw-r--r--keyboards/redox/keymaps/default/keymap.c6
-rw-r--r--keyboards/redox/rules.mk2
-rw-r--r--keyboards/redox_media/keyboard.json3
-rw-r--r--keyboards/redox_media/redox_media.c4
-rwxr-xr-xkeyboards/reviung/reviung34/keyboard.json3
-rw-r--r--keyboards/reviung/reviung39/keyboard.json3
-rw-r--r--keyboards/reviung/reviung41/keyboard.json3
-rw-r--r--keyboards/reviung/reviung5/keyboard.json3
-rw-r--r--keyboards/reviung/reviung5/keymaps/default_lre/keymap.c2
-rw-r--r--keyboards/reviung/reviung5/keymaps/default_rre/keymap.c2
-rw-r--r--keyboards/reviung/reviung53/keyboard.json3
-rw-r--r--keyboards/rgbkb/zen/rev1/keyboard.json3
-rw-r--r--keyboards/rgbkb/zen/rev2/keyboard.json3
-rw-r--r--keyboards/rocketboard_16/keycode_lookup.c32
-rw-r--r--keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c12
-rw-r--r--keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c12
-rw-r--r--keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c6
-rw-r--r--keyboards/rose75/keyboard.json6
-rw-r--r--keyboards/rpiguy9907/southpaw66/keyboard.json3
-rw-r--r--keyboards/runes/skjoldr/keyboard.json8
-rw-r--r--keyboards/runes/vaengr/keyboard.json8
-rw-r--r--keyboards/rura66/rev1/keyboard.json3
-rw-r--r--keyboards/ryanbaekr/rb1/keyboard.json3
-rw-r--r--keyboards/ryanskidmore/rskeys100/keyboard.json8
-rw-r--r--keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c8
-rw-r--r--keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c8
-rw-r--r--keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c4
-rw-r--r--keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c12
-rw-r--r--keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c4
-rw-r--r--keyboards/sawnsprojects/bunnygirl65/keyboard.json6
-rw-r--r--keyboards/sawnsprojects/okayu/info.json8
-rw-r--r--keyboards/sekigon/grs_70ec/matrix.c2
-rw-r--r--keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c4
-rw-r--r--keyboards/shuguet/shu89/keymaps/default/keymap.json4
-rw-r--r--keyboards/signum/3_0/keymaps/default/keymap.c6
-rw-r--r--keyboards/signum/3_0/keymaps/default/layout.py12
-rw-r--r--keyboards/sirius/uni660/rev2/rules.mk2
-rw-r--r--keyboards/sixkeyboard/keyboard.json8
-rw-r--r--keyboards/skmt/15k/keyboard.json8
-rw-r--r--keyboards/skyloong/gk61/v1/keyboard.json8
-rw-r--r--keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json6
-rw-r--r--keyboards/splitkb/elora/rev1/myriad.c124
-rw-r--r--keyboards/splitkb/halcyon/ferris/keymaps/default/keymap.json6
-rw-r--r--keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json8
-rw-r--r--keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json8
-rw-r--r--keyboards/stenokeyboards/the_uni/usb_c/keyboard.json8
-rw-r--r--keyboards/synthlabs/060/keyboard.json8
-rw-r--r--keyboards/synthlabs/065/keyboard.json6
-rw-r--r--keyboards/synthlabs/solo/keyboard.json8
-rw-r--r--keyboards/system76/launch_1/launch_1.c2
-rw-r--r--keyboards/system76/launch_1/rgb_matrix_kb.inc2
-rw-r--r--keyboards/system76/system76_ec.c2
-rw-r--r--keyboards/tacworks/tac_k1/keyboard.json6
-rwxr-xr-xkeyboards/tada68/keymaps/default/keymap.c4
-rwxr-xr-xkeyboards/tada68/keymaps/rgb/keymap.c4
-rw-r--r--keyboards/takashicompany/baumkuchen/baumkuchen.c4
-rw-r--r--keyboards/takashicompany/center_enter/keymaps/default/keymap.c4
-rw-r--r--keyboards/takashicompany/compacx/compacx.c4
-rw-r--r--keyboards/takashicompany/dogtag/keymaps/default/keymap.c2
-rw-r--r--keyboards/takashicompany/goat51/keymaps/default/keymap.c4
-rw-r--r--keyboards/takashicompany/jourkey/keymaps/default/keymap.c2
-rw-r--r--keyboards/takashicompany/qoolee/keymaps/default/keymap.c4
-rw-r--r--keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c4
-rw-r--r--keyboards/teleport/native/info.json8
-rw-r--r--keyboards/thumbsup/keymaps/default/keymap.c12
-rw-r--r--keyboards/toffee_studio/blueberry/keymaps/default/keymap.c6
-rw-r--r--keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c2
-rw-r--r--keyboards/trnthsn/e8ghtyneo/e8ghtyneo.c24
-rw-r--r--keyboards/trnthsn/e8ghtyneo/info.json7
-rw-r--r--keyboards/trnthsn/s6xtyfs/info.json1
-rw-r--r--keyboards/tunks/ergo33/keymaps/default/keymap.c4
-rw-r--r--keyboards/tweetydabird/lotus58/info.json6
-rw-r--r--keyboards/tzarc/djinn/config.h2
-rw-r--r--keyboards/tzarc/djinn/graphics/theme_djinn_default.c51
-rw-r--r--keyboards/tzarc/djinn/keymaps/default/keymap.c8
-rw-r--r--keyboards/tzarc/djinn/rules.mk2
-rw-r--r--keyboards/tzarc/ghoul/rules.mk2
-rw-r--r--keyboards/varanidae/keymaps/ansi/keymap.c4
-rw-r--r--keyboards/varanidae/keymaps/ansi_split_bs_rshift/keymap.c4
-rw-r--r--keyboards/varanidae/keymaps/default/keymap.c4
-rw-r--r--keyboards/varanidae/keymaps/iso/keymap.c4
-rw-r--r--keyboards/varanidae/keymaps/iso_split_bs_rshift/keymap.c4
-rw-r--r--keyboards/vertex/angle65/keyboard.json8
-rw-r--r--keyboards/vertex/arc60/keyboard.json8
-rw-r--r--keyboards/vertex/arc60h/keyboard.json8
-rw-r--r--keyboards/vertex/cycle8/keyboard.json8
-rw-r--r--keyboards/vertex/t75/keyboard.json6
-rw-r--r--keyboards/viktus/at101_bh/keyboard.json8
-rw-r--r--keyboards/viktus/omnikey_bh/keyboard.json8
-rw-r--r--keyboards/viktus/z150_bh/keyboard.json8
-rw-r--r--keyboards/waterfowl/waterfowl.c8
-rw-r--r--keyboards/willoucom/keypad/keyboard.json6
-rw-r--r--keyboards/winry/winry25tc/keyboard.json4
-rw-r--r--keyboards/wolf/frogpad/keymaps/default/keymap.c4
-rw-r--r--keyboards/work_louder/micro/micro.c4
-rw-r--r--keyboards/work_louder/rgb_functions.c1
-rw-r--r--keyboards/wuque/tata80/wk/keyboard.json8
-rw-r--r--keyboards/wuque/tata80/wkl/keyboard.json8
-rw-r--r--keyboards/xdboards/recon/recon.c4
-rw-r--r--keyboards/xelus/dharma/keyboard.json8
-rw-r--r--keyboards/xelus/pachi/rgb/rev1/keyboard.json8
-rw-r--r--keyboards/xelus/rs108/keyboard.json6
-rw-r--r--keyboards/xelus/rs60/rev1/keyboard.json8
-rw-r--r--keyboards/xelus/rs60/rev2_0/keyboard.json6
-rw-r--r--keyboards/xelus/rs60/rev2_1/keyboard.json6
-rw-r--r--keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c2
-rw-r--r--keyboards/xiudi/xd60/keymaps/default/keymap.c2
-rw-r--r--keyboards/yandrstudio/zhou65/keyboard.json8
-rw-r--r--keyboards/yanghu/unicorne/keymaps/default/keymap.c4
-rw-r--r--keyboards/ydkb/grape/keymaps/default/keymap.c2
-rw-r--r--keyboards/ymdk/yd60mq/keymaps/iso/keymap.c4
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/default/keymap.c4
-rw-r--r--keyboards/yushakobo/navpad/10/keymaps/default/readme.md4
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c4
-rw-r--r--keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md4
-rw-r--r--keyboards/yushakobo/quick17/keymaps/default/keymap.c6
-rw-r--r--keyboards/zsa/moonlander/keymaps/default/keymap.c6
-rw-r--r--layouts/default/ortho_5x13/default_ortho_5x13/keymap.c12
-rw-r--r--layouts/default/ortho_6x13/default_ortho_6x13/keymap.c12
-rw-r--r--lib/python/qmk/cli/ci/validate_aliases.py6
-rwxr-xr-xlib/python/qmk/cli/generate/config_h.py15
-rw-r--r--lib/python/qmk/cli/list/keyboards.py3
-rw-r--r--lib/python/qmk/cli/migrate.py4
-rw-r--r--lib/python/qmk/cli/resolve_alias.py2
-rw-r--r--lib/python/qmk/info.py31
-rw-r--r--lib/python/qmk/keyboard.py34
-rw-r--r--lib/python/qmk/path.py6
-rw-r--r--quantum/audio/audio.c5
-rw-r--r--quantum/command.c5
-rw-r--r--quantum/led_matrix/led_matrix.c55
-rw-r--r--quantum/led_matrix/led_matrix.h4
-rw-r--r--quantum/pointing_device/pointing_device.c42
-rw-r--r--quantum/pointing_device/pointing_device.h27
-rw-r--r--quantum/process_keycode/process_oneshot.c25
-rw-r--r--quantum/process_keycode/process_oneshot.h10
-rw-r--r--quantum/process_keycode/process_quantum.c76
-rw-r--r--quantum/process_keycode/process_quantum.h10
-rw-r--r--quantum/process_keycode/process_underglow.c5
-rw-r--r--quantum/quantum.c107
-rw-r--r--quantum/quantum.h1
-rw-r--r--quantum/quantum_keycodes.h13
-rw-r--r--quantum/quantum_keycodes_legacy.h64
-rw-r--r--quantum/rgb_matrix/animations/starlight_smooth_anim.h2
-rw-r--r--quantum/rgb_matrix/rgb_matrix.c56
-rw-r--r--quantum/rgb_matrix/rgb_matrix.h4
-rw-r--r--quantum/via.c8
-rw-r--r--readme.md4
-rw-r--r--tests/pointing/test_pointing.cpp22
-rw-r--r--tests/test_common/pointing_device_driver.c3
-rw-r--r--tmk_core/protocol/chibios/chibios.c3
-rw-r--r--tmk_core/protocol/chibios/usb_main.c12
-rw-r--r--tmk_core/protocol/lufa/lufa.c13
-rw-r--r--tmk_core/protocol/vusb/protocol.c24
1024 files changed, 4698 insertions, 9056 deletions
diff --git a/Makefile b/Makefile
index f1e3bf856f..5bb4f0d8eb 100644
--- a/Makefile
+++ b/Makefile
@@ -115,7 +115,7 @@ endef
TRY_TO_MATCH_RULE_FROM_LIST = $(eval $(call TRY_TO_MATCH_RULE_FROM_LIST_HELPER,$1))$(RULE_FOUND)
# As TRY_TO_MATCH_RULE_FROM_LIST_HELPER, but with additional
-# resolution of DEFAULT_FOLDER and keyboard_aliases.hjson for provided rule
+# resolution of keyboard_aliases.hjson for provided rule
define TRY_TO_MATCH_RULE_FROM_LIST_HELPER_KB
# Split on ":", padding with empty strings to avoid indexing issues
TOKEN1:=$$(shell python3 -c "import sys; print((sys.argv[1].split(':',1)+[''])[0])" $$(RULE))
@@ -255,7 +255,7 @@ endef
# if we are going to compile all keyboards, match the rest of the rule
# for each of them
define PARSE_ALL_KEYBOARDS
- $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards --no-resolve-defaults)))
+ $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell $(QMK_BIN) list-keyboards)))
endef
# Prints a list of all known keymaps for the given keyboard
@@ -447,7 +447,7 @@ git-submodules: git-submodule
.PHONY: list-keyboards
list-keyboards:
- $(QMK_BIN) list-keyboards --no-resolve-defaults | tr '\n' ' '
+ $(QMK_BIN) list-keyboards | tr '\n' ' '
.PHONY: list-tests
list-tests:
@@ -455,7 +455,7 @@ list-tests:
.PHONY: generate-keyboards-file
generate-keyboards-file:
- $(QMK_BIN) list-keyboards --no-resolve-defaults
+ $(QMK_BIN) list-keyboards
.PHONY: clean
clean:
diff --git a/builddefs/common_features.mk b/builddefs/common_features.mk
index ca60873bec..c122afcff9 100644
--- a/builddefs/common_features.mk
+++ b/builddefs/common_features.mk
@@ -29,6 +29,8 @@ QUANTUM_SRC += \
$(QUANTUM_DIR)/logging/debug.c \
$(QUANTUM_DIR)/logging/sendchar.c \
$(QUANTUM_DIR)/process_keycode/process_default_layer.c \
+ $(QUANTUM_DIR)/process_keycode/process_oneshot.c \
+ $(QUANTUM_DIR)/process_keycode/process_quantum.c \
include $(QUANTUM_DIR)/nvm/rules.mk
@@ -633,6 +635,9 @@ ifeq ($(strip $(VIA_ENABLE)), yes)
RAW_ENABLE := yes
BOOTMAGIC_ENABLE := yes
TRI_LAYER_ENABLE := yes
+ ifeq ($(strip $(VIA_INSECURE)), yes)
+ OPT_DEFS += -DVIA_INSECURE
+ endif
endif
ifeq ($(strip $(RAW_ENABLE)), yes)
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index e4def1a4d7..356dd6ba52 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -120,6 +120,7 @@
"MATRIX_HAS_GHOST": {"info_key": "matrix_pins.ghost", "value_type": "flag"},
"MATRIX_INPUT_PRESSED_STATE": {"info_key": "matrix_pins.input_pressed_state", "value_type": "int"},
"MATRIX_IO_DELAY": {"info_key": "matrix_pins.io_delay", "value_type": "int"},
+ "MATRIX_MASKED": {"info_key": "matrix_pins.masked", "value_type": "flag"},
// Mouse Keys
"MOUSEKEY_DELAY": {"info_key": "mousekey.delay", "value_type": "int"},
diff --git a/data/mappings/info_rules.hjson b/data/mappings/info_rules.hjson
index 238957f170..d43d83c3ea 100644
--- a/data/mappings/info_rules.hjson
+++ b/data/mappings/info_rules.hjson
@@ -53,8 +53,8 @@
"WS2812_DRIVER": {"info_key": "ws2812.driver"},
// Items we want flagged in lint
- "DEFAULT_FOLDER": {"info_key": "_deprecated.default_folder", "deprecated": true},
"CTPC": {"info_key": "_invalid.ctpc", "invalid": true, "replace_with": "CONVERT_TO=proton_c"},
"CONVERT_TO_PROTON_C": {"info_key": "_invalid.ctpc", "invalid": true, "replace_with": "CONVERT_TO=proton_c"},
+ "DEFAULT_FOLDER": {"info_key": "_invalid.default_folder", "invalid": true},
"VIAL_ENABLE": {"info_key": "_invalid.vial", "invalid": true}
}
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 86850af7a4..cf0cfe52f1 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -68,6 +68,45 @@
"bakeneko80": {
"target": "kkatano/bakeneko80"
},
+ "bastardkb/dilemma/3x5_2/splinky": {
+ "target": "bastardkb/dilemma/3x5_2/promicro"
+ },
+ "bastardkb/scylla/v2/elitec": {
+ "target": "bastardkb/scylla/promicro"
+ },
+ "bastardkb/scylla/v2/splinky_2": {
+ "target": "bastardkb/scylla/promicro"
+ },
+ "bastardkb/scylla/v2/splinky_3": {
+ "target": "bastardkb/scylla/promicro"
+ },
+ "bastardkb/scylla/v2/stemcell": {
+ "target": "bastardkb/scylla/promicro"
+ },
+ "bastardkb/skeletyl/v2/elitec": {
+ "target": "bastardkb/skeletyl/promicro"
+ },
+ "bastardkb/skeletyl/v2/splinky_2": {
+ "target": "bastardkb/skeletyl/promicro"
+ },
+ "bastardkb/skeletyl/v2/splinky_3": {
+ "target": "bastardkb/skeletyl/promicro"
+ },
+ "bastardkb/skeletyl/v2/stemcell": {
+ "target": "bastardkb/skeletyl/promicro"
+ },
+ "bastardkb/tbkmini/v2/elitec": {
+ "target": "bastardkb/tbkmini/promicro"
+ },
+ "bastardkb/tbkmini/v2/splinky_2": {
+ "target": "bastardkb/tbkmini/promicro"
+ },
+ "bastardkb/tbkmini/v2/splinky_3": {
+ "target": "bastardkb/tbkmini/promicro"
+ },
+ "bastardkb/tbkmini/v2/stemcell": {
+ "target": "bastardkb/tbkmini/promicro"
+ },
"bear_face": {
"target": "bear_face/v1"
},
@@ -257,44 +296,11 @@
"handwired/jscotto/scottostarter": {
"target": "handwired/scottokeebs/scottostarter"
},
- "helix/pico/sc/back": {
- "target": "helix/pico/sc"
- },
- "helix/pico/sc/under": {
- "target": "helix/pico/sc"
- },
- "helix/rev2/back/oled": {
- "target": "helix/rev2/back"
- },
- "helix/rev2/oled": {
- "target": "helix/rev2"
- },
- "helix/rev2/oled/back": {
- "target": "helix/rev2/back"
- },
- "helix/rev2/oled/under": {
- "target": "helix/rev2/under"
- },
- "helix/rev2/sc/back": {
- "target": "helix/rev2/sc"
- },
- "helix/rev2/sc/oled": {
- "target": "helix/rev2/sc"
- },
- "helix/rev2/sc/oledback": {
- "target": "helix/rev2/sc"
+ "helix": {
+ "target": "helix/beta"
},
- "helix/rev2/sc/oledunder": {
- "target": "helix/rev2/sc"
- },
- "helix/rev2/sc/under": {
- "target": "helix/rev2/sc"
- },
- "helix/rev2/under": {
- "target": "helix/rev2/sc"
- },
- "helix/rev2/under/oled": {
- "target": "helix/rev2/under"
+ "helix/rev2": {
+ "target": "helix/beta"
},
"honeycomb": {
"target": "keyhive/honeycomb"
@@ -1881,6 +1887,12 @@
"kin80": {
"target": "kin80/blackpill401"
},
+ "kprepublic/cstc40/daughterboard": {
+ "target": "kprepublic/cstc40/rev1"
+ },
+ "kprepublic/cstc40/single_pcb": {
+ "target": "kprepublic/cstc40/rev2"
+ },
"kumaokobo/kudox_full": {
"target": "kumaokobo/kudox_full/rev1"
},
@@ -2258,5 +2270,48 @@
},
"zsa/planck_ez": {
"target": "zsa/planck_ez/base"
+ },
+ // DEFAULT_FOLDER removed during 2025 Q3 cycle
+ "cannonkeys/satisfaction75": {
+ "target": "cannonkeys/satisfaction75/rev1"
+ },
+ "converter/adb_usb": {
+ "target": "converter/adb_usb/rev1"
+ },
+ "converter/sun_usb": {
+ "target": "converter/sun_usb/type5"
+ },
+ "converter/usb_usb": {
+ "target": "converter/usb_usb/hasu"
+ },
+ "durgod/dgk6x": {
+ "target": "durgod/dgk6x/hades_ansi"
+ },
+ "ergodox_ez": {
+ "target": "ergodox_ez/base"
+ },
+ "ferris/0_2": {
+ "target": "ferris/0_2/base"
+ },
+ "handwired/dygma/raise": {
+ "target": "handwired/dygma/raise/ansi"
+ },
+ "ibm/model_m/mschwingen": {
+ "target": "ibm/model_m/mschwingen/led_wired"
+ },
+ "mechwild/sugarglider": {
+ "target": "mechwild/sugarglider/wide_oled/f401"
+ },
+ "mechwild/sugarglider/wide_oled": {
+ "target": "mechwild/sugarglider/wide_oled/f401"
+ },
+ "novelkeys/nk65": {
+ "target": "novelkeys/nk65/v1"
+ },
+ "novelkeys/nk65/base": {
+ "target": "novelkeys/nk65/v1"
+ },
+ "sirius/uni660/rev2": {
+ "target": "sirius/uni660/rev2/ansi"
}
}
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema
index 3aa259605e..13ceec5afa 100644
--- a/data/schemas/keyboard.jsonschema
+++ b/data/schemas/keyboard.jsonschema
@@ -473,6 +473,7 @@
"ghost": {"type": "boolean"},
"input_pressed_state": {"$ref": "./definitions.jsonschema#/unsigned_int"},
"io_delay": {"$ref": "./definitions.jsonschema#/unsigned_int"},
+ "masked": {"type": "boolean"},
"direct": {
"type": "array",
"items": {"$ref": "./definitions.jsonschema#/mcu_pin_array"}
diff --git a/docs/ChangeLog/20250831/PR25414.md b/docs/ChangeLog/20250831/PR25414.md
new file mode 100644
index 0000000000..bee901c6ca
--- /dev/null
+++ b/docs/ChangeLog/20250831/PR25414.md
@@ -0,0 +1,5 @@
+# Mitigate VIA keylogger security issues [#25414](https://github.com/qmk/qmk_firmware/pull/25414)
+
+VIA's keyboard matrix testing functionality, which allows users to identify active key presses, has been identified as a potential security concern by community members and security researchers. This feature has been demonstrated to enable unauthorized keystroke capture, with documented examples showing how malicious scripts could exploit this capability to create keyloggers. A recent security assessment revealed that user credentials could be compromised by exploiting the matrix testing function combined with VIA's keycode assignment queries. In this attack scenario, a script could remain active during a locked session and capture password input when users authenticate upon return.
+
+The QMK team notified the VIA team of this security vulnerability on May 17, 2022, and made multiple subsequent attempts to coordinate a mitigation strategy. Despite repeated outreach, the VIA team has provided no acknowledgment or response to these security concerns. Given the severity of the potential security implications and the lack of engagement from the VIA team, the QMK team has unilaterally implemented a security enhancement that modifies the keyboard matrix testing functionality to prevent the reporting of key press events. This change prioritizes user security and data protection over potential feature compatibility concerns within VIA.
diff --git a/docs/config_options.md b/docs/config_options.md
index b2a2117693..91c17cf09d 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -364,8 +364,6 @@ This is a [make](https://www.gnu.org/software/make/manual/make.html) file that i
## Build Options
-* `DEFAULT_FOLDER`
- * Used to specify a default folder when a keyboard has more than one sub-folder.
* `FIRMWARE_FORMAT`
* Defines which format (bin, hex) is copied to the root `qmk_firmware` folder after building.
* `SRC`
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index b21accd367..a6f8bc8372 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -2,36 +2,36 @@
These allow you to combine a modifier with a keycode. When pressed, the keydown event for the modifier, then `kc` will be sent. On release, the keyup event for `kc`, then the modifier will be sent.
-|Key |Aliases |Description |
-|----------|----------------------------------|-------------------------------------------------------------------------------|
-|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
-|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
-|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
-|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)` |Hold Left GUI and press `kc` |
-|`LCS(kc)` | |Hold Left Control and Left Shift and press `kc` |
-|`LCA(kc)` | |Hold Left Control and Left Alt and press `kc` |
-|`LCG(kc)` | |Hold Left Control and Left GUI and press `kc` |
-|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
-|`LSG(kc)` |`SGUI(kc)`, `SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and Left GUI and press `kc` |
-|`LAG(kc)` | |Hold Left Alt and Left GUI and press `kc` |
-|`LCSG(kc)`| |Hold Left Control, Left Shift and Left GUI and press `kc` |
-|`LCAG(kc)`| |Hold Left Control, Left Alt and Left GUI and press `kc` |
-|`LSAG(kc)`| |Hold Left Shift, Left Alt and Left GUI and press `kc` |
-|`RCTL(kc)`| |Hold Right Control and press `kc` |
-|`RSFT(kc)`| |Hold Right Shift and press `kc` |
-|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
-|`RGUI(kc)`|`RCMD(kc)`, `RWIN(kc)` |Hold Right GUI and press `kc` |
-|`RCA(kc)` | |Hold Right Control and Right Alt and press `kc` |
-|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
-|`RCG(kc)` | |Hold Right Control and Right GUI and press `kc` |
-|`RSA(kc)` |`SAGR(kc)` |Hold Right Shift and Right Alt and press `kc` |
-|`RSG(kc)` | |Hold Right Shift and Right GUI and press `kc` |
-|`RAG(kc)` | |Hold Right Alt and Right GUI and press `kc` |
-|`RCSG(kc)`| |Hold Right Control, Right Shift and Right GUI and press `kc` |
-|`RCAG(kc)`| |Hold Right Control, Right Alt and Right GUI and press `kc` |
-|`RSAG(kc)`| |Hold Right Shift, Right Alt and Right GUI and press `kc` |
-|`MEH(kc)` | |Hold Left Control, Left Shift and Left Alt and press `kc` |
-|`HYPR(kc)`| |Hold Left Control, Left Shift, Left Alt and Left GUI and press `kc`<sup>1</sup>|
+|Key |Aliases |Description |
+|----------|-------------------------------|-------------------------------------------------------------------------------|
+|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
+|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
+|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
+|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` |
+|`LCS(kc)` | |Hold Left Control and Left Shift and press `kc` |
+|`LCA(kc)` | |Hold Left Control and Left Alt and press `kc` |
+|`LCG(kc)` | |Hold Left Control and Left GUI and press `kc` |
+|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
+|`LSG(kc)` | |Hold Left Shift and Left GUI and press `kc` |
+|`LAG(kc)` | |Hold Left Alt and Left GUI and press `kc` |
+|`LCSG(kc)`| |Hold Left Control, Left Shift and Left GUI and press `kc` |
+|`LCAG(kc)`| |Hold Left Control, Left Alt and Left GUI and press `kc` |
+|`LSAG(kc)`| |Hold Left Shift, Left Alt and Left GUI and press `kc` |
+|`RCTL(kc)`| |Hold Right Control and press `kc` |
+|`RSFT(kc)`| |Hold Right Shift and press `kc` |
+|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
+|`RGUI(kc)`|`RCMD(kc)`, `RWIN(kc)` |Hold Right GUI and press `kc` |
+|`RCA(kc)` | |Hold Right Control and Right Alt and press `kc` |
+|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
+|`RCG(kc)` | |Hold Right Control and Right GUI and press `kc` |
+|`RSA(kc)` | |Hold Right Shift and Right Alt and press `kc` |
+|`RSG(kc)` | |Hold Right Shift and Right GUI and press `kc` |
+|`RAG(kc)` | |Hold Right Alt and Right GUI and press `kc` |
+|`RCSG(kc)`| |Hold Right Control, Right Shift and Right GUI and press `kc` |
+|`RCAG(kc)`| |Hold Right Control, Right Alt and Right GUI and press `kc` |
+|`RSAG(kc)`| |Hold Right Shift, Right Alt and Right GUI and press `kc` |
+|`MEH(kc)` | |Hold Left Control, Left Shift and Left Alt and press `kc` |
+|`HYPR(kc)`| |Hold Left Control, Left Shift, Left Alt and Left GUI and press `kc`<sup>1</sup>|
<sup>1. More information on the Hyper key can be found on [this blog post by Brett Terpstra](https://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/).</sup>
diff --git a/docs/features/led_matrix.md b/docs/features/led_matrix.md
index 113b13f03b..28d24bc400 100644
--- a/docs/features/led_matrix.md
+++ b/docs/features/led_matrix.md
@@ -214,9 +214,30 @@ led_matrix_mode(LED_MATRIX_CUSTOM_my_cool_effect);
For inspiration and examples, check out the built-in effects under `quantum/led_matrix/animations/`.
+## Naming
+
+If you wish to be able to use the name of an effect in your code -- say for a display indicator -- then you can enable the function `led_matrix_get_mode_name` in the following manner:
+
+In your keymap's `config.h`:
+```c
+#define LED_MATRIX_MODE_NAME_ENABLE
+```
+
+In your `keymap.c`
+```c
+const char* effect_name = led_matrix_get_mode_name(led_matrix_get_mode());
+// do something with `effect_name`, like `oled_write_ln(effect_name, false);`
+```
+
+::: info
+`led_matrix_get_mode_name()` is not enabled by default as it increases the amount of flash memory used by the firmware based on the number of effects enabled.
+:::
+
+
## Additional `config.h` Options {#additional-configh-options}
```c
+#define LED_MATRIX_MODE_NAME_ENABLE // enables led_matrix_get_mode_name()
#define LED_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
#define LED_MATRIX_TIMEOUT 0 // number of milliseconds to wait until led automatically turns off
#define LED_MATRIX_SLEEP // turn off effects when suspended
diff --git a/docs/features/pointing_device.md b/docs/features/pointing_device.md
index a139df9dc4..f25ea1b033 100644
--- a/docs/features/pointing_device.md
+++ b/docs/features/pointing_device.md
@@ -379,7 +379,7 @@ POINTING_DEVICE_DRIVER = custom
Using the custom driver will require implementing the following functions:
```c
-void pointing_device_driver_init(void) {}
+bool pointing_device_driver_init(void) { return true; }
report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) { return mouse_report; }
uint16_t pointing_device_driver_get_cpi(void) { return 0; }
void pointing_device_driver_set_cpi(uint16_t cpi) {}
@@ -467,20 +467,22 @@ If there is a `_RIGHT` configuration option or callback, the [common configurati
## Callbacks and Functions
-| Function | Description |
-| ---------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
-| `pointing_device_init_kb(void)` | Callback to allow for keyboard level initialization. Useful for additional hardware sensors. |
-| `pointing_device_init_user(void)` | Callback to allow for user level initialization. Useful for additional hardware sensors. |
-| `pointing_device_task_kb(mouse_report)` | Callback that sends sensor data, so keyboard code can intercept and modify the data. Returns a mouse report. |
-| `pointing_device_task_user(mouse_report)` | Callback that sends sensor data, so user code can intercept and modify the data. Returns a mouse report. |
-| `pointing_device_handle_buttons(buttons, pressed, button)` | Callback to handle hardware button presses. Returns a `uint8_t`. |
-| `pointing_device_get_cpi(void)` | Gets the current CPI/DPI setting from the sensor, if supported. |
-| `pointing_device_set_cpi(uint16_t)` | Sets the CPI/DPI, if supported. |
-| `pointing_device_get_report(void)` | Returns the current mouse report (as a `report_mouse_t` data structure). |
-| `pointing_device_set_report(mouse_report)` | Sets the mouse report to the assigned `report_mouse_t` data structured passed to the function. |
-| `pointing_device_send(void)` | Sends the current mouse report to the host system. Function can be replaced. |
-| `has_mouse_report_changed(new_report, old_report)` | Compares the old and new `report_mouse_t` data and returns true only if it has changed. |
-| `pointing_device_adjust_by_defines(mouse_report)` | Applies rotations and invert configurations to a raw mouse report. |
+| Function | Description |
+| ------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- |
+| `pointing_device_init_kb(void)` | Callback to allow for keyboard level initialization. Useful for additional hardware sensors. |
+| `pointing_device_init_user(void)` | Callback to allow for user level initialization. Useful for additional hardware sensors. |
+| `pointing_device_task_kb(mouse_report)` | Callback that sends sensor data, so keyboard code can intercept and modify the data. Returns a mouse report. |
+| `pointing_device_task_user(mouse_report)` | Callback that sends sensor data, so user code can intercept and modify the data. Returns a mouse report. |
+| `pointing_device_handle_buttons(buttons, pressed, button)` | Callback to handle hardware button presses. Returns a `uint8_t`. |
+| `pointing_device_get_cpi(void)` | Gets the current CPI/DPI setting from the sensor, if supported. |
+| `pointing_device_set_cpi(uint16_t)` | Sets the CPI/DPI, if supported. |
+| `pointing_device_get_report(void)` | Returns the current mouse report (as a `report_mouse_t` data structure). |
+| `pointing_device_set_report(mouse_report)` | Sets the mouse report to the assigned `report_mouse_t` data structured passed to the function. |
+| `pointing_device_send(void)` | Sends the current mouse report to the host system. Function can be replaced. |
+| `has_mouse_report_changed(new_report, old_report)` | Compares the old and new `report_mouse_t` data and returns true only if it has changed. |
+| `pointing_device_adjust_by_defines(mouse_report)` | Applies rotations and invert configurations to a raw mouse report. |
+| `pointing_device_get_status(void)` | Returns device status as `pointing_device_status_t` a good return is `POINTING_DEVICE_STATUS_SUCCESS`. |
+| `pointing_device_set_status(pointing_device_status_t status)` | Sets device status, anything other than `POINTING_DEVICE_STATUS_SUCCESS` will disable reports from the device.|
## Split Keyboard Callbacks and Functions
diff --git a/docs/features/rgb_matrix.md b/docs/features/rgb_matrix.md
index 130c1c5a5e..b0110b436b 100644
--- a/docs/features/rgb_matrix.md
+++ b/docs/features/rgb_matrix.md
@@ -365,9 +365,30 @@ These are shorthands to popular colors. The `RGB` ones can be passed to the `set
These are defined in [`color.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/color.h). Feel free to add to this list!
+## Naming
+
+If you wish to be able to use the name of an effect in your code -- say for a display indicator -- then you can enable the function `rgb_matrix_get_mode_name` in the following manner:
+
+In your keymap's `config.h`:
+```c
+#define RGB_MATRIX_MODE_NAME_ENABLE
+```
+
+In your `keymap.c`
+```c
+const char* effect_name = rgb_matrix_get_mode_name(rgb_matrix_get_mode());
+// do something with `effect_name`, like `oled_write_ln(effect_name, false);`
+```
+
+::: info
+`rgb_matrix_get_mode_name()` is not enabled by default as it increases the amount of flash memory used by the firmware based on the number of effects enabled.
+:::
+
+
## Additional `config.h` Options {#additional-configh-options}
```c
+#define RGB_MATRIX_MODE_NAME_ENABLE // enables rgb_matrix_get_mode_name()
#define RGB_MATRIX_KEYRELEASES // reactive effects respond to keyreleases (instead of keypresses)
#define RGB_MATRIX_TIMEOUT 0 // number of milliseconds to wait until rgb automatically turns off
#define RGB_MATRIX_SLEEP // turn off effects when suspended
diff --git a/docs/keycodes.md b/docs/keycodes.md
index 33014a54a5..e569e87431 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -657,38 +657,38 @@ See also: [Mouse Keys](features/mouse_keys)
See also: [Modifier Keys](feature_advanced_keycodes#modifier-keys)
-|Key |Aliases |Description |
-|----------|----------------------------------|-------------------------------------------------------------------|
-|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
-|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
-|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
-|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)` |Hold Left GUI and press `kc` |
-|`LCS(kc)` | |Hold Left Control and Left Shift and press `kc` |
-|`LCA(kc)` | |Hold Left Control and Left Alt and press `kc` |
-|`LCG(kc)` | |Hold Left Control and Left GUI and press `kc` |
-|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
-|`LSG(kc)` |`SGUI(kc)`, `SCMD(kc)`, `SWIN(kc)`|Hold Left Shift and Left GUI and press `kc` |
-|`LAG(kc)` | |Hold Left Alt and Left GUI and press `kc` |
-|`LCSG(kc)`| |Hold Left Control, Left Shift and Left GUI and press `kc` |
-|`LCAG(kc)`| |Hold Left Control, Left Alt and Left GUI and press `kc` |
-|`LSAG(kc)`| |Hold Left Shift, Left Alt and Left GUI and press `kc` |
-|`RCTL(kc)`| |Hold Right Control and press `kc` |
-|`RSFT(kc)`| |Hold Right Shift and press `kc` |
-|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
-|`RGUI(kc)`|`RCMD(kc)`, `RWIN(kc)` |Hold Right GUI and press `kc` |
-|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
-|`RCA(kc)` | |Hold Right Control and Right Alt and press `kc` |
-|`RCG(kc)` | |Hold Right Control and Right GUI and press `kc` |
-|`RSA(kc)` |`SAGR(kc)` |Hold Right Shift and Right Alt and press `kc` |
-|`RSG(kc)` | |Hold Right Shift and Right GUI and press `kc` |
-|`RAG(kc)` | |Hold Right Alt and Right GUI and press `kc` |
-|`RCSG(kc)`| |Hold Right Control, Right Shift and Right GUI and press `kc` |
-|`RCAG(kc)`| |Hold Right Control, Right Alt and Right GUI and press `kc` |
-|`RSAG(kc)`| |Hold Right Shift, Right Alt and Right GUI and press `kc` |
-|`MEH(kc)` | |Hold Left Control, Left Shift and Left Alt and press `kc` |
-|`HYPR(kc)`| |Hold Left Control, Left Shift, Left Alt and Left GUI and press `kc`|
-|`KC_MEH` | |Left Control, Left Shift and Left Alt |
-|`KC_HYPR` | |Left Control, Left Shift, Left Alt and Left GUI |
+|Key |Aliases |Description |
+|----------|-------------------------------|-------------------------------------------------------------------|
+|`LCTL(kc)`|`C(kc)` |Hold Left Control and press `kc` |
+|`LSFT(kc)`|`S(kc)` |Hold Left Shift and press `kc` |
+|`LALT(kc)`|`A(kc)`, `LOPT(kc)` |Hold Left Alt and press `kc` |
+|`LGUI(kc)`|`G(kc)`, `LCMD(kc)`, `LWIN(kc)`|Hold Left GUI and press `kc` |
+|`LCS(kc)` | |Hold Left Control and Left Shift and press `kc` |
+|`LCA(kc)` | |Hold Left Control and Left Alt and press `kc` |
+|`LCG(kc)` | |Hold Left Control and Left GUI and press `kc` |
+|`LSA(kc)` | |Hold Left Shift and Left Alt and press `kc` |
+|`LSG(kc)` | |Hold Left Shift and Left GUI and press `kc` |
+|`LAG(kc)` | |Hold Left Alt and Left GUI and press `kc` |
+|`LCSG(kc)`| |Hold Left Control, Left Shift and Left GUI and press `kc` |
+|`LCAG(kc)`| |Hold Left Control, Left Alt and Left GUI and press `kc` |
+|`LSAG(kc)`| |Hold Left Shift, Left Alt and Left GUI and press `kc` |
+|`RCTL(kc)`| |Hold Right Control and press `kc` |
+|`RSFT(kc)`| |Hold Right Shift and press `kc` |
+|`RALT(kc)`|`ROPT(kc)`, `ALGR(kc)` |Hold Right Alt and press `kc` |
+|`RGUI(kc)`|`RCMD(kc)`, `RWIN(kc)` |Hold Right GUI and press `kc` |
+|`RCS(kc)` | |Hold Right Control and Right Shift and press `kc` |
+|`RCA(kc)` | |Hold Right Control and Right Alt and press `kc` |
+|`RCG(kc)` | |Hold Right Control and Right GUI and press `kc` |
+|`RSA(kc)` | |Hold Right Shift and Right Alt and press `kc` |
+|`RSG(kc)` | |Hold Right Shift and Right GUI and press `kc` |
+|`RAG(kc)` | |Hold Right Alt and Right GUI and press `kc` |
+|`RCSG(kc)`| |Hold Right Control, Right Shift and Right GUI and press `kc` |
+|`RCAG(kc)`| |Hold Right Control, Right Alt and Right GUI and press `kc` |
+|`RSAG(kc)`| |Hold Right Shift, Right Alt and Right GUI and press `kc` |
+|`MEH(kc)` | |Hold Left Control, Left Shift and Left Alt and press `kc` |
+|`HYPR(kc)`| |Hold Left Control, Left Shift, Left Alt and Left GUI and press `kc`|
+|`KC_MEH` | |Left Control, Left Shift and Left Alt |
+|`KC_HYPR` | |Left Control, Left Shift, Left Alt and Left GUI |
## Mod-Tap Keys {#mod-tap-keys}
@@ -705,7 +705,7 @@ See also: [Mod-Tap](mod_tap)
|`LCA_T(kc)` | |Left Control and Left Alt when held, `kc` when tapped |
|`LCG_T(kc)` | |Left Control and Left GUI when held, `kc` when tapped |
|`LSA_T(kc)` | |Left Shift and Left Alt when held, `kc` when tapped |
-|`LSG_T(kc)` |`SGUI_T(kc)`, `SCMD_T(kc)`, `SWIN_T(kc)` |Left Shift and Left GUI when held, `kc` when tapped |
+|`LSG_T(kc)` | |Left Shift and Left GUI when held, `kc` when tapped |
|`LAG_T(kc)` | |Left Alt and Left GUI when held, `kc` when tapped |
|`LCSG_T(kc)` | |Left Control, Left Shift and Left GUI when held, `kc` when tapped |
|`LCAG_T(kc)` | |Left Control, Left Alt and Left GUI when held, `kc` when tapped |
@@ -717,14 +717,14 @@ See also: [Mod-Tap](mod_tap)
|`RCS_T(kc)` | |Right Control and Right Shift when held, `kc` when tapped |
|`RCA_T(kc)` | |Right Control and Right Alt when held, `kc` when tapped |
|`RCG_T(kc)` | |Right Control and Right GUI when held, `kc` when tapped |
-|`RSA_T(kc)` |`SAGR_T(kc)` |Right Shift and Right Alt when held, `kc` when tapped |
+|`RSA_T(kc)` | |Right Shift and Right Alt when held, `kc` when tapped |
|`RSG_T(kc)` | |Right Shift and Right GUI when held, `kc` when tapped |
|`RAG_T(kc)` | |Right Alt and Right GUI when held, `kc` when tapped |
|`RCSG_T(kc)` | |Right Control, Right Shift and Right GUI when held, `kc` when tapped |
|`RCAG_T(kc)` | |Right Control, Right Alt and Right GUI when held, `kc` when tapped |
|`RSAG_T(kc)` | |Right Shift, Right Alt and Right GUI when held, `kc` when tapped |
|`MEH_T(kc)` | |Left Control, Left Shift and Left Alt when held, `kc` when tapped |
-|`HYPR_T(kc)` |`ALL_T(kc)` |Left Control, Left Shift, Left Alt and Left GUI when held, `kc` when tapped|
+|`HYPR_T(kc)` | |Left Control, Left Shift, Left Alt and Left GUI when held, `kc` when tapped|
## Tapping Term Keys {#tapping-term-keys}
diff --git a/docs/mod_tap.md b/docs/mod_tap.md
index ebf79adb7f..67922c0915 100644
--- a/docs/mod_tap.md
+++ b/docs/mod_tap.md
@@ -37,7 +37,7 @@ For convenience, QMK includes some Mod-Tap shortcuts to make common combinations
|`LCA_T(kc)` | |Left Control and Left Alt when held, `kc` when tapped |
|`LCG_T(kc)` | |Left Control and Left GUI when held, `kc` when tapped |
|`LSA_T(kc)` | |Left Shift and Left Alt when held, `kc` when tapped |
-|`LSG_T(kc)` |`SGUI_T(kc)`, `SCMD_T(kc)`, `SWIN_T(kc)` |Left Shift and Left GUI when held, `kc` when tapped |
+|`LSG_T(kc)` | |Left Shift and Left GUI when held, `kc` when tapped |
|`LAG_T(kc)` | |Left Alt and Left GUI when held, `kc` when tapped |
|`LCSG_T(kc)`| |Left Control, Left Shift and Left GUI when held, `kc` when tapped |
|`LCAG_T(kc)`| |Left Control, Left Alt and Left GUI when held, `kc` when tapped |
@@ -49,14 +49,14 @@ For convenience, QMK includes some Mod-Tap shortcuts to make common combinations
|`RCS_T(kc)` | |Right Control and Right Shift when held, `kc` when tapped |
|`RCA_T(kc)` | |Right Control and Right Alt when held, `kc` when tapped |
|`RCG_T(kc)` | |Right Control and Right GUI when held, `kc` when tapped |
-|`RSA_T(kc)` |`SAGR_T(kc)` |Right Shift and Right Alt when held, `kc` when tapped |
+|`RSA_T(kc)` | |Right Shift and Right Alt when held, `kc` when tapped |
|`RSG_T(kc)` | |Right Shift and Right GUI when held, `kc` when tapped |
|`RAG_T(kc)` | |Right Alt and Right GUI when held, `kc` when tapped |
|`RCSG_T(kc)`| |Right Control, Right Shift and Right GUI when held, `kc` when tapped |
|`RCAG_T(kc)`| |Right Control, Right Alt and Right GUI when held, `kc` when tapped |
|`RSAG_T(kc)`| |Right Shift, Right Alt and Right GUI when held, `kc` when tapped |
|`MEH_T(kc)` | |Left Control, Left Shift and Left Alt when held, `kc` when tapped |
-|`HYPR_T(kc)`|`ALL_T(kc)` |Left Control, Left Shift, Left Alt and Left GUI when held, `kc` when tapped<sup>1</sup>|
+|`HYPR_T(kc)`| |Left Control, Left Shift, Left Alt and Left GUI when held, `kc` when tapped<sup>1</sup>|
<sup>1. More information on the Hyper key can be found on [this blog post by Brett Terpstra](https://brettterpstra.com/2012/12/08/a-useful-caps-lock-key/).</sup>
diff --git a/docs/reference_info_json.md b/docs/reference_info_json.md
index a64f2992b5..71d1c5c865 100644
--- a/docs/reference_info_json.md
+++ b/docs/reference_info_json.md
@@ -480,6 +480,9 @@ Configures the [LED Matrix](features/led_matrix) feature.
* `io_delay` <Badge type="info">Number</Badge>
* The amount of time to wait between row/col selection and col/row pin reading, in microseconds.
* Default: `30` (30 µs)
+ * `masked` <Badge type="info">Boolean</Badge>
+ * Whether configured intersections should be ignored.
+ * Default: `false`
* `rows` <Badge type="info">Array: Pin</Badge>
* A list of GPIO pins connected to the matrix rows.
* Example: `["B0", "B1", "B2"]`
diff --git a/drivers/sensors/adns5050.c b/drivers/sensors/adns5050.c
index 1768c9f3b4..ac4c95b0c2 100644
--- a/drivers/sensors/adns5050.c
+++ b/drivers/sensors/adns5050.c
@@ -55,7 +55,7 @@ const pointing_device_driver_t adns5050_pointing_device_driver = {
static bool powered_down = false;
-void adns5050_init(void) {
+bool adns5050_init(void) {
// Initialize the ADNS serial pins.
gpio_set_pin_output(ADNS5050_SCLK_PIN);
gpio_set_pin_output(ADNS5050_SDIO_PIN);
@@ -75,6 +75,8 @@ void adns5050_init(void) {
// gets the adns ready for write commands
// (for example, setting the dpi).
adns5050_read_burst();
+
+ return adns5050_check_signature();
}
// Perform a synchronization with the ADNS.
@@ -220,7 +222,7 @@ uint16_t adns5050_get_cpi(void) {
return (uint16_t)((cpival & 0b10000) * 125);
}
-bool adns5050_check_signature(void) {
+bool __attribute__((weak)) adns5050_check_signature(void) {
uint8_t pid = adns5050_read_reg(REG_PRODUCT_ID);
uint8_t rid = adns5050_read_reg(REG_REVISION_ID);
uint8_t pid2 = adns5050_read_reg(REG_PRODUCT_ID2);
diff --git a/drivers/sensors/adns5050.h b/drivers/sensors/adns5050.h
index 4dfcbc3c70..648b49e387 100644
--- a/drivers/sensors/adns5050.h
+++ b/drivers/sensors/adns5050.h
@@ -70,12 +70,12 @@ typedef struct {
int8_t dy;
} report_adns5050_t;
-const pointing_device_driver_t adns5050_pointing_device_driver;
+extern const pointing_device_driver_t adns5050_pointing_device_driver;
// A bunch of functions to implement the ADNS5050-specific serial protocol.
// Note that the "serial.h" driver is insufficient, because it does not
// manually manipulate a serial clock signal.
-void adns5050_init(void);
+bool adns5050_init(void);
void adns5050_sync(void);
uint8_t adns5050_serial_read(void);
void adns5050_serial_write(uint8_t data);
diff --git a/drivers/sensors/adns9800.c b/drivers/sensors/adns9800.c
index 0dbc528351..f5958dd350 100644
--- a/drivers/sensors/adns9800.c
+++ b/drivers/sensors/adns9800.c
@@ -115,7 +115,14 @@ uint8_t adns9800_read(uint8_t reg_addr) {
return data;
}
-void adns9800_init(void) {
+bool __attribute__((weak)) adns9800_check_signature(void) {
+ if (adns9800_read(REG_Product_ID) != 0x33) {
+ return false;
+ }
+ return true;
+}
+
+bool adns9800_init(void) {
gpio_set_pin_output(ADNS9800_CS_PIN);
spi_init();
@@ -178,6 +185,8 @@ void adns9800_init(void) {
adns9800_write(REG_LASER_CTRL0, laser_ctrl0 & 0xf0);
adns9800_set_cpi(ADNS9800_CPI);
+
+ return adns9800_check_signature();
}
config_adns9800_t adns9800_get_config(void) {
diff --git a/drivers/sensors/adns9800.h b/drivers/sensors/adns9800.h
index 023f31b132..ea854e8675 100644
--- a/drivers/sensors/adns9800.h
+++ b/drivers/sensors/adns9800.h
@@ -61,9 +61,9 @@ typedef struct {
int16_t y;
} report_adns9800_t;
-const pointing_device_driver_t adns9800_pointing_device_driver;
+extern const pointing_device_driver_t adns9800_pointing_device_driver;
-void adns9800_init(void);
+bool adns9800_init(void);
config_adns9800_t adns9800_get_config(void);
void adns9800_set_config(config_adns9800_t);
uint16_t adns9800_get_cpi(void);
diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 93bbaa1b51..eec97e8eed 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -135,7 +135,7 @@ report_analog_joystick_t analog_joystick_read(void) {
return report;
}
-void analog_joystick_init(void) {
+bool analog_joystick_init(void) {
gpio_set_pin_input_high(ANALOG_JOYSTICK_X_AXIS_PIN);
gpio_set_pin_input_high(ANALOG_JOYSTICK_Y_AXIS_PIN);
@@ -152,6 +152,8 @@ void analog_joystick_init(void) {
maxAxisValues[0] = xOrigin + 100;
maxAxisValues[1] = yOrigin + 100;
#endif
+
+ return true;
}
report_mouse_t analog_joystick_get_report(report_mouse_t mouse_report) {
diff --git a/drivers/sensors/analog_joystick.h b/drivers/sensors/analog_joystick.h
index c84da83db1..f8cc315533 100644
--- a/drivers/sensors/analog_joystick.h
+++ b/drivers/sensors/analog_joystick.h
@@ -43,7 +43,7 @@
# define ANALOG_JOYSTICK_SPEED_MAX 2
#endif
-const pointing_device_driver_t analog_joystick_pointing_device_driver;
+extern const pointing_device_driver_t analog_joystick_pointing_device_driver;
typedef struct {
int8_t x;
@@ -51,5 +51,5 @@ typedef struct {
bool button;
} report_analog_joystick_t;
report_analog_joystick_t analog_joystick_read(void);
-void analog_joystick_init(void);
+bool analog_joystick_init(void);
report_mouse_t analog_joystick_get_report(report_mouse_t mouse_report);
diff --git a/drivers/sensors/azoteq_iqs5xx.c b/drivers/sensors/azoteq_iqs5xx.c
index ae26ee60cf..7586ac52d1 100644
--- a/drivers/sensors/azoteq_iqs5xx.c
+++ b/drivers/sensors/azoteq_iqs5xx.c
@@ -321,7 +321,7 @@ void azoteq_iqs5xx_setup_resolution(void) {
static i2c_status_t azoteq_iqs5xx_init_status = 1;
-void azoteq_iqs5xx_init(void) {
+bool azoteq_iqs5xx_init(void) {
i2c_init();
i2c_ping_address(AZOTEQ_IQS5XX_ADDRESS, 1); // wake
azoteq_iqs5xx_reset_suspend(true, false, true);
@@ -349,67 +349,65 @@ void azoteq_iqs5xx_init(void) {
azoteq_iqs5xx_init_status |= azoteq_iqs5xx_set_gesture_config(true);
wait_ms(AZOTEQ_IQS5XX_REPORT_RATE + 1);
}
+
+ return azoteq_iqs5xx_init_status == I2C_STATUS_SUCCESS;
};
report_mouse_t azoteq_iqs5xx_get_report(report_mouse_t mouse_report) {
report_mouse_t temp_report = {0};
- if (azoteq_iqs5xx_init_status == I2C_STATUS_SUCCESS) {
- azoteq_iqs5xx_base_data_t base_data = {0};
- i2c_status_t status = azoteq_iqs5xx_get_base_data(&base_data);
- bool ignore_movement = false;
+ azoteq_iqs5xx_base_data_t base_data = {0};
+ i2c_status_t status = azoteq_iqs5xx_get_base_data(&base_data);
+ bool ignore_movement = false;
- if (status == I2C_STATUS_SUCCESS) {
+ if (status == I2C_STATUS_SUCCESS) {
#ifdef POINTING_DEVICE_DEBUG
- if (base_data.previous_cycle_time > AZOTEQ_IQS5XX_REPORT_RATE) {
- pd_dprintf("IQS5XX - previous cycle time missed, took: %dms\n", base_data.previous_cycle_time);
- }
+ if (base_data.previous_cycle_time > AZOTEQ_IQS5XX_REPORT_RATE) {
+ pd_dprintf("IQS5XX - previous cycle time missed, took: %dms\n", base_data.previous_cycle_time);
+ }
#endif
- if (base_data.gesture_events_0.single_tap || base_data.gesture_events_0.press_and_hold) {
- pd_dprintf("IQS5XX - Single tap/hold.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON1);
- } else if (base_data.gesture_events_1.two_finger_tap) {
- pd_dprintf("IQS5XX - Two finger tap.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON2);
- } else if (base_data.gesture_events_0.swipe_x_neg) {
- pd_dprintf("IQS5XX - X-.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON4);
- ignore_movement = true;
- } else if (base_data.gesture_events_0.swipe_x_pos) {
- pd_dprintf("IQS5XX - X+.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON5);
- ignore_movement = true;
- } else if (base_data.gesture_events_0.swipe_y_neg) {
- pd_dprintf("IQS5XX - Y-.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON6);
- ignore_movement = true;
- } else if (base_data.gesture_events_0.swipe_y_pos) {
- pd_dprintf("IQS5XX - Y+.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON3);
- ignore_movement = true;
- } else if (base_data.gesture_events_1.zoom) {
- if (AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l) < 0) {
- pd_dprintf("IQS5XX - Zoom out.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON7);
- } else if (AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l) > 0) {
- pd_dprintf("IQS5XX - Zoom in.\n");
- temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON8);
- }
- } else if (base_data.gesture_events_1.scroll) {
- pd_dprintf("IQS5XX - Scroll.\n");
- temp_report.h = CONSTRAIN_HID(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l));
- temp_report.v = CONSTRAIN_HID(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.y.h, base_data.y.l));
+ if (base_data.gesture_events_0.single_tap || base_data.gesture_events_0.press_and_hold) {
+ pd_dprintf("IQS5XX - Single tap/hold.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON1);
+ } else if (base_data.gesture_events_1.two_finger_tap) {
+ pd_dprintf("IQS5XX - Two finger tap.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON2);
+ } else if (base_data.gesture_events_0.swipe_x_neg) {
+ pd_dprintf("IQS5XX - X-.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON4);
+ ignore_movement = true;
+ } else if (base_data.gesture_events_0.swipe_x_pos) {
+ pd_dprintf("IQS5XX - X+.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON5);
+ ignore_movement = true;
+ } else if (base_data.gesture_events_0.swipe_y_neg) {
+ pd_dprintf("IQS5XX - Y-.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON6);
+ ignore_movement = true;
+ } else if (base_data.gesture_events_0.swipe_y_pos) {
+ pd_dprintf("IQS5XX - Y+.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON3);
+ ignore_movement = true;
+ } else if (base_data.gesture_events_1.zoom) {
+ if (AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l) < 0) {
+ pd_dprintf("IQS5XX - Zoom out.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON7);
+ } else if (AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l) > 0) {
+ pd_dprintf("IQS5XX - Zoom in.\n");
+ temp_report.buttons = pointing_device_handle_buttons(temp_report.buttons, true, POINTING_DEVICE_BUTTON8);
}
- if (base_data.number_of_fingers == 1 && !ignore_movement) {
- temp_report.x = CONSTRAIN_HID_XY(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l));
- temp_report.y = CONSTRAIN_HID_XY(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.y.h, base_data.y.l));
- }
-
- } else {
- pd_dprintf("IQS5XX - get report failed, i2c status: %d \n", status);
+ } else if (base_data.gesture_events_1.scroll) {
+ pd_dprintf("IQS5XX - Scroll.\n");
+ temp_report.h = CONSTRAIN_HID(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l));
+ temp_report.v = CONSTRAIN_HID(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.y.h, base_data.y.l));
}
+ if (base_data.number_of_fingers == 1 && !ignore_movement) {
+ temp_report.x = CONSTRAIN_HID_XY(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.x.h, base_data.x.l));
+ temp_report.y = CONSTRAIN_HID_XY(AZOTEQ_IQS5XX_COMBINE_H_L_BYTES(base_data.y.h, base_data.y.l));
+ }
+
} else {
- pd_dprintf("IQS5XX - Init failed, i2c status: %d \n", azoteq_iqs5xx_init_status);
+ pd_dprintf("IQS5XX - get report failed, i2c status: %d \n", status);
}
return temp_report;
diff --git a/drivers/sensors/azoteq_iqs5xx.h b/drivers/sensors/azoteq_iqs5xx.h
index eb01903e33..a5866b3d85 100644
--- a/drivers/sensors/azoteq_iqs5xx.h
+++ b/drivers/sensors/azoteq_iqs5xx.h
@@ -178,9 +178,9 @@ typedef struct {
# define POINTING_DEVICE_TASK_THROTTLE_MS AZOTEQ_IQS5XX_REPORT_RATE + 1
#endif
-const pointing_device_driver_t azoteq_iqs5xx_pointing_device_driver;
+extern const pointing_device_driver_t azoteq_iqs5xx_pointing_device_driver;
-void azoteq_iqs5xx_init(void);
+bool azoteq_iqs5xx_init(void);
i2c_status_t azoteq_iqs5xx_wake(void);
report_mouse_t azoteq_iqs5xx_get_report(report_mouse_t mouse_report);
i2c_status_t azoteq_iqs5xx_get_report_rate(azoteq_iqs5xx_report_rate_t *report_rate, azoteq_iqs5xx_charging_modes_t mode, bool end_session);
diff --git a/drivers/sensors/cirque_pinnacle.c b/drivers/sensors/cirque_pinnacle.c
index 893cb98bf0..45072ae874 100644
--- a/drivers/sensors/cirque_pinnacle.c
+++ b/drivers/sensors/cirque_pinnacle.c
@@ -18,7 +18,6 @@
# endif
#endif
-bool touchpad_init;
uint16_t scale_data = CIRQUE_PINNACLE_DEFAULT_SCALE;
void cirque_pinnacle_clear_flags(void);
@@ -232,14 +231,14 @@ bool cirque_pinnacle_connected(void) {
}
/* Pinnacle-based TM040040/TM035035/TM023023 Functions */
-void cirque_pinnacle_init(void) {
+bool cirque_pinnacle_init(void) {
#if defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_spi)
spi_init();
#elif defined(POINTING_DEVICE_DRIVER_cirque_pinnacle_i2c)
i2c_init();
#endif
- touchpad_init = true;
+ bool touchpad_init = true;
// send a RESET command now, in case QMK had a soft-reset without a power cycle
RAP_Write(HOSTREG__SYSCONFIG1, HOSTREG__SYSCONFIG1__RESET);
@@ -293,6 +292,8 @@ void cirque_pinnacle_init(void) {
#ifndef CIRQUE_PINNACLE_SKIP_SENSOR_CHECK
touchpad_init = cirque_pinnacle_connected();
#endif
+
+ return touchpad_init;
}
pinnacle_data_t cirque_pinnacle_read_data(void) {
diff --git a/drivers/sensors/cirque_pinnacle.h b/drivers/sensors/cirque_pinnacle.h
index 1a17e539a4..f71ee8da1f 100644
--- a/drivers/sensors/cirque_pinnacle.h
+++ b/drivers/sensors/cirque_pinnacle.h
@@ -112,9 +112,9 @@ typedef struct {
#define cirque_pinnacle_i2c_pointing_device_driver cirque_pinnacle_pointing_device_driver
#define cirque_pinnacle_spi_pointing_device_driver cirque_pinnacle_pointing_device_driver
-const pointing_device_driver_t cirque_pinnacle_pointing_device_driver;
+extern const pointing_device_driver_t cirque_pinnacle_pointing_device_driver;
-void cirque_pinnacle_init(void);
+bool cirque_pinnacle_init(void);
void cirque_pinnacle_calibrate(void);
void cirque_pinnacle_cursor_smoothing(bool enable);
pinnacle_data_t cirque_pinnacle_read_data(void);
diff --git a/drivers/sensors/cirque_pinnacle_i2c.c b/drivers/sensors/cirque_pinnacle_i2c.c
index a3622e9d60..8d766c69d9 100644
--- a/drivers/sensors/cirque_pinnacle_i2c.c
+++ b/drivers/sensors/cirque_pinnacle_i2c.c
@@ -7,29 +7,22 @@
#define WRITE_MASK 0x80
#define READ_MASK 0xA0
-extern bool touchpad_init;
-
/* RAP Functions */
// Reads <count> Pinnacle registers starting at <address>
void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
- if (touchpad_init) {
- i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
- if (i2c_read_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
- pd_dprintf("error cirque_pinnacle i2c_read_register\n");
- touchpad_init = false;
- }
+ i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, NULL, 0, CIRQUE_PINNACLE_TIMEOUT);
+ if (i2c_read_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, data, count, CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
+ pd_dprintf("error cirque_pinnacle i2c_read_register\n");
+ pointing_device_set_status(POINTING_DEVICE_STATUS_FAILED);
}
}
// Writes single-byte <data> to <address>
void RAP_Write(uint8_t address, uint8_t data) {
uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
-
- if (touchpad_init) {
- if (i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
- pd_dprintf("error cirque_pinnacle i2c_write_register\n");
- touchpad_init = false;
- }
+ if (i2c_write_register(CIRQUE_PINNACLE_ADDR << 1, cmdByte, &data, sizeof(data), CIRQUE_PINNACLE_TIMEOUT) != I2C_STATUS_SUCCESS) {
+ pd_dprintf("error cirque_pinnacle i2c_write_register\n");
+ pointing_device_set_status(POINTING_DEVICE_STATUS_FAILED);
}
}
diff --git a/drivers/sensors/cirque_pinnacle_spi.c b/drivers/sensors/cirque_pinnacle_spi.c
index 5cb39aebb0..eefdb4d0a7 100644
--- a/drivers/sensors/cirque_pinnacle_spi.c
+++ b/drivers/sensors/cirque_pinnacle_spi.c
@@ -7,40 +7,35 @@
#define READ_MASK 0xA0
#define FILLER_BYTE 0xFC
-extern bool touchpad_init;
-
/* RAP Functions */
// Reads <count> Pinnacle registers starting at <address>
void RAP_ReadBytes(uint8_t address, uint8_t* data, uint8_t count) {
uint8_t cmdByte = READ_MASK | address; // Form the READ command byte
- if (touchpad_init) {
- if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
- spi_write(cmdByte); // write command byte, receive filler
- spi_write(FILLER_BYTE); // write & receive filler
- spi_write(FILLER_BYTE); // write & receive filler
- for (uint8_t i = 0; i < count; i++) {
- data[i] = spi_write(FILLER_BYTE); // write filler, receive data on the third filler send
- }
- } else {
- pd_dprintf("error cirque_pinnacle spi_start read\n");
- touchpad_init = false;
+
+ if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
+ spi_write(cmdByte); // write command byte, receive filler
+ spi_write(FILLER_BYTE); // write & receive filler
+ spi_write(FILLER_BYTE); // write & receive filler
+ for (uint8_t i = 0; i < count; i++) {
+ data[i] = spi_write(FILLER_BYTE); // write filler, receive data on the third filler send
}
- spi_stop();
+ } else {
+ pd_dprintf("error cirque_pinnacle spi_start read\n");
+ pointing_device_set_status(POINTING_DEVICE_STATUS_FAILED);
}
+ spi_stop();
}
// Writes single-byte <data> to <address>
void RAP_Write(uint8_t address, uint8_t data) {
uint8_t cmdByte = WRITE_MASK | address; // Form the WRITE command byte
- if (touchpad_init) {
- if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
- spi_write(cmdByte);
- spi_write(data);
- } else {
- pd_dprintf("error cirque_pinnacle spi_start write\n");
- touchpad_init = false;
- }
- spi_stop();
+ if (spi_start(CIRQUE_PINNACLE_SPI_CS_PIN, CIRQUE_PINNACLE_SPI_LSBFIRST, CIRQUE_PINNACLE_SPI_MODE, CIRQUE_PINNACLE_SPI_DIVISOR)) {
+ spi_write(cmdByte);
+ spi_write(data);
+ } else {
+ pd_dprintf("error cirque_pinnacle spi_start write\n");
+ pointing_device_set_status(POINTING_DEVICE_STATUS_FAILED);
}
+ spi_stop();
}
diff --git a/drivers/sensors/paw3204.c b/drivers/sensors/paw3204.c
index 475821f175..228b7fa986 100644
--- a/drivers/sensors/paw3204.c
+++ b/drivers/sensors/paw3204.c
@@ -58,7 +58,15 @@ const pointing_device_driver_t paw3204_pointing_device_driver = {
.get_cpi = paw3204_get_cpi,
};
-void paw3204_init(void) {
+uint8_t read_pid_paw3204(void) {
+ return paw3204_read_reg(REG_PID1);
+}
+
+bool __attribute__((weak)) paw3204_check_signature(void) {
+ return (read_pid_paw3204() == 0x30);
+}
+
+bool paw3204_init(void) {
gpio_set_pin_output(PAW3204_SCLK_PIN); // setclockpin to output
gpio_set_pin_input_high(PAW3204_SDIO_PIN); // set datapin input high
@@ -69,6 +77,8 @@ void paw3204_init(void) {
paw3204_read_reg(0x01); // read id2
// PAW3204_write_reg(REG_SETUP,0x06); // dont reset sensor and set cpi 1600
paw3204_write_reg(REG_IMGTRASH, 0x32); // write image trashhold
+
+ return paw3204_check_signature();
}
uint8_t paw3204_serial_read(void) {
@@ -175,10 +185,6 @@ uint16_t paw3204_get_cpi(void) {
return cpival;
}
-uint8_t read_pid_paw3204(void) {
- return paw3204_read_reg(REG_PID1);
-}
-
report_mouse_t paw3204_get_report(report_mouse_t mouse_report) {
report_paw3204_t data = paw3204_read();
if (data.isMotion) {
diff --git a/drivers/sensors/paw3204.h b/drivers/sensors/paw3204.h
index a4bb8e16a6..0bf5713548 100644
--- a/drivers/sensors/paw3204.h
+++ b/drivers/sensors/paw3204.h
@@ -41,7 +41,7 @@ typedef struct {
bool isMotion;
} report_paw3204_t;
-const pointing_device_driver_t paw3204_pointing_device_driver;
+extern const pointing_device_driver_t paw3204_pointing_device_driver;
/**
* @brief Initializes the sensor so it is in a working state and ready to
@@ -50,7 +50,7 @@ const pointing_device_driver_t paw3204_pointing_device_driver;
* @return true Initialization was a success
* @return false Initialization failed, do not proceed operation
*/
-void paw3204_init(void);
+bool paw3204_init(void);
/**
* @brief Reads and clears the current delta, and motion register values on the
diff --git a/drivers/sensors/pimoroni_trackball.c b/drivers/sensors/pimoroni_trackball.c
index 06e5042953..daa5786554 100644
--- a/drivers/sensors/pimoroni_trackball.c
+++ b/drivers/sensors/pimoroni_trackball.c
@@ -82,9 +82,12 @@ i2c_status_t read_pimoroni_trackball(pimoroni_data_t *data) {
return status;
}
-__attribute__((weak)) void pimoroni_trackball_device_init(void) {
+__attribute__((weak)) bool pimoroni_trackball_device_init(void) {
i2c_init();
- pimoroni_trackball_set_rgbw(0x00, 0x00, 0x00, 0x00);
+ uint8_t rgbw_data[4] = {0};
+ i2c_status_t status = i2c_write_register(PIMORONI_TRACKBALL_ADDRESS << 1, PIMORONI_TRACKBALL_REG_LED_RED, rgbw_data, sizeof(rgbw_data), PIMORONI_TRACKBALL_TIMEOUT);
+
+ return (status == I2C_STATUS_SUCCESS);
}
int16_t pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_dir, uint8_t scale) {
diff --git a/drivers/sensors/pimoroni_trackball.h b/drivers/sensors/pimoroni_trackball.h
index 1904214a74..74ae6d7228 100644
--- a/drivers/sensors/pimoroni_trackball.h
+++ b/drivers/sensors/pimoroni_trackball.h
@@ -50,9 +50,9 @@ typedef struct {
uint8_t click;
} pimoroni_data_t;
-const pointing_device_driver_t pimoroni_trackball_pointing_device_driver;
+extern const pointing_device_driver_t pimoroni_trackball_pointing_device_driver;
-void pimoroni_trackball_device_init(void);
+bool pimoroni_trackball_device_init(void);
void pimoroni_trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
int16_t pimoroni_trackball_get_offsets(uint8_t negative_dir, uint8_t positive_dir, uint8_t scale);
uint16_t pimoroni_trackball_get_cpi(void);
diff --git a/drivers/sensors/pmw3320.c b/drivers/sensors/pmw3320.c
index 74fefd4c53..db74540ec1 100644
--- a/drivers/sensors/pmw3320.c
+++ b/drivers/sensors/pmw3320.c
@@ -30,7 +30,7 @@ const pointing_device_driver_t pmw3320_pointing_device_drivera = {
.get_cpi = pmw3320_get_cpi,
};
-void pmw3320_init(void) {
+bool pmw3320_init(void) {
// Initialize sensor serial pins.
gpio_set_pin_output(PMW3320_SCLK_PIN);
gpio_set_pin_output(PMW3320_SDIO_PIN);
@@ -56,6 +56,8 @@ void pmw3320_init(void) {
pmw3320_write_reg(REG_Led_Control, 0x4);
// Disable rest mode
pmw3320_write_reg(REG_Performance, 0x80);
+
+ return pmw3320_check_signature();
}
// Perform a synchronization with sensor.
@@ -192,7 +194,7 @@ void pmw3320_set_cpi(uint16_t cpi) {
pmw3320_write_reg(REG_Resolution, 0x20 | cpival);
}
-bool pmw3320_check_signature(void) {
+bool __attribute__((weak)) pmw3320_check_signature(void) {
uint8_t pid = pmw3320_read_reg(REG_Product_ID);
uint8_t pid2 = pmw3320_read_reg(REG_Inverse_Product_ID);
diff --git a/drivers/sensors/pmw3320.h b/drivers/sensors/pmw3320.h
index cfff25bd8a..c80eb8e145 100644
--- a/drivers/sensors/pmw3320.h
+++ b/drivers/sensors/pmw3320.h
@@ -55,13 +55,13 @@ typedef struct {
int8_t dy;
} report_pmw3320_t;
-const pointing_device_driver_t pmw3320_pointing_device_driver;
+extern const pointing_device_driver_t pmw3320_pointing_device_driver;
// A bunch of functions to implement the PMW3320-specific serial protocol.
// Mostly taken from ADNS5050 driver.
// Note that the "serial.h" driver is insufficient, because it does not
// manually manipulate a serial clock signal.
-void pmw3320_init(void);
+bool pmw3320_init(void);
void pmw3320_sync(void);
uint8_t pmw3320_serial_read(void);
void pmw3320_serial_write(uint8_t data);
diff --git a/drivers/sensors/pmw3389.c b/drivers/sensors/pmw3389.c
index 85d2c8a429..efa90c2100 100644
--- a/drivers/sensors/pmw3389.c
+++ b/drivers/sensors/pmw3389.c
@@ -29,4 +29,4 @@ void pmw33xx_set_cpi(uint8_t sensor, uint16_t cpi) {
}
// PID, Inverse PID
-const uint8_t pmw33xx_firmware_signature[2] PROGMEM = {0x42, 0xBD};
+const uint8_t pmw33xx_firmware_signature[2] PROGMEM = {0x47, 0xB8};
diff --git a/drivers/sensors/pmw33xx_common.c b/drivers/sensors/pmw33xx_common.c
index f3285ec497..61e309ea27 100644
--- a/drivers/sensors/pmw33xx_common.c
+++ b/drivers/sensors/pmw33xx_common.c
@@ -102,7 +102,7 @@ uint8_t pmw33xx_read(uint8_t sensor, uint8_t reg_addr) {
return data;
}
-bool pmw33xx_check_signature(uint8_t sensor) {
+__attribute__((weak)) bool pmw33xx_check_signature(uint8_t sensor) {
uint8_t signature_dump[2] = {
pmw33xx_read(sensor, REG_Product_ID),
pmw33xx_read(sensor, REG_Inverse_Product_ID),
@@ -236,8 +236,8 @@ pmw33xx_report_t pmw33xx_read_burst(uint8_t sensor) {
return report;
}
-void pmw33xx_init_wrapper(void) {
- pmw33xx_init(0);
+bool pmw33xx_init_wrapper(void) {
+ return pmw33xx_init(0);
}
void pmw33xx_set_cpi_wrapper(uint16_t cpi) {
diff --git a/drivers/sensors/pmw33xx_common.h b/drivers/sensors/pmw33xx_common.h
index 82303ba6d9..ff890f49a9 100644
--- a/drivers/sensors/pmw33xx_common.h
+++ b/drivers/sensors/pmw33xx_common.h
@@ -106,7 +106,7 @@ STATIC_ASSERT(sizeof((pmw33xx_report_t){0}.motion) == 1, "pmw33xx_report_t.motio
#define pmw3360_pointing_device_driver pmw33xx_pointing_device_driver;
#define pmw3389_pointing_device_driver pmw33xx_pointing_device_driver;
-const pointing_device_driver_t pmw33xx_pointing_device_driver;
+extern const pointing_device_driver_t pmw33xx_pointing_device_driver;
/**
* @brief Initializes the given sensor so it is in a working state and ready to
@@ -177,7 +177,7 @@ uint8_t pmw33xx_read(uint8_t sensor, uint8_t reg_addr);
*/
bool pmw33xx_write(uint8_t sensor, uint8_t reg_addr, uint8_t data);
-void pmw33xx_init_wrapper(void);
+bool pmw33xx_init_wrapper(void);
void pmw33xx_set_cpi_wrapper(uint16_t cpi);
uint16_t pmw33xx_get_cpi_wrapper(void);
report_mouse_t pmw33xx_get_report(report_mouse_t mouse_report);
diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h
index e20a9854a5..8d40ecdaec 100644
--- a/keyboards/1upkeyboards/pi50/config.h
+++ b/keyboards/1upkeyboards/pi50/config.h
@@ -8,3 +8,4 @@
#define I2C_DRIVER I2CD1
#define OLED_BRIGHTNESS 128
#define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c"
+#define RGB_MATRIX_MODE_NAME_ENABLE
diff --git a/keyboards/1upkeyboards/pi50/pi50.c b/keyboards/1upkeyboards/pi50/pi50.c
index cc0cdbe333..c55b2669ef 100644
--- a/keyboards/1upkeyboards/pi50/pi50.c
+++ b/keyboards/1upkeyboards/pi50/pi50.c
@@ -18,49 +18,6 @@
#include <ctype.h>
#include <stdio.h>
-#if defined(RGB_MATRIX_EFFECT)
-# undef RGB_MATRIX_EFFECT
-#endif // defined(RGB_MATRIX_EFFECT)
-
-#define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
-enum {
- RGB_MATRIX_EFFECT_NONE,
-#include "rgb_matrix_effects.inc"
-#undef RGB_MATRIX_EFFECT
-#ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-#endif
-#ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-#endif
-#if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
-# include "rgb_matrix_community_modules.inc"
-#endif
-};
-
-#define RGB_MATRIX_EFFECT(x) \
- case RGB_MATRIX_EFFECT_##x: \
- return #x;
-const char* rgb_matrix_name(uint8_t effect) {
- switch (effect) {
- case RGB_MATRIX_EFFECT_NONE:
- return "NONE";
-#include "rgb_matrix_effects.inc"
-#undef RGB_MATRIX_EFFECT
-#ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-#endif
-#ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-#endif
-#if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
-# include "rgb_matrix_community_modules.inc"
-#endif
- default:
- return "UNKNOWN";
- }
-}
-
#ifdef OLED_ENABLE
static uint32_t oled_logo_timer = 0;
@@ -154,7 +111,7 @@ void user_oled_magic(void) {
oled_write_P(led_state.num_lock ? PSTR("Num(x) ") : PSTR("Num( ) "), false);
oled_write_P(led_state.scroll_lock ? PSTR("Scrl(x)") : PSTR("Scrl( )"), false);
- char *mode_name = strdup(rgb_matrix_name(rgb_matrix_get_mode()));
+ char *mode_name = strdup(rgb_matrix_get_mode_name(rgb_matrix_get_mode()));
if (mode_name != NULL) {
int len = strlen(mode_name);
bool capitalize_next = true;
diff --git a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
index c32f2a04d2..0fe7cdc247 100644
--- a/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
+++ b/keyboards/3w6/rev2/keymaps/default_pimoroni/pimoroni_trackball.c
@@ -89,9 +89,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
if (IS_MOUSEKEY_BUTTON(keycode)) {
report_mouse_t currentReport = pointing_device_get_report();
if (record->event.pressed) {
- currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
+ currentReport.buttons |= 1 << (keycode - QK_MOUSE_BUTTON_1);
} else {
- currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
+ currentReport.buttons &= ~(1 << (keycode - QK_MOUSE_BUTTON_1));
}
pointing_device_set_report(currentReport);
pointing_device_send();
diff --git a/keyboards/40percentclub/ut47/keymaps/default/keymap.c b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
index 4eb2c190c1..4a9de82492 100644
--- a/keyboards/40percentclub/ut47/keymaps/default/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/default/keymap.c
@@ -101,7 +101,7 @@ LAYOUT( /* Tab */
KC_ESC, KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, LED_TOG, LED_CHG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT
),
};
diff --git a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
index 86ceefaafb..17c0be7772 100644
--- a/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
+++ b/keyboards/40percentclub/ut47/keymaps/rgb/keymap.c
@@ -53,7 +53,7 @@ LAYOUT( /* Tab */
KC_ESC, KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, UG_VALU, UG_VALD, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT
),
};
diff --git a/keyboards/adpenrose/akemipad/keyboard.json b/keyboards/adpenrose/akemipad/keyboard.json
index 2dcfed3b5a..085ca5e406 100644
--- a/keyboards/adpenrose/akemipad/keyboard.json
+++ b/keyboards/adpenrose/akemipad/keyboard.json
@@ -42,8 +42,7 @@
"qmk": {
"tap_keycode_delay": 10
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c b/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c
index d65d119338..e545bdb1da 100644
--- a/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c
+++ b/keyboards/afternoonlabs/summer_breeze/keymaps/default/keymap.c
@@ -29,13 +29,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MAIN] = LAYOUT(
//┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
- _______, KC_WH_U, _______, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_MINS, KC_EQL, KC_GRV,
+ _______, MS_WHLU, _______, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, KC_MINS, KC_EQL, KC_GRV,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
- KC_BTN1, KC_WH_D, KC_BTN2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_LBRC, KC_RBRC, KC_BSLS,
+ MS_BTN1, MS_WHLD, MS_BTN2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_LBRC, KC_RBRC, KC_BSLS,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
- KC_MS_U, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP,
+ MS_UP, KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_UP,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
- KC_MS_L, KC_MS_D, KC_MS_R, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RIGHT,
+ MS_LEFT, MS_DOWN, MS_RGHT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_LEFT, KC_DOWN, KC_RIGHT,
//└────────┴────────┴────────┘└────────┴────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┴────────┴────────┴────────┘└────────┴────────┴────────┘
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_ENT, RAISE, LOWER, XXXXXXX
// └────────┴────────┴────────┴────────┘ └────────┴────────┴────────┴────────┘
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//┌────────┬────────┬────────┐┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐┌────────┬────────┬────────┐
_______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
- _______, KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, MS_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//├────────┼────────┼────────┤├────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┤├────────┼────────┼────────┤
diff --git a/keyboards/ai/keyboard.json b/keyboards/ai/keyboard.json
index bf594d306a..f8a5ba9925 100644
--- a/keyboards/ai/keyboard.json
+++ b/keyboards/ai/keyboard.json
@@ -2,7 +2,7 @@
"manufacturer": "Louis Dalibard",
"keyboard_name": "ai",
"maintainer": "make42",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
@@ -14,7 +14,6 @@
"cols": ["F5", "F6", "F7", "B1"],
"rows": ["D0", "D4", "C6", "D7", "D1"]
},
- "processor": "atmega32u4",
"usb": {
"device_version": "1.0.0",
"pid": "0x0000",
diff --git a/keyboards/ai03/orbit/keymaps/default/keymap.c b/keyboards/ai03/orbit/keymaps/default/keymap.c
index de737d4b9a..d777fafef1 100644
--- a/keyboards/ai03/orbit/keymaps/default/keymap.c
+++ b/keyboards/ai03/orbit/keymaps/default/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[2] = LAYOUT( /* Mousekeys and Numpad */
KC_NO, _______, _______, _______, _______, _______, _______, KC_NUM, KC_P7, KC_P8, KC_P9, KC_PSLS, _______, _______,
- KC_NO, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, _______,
- TO(1), _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, _______,
- TO(1), _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_BTN3, _______, DBLZERO, KC_P0, KC_PDOT, KC_PENT, KC_PPLS, _______, MANUAL,
+ KC_NO, _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, _______, KC_P4, KC_P5, KC_P6, KC_PAST, _______, _______,
+ TO(1), _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, _______, KC_P1, KC_P2, KC_P3, KC_PMNS, _______, _______,
+ TO(1), _______, MS_ACL0, MS_ACL1, MS_ACL2, MS_BTN3, _______, DBLZERO, KC_P0, KC_PDOT, KC_PENT, KC_PPLS, _______, MANUAL,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
index 0010c9f97b..e541c14d01 100644
--- a/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
+++ b/keyboards/aidansmithdotdev/fine40/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC , QK_BOOT, _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ ,
_______ , KC_F11 , KC_F12 , KC_F13 , KC_F14 , KC_F15 , KC_F16 , KC_F17 , KC_F18 , KC_F19 , KC_F20 , _______ ,
_______ , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , _______ ,
- _______ , _______ , _______ , _______ , _______ , _______ , _______ , KC_MS_L , KC_MS_D , KC_MS_U , KC_MS_R , _______
+ _______ , _______ , _______ , _______ , _______ , _______ , _______ , MS_LEFT , MS_DOWN , MS_UP , MS_RGHT , _______
),
};
diff --git a/keyboards/akko/5087/keyboard.json b/keyboards/akko/5087/keyboard.json
index 0561817b69..564a5519a9 100644
--- a/keyboards/akko/5087/keyboard.json
+++ b/keyboards/akko/5087/keyboard.json
@@ -7,8 +7,12 @@
"vid": "0xFFFE",
"pid": "0x000C",
"device_version": "1.0.4",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/akko/5108/keyboard.json b/keyboards/akko/5108/keyboard.json
index b62dbbf17c..a393f952d8 100644
--- a/keyboards/akko/5108/keyboard.json
+++ b/keyboards/akko/5108/keyboard.json
@@ -7,8 +7,12 @@
"vid": "0xFFFE",
"pid": "0x000D",
"device_version": "1.0.3",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/akko/acr87/keyboard.json b/keyboards/akko/acr87/keyboard.json
index 17981b609a..bf72c511b5 100644
--- a/keyboards/akko/acr87/keyboard.json
+++ b/keyboards/akko/acr87/keyboard.json
@@ -7,8 +7,12 @@
"vid": "0xFFFE",
"pid": "0x0010",
"device_version": "1.0.1",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/akko/top40/keyboard.json b/keyboards/akko/top40/keyboard.json
index 3cb7086608..857ffda276 100644
--- a/keyboards/akko/top40/keyboard.json
+++ b/keyboards/akko/top40/keyboard.json
@@ -7,8 +7,12 @@
"vid": "0xFFFE",
"pid": "0x000E",
"device_version": "1.0.2",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/aleblazer/zodiark/keyboard.json b/keyboards/aleblazer/zodiark/keyboard.json
index fba239866e..6818797809 100644
--- a/keyboards/aleblazer/zodiark/keyboard.json
+++ b/keyboards/aleblazer/zodiark/keyboard.json
@@ -71,8 +71,7 @@
"pin": "D3"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/alpha/keyboard.json b/keyboards/alpha/keyboard.json
index 84a25eb180..7c18d47045 100644
--- a/keyboards/alpha/keyboard.json
+++ b/keyboards/alpha/keyboard.json
@@ -45,8 +45,7 @@
"rows": ["D4", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/amjkeyboard/amj84/keyboard.json b/keyboards/amjkeyboard/amj84/keyboard.json
index a6108ab9a7..4ef3bfb776 100644
--- a/keyboards/amjkeyboard/amj84/keyboard.json
+++ b/keyboards/amjkeyboard/amj84/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x00D8",
"pid": "0x6068",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/aplyard/aplx6/rev1/keyboard.json b/keyboards/aplyard/aplx6/rev1/keyboard.json
index 667ebdba02..5e3c35b49b 100644
--- a/keyboards/aplyard/aplx6/rev1/keyboard.json
+++ b/keyboards/aplyard/aplx6/rev1/keyboard.json
@@ -15,8 +15,7 @@
"rows": ["E6", "B3"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/aplyard/aplx6/rev2/keyboard.json b/keyboards/aplyard/aplx6/rev2/keyboard.json
index 4c881534f4..56ec03479f 100644
--- a/keyboards/aplyard/aplx6/rev2/keyboard.json
+++ b/keyboards/aplyard/aplx6/rev2/keyboard.json
@@ -25,8 +25,7 @@
"qmk": {
"tap_keycode_delay": 50
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/arabica37/rev1/keyboard.json b/keyboards/arabica37/rev1/keyboard.json
index d1db9a276c..1433875e29 100644
--- a/keyboards/arabica37/rev1/keyboard.json
+++ b/keyboards/arabica37/rev1/keyboard.json
@@ -31,8 +31,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c b/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
index 5318b16df5..dc4e21127a 100644
--- a/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
+++ b/keyboards/arrayperipherals/1x4p1/keymaps/default/keymap.c
@@ -20,9 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
index 6e0a6a18dc..97f465de35 100644
--- a/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
+++ b/keyboards/arrowmechanics/wings/keymaps/default/keymap.c
@@ -10,7 +10,7 @@ enum layers {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[BASE] = LAYOUT(
KC_VOLU, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_EQL, KC_PSCR, KC_DEL,
- KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RM_NEXT, KC_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC,
+ KC_VOLD, KC_ESC, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, RM_NEXT, MS_BTN1, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_BSPC,
KC_MPLY, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, C(KC_C), C(KC_V), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_MNXT, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, C(KC_Z), C(KC_Y), KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_MPRV, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT, KC_ENT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_HOME,
@@ -20,6 +20,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [BASE] = { ENCODER_CCW_CW(RM_HUEU, RM_HUED), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [BASE] = { ENCODER_CCW_CW(RM_HUEU, RM_HUED), ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
};
#endif
diff --git a/keyboards/ashwing66/keymaps/default/keymap.c b/keyboards/ashwing66/keymaps/default/keymap.c
index 304f888742..416fe0261e 100644
--- a/keyboards/ashwing66/keymaps/default/keymap.c
+++ b/keyboards/ashwing66/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LAYERB] = LAYOUT_5x16(
KC_ESC ,RM_TOGG,RM_PREV ,RM_NEXT ,RM_VALD ,RM_VALU ,RM_SPDD ,RM_SPDU ,RM_HUED ,RM_HUEU ,RM_SATD ,RM_SATU ,
- KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_Y ,KC_BTN1 ,KC_MS_U ,KC_BTN2 ,KC_P ,KC_EQL ,
- KC_LCTL,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_H ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_SCLN ,KC_QUOT ,
+ KC_TAB ,KC_Q ,KC_W ,KC_E ,KC_R ,KC_T ,KC_Y ,MS_BTN1 ,MS_UP ,MS_BTN2 ,KC_P ,KC_EQL ,
+ KC_LCTL,KC_A ,KC_S ,KC_D ,KC_F ,KC_G ,KC_H ,MS_LEFT ,MS_DOWN ,MS_RGHT ,KC_SCLN ,KC_QUOT ,
KC_LSFT,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_LBRC ,KC_MUTE ,KC_RBRC ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT ,
KC_LBRC,KC_PSCR,KC_CAPS ,_______ ,KC_LGUI ,KC_LALT ,KC_SPC ,KC_END ,KC_HOME ,KC_ENT ,KC_BSPC ,_______ ,KC_INS ,KC_DEL ,KC_BSLS ,KC_RBRC
),
diff --git a/keyboards/atlantis/ak81_ve/keyboard.json b/keyboards/atlantis/ak81_ve/keyboard.json
index 7c01714201..3868625d93 100644
--- a/keyboards/atlantis/ak81_ve/keyboard.json
+++ b/keyboards/atlantis/ak81_ve/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x416B",
"pid": "0x0081",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/atomic/keymaps/default/keymap.c b/keyboards/atomic/keymaps/default/keymap.c
index 70feec1038..4afcf6c053 100644
--- a/keyboards/atomic/keymaps/default/keymap.c
+++ b/keyboards/atomic/keymaps/default/keymap.c
@@ -203,8 +203,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
KC_NUM, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, ___T___, ___T___,
KC_SCRL, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_PAUS, KC_PSCR,
- KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
- _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, KC_MS_U, KC_WH_D,
- _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ KC_CAPS, MS_BTN5, MS_BTN4, MS_BTN3, MS_BTN2, MS_ACL0, MS_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, MS_WHLU,
+ _______, _______, DF(_QW), DF(_CM), DF(_DV), _______, _______, _______, _______, _______, _______, ___T___, ___T___, MS_UP, MS_WHLD,
+ _______, _______, _______, _______, _______, MS_BTN1, MS_BTN1, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
};
diff --git a/keyboards/atreus62/keyboard.json b/keyboards/atreus62/keyboard.json
index 5fb786fa98..34e19925e9 100644
--- a/keyboards/atreus62/keyboard.json
+++ b/keyboards/atreus62/keyboard.json
@@ -27,8 +27,7 @@
"rows": ["D2", "D3", "D1", "D0", "D4"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/atreyu/rev1/rev1.c b/keyboards/atreyu/rev1/rev1.c
index 026eba4b8a..495d6e85f5 100644
--- a/keyboards/atreyu/rev1/rev1.c
+++ b/keyboards/atreyu/rev1/rev1.c
@@ -31,9 +31,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
if (index == 0) {
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/atreyu/rev2/rev2.c b/keyboards/atreyu/rev2/rev2.c
index 78c70631a3..37c9e489c1 100644
--- a/keyboards/atreyu/rev2/rev2.c
+++ b/keyboards/atreyu/rev2/rev2.c
@@ -31,9 +31,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
if (index == 0) {
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/avalanche/v1/keyboard.json b/keyboards/avalanche/v1/keyboard.json
index 0e539bdefc..4a6e2fbcbb 100644
--- a/keyboards/avalanche/v1/keyboard.json
+++ b/keyboards/avalanche/v1/keyboard.json
@@ -25,8 +25,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/avalanche/v2/keyboard.json b/keyboards/avalanche/v2/keyboard.json
index 2c38fd1056..f1fd8e1a53 100644
--- a/keyboards/avalanche/v2/keyboard.json
+++ b/keyboards/avalanche/v2/keyboard.json
@@ -39,8 +39,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/avalanche/v3/keyboard.json b/keyboards/avalanche/v3/keyboard.json
index 84191a103f..fb15395524 100644
--- a/keyboards/avalanche/v3/keyboard.json
+++ b/keyboards/avalanche/v3/keyboard.json
@@ -38,8 +38,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/avalanche/v4/keyboard.json b/keyboards/avalanche/v4/keyboard.json
index 2a548c5665..33abc8c96b 100644
--- a/keyboards/avalanche/v4/keyboard.json
+++ b/keyboards/avalanche/v4/keyboard.json
@@ -53,8 +53,7 @@
"alternating": true
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/aya/keymaps/default/keymap.c b/keyboards/aya/keymaps/default/keymap.c
index 255e13d7b7..ec429cf375 100644
--- a/keyboards/aya/keymaps/default/keymap.c
+++ b/keyboards/aya/keymaps/default/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[0] = LAYOUT(
_______, KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5, KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL,
- _______, KC_BTN2, KC_Q , KC_W , KC_E , KC_R , KC_T, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC,
- _______, KC_BTN1, KC_A , KC_S , KC_D , KC_F , KC_G, _______, _______, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS,
+ _______, MS_BTN2, KC_Q , KC_W , KC_E , KC_R , KC_T, KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC,
+ _______, MS_BTN1, KC_A , KC_S , KC_D , KC_F , KC_G, _______, _______, KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_NUHS,
_______, KC_NUBS, KC_Z , KC_X , KC_C , KC_V , KC_B, KC_LALT, MO(2) , _______, KC_DEL , KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, _______, _______,
KC_LSFT, _LG_ESC, KC_TAB , MO(1) , _______, KC_ENT, _RC_SPC, _RS_BSP
),
@@ -79,9 +79,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLU, MS_WHLR, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2
+ _______, _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2
),
};
diff --git a/keyboards/b_sides/rev41lp/keyboard.json b/keyboards/b_sides/rev41lp/keyboard.json
index 75c7affbf5..39f994eea1 100644
--- a/keyboards/b_sides/rev41lp/keyboard.json
+++ b/keyboards/b_sides/rev41lp/keyboard.json
@@ -27,8 +27,7 @@
"levels": 7,
"max_brightness": 150
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_rev41lp": "LAYOUT"
},
diff --git a/keyboards/bajjak/bajjak.c b/keyboards/bajjak/bajjak.c
index aadeb0415a..17d9165232 100644
--- a/keyboards/bajjak/bajjak.c
+++ b/keyboards/bajjak/bajjak.c
@@ -21,6 +21,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "bajjak.h"
+bool bajjak_left_led_1 = 0;
+bool bajjak_left_led_2 = 0;
+bool bajjak_left_led_3 = 0;
+
extern inline void bajjak_board_led_on(void);
extern inline void bajjak_right_led_1_on(void);
extern inline void bajjak_right_led_2_on(void);
diff --git a/keyboards/bajjak/bajjak.h b/keyboards/bajjak/bajjak.h
index cd4ae50053..f3acb54f59 100644
--- a/keyboards/bajjak/bajjak.h
+++ b/keyboards/bajjak/bajjak.h
@@ -66,9 +66,9 @@ inline void bajjak_right_led_3_off(void) { gpio_set_pin_input(B7); gpio_write_
inline void bajjak_right_led_off(uint8_t led) { gpio_set_pin_input(led+4); gpio_write_pin_low(led+4); }
#ifdef LEFT_LEDS
-bool bajjak_left_led_1;
-bool bajjak_left_led_2;
-bool bajjak_left_led_3;
+extern bool bajjak_left_led_1;
+extern bool bajjak_left_led_2;
+extern bool bajjak_left_led_3;
inline void bajjak_left_led_1_on(void) { bajjak_left_led_1 = 1; }
inline void bajjak_left_led_2_on(void) { bajjak_left_led_2 = 1; }
diff --git a/keyboards/bajjak/keymaps/5x6/keymap.c b/keyboards/bajjak/keymaps/5x6/keymap.c
index b700976dc9..65061a398a 100644
--- a/keyboards/bajjak/keymaps/5x6/keymap.c
+++ b/keyboards/bajjak/keymaps/5x6/keymap.c
@@ -122,9 +122,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Left hand Right hand
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_SLEP, KC_BRID, KC_BRIU, XXXXXXX, XXXXXXX, XXXXXXX, KC_EJCT, XXXXXXX, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU,
- XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- QK_BOOT, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, XXXXXXX, KC_WH_L, XXXXXXX, KC_WH_R, XXXXXXX, DF(SYMB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ QK_BOOT, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, MS_WHLL, XXXXXXX, MS_WHLR, XXXXXXX, DF(SYMB), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, DF(BASE),
_______, _______, _______, _______,
_______, _______,
diff --git a/keyboards/bajjak/keymaps/default/keymap.c b/keyboards/bajjak/keymaps/default/keymap.c
index 4e2a7e055c..39919c628c 100644
--- a/keyboards/bajjak/keymaps/default/keymap.c
+++ b/keyboards/bajjak/keymaps/default/keymap.c
@@ -128,9 +128,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Left hand Right hand
KC_SLEP, KC_BRID, KC_BRIU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_EJCT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_TAB, _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_CAPS, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_LSFT, _______, KC_WH_L, _______, KC_WH_R, _______, _______, _______, _______, _______, _______, _______,
+ KC_TAB, _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_CAPS, _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, _______, _______, _______, _______, _______, _______, _______,
+ KC_LSFT, _______, MS_WHLL, _______, MS_WHLR, _______, _______, _______, _______, _______, _______, _______,
KC_LCTL, KC_LGUI, ALT_T(KC_INSERT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, _______, _______, QK_BOOT,
CTL_T(KC_ESC), KC_LALT, KC_RGUI, CTL_T(KC_RALT),
KC_HOME, KC_PGUP,
diff --git a/keyboards/balloondogcaps/tr90pm/keyboard.json b/keyboards/balloondogcaps/tr90pm/keyboard.json
index da8f29e977..e103091bd7 100644
--- a/keyboards/balloondogcaps/tr90pm/keyboard.json
+++ b/keyboards/balloondogcaps/tr90pm/keyboard.json
@@ -2,7 +2,7 @@
"manufacturer": "Balloondog",
"keyboard_name": "TR90PM",
"maintainer": "balloondogcaps",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
@@ -14,7 +14,6 @@
"cols": ["D1", "D0", "D4"],
"rows": ["C6", "D7", "E6"]
},
- "processor": "atmega32u4",
"usb": {
"device_version": "1.0.0",
"pid": "0x0002",
diff --git a/keyboards/bandominedoni/keyboard.json b/keyboards/bandominedoni/keyboard.json
index 41212aedef..f6ea0f43c3 100644
--- a/keyboards/bandominedoni/keyboard.json
+++ b/keyboards/bandominedoni/keyboard.json
@@ -47,8 +47,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/basekeys/slice/rev1/keyboard.json b/keyboards/basekeys/slice/rev1/keyboard.json
index a6097e560a..209e4ef57a 100644
--- a/keyboards/basekeys/slice/rev1/keyboard.json
+++ b/keyboards/basekeys/slice/rev1/keyboard.json
@@ -30,8 +30,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/basekeys/slice/rev1_rgb/keyboard.json b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
index d6d7b8ad45..6747729363 100644
--- a/keyboards/basekeys/slice/rev1_rgb/keyboard.json
+++ b/keyboards/basekeys/slice/rev1_rgb/keyboard.json
@@ -56,8 +56,7 @@
"twinkle": true
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
index 4366a8a3e9..18ce680709 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/config.h
@@ -1,37 +1,12 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Handedness. */
-#define SPLIT_HAND_PIN GP29
-#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
-/* Cirque trackpad. */
#define SPI_SCK_PIN GP22
#define SPI_MOSI_PIN GP23
#define SPI_MISO_PIN GP20
#define POINTING_DEVICE_CS_PIN GP21
-/* Reset. */
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
index 57d15376d6..7f198be26b 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/halconf.h
@@ -1,20 +1,5 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_SPI TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
index 366deac293..c388855691 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/keyboard.json
@@ -1,22 +1,17 @@
{
- "keyboard_name": "Dilemma (3x5+2) Assembled",
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "pointing_device": true
- },
+ "bootloader": "rp2040",
"matrix_pins": {
"cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
"rows": ["GP4", "GP5", "GP28", "GP26"]
},
- "diode_direction": "ROW2COL",
+ "processor": "RP2040",
"split": {
- "enabled": true,
+ "handedness": {
+ "pin": "GP29"
+ },
"serial": {
+ "driver": "vendor",
"pin": "GP1"
}
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
+ }
}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
index 81821c159d..43d849d2a2 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/mcuconf.h
@@ -1,20 +1,5 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
index 48216ee8b7..fb5d649735 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
+++ b/keyboards/bastardkb/dilemma/3x5_2/assembled/rules.mk
@@ -1,7 +1 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
-
-SERIAL_DRIVER = vendor
-
-POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.
+POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
diff --git a/keyboards/bastardkb/dilemma/3x5_2/config.h b/keyboards/bastardkb/dilemma/3x5_2/config.h
new file mode 100644
index 0000000000..cd7f368bd3
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/config.h
@@ -0,0 +1,5 @@
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define SPLIT_HAND_PIN_LOW_IS_LEFT
diff --git a/keyboards/bastardkb/dilemma/3x5_2/info.json b/keyboards/bastardkb/dilemma/3x5_2/info.json
index bfd12e81d0..9e34cac13e 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/info.json
+++ b/keyboards/bastardkb/dilemma/3x5_2/info.json
@@ -1,4 +1,15 @@
{
+ "keyboard_name": "Dilemma 3x5+2",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "pointing_device": true
+ },
+ "split": {
+ "enabled": true
+ },
"usb": {
"device_version": "1.0.0",
"pid": "0x1835"
@@ -12,40 +23,33 @@
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
-
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 3], "x": 12, "y": 0},
{"matrix": [4, 2], "x": 13, "y": 0},
{"matrix": [4, 1], "x": 14, "y": 0},
{"matrix": [4, 0], "x": 15, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
-
{"matrix": [5, 4], "x": 11, "y": 1},
{"matrix": [5, 3], "x": 12, "y": 1},
{"matrix": [5, 2], "x": 13, "y": 1},
{"matrix": [5, 1], "x": 14, "y": 1},
{"matrix": [5, 0], "x": 15, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
-
{"matrix": [6, 4], "x": 11, "y": 2},
{"matrix": [6, 3], "x": 12, "y": 2},
{"matrix": [6, 2], "x": 13, "y": 2},
{"matrix": [6, 1], "x": 14, "y": 2},
{"matrix": [6, 0], "x": 15, "y": 2},
-
{"matrix": [3, 0], "x": 4, "y": 3},
{"matrix": [3, 2], "x": 5, "y": 3},
-
{"matrix": [7, 2], "x": 10, "y": 3},
{"matrix": [7, 0], "x": 11, "y": 3}
]
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c b/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c
deleted file mode 100644
index 0f9aff0a85..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-enum charybdis_keymap_layers {
- LAYER_BASE = 0,
- LAYER_NAV,
- LAYER_SYM,
- LAYER_NUM,
-};
-
-#define NAV MO(LAYER_NAV)
-#define SYM MO(LAYER_SYM)
-
-// clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [LAYER_BASE] = LAYOUT_split_3x5_2(
- // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
- NAV, CW_TOGG, KC_SPC, SYM
- // ╰──────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_NAV] = LAYOUT_split_3x5_2(
- // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
- KC_TAB, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, XXXXXXX, KC_HOME, KC_UP, KC_END, KC_DEL,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_LSFT, KC_LCTL, KC_LALT, KC_RGUI, KC_VOLD, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, KC_BSPC,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- QK_BOOT, EE_CLR, KC_MPRV, KC_MNXT, KC_MPLY, XXXXXXX, KC_PGDN, KC_PGUP, XXXXXXX, KC_ENT,
- // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
- _______, KC_LSFT, KC_SPC, _______
- // ╰──────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_SYM] = LAYOUT_split_3x5_2(
- // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
- KC_ESC, KC_LBRC, KC_LCBR, KC_LPRN, KC_TILD, KC_CIRC, KC_RPRN, KC_RCBR, KC_RBRC, KC_GRV,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_MINS, KC_ASTR, KC_EQL, KC_UNDS, KC_DLR, KC_HASH, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_PLUS, KC_PIPE, KC_AT, KC_SLSH, KC_PERC, _______, KC_BSLS, KC_AMPR, KC_QUES, KC_EXLM,
- // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
- _______, KC_LSFT, KC_SPC, _______
- // ╰──────────────────╯ ╰──────────────────╯
- ),
-
- [LAYER_NUM] = LAYOUT_split_3x5_2(
- // ╭─────────────────────────────────────────────╮ ╭─────────────────────────────────────────────╮
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI, KC_F11, KC_F12, KC_RGUI, KC_RALT, KC_RCTL, KC_RSFT,
- // ├─────────────────────────────────────────────┤ ├─────────────────────────────────────────────┤
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
- // ╰─────────────────────────────────────────────┤ ├─────────────────────────────────────────────╯
- _______, KC_LSFT, KC_SPC, _______
- // ╰──────────────────╯ ╰──────────────────╯
- ),
-};
-// clang-format on
-
-layer_state_t layer_state_set_user(layer_state_t state) {
- return update_tri_layer_state(state, LAYER_NAV, LAYER_SYM, LAYER_NUM);
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.json b/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.json
new file mode 100644
index 0000000000..e2387d879f
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/default/keymap.json
@@ -0,0 +1,26 @@
+{
+ "keyboard": "bastardkb/dilemma/3x5_2/promicro",
+ "keymap": "default",
+ "layout": "LAYOUT_split_3x5_2",
+ "layers": [
+ [
+ "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P",
+ "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN",
+ "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH",
+ "MO(1)", "KC_SPC", "KC_ENT", "MO(2)"
+ ],
+ [
+ "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0",
+ "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______"
+ ],
+ [
+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
+
diff --git a/keyboards/bastardkb/dilemma/3x5_2/promicro/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/promicro/keyboard.json
new file mode 100644
index 0000000000..55ce3cdbf1
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["B4", "B5", "E6", "D7", "F6"],
+ "rows": ["D4", "C6", "F5", "F7"]
+ },
+ "split": {
+ "handedness": {
+ "pin": "F4"
+ },
+ "serial": {
+ "pin": "D2"
+ }
+ }
+}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/promicro/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/promicro/rules.mk
new file mode 100644
index 0000000000..fedac72e2e
--- /dev/null
+++ b/keyboards/bastardkb/dilemma/3x5_2/promicro/rules.mk
@@ -0,0 +1 @@
+POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
deleted file mode 100644
index fd7bb0f107..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/config.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-//#define SPLIT_HAND_PIN GP29
-// If you've soldered the handedness pull-up on the upper side instead of the
-// left one, uncomment the following line.
-//#define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
deleted file mode 100644
index 2e098f5113..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/halconf.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* Copyright 2022 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_I2C TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json b/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
deleted file mode 100644
index e954f4f657..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/keyboard.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "keyboard_name": "Dilemma (3x5+2) Splinky",
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "pointing_device": true
- },
- "matrix_pins": {
- "cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
- "rows": ["GP4", "GP5", "GP28", "GP26"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h b/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
deleted file mode 100644
index c748d941e9..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/mcuconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef RP_I2C_USE_I2C1
-#define RP_I2C_USE_I2C1 TRUE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk b/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
deleted file mode 100644
index 942028da2c..0000000000
--- a/keyboards/bastardkb/dilemma/3x5_2/splinky/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default
-RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
-
-SERIAL_DRIVER = vendor
-
-POINTING_DEVICE_DRIVER = cirque_pinnacle_i2c # DIY version uses I2C.
diff --git a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
index a186139835..444e479d1a 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
+++ b/keyboards/bastardkb/dilemma/3x5_3/3x5_3.c
@@ -27,7 +27,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
switch (index) {
case 0: // Left-half encoder, mouse scroll.
- tap_code(clockwise ? KC_MS_WH_UP : KC_MS_WH_DOWN);
+ tap_code(clockwise ? MS_WHLU : MS_WHLD);
break;
case 1: // Right-half encoder, volume control.
tap_code(clockwise ? KC_AUDIO_VOL_UP : KC_AUDIO_VOL_DOWN);
diff --git a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
index 49b24fbd04..3545e60503 100644
--- a/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
+++ b/keyboards/bastardkb/dilemma/4x6_4/4x6_4.c
@@ -48,7 +48,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
switch (index) {
case 0: // Left-half encoder, mouse scroll.
- tap_code(clockwise ? KC_MS_WH_DOWN : KC_MS_WH_UP);
+ tap_code(clockwise ? MS_WHLD : MS_WHLU);
break;
case 1: // Right-half encoder, volume control.
tap_code(clockwise ? KC_AUDIO_VOL_UP : KC_AUDIO_VOL_DOWN);
diff --git a/keyboards/bastardkb/dilemma/dilemma.c b/keyboards/bastardkb/dilemma/dilemma.c
index b406e26526..c14345d075 100644
--- a/keyboards/bastardkb/dilemma/dilemma.c
+++ b/keyboards/bastardkb/dilemma/dilemma.c
@@ -328,22 +328,6 @@ void matrix_init_kb(void) {
}
#endif // POINTING_DEVICE_ENABLE
-// Forward declare RP2040 SDK declaration.
-void gpio_init(uint gpio);
-
-void keyboard_pre_init_kb(void) {
- // Ensures that GP26 through GP29 are initialized as digital inputs (as
- // opposed to analog inputs). These GPIOs are shared with A0 through A3,
- // respectively. On RP2040-B2 and later, the digital inputs are disabled by
- // default (see RP2040-E6).
- gpio_init(GP26);
- gpio_init(GP27);
- gpio_init(GP28);
- gpio_init(GP29);
-
- keyboard_pre_init_user();
-}
-
bool shutdown_kb(bool jump_to_bootloader) {
if (!shutdown_user(jump_to_bootloader)) {
return false;
diff --git a/keyboards/bastardkb/dilemma/readme.md b/keyboards/bastardkb/dilemma/readme.md
index 876400ae52..a149853015 100644
--- a/keyboards/bastardkb/dilemma/readme.md
+++ b/keyboards/bastardkb/dilemma/readme.md
@@ -1,21 +1,31 @@
# Dilemma
-A family of split keyboards with embedded RP2040 controllers, support for Cirque GlidePoint circle trackpads, and SPI + I2C breakouts for other peripherals
-
-- Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-- Hardware Supported: [Bastardkb Dilemma](https://github.com/Bastardkb/Dilemma)
-- Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
-
-A DIY version of the 3x5_2 PCB with promicro compatible footprint is also available.
+* Keyboard Maintainer: [BastardKB](https://github.com/BastardKB)
+* Hardware Supported: Dilemma PCBs with integrated or devlopment board<sup>*</sup> microcontrollers
+* Hardware Availability: [GitHub](https://github.com/Bastardkb/Dilemma)
Make example for this keyboard (after setting up your build environment):
+ make bastardkb/dilemma/3x5_2/assembled:default
+ make bastardkb/dilemma/3x5_2/promicro:default
make bastardkb/dilemma/3x5_3:default
make bastardkb/dilemma/4x6_4:default
Flashing example for this keyboard:
+ make bastardkb/dilemma/3x5_2/assembled:default:flash
+ make bastardkb/dilemma/3x5_2/promicro:default:flash
make bastardkb/dilemma/3x5_3:default:flash
make bastardkb/dilemma/4x6_4:default:flash
-See the [keyboard build instructions](http://docs.bastardkb.com/)
+Note<sup>*</sup>: the `dilemma/3x5_2/promicro` revision is the only DIY Dilemma PCB. It is footprint and pin compatible with a Pro Micro development board, and the firmware is written as such it can be used with the Converter Feature. This PCB uses I2C communication for the Cirque Trackpad, opposed to SPI for the variants with an integrated microcontroller.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset button**: Double-tap the reset button under/near the microcontroller.
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/bastardkb/readme.md b/keyboards/bastardkb/readme.md
new file mode 100644
index 0000000000..1b95e09946
--- /dev/null
+++ b/keyboards/bastardkb/readme.md
@@ -0,0 +1,19 @@
+# Information for Various BastardKB Hardware
+
+## Handedness Pin on Elite-C Holder
+The [Elite-C Holder](https://github.com/Bastardkb/Elite-C-holder) supports setting [handedness by pin](https://docs.qmk.fm/features/split_keyboard#handedness-by-pin) on pin F1 of an Elite-C.
+
+To utilise this, you must be using an Elite-C compatible development board (with the bottom 5 pins broken out) and install the necessary resistor. The following firmware configuration can be made in your keymap directory:
+```Makefile
+# rules.mk
+
+PIN_COMPATIBLE = elite_c
+```
+
+```c
+// config.h
+#pragma once
+
+#define SPLIT_HAND_PIN F1
+#define SPLIT_HAND_PIN_LOW_IS_LEFT
+```
diff --git a/keyboards/bastardkb/scylla/blackpill/config.h b/keyboards/bastardkb/scylla/blackpill/config.h
index bf7879edbe..c6b40f3e5f 100644
--- a/keyboards/bastardkb/scylla/blackpill/config.h
+++ b/keyboards/bastardkb/scylla/blackpill/config.h
@@ -1,27 +1,9 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Publicw License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Handedness. */
-#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
-
/* RGB settings. */
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
@@ -30,13 +12,6 @@
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3
-/* Serial configuration for split keyboard. */
-#define SERIAL_USART_TX_PIN A9
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
/* SPI config for EEPROM. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
diff --git a/keyboards/bastardkb/scylla/blackpill/halconf.h b/keyboards/bastardkb/scylla/blackpill/halconf.h
index 5c5dff98d4..545fc20cb3 100644
--- a/keyboards/bastardkb/scylla/blackpill/halconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/halconf.h
@@ -1,21 +1,6 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/scylla/blackpill/keyboard.json b/keyboards/bastardkb/scylla/blackpill/keyboard.json
index 5294976fd3..4bef461b6b 100644
--- a/keyboards/bastardkb/scylla/blackpill/keyboard.json
+++ b/keyboards/bastardkb/scylla/blackpill/keyboard.json
@@ -1,37 +1,23 @@
{
- "keyboard_name": "Scylla Blackpill",
- "usb": {
- "device_version": "1.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
+ "development_board": "blackpill_f411",
"eeprom": {
"driver": "spi"
},
- "split": {
- "enabled": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A1",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
"matrix_pins": {
"cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
"rows": ["B15", "A2", "B8", "A8", "B9"]
},
- "diode_direction": "ROW2COL",
- "development_board": "blackpill_f411"
+ "split": {
+ "handedness": {
+ "pin": "A3"
+ },
+ "serial": {
+ "driver": "usart",
+ "pin": "A9"
+ }
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A1"
+ }
}
diff --git a/keyboards/bastardkb/scylla/blackpill/mcuconf.h b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
index 2b3f30cbfe..cc77ec94ae 100644
--- a/keyboards/bastardkb/scylla/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/scylla/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
diff --git a/keyboards/bastardkb/scylla/blackpill/rules.mk b/keyboards/bastardkb/scylla/blackpill/rules.mk
deleted file mode 100644
index 48c904dd64..0000000000
--- a/keyboards/bastardkb/scylla/blackpill/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/scylla/info.json b/keyboards/bastardkb/scylla/info.json
index 6508c15b5a..7f3619c6d0 100644
--- a/keyboards/bastardkb/scylla/info.json
+++ b/keyboards/bastardkb/scylla/info.json
@@ -1,23 +1,85 @@
{
- "url": "https://bastardkb.com/scylla",
- "usb": {
- "pid": "0x1829"
+ "keyboard_name": "Scylla",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "rgb_matrix": true
},
"rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 2},
+ {"matrix": [1, 0], "x": 0, "y": 16, "flags": 2},
+ {"matrix": [2, 0], "x": 0, "y": 32, "flags": 2},
+ {"matrix": [3, 0], "x": 0, "y": 48, "flags": 2},
+ {"matrix": [3, 1], "x": 20, "y": 48, "flags": 4},
+ {"matrix": [2, 1], "x": 20, "y": 32, "flags": 4},
+ {"matrix": [1, 1], "x": 20, "y": 16, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 41, "y": 16, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
+ {"matrix": [3, 2], "x": 41, "y": 48, "flags": 4},
+ {"matrix": [3, 3], "x": 61, "y": 48, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 32, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 16, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 81, "y": 16, "flags": 4},
+ {"matrix": [2, 4], "x": 81, "y": 32, "flags": 4},
+ {"matrix": [3, 4], "x": 81, "y": 48, "flags": 4},
+ {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 102, "y": 16, "flags": 4},
+ {"matrix": [2, 5], "x": 102, "y": 32, "flags": 4},
+ {"matrix": [3, 5], "x": 102, "y": 48, "flags": 4},
+ {"matrix": [4, 2], "x": 102, "y": 64, "flags": 2},
+ {"matrix": [4, 5], "x": 81, "y": 64, "flags": 2},
+ {"matrix": [4, 3], "x": 61, "y": 56, "flags": 2},
+ {"matrix": [4, 4], "x": 81, "y": 56, "flags": 2},
+ {"matrix": [4, 1], "x": 102, "y": 56, "flags": 2},
+ {"matrix": [5, 0], "x": 224, "y": 0, "flags": 2},
+ {"matrix": [6, 0], "x": 224, "y": 16, "flags": 2},
+ {"matrix": [7, 0], "x": 224, "y": 32, "flags": 2},
+ {"matrix": [8, 0], "x": 224, "y": 48, "flags": 2},
+ {"matrix": [8, 1], "x": 204, "y": 48, "flags": 4},
+ {"matrix": [7, 1], "x": 204, "y": 32, "flags": 4},
+ {"matrix": [6, 1], "x": 204, "y": 16, "flags": 4},
+ {"matrix": [5, 1], "x": 204, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [6, 2], "x": 183, "y": 16, "flags": 4},
+ {"matrix": [7, 2], "x": 183, "y": 32, "flags": 4},
+ {"matrix": [8, 2], "x": 183, "y": 48, "flags": 4},
+ {"matrix": [8, 3], "x": 163, "y": 48, "flags": 4},
+ {"matrix": [7, 3], "x": 163, "y": 32, "flags": 4},
+ {"matrix": [6, 3], "x": 163, "y": 16, "flags": 4},
+ {"matrix": [5, 3], "x": 163, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [6, 4], "x": 142, "y": 16, "flags": 4},
+ {"matrix": [7, 4], "x": 142, "y": 32, "flags": 4},
+ {"matrix": [8, 4], "x": 142, "y": 48, "flags": 4},
+ {"matrix": [5, 5], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [6, 5], "x": 122, "y": 16, "flags": 4},
+ {"matrix": [7, 5], "x": 122, "y": 32, "flags": 4},
+ {"matrix": [8, 5], "x": 122, "y": 48, "flags": 4},
+ {"matrix": [9, 2], "x": 122, "y": 64, "flags": 2},
+ {"matrix": [9, 5], "x": 142, "y": 64, "flags": 2},
+ {"matrix": [9, 3], "x": 163, "y": 56, "flags": 2},
+ {"matrix": [9, 4], "x": 142, "y": 56, "flags": 2},
+ {"matrix": [9, 1], "x": 122, "y": 56, "flags": 2}
+ ],
"max_brightness": 50,
"sleep": true,
"split_count": [29, 29]
},
- "rgblight": {
- "led_count": 58,
- "split_count": [29, 29]
- },
"split": {
- "transport": {
- "sync": {
- "matrix_state": true
- }
- }
+ "enabled": true
+ },
+ "url": "https://github.com/Bastardkb/Scylla",
+ "usb": {
+ "device_version": "2.0.0",
+ "pid": "0x1829"
},
"layouts": {
"LAYOUT_split_4x6_5": {
@@ -28,67 +90,56 @@
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
-
{"matrix": [5, 5], "x": 11, "y": 0},
{"matrix": [5, 4], "x": 12, "y": 0},
{"matrix": [5, 3], "x": 13, "y": 0},
{"matrix": [5, 2], "x": 14, "y": 0},
{"matrix": [5, 1], "x": 15, "y": 0},
{"matrix": [5, 0], "x": 16, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
-
{"matrix": [6, 5], "x": 11, "y": 1},
{"matrix": [6, 4], "x": 12, "y": 1},
{"matrix": [6, 3], "x": 13, "y": 1},
{"matrix": [6, 2], "x": 14, "y": 1},
{"matrix": [6, 1], "x": 15, "y": 1},
{"matrix": [6, 0], "x": 16, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
-
{"matrix": [7, 5], "x": 11, "y": 2},
{"matrix": [7, 4], "x": 12, "y": 2},
{"matrix": [7, 3], "x": 13, "y": 2},
{"matrix": [7, 2], "x": 14, "y": 2},
{"matrix": [7, 1], "x": 15, "y": 2},
{"matrix": [7, 0], "x": 16, "y": 2},
-
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3},
-
{"matrix": [8, 5], "x": 11, "y": 3},
{"matrix": [8, 4], "x": 12, "y": 3},
{"matrix": [8, 3], "x": 13, "y": 3},
{"matrix": [8, 2], "x": 14, "y": 3},
{"matrix": [8, 1], "x": 15, "y": 3},
{"matrix": [8, 0], "x": 16, "y": 3},
-
{"matrix": [4, 3], "x": 5, "y": 4},
{"matrix": [4, 4], "x": 6, "y": 4},
{"matrix": [4, 1], "x": 7, "y": 4},
-
{"matrix": [9, 1], "x": 9, "y": 4},
{"matrix": [9, 4], "x": 10, "y": 4},
{"matrix": [9, 3], "x": 11, "y": 4},
-
{"matrix": [4, 5], "x": 6, "y": 5},
{"matrix": [4, 2], "x": 7, "y": 5},
-
{"matrix": [9, 2], "x": 9, "y": 5},
{"matrix": [9, 5], "x": 10, "y": 5}
]
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.c b/keyboards/bastardkb/scylla/keymaps/default/keymap.c
deleted file mode 100644
index 8e9b0190d4..0000000000
--- a/keyboards/bastardkb/scylla/keymaps/default/keymap.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_split_4x6_5(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- //-------------------------------------------------//-----------------------------------------------------------//
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
- //-------------------------------------------------//-----------------------------------------------------------//
- KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- //-------------------------------------------------//-----------------------------------------------------------//
- KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS,
- //-------------------------------------------------//-----------------------------------------------------------//
- KC_LCTL, KC_SPC, MO(1), MO(2), KC_ENT, KC_RGUI, KC_HOME, KC_BSPC, KC_DEL, KC_RALT),
-
- [1] = LAYOUT_split_4x6_5(KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
- //---------------------------------------------------------//-----------------------------------------------------------//
- QK_BOOT, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, _______, KC_PLUS,
- //---------------------------------------------------------//-----------------------------------------------------------//
- _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_LPRN, KC_RPRN, KC_P4, KC_P5, KC_P6, KC_MINS, KC_PIPE,
- //---------------------------------------------------------//-----------------------------------------------------------//
- _______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_EQL, KC_UNDS,
- //---------------------------------------------------------//-----------------------------------------------------------//
- KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, KC_RGUI, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
-
- [2] = LAYOUT_split_4x6_5(KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- //---------------------------------------------------------//--------------------------------------------------------------//
- _______, _______, RM_PREV, RM_TOGG, RM_NEXT, KC_LBRC, KC_RBRC, _______, KC_NUM, KC_INS, KC_SCRL, KC_MUTE,
- //---------------------------------------------------------//--------------------------------------------------------------//
- _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_LPRN, KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_VOLU,
- //---------------------------------------------------------//--------------------------------------------------------------//
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD,
- //---------------------------------------------------------//--------------------------------------------------------------//
- KC_LCTL, KC_HOME, KC_TRNS, KC_TRNS, KC_RALT, QK_BOOT, KC_SPC, KC_BSPC, KC_RCTL, KC_ENT),
-};
diff --git a/keyboards/bastardkb/scylla/keymaps/default/keymap.json b/keyboards/bastardkb/scylla/keymaps/default/keymap.json
new file mode 100644
index 0000000000..d06e183517
--- /dev/null
+++ b/keyboards/bastardkb/scylla/keymaps/default/keymap.json
@@ -0,0 +1,31 @@
+{
+ "keyboard": "bastardkb/scylla/promicro",
+ "keymap": "default",
+ "layout": "LAYOUT_split_4x6_5",
+ "layers": [
+ [
+ "KC_ESC" , "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_GRV" ,
+ "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC",
+ "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
+ "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_CAPS",
+ "KC_LGUI", "MO(1)", "KC_SPC", "KC_ENT", "MO(2)", "KC_RGUI",
+ "KC_LALT", "KC_SPC", "KC_BSPC", "KC_RALT"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "_______",
+ "_______", "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG", "_______",
+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
diff --git a/keyboards/bastardkb/scylla/promicro/keyboard.json b/keyboards/bastardkb/scylla/promicro/keyboard.json
new file mode 100644
index 0000000000..89116f7dcd
--- /dev/null
+++ b/keyboards/bastardkb/scylla/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F4", "F7", "C6", "D4", "B5"]
+ },
+ "split": {
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/bastardkb/scylla/readme.md b/keyboards/bastardkb/scylla/readme.md
index 830b8eacda..fd40c418c7 100644
--- a/keyboards/bastardkb/scylla/readme.md
+++ b/keyboards/bastardkb/scylla/readme.md
@@ -1,29 +1,27 @@
# Scylla
-A modern, low-profile split ergonomic keyboard
+* Keyboard Maintainer: [Quentin Lebastard](https://github.com/bastardkb)
+* Hardware Supported: BastardKB Blackpill or Pro Micro adapter & compatible development boards
+* Hardware Availability: [GitHub](https://github.com/Bastardkb/Scylla)
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastard Keyboards](https://bastardkb.com/)
+Make example for this keyboard (after setting up your build environment):
-## Building the firmware
+ make bastardkb/scylla/blackpill:default
+ make bastardkb/scylla/promicro:default
-**You must specify the shield version when compiling/flashing the firmware.**
+Flashing example for this keyboard:
-The template is:
+ make bastardkb/scylla/blackpill:default:flash
+ make bastardkb/scylla/promicro:default:flash
-```shell
-qmk compile -kb bastardkb/scylla/{VERSION}/elitec -km {KEYMAP}
-```
-
-| Shield Version | default | via |
-| --------------- | ------------------------------------------------------------- | --------------------------------------------------------- |
-| v1 (Elite-C) | `qmk compile -kb bastardkb/scylla/v1/elitec -km default` | `qmk compile -kb bastardkb/scylla/v1/elitec -km via` |
-| v2 (Elite-C) | `qmk compile -kb bastardkb/scylla/v2/elitec -km default` | `qmk compile -kb bastardkb/scylla/v2/elitec -km via` |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km default` | `qmk compile -kb bastardkb/scylla/v2/splinky/v2 -km via` |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km default` | `qmk compile -kb bastardkb/scylla/v2/splinky/v3 -km via` |
-| v2 (STeMCell) | `qmk compile -kb bastardkb/scylla/v2/stemcell -km default` | `qmk compile -kb bastardkb/scylla/v2/stemcell -km via` |
+Note if using the `promicro` version: If you are using an Elite-C compatible development board, see [here](../readme.md#handedness-pin-on-elite-c-holder) for setting handedness by pin.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-See the [keyboard build instructions](https://docs.bastardkb.com)
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the adapter PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/bastardkb/scylla/scylla.c b/keyboards/bastardkb/scylla/scylla.c
deleted file mode 100644
index 7aaa0fc1ce..0000000000
--- a/keyboards/bastardkb/scylla/scylla.c
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // left
- { 0, 7, 8, 15, 16, 20 },
- { 1, 6, 9, 14, 17, 21 },
- { 2, 5, 10, 13, 18, 22 },
- { 3, 4, 11, 12, 19, 23 },
- { NO_LED, 28, 24, 26, 27, 25 },
- // right
- { 29, 36, 37, 44, 45, 49 },
- { 30, 35, 38, 43, 46, 50 },
- { 31, 34, 39, 42, 47, 51 },
- { 32, 33, 40, 41, 48, 52 },
- { NO_LED, 57, 53, 55, 56, 54 }
-}, {
- // left
- { 0, 0 }, { 0, 16 }, { 0, 32 }, { 0, 48 }, // col 1
- { 20, 48 }, { 20, 32 }, { 20, 16 }, { 20, 0 }, // col 2
- { 41, 0 }, { 41, 16 }, { 41, 32 }, { 41, 48 },
- { 61, 48 }, { 61, 32 }, { 61, 16 }, { 61, 0 },
- { 81, 0 }, { 81, 16 }, { 81, 32 }, { 81, 48 },
- { 102, 0 }, { 102, 16 }, { 102, 32 }, { 102, 48 },
- { 102, 64 }, { 81, 64 }, { 61, 56 }, { 81, 56 }, { 102, 56 }, // left thumb cluster
- // right
- { 224, 0 }, { 224, 16 }, { 224, 32 }, { 224, 48 }, // col 12
- { 204, 48 }, { 204, 32 }, { 204, 16 }, { 204, 0 }, // col 11
- { 183, 0 }, { 183, 16 }, { 183, 32 }, { 183, 48 },
- { 163, 48 }, { 163, 32 }, { 163, 16 }, { 163, 0 },
- { 142, 0 }, { 142, 16 }, { 142, 32 }, { 142, 48 },
- { 122, 0 }, { 122, 16 }, { 122, 32 }, { 122, 48 },
- { 122, 64 }, { 142, 64 }, { 163, 56 }, { 142, 56 }, { 122, 56 } // right thumb cluster
-}, {
- // left
- 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 2, 2, 2, 2, 2,
- // right
- 2, 2, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 2, 2, 2, 2, 2
-} };
-#endif
-// clang-format on
diff --git a/keyboards/bastardkb/scylla/v1/elitec/config.h b/keyboards/bastardkb/scylla/v1/elitec/config.h
deleted file mode 100644
index 41b5aa1c66..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json b/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
deleted file mode 100644
index 25963f006c..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "Scylla Elite-C",
- "usb": {
- "device_version": "1.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D2"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
- "rows": ["D7", "B5", "F7", "F6", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D0"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/scylla/v1/elitec/rules.mk b/keyboards/bastardkb/scylla/v1/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/scylla/v1/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/scylla/v2/elitec/config.h b/keyboards/bastardkb/scylla/v2/elitec/config.h
deleted file mode 100644
index e6b7fefa66..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json b/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
deleted file mode 100644
index 316606b17b..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "Scylla Elite-C",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
- "rows": ["F4", "F7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/scylla/v2/elitec/rules.mk b/keyboards/bastardkb/scylla/v2/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/scylla/v2/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/config.h b/keyboards/bastardkb/scylla/v2/splinky_2/config.h
deleted file mode 100644
index 977fb0a6e8..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
deleted file mode 100644
index 2c0beb5c1d..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "Scylla Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
- "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/readme.md b/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/config.h b/keyboards/bastardkb/scylla/v2/splinky_3/config.h
deleted file mode 100644
index e496023656..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json b/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
deleted file mode 100644
index ed92be5a45..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "Scylla Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
- "rows": ["GP29", "GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/readme.md b/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk b/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/scylla/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/config.h b/keyboards/bastardkb/scylla/v2/stemcell/config.h
deleted file mode 100644
index ca1cc0f719..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define A0 PAL_LINE(GPIOA, 0)
-// #define SPLIT_HAND_PIN A0
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* RGB settings. */
-#define WS2812_PWM_DRIVER PWMD2
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_PWM_DMA_CHANNEL 3
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/halconf.h b/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
deleted file mode 100644
index dbeb6aeaa0..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json b/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
deleted file mode 100644
index 80325bfea3..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "keyboard_name": "Scylla STeMCell",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A2",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
- "matrix_pins": {
- "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
- "rows": ["B10", "B0", "B3", "A15", "B9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "A3"
- }
- },
- "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h b/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
deleted file mode 100644
index 6afebade36..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk b/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
deleted file mode 100644
index 3fe3e4ffbe..0000000000
--- a/keyboards/bastardkb/scylla/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/blackpill/config.h b/keyboards/bastardkb/skeletyl/blackpill/config.h
index bf7879edbe..c6b40f3e5f 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/config.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/config.h
@@ -1,27 +1,9 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Publicw License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Handedness. */
-#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
-
/* RGB settings. */
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
@@ -30,13 +12,6 @@
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3
-/* Serial configuration for split keyboard. */
-#define SERIAL_USART_TX_PIN A9
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
/* SPI config for EEPROM. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
diff --git a/keyboards/bastardkb/skeletyl/blackpill/halconf.h b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
index 5c5dff98d4..545fc20cb3 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/halconf.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/halconf.h
@@ -1,21 +1,6 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/skeletyl/blackpill/keyboard.json b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json
index 16fa2b2412..15edbf74b8 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/keyboard.json
+++ b/keyboards/bastardkb/skeletyl/blackpill/keyboard.json
@@ -1,37 +1,23 @@
{
- "keyboard_name": "Skeletyl Blackpill",
- "usb": {
- "device_version": "1.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
+ "development_board": "blackpill_f411",
"eeprom": {
"driver": "spi"
},
- "split": {
- "enabled": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A1",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
"matrix_pins": {
"cols": ["B1", "B10", "B3", "B4", "B5"],
"rows": ["A2", "B8", "A8", "B9"]
},
- "diode_direction": "ROW2COL",
- "development_board": "blackpill_f411"
+ "split": {
+ "handedness": {
+ "pin": "A3"
+ },
+ "serial": {
+ "driver": "usart",
+ "pin": "A9"
+ }
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A1"
+ }
}
diff --git a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
index 2b3f30cbfe..cc77ec94ae 100644
--- a/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/skeletyl/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
diff --git a/keyboards/bastardkb/skeletyl/blackpill/rules.mk b/keyboards/bastardkb/skeletyl/blackpill/rules.mk
deleted file mode 100644
index 48c904dd64..0000000000
--- a/keyboards/bastardkb/skeletyl/blackpill/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/skeletyl/info.json b/keyboards/bastardkb/skeletyl/info.json
index e4ac29207d..470197edb9 100644
--- a/keyboards/bastardkb/skeletyl/info.json
+++ b/keyboards/bastardkb/skeletyl/info.json
@@ -1,23 +1,63 @@
{
- "url": "https://www.bastardkb.com/skeletyl",
- "usb": {
- "pid": "0x1830"
+ "keyboard_name": "Skeletyl",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "rgb_matrix": true
},
"rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 4},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 18, "y": 0, "flags": 4},
+ {"matrix": [1, 1], "x": 18, "y": 21, "flags": 4},
+ {"matrix": [2, 1], "x": 18, "y": 42, "flags": 4},
+ {"matrix": [2, 2], "x": 36, "y": 42, "flags": 4},
+ {"matrix": [1, 2], "x": 36, "y": 21, "flags": 4},
+ {"matrix": [0, 2], "x": 36, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 54, "y": 0, "flags": 4},
+ {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4},
+ {"matrix": [2, 3], "x": 54, "y": 42, "flags": 4},
+ {"matrix": [0, 4], "x": 72, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 72, "y": 21, "flags": 4},
+ {"matrix": [2, 4], "x": 72, "y": 42, "flags": 4},
+ {"matrix": [3, 2], "x": 72, "y": 64, "flags": 1},
+ {"matrix": [3, 3], "x": 90, "y": 64, "flags": 1},
+ {"matrix": [3, 0], "x": 108, "y": 64, "flags": 1},
+ {"matrix": [6, 0], "x": 224, "y": 42, "flags": 4},
+ {"matrix": [5, 0], "x": 224, "y": 21, "flags": 4},
+ {"matrix": [4, 0], "x": 224, "y": 0, "flags": 4},
+ {"matrix": [4, 1], "x": 206, "y": 0, "flags": 4},
+ {"matrix": [5, 1], "x": 206, "y": 21, "flags": 4},
+ {"matrix": [6, 1], "x": 206, "y": 42, "flags": 4},
+ {"matrix": [6, 2], "x": 188, "y": 42, "flags": 4},
+ {"matrix": [5, 2], "x": 188, "y": 21, "flags": 4},
+ {"matrix": [4, 2], "x": 188, "y": 0, "flags": 4},
+ {"matrix": [4, 3], "x": 170, "y": 0, "flags": 4},
+ {"matrix": [5, 3], "x": 170, "y": 21, "flags": 4},
+ {"matrix": [6, 3], "x": 170, "y": 42, "flags": 4},
+ {"matrix": [4, 4], "x": 152, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 152, "y": 21, "flags": 4},
+ {"matrix": [6, 4], "x": 152, "y": 42, "flags": 4},
+ {"matrix": [7, 2], "x": 152, "y": 64, "flags": 1},
+ {"matrix": [7, 3], "x": 134, "y": 64, "flags": 1},
+ {"matrix": [7, 0], "x": 116, "y": 64, "flags": 1}
+ ],
"max_brightness": 50,
"sleep": true,
"split_count": [18, 18]
},
- "rgblight": {
- "led_count": 36,
- "split_count": [18, 18]
- },
"split": {
- "transport": {
- "sync": {
- "matrix_state": true
- }
- }
+ "enabled": true
+ },
+ "url": "https://github.com/Bastardkb/Skeletyl",
+ "usb": {
+ "device_version": "2.0.0",
+ "pid": "0x1830"
},
"community_layouts": ["split_3x5_3"],
"layouts": {
@@ -28,41 +68,34 @@
{"matrix": [0, 2], "x": 2, "y": 0},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
-
{"matrix": [4, 4], "x": 11, "y": 0},
{"matrix": [4, 3], "x": 12, "y": 0},
{"matrix": [4, 2], "x": 13, "y": 0},
{"matrix": [4, 1], "x": 14, "y": 0},
{"matrix": [4, 0], "x": 15, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
-
{"matrix": [5, 4], "x": 11, "y": 1},
{"matrix": [5, 3], "x": 12, "y": 1},
{"matrix": [5, 2], "x": 13, "y": 1},
{"matrix": [5, 1], "x": 14, "y": 1},
{"matrix": [5, 0], "x": 15, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
-
{"matrix": [6, 4], "x": 11, "y": 2},
{"matrix": [6, 3], "x": 12, "y": 2},
{"matrix": [6, 2], "x": 13, "y": 2},
{"matrix": [6, 1], "x": 14, "y": 2},
{"matrix": [6, 0], "x": 15, "y": 2},
-
{"matrix": [3, 2], "x": 4, "y": 3},
{"matrix": [3, 3], "x": 5, "y": 3},
{"matrix": [3, 0], "x": 6, "y": 3},
-
{"matrix": [7, 0], "x": 9, "y": 3},
{"matrix": [7, 3], "x": 10, "y": 3},
{"matrix": [7, 2], "x": 11, "y": 3}
diff --git a/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c b/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c
deleted file mode 100644
index 1f49629c88..0000000000
--- a/keyboards/bastardkb/skeletyl/keymaps/default/keymap.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_split_3x5_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC , MO(1), MO(2), KC_ENT , KC_RALT
- //`--------------------------' `--------------------------'
-
- ),
-
- [1] = LAYOUT_split_3x5_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, _______, MO(3), KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- ),
-
- [2] = LAYOUT_split_3x5_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, MO(3), _______, KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- ),
-
- [3] = LAYOUT_split_3x5_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- RM_HUEU, RM_SATU, RM_VALU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- RM_HUED, RM_SATD, RM_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- )
-};
diff --git a/keyboards/bastardkb/skeletyl/keymaps/default/keymap.json b/keyboards/bastardkb/skeletyl/keymaps/default/keymap.json
new file mode 100644
index 0000000000..5253ca2a12
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/keymaps/default/keymap.json
@@ -0,0 +1,26 @@
+{
+ "keyboard": "bastardkb/skeletyl/promicro",
+ "keymap": "default",
+ "layout": "LAYOUT_split_3x5_3",
+ "layers": [
+ [
+ "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P",
+ "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN",
+ "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH",
+ "KC_LGUI", "MO(1)", "KC_SPC", "KC_ENT", "MO(2)", "KC_RALT"
+ ],
+ [
+ "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0",
+ "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______"
+ ],
+ [
+ "QK_BOOT", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG",
+ "EE_CLR", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
+
diff --git a/keyboards/bastardkb/skeletyl/promicro/keyboard.json b/keyboards/bastardkb/skeletyl/promicro/keyboard.json
new file mode 100644
index 0000000000..d9c399865b
--- /dev/null
+++ b/keyboards/bastardkb/skeletyl/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F7", "C6", "D4", "B5"]
+ },
+ "split": {
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/bastardkb/skeletyl/readme.md b/keyboards/bastardkb/skeletyl/readme.md
index bd05820d35..7299964968 100644
--- a/keyboards/bastardkb/skeletyl/readme.md
+++ b/keyboards/bastardkb/skeletyl/readme.md
@@ -1,31 +1,27 @@
# Skeletyl
-A very small keyboard made for ergonomic enthusiasts.
+* Keyboard Maintainer: [Quentin Lebastard](https://github.com/bastardkb)
+* Hardware Supported: BastardKB Blackpill or Pro Micro adapter & compatible development boards
+* Hardware Availability: [GitHub](https://github.com/Bastardkb/Skeletyl)
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
+Make example for this keyboard (after setting up your build environment):
-## Building the firmware
+ make bastardkb/skeletyl/blackpill:default
+ make bastardkb/skeletyl/promicro:default
-**You must specify the shield version when compiling/flashing the firmware.**
+Flashing example for this keyboard:
-The template is:
+ make bastardkb/skeletyl/blackpill:default:flash
+ make bastardkb/skeletyl/promicro:default:flash
-```shell
-qmk compile -kb bastardkb/skeletyl/{VERSION}/elitec -km {KEYMAP}
-```
+Note if using the `promicro` version: If you are using an Elite-C compatible development board, see [here](../readme.md#handedness-pin-on-elite-c-holder) for setting handedness by pin.
-| Shield Version | default | via |
-| --------------- | --------------------------------------------------------------- | ----------------------------------------------------------- |
-| v1 (Elite-C) | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km default` | `qmk compile -kb bastardkb/skeletyl/v1/elitec -km via` |
-| v2 (Elite-C) | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km default` | `qmk compile -kb bastardkb/skeletyl/v2/elitec -km via` |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km default` | `qmk compile -kb bastardkb/skeletyl/v2/splinky_2 -km via` |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km default` | `qmk compile -kb bastardkb/skeletyl/v2/splinky_3 -km via` |
-| v2 (STeMCell) | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km default` | `qmk compile -kb bastardkb/skeletyl/v2/stemcell -km via` |
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-This keyboard is made to be used with the Miryoku layout, do not use the default keymap.
+## Bootloader
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+Enter the bootloader in 3 ways:
-See the [keyboard build instructions](http://docs.bastardkb.com/)
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the adapter PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/bastardkb/skeletyl/skeletyl.c b/keyboards/bastardkb/skeletyl/skeletyl.c
deleted file mode 100644
index 6c65c3fa87..0000000000
--- a/keyboards/bastardkb/skeletyl/skeletyl.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-/**
- * LEDs index.
- *
- * ╭────────────────────╮ ╭────────────────────╮
- * 2 3 8 9 12 30 27 26 21 20
- * ├────────────────────┤ ├────────────────────┤
- * 1 4 7 10 13 31 28 25 22 19
- * ├────────────────────┤ ├────────────────────┤
- * 0 5 6 11 14 32 29 24 23 18
- * ╰────────────────────╯ ╰────────────────────╯
- * 15 16 17 35 34 33
- * ╰────────────╯ ╰────────────╯
- */
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- /* Key Matrix to LED index. */
- // Left split.
- { 2, 3, 8, 9, 12 }, // Top row
- { 1, 4, 7, 10, 13 }, // Middle row
- { 0, 5, 6, 11, 14 }, // Bottom row
- { 17, NO_LED, 15, 16, NO_LED }, // Thumb cluster
- // Right split.
- { 20, 21, 26, 27, 30 }, // Top row
- { 19, 22, 25, 28, 31 }, // Middle row
- { 18, 23, 24, 29, 32 }, // Bottom row
- { 35, NO_LED, 33, 34, NO_LED }, // Thumb cluster
-}, {
- /* LED index to physical position. */
- // Left split.
- /* index=0 */ { 0, 42 }, { 0, 21 }, { 0, 0 }, // col 1 (left most)
- /* index=3 */ { 18, 0 }, { 18, 21 }, { 18, 42 }, // col 2
- /* index=6 */ { 36, 42 }, { 36, 21 }, { 36, 0 },
- /* index=9 */ { 54, 0 }, { 54, 21 }, { 54, 42 },
- /* index=12 */ { 72, 0 }, { 72, 21 }, { 72, 42 },
- /* index=15 */ { 72, 64 }, { 90, 64 }, { 108, 64 }, // Thumb cluster
- // Right split.
- /* index=18 */ { 224, 42 }, { 224, 21 }, { 224, 0 }, // col 10 (right most)
- /* index=21 */ { 206, 0 }, { 206, 21 }, { 206, 42 }, // col 9
- /* index=24 */ { 188, 42 }, { 188, 21 }, { 188, 0 },
- /* index=27 */ { 170, 0 }, { 170, 21 }, { 170, 42 },
- /* index=30 */ { 152, 0 }, { 152, 21 }, { 152, 42 },
- /* index=33 */ { 152, 64 }, { 134, 64 }, { 116, 64 }, // Thumb cluster
-}, {
- /* LED index to flag. */
- // Left split.
- /* index=0 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 1
- /* index=3 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 2
- /* index=6 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=9 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=12 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=15 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
- // Right split.
- /* index=18 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 10
- /* index=21 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, // col 9
- /* index=24 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=27 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=30 */ LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT, LED_FLAG_KEYLIGHT,
- /* index=33 */ LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, LED_FLAG_MODIFIER, // Thumb cluster
-} };
-#endif
-// clang-format on
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/config.h b/keyboards/bastardkb/skeletyl/v1/elitec/config.h
deleted file mode 100644
index 41b5aa1c66..0000000000
--- a/keyboards/bastardkb/skeletyl/v1/elitec/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
deleted file mode 100644
index 3bbba6d310..0000000000
--- a/keyboards/bastardkb/skeletyl/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "Skeletyl Elite-C",
- "usb": {
- "device_version": "1.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D2"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["E6", "C6", "B1", "B3", "B2"],
- "rows": ["B5", "F7", "F6", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D0"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/skeletyl/v1/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/config.h b/keyboards/bastardkb/skeletyl/v2/elitec/config.h
deleted file mode 100644
index e6b7fefa66..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/elitec/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json b/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
deleted file mode 100644
index 43675db36d..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "Skeletyl Elite-C",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["F5", "B6", "D7", "E6", "B4"],
- "rows": ["F7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk b/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
deleted file mode 100644
index 977fb0a6e8..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
deleted file mode 100644
index 32030dbd00..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "Skeletyl Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP28", "GP15", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h b/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
deleted file mode 100644
index e496023656..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json b/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
deleted file mode 100644
index 51227f5065..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "Skeletyl Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP28", "GP21", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md b/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk b/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h b/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
deleted file mode 100644
index ca1cc0f719..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define A0 PAL_LINE(GPIOA, 0)
-// #define SPLIT_HAND_PIN A0
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* RGB settings. */
-#define WS2812_PWM_DRIVER PWMD2
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_PWM_DMA_CHANNEL 3
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
deleted file mode 100644
index dbeb6aeaa0..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json b/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
deleted file mode 100644
index 2e9745b7f2..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "keyboard_name": "Skeletyl STeMCell",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A2",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
- "matrix_pins": {
- "cols": ["B2", "A4", "B4", "B5", "B8"],
- "rows": ["B0", "B3", "A15", "B9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "A3"
- }
- },
- "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h b/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
deleted file mode 100644
index 6afebade36..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk b/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
deleted file mode 100644
index 3fe3e4ffbe..0000000000
--- a/keyboards/bastardkb/skeletyl/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbkmini/blackpill/config.h b/keyboards/bastardkb/tbkmini/blackpill/config.h
index bf7879edbe..c6b40f3e5f 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/config.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/config.h
@@ -1,27 +1,9 @@
-/*
- * Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Publicw License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Christopher Courtney <[email protected]> (@drashna)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Handedness. */
-#define SPLIT_HAND_PIN A3 // High -> left, Low -> right.
-
/* RGB settings. */
#define WS2812_PWM_DRIVER PWMD2
#define WS2812_PWM_CHANNEL 2
@@ -30,13 +12,6 @@
#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM1
#define WS2812_PWM_DMA_CHANNEL 3
-/* Serial configuration for split keyboard. */
-#define SERIAL_USART_TX_PIN A9
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
-
/* SPI config for EEPROM. */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
diff --git a/keyboards/bastardkb/tbkmini/blackpill/halconf.h b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
index 5c5dff98d4..545fc20cb3 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/halconf.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/halconf.h
@@ -1,21 +1,6 @@
-/**
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#define HAL_USE_PWM TRUE
diff --git a/keyboards/bastardkb/tbkmini/blackpill/keyboard.json b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json
index 61d0e741fe..df77023bd6 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/keyboard.json
+++ b/keyboards/bastardkb/tbkmini/blackpill/keyboard.json
@@ -1,37 +1,23 @@
{
- "keyboard_name": "TBK Mini Blackpill",
- "usb": {
- "device_version": "1.0.0",
- "shared_endpoint": {
- "keyboard": true
- }
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
+ "development_board": "blackpill_f411",
"eeprom": {
"driver": "spi"
},
- "split": {
- "enabled": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A1",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
"matrix_pins": {
"cols": ["B0", "B1", "B10", "B3", "B4", "B5"],
"rows": ["A2", "B8", "A8", "B9"]
},
- "diode_direction": "ROW2COL",
- "development_board": "blackpill_f411"
+ "split": {
+ "handedness": {
+ "pin": "A3"
+ },
+ "serial": {
+ "driver": "usart",
+ "pin": "A9"
+ }
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A1"
+ }
}
diff --git a/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
index 2b3f30cbfe..cc77ec94ae 100644
--- a/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
+++ b/keyboards/bastardkb/tbkmini/blackpill/mcuconf.h
@@ -1,22 +1,7 @@
-/*
- * Copyright 2020 Nick Brassel (tzarc)
- * Copyright 2021 Stefan Kerkmann (@KarlK90)
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
+// Copyright 2020 Nick Brassel (tzarc)
+// Copyright 2021 Stefan Kerkmann (@KarlK90)
+// Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
diff --git a/keyboards/bastardkb/tbkmini/blackpill/rules.mk b/keyboards/bastardkb/tbkmini/blackpill/rules.mk
deleted file mode 100644
index 48c904dd64..0000000000
--- a/keyboards/bastardkb/tbkmini/blackpill/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-MOUSE_SHARED_EP = no # Unify multiple HID interfaces into a single Endpoint
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bastardkb/tbkmini/info.json b/keyboards/bastardkb/tbkmini/info.json
index ff2df9cdd6..f37e092c2d 100644
--- a/keyboards/bastardkb/tbkmini/info.json
+++ b/keyboards/bastardkb/tbkmini/info.json
@@ -1,24 +1,70 @@
{
- "url": "https://www.bastardkb.com/tbk-mini",
+ "url": "https://github.com/Bastardkb/TBK-Mini",
+ "keyboard_name": "TBK Mini",
"usb": {
- "pid": "0x1828"
+ "pid": "0x1828",
+ "device_version": "2.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
+ "split": {
+ "enabled": true
+ },
+ "diode_direction": "ROW2COL",
"rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 2},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 2},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 2},
+ {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+ {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
+ {"matrix": [1, 2], "x": 41, "y": 21, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+ {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+ {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+ {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4},
+ {"matrix": [1, 5], "x": 102, "y": 21, "flags": 4},
+ {"matrix": [2, 5], "x": 102, "y": 42, "flags": 4},
+ {"matrix": [3, 1], "x": 61, "y": 64, "flags": 2},
+ {"matrix": [3, 3], "x": 81, "y": 64, "flags": 2},
+ {"matrix": [3, 4], "x": 102, "y": 64, "flags": 2},
+ {"matrix": [4, 0], "x": 224, "y": 0, "flags": 2},
+ {"matrix": [5, 0], "x": 224, "y": 21, "flags": 2},
+ {"matrix": [6, 0], "x": 224, "y": 42, "flags": 2},
+ {"matrix": [6, 1], "x": 204, "y": 42, "flags": 4},
+ {"matrix": [5, 1], "x": 204, "y": 21, "flags": 4},
+ {"matrix": [4, 1], "x": 204, "y": 0, "flags": 4},
+ {"matrix": [4, 2], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [5, 2], "x": 183, "y": 21, "flags": 4},
+ {"matrix": [6, 2], "x": 183, "y": 42, "flags": 4},
+ {"matrix": [6, 3], "x": 163, "y": 42, "flags": 4},
+ {"matrix": [5, 3], "x": 163, "y": 21, "flags": 4},
+ {"matrix": [4, 3], "x": 163, "y": 0, "flags": 4},
+ {"matrix": [4, 4], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [5, 4], "x": 142, "y": 21, "flags": 4},
+ {"matrix": [6, 4], "x": 142, "y": 42, "flags": 4},
+ {"matrix": [4, 5], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [5, 5], "x": 122, "y": 21, "flags": 4},
+ {"matrix": [6, 5], "x": 122, "y": 42, "flags": 4},
+ {"matrix": [7, 1], "x": 163, "y": 64, "flags": 2},
+ {"matrix": [7, 3], "x": 142, "y": 64, "flags": 2},
+ {"matrix": [7, 4], "x": 122, "y": 64, "flags": 2}
+ ],
"max_brightness": 50,
"sleep": true,
"split_count": [21, 21]
},
- "rgblight": {
- "led_count": 42,
- "split_count": [21, 21]
- },
- "split": {
- "transport": {
- "sync": {
- "matrix_state": true
- }
- }
- },
"community_layouts": ["split_3x6_3"],
"layouts": {
"LAYOUT_split_3x6_3": {
@@ -29,46 +75,39 @@
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
-
{"matrix": [4, 5], "x": 11, "y": 0},
{"matrix": [4, 4], "x": 12, "y": 0},
{"matrix": [4, 3], "x": 13, "y": 0},
{"matrix": [4, 2], "x": 14, "y": 0},
{"matrix": [4, 1], "x": 15, "y": 0},
{"matrix": [4, 0], "x": 16, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
-
{"matrix": [5, 5], "x": 11, "y": 1},
{"matrix": [5, 4], "x": 12, "y": 1},
{"matrix": [5, 3], "x": 13, "y": 1},
{"matrix": [5, 2], "x": 14, "y": 1},
{"matrix": [5, 1], "x": 15, "y": 1},
{"matrix": [5, 0], "x": 16, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
-
{"matrix": [6, 5], "x": 11, "y": 2},
{"matrix": [6, 4], "x": 12, "y": 2},
{"matrix": [6, 3], "x": 13, "y": 2},
{"matrix": [6, 2], "x": 14, "y": 2},
{"matrix": [6, 1], "x": 15, "y": 2},
{"matrix": [6, 0], "x": 16, "y": 2},
-
{"matrix": [3, 3], "x": 5, "y": 3},
{"matrix": [3, 4], "x": 6, "y": 3},
{"matrix": [3, 1], "x": 7, "y": 3},
-
{"matrix": [7, 1], "x": 9, "y": 3},
{"matrix": [7, 4], "x": 10, "y": 3},
{"matrix": [7, 3], "x": 11, "y": 3}
diff --git a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
deleted file mode 100644
index d87e9c2a44..0000000000
--- a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- [0] = LAYOUT_split_3x6_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ESC,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, MO(1), MO(2), KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
-
- ),
-
- [1] = LAYOUT_split_3x6_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, _______, MO(3), KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- ),
-
- [2] = LAYOUT_split_3x6_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- KC_TAB, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, MO(3), _______, KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- ),
-
- [3] = LAYOUT_split_3x6_3(
- //,-----------------------------------------------------. ,-----------------------------------------------------.
- QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- RM_TOGG, RM_HUEU, RM_SATU, RM_VALU, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- RM_NEXT, RM_HUED, RM_SATD, RM_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- //|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_LGUI, KC_SPC, _______, _______, KC_ENT, KC_RALT
- //`--------------------------' `--------------------------'
- )};
diff --git a/keyboards/bastardkb/tbkmini/keymaps/default/keymap.json b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.json
new file mode 100644
index 0000000000..72ca022da9
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/keymaps/default/keymap.json
@@ -0,0 +1,25 @@
+{
+ "keyboard": "bastardkb/tbkmini/promicro",
+ "keymap": "default",
+ "layout": "LAYOUT_split_3x6_3",
+ "layers": [
+ [
+ "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC",
+ "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
+ "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_ESC",
+ "KC_LGUI", "MO(1)", "KC_SPC", "KC_ENT", "MO(2)", "KC_RALT"
+ ],
+ [
+ "_______", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "_______",
+ "_______", "KC_EXLM", "KC_AT", "KC_HASH", "KC_DLR", "KC_PERC", "KC_CIRC", "KC_AMPR", "KC_ASTR", "KC_LPRN", "KC_RPRN", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______"
+ ],
+ [
+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "RM_VALU", "RM_HUEU", "RM_SATU", "RM_NEXT", "RM_TOGG", "_______",
+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "RM_VALD", "RM_HUED", "RM_SATD", "RM_PREV", "CK_TOGG", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______"
+ ]
+ ]
+}
diff --git a/keyboards/bastardkb/tbkmini/promicro/keyboard.json b/keyboards/bastardkb/tbkmini/promicro/keyboard.json
new file mode 100644
index 0000000000..c1e653ffc1
--- /dev/null
+++ b/keyboards/bastardkb/tbkmini/promicro/keyboard.json
@@ -0,0 +1,15 @@
+{
+ "development_board": "elite_c",
+ "matrix_pins": {
+ "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
+ "rows": ["F7", "C6", "D4", "B5"]
+ },
+ "split": {
+ "serial": {
+ "pin": "D2"
+ }
+ },
+ "ws2812": {
+ "pin": "D3"
+ }
+}
diff --git a/keyboards/bastardkb/tbkmini/readme.md b/keyboards/bastardkb/tbkmini/readme.md
index 74e24ff506..87f6cdcf2f 100644
--- a/keyboards/bastardkb/tbkmini/readme.md
+++ b/keyboards/bastardkb/tbkmini/readme.md
@@ -1,29 +1,27 @@
# TBK Mini
-A split, compact ergonomic keyboard.
+* Keyboard Maintainer: [Quentin Lebastard](https://github.com/bastardkb)
+* Hardware Supported: BastardKB Blackpill or Pro Micro adapter & compatible development boards
+* Hardware Availability: [GitHub](https://github.com/Bastardkb/TBK-Mini)
-* Keyboard Maintainer: [Bastard Keyboards](https://github.com/Bastardkb/)
-* Hardware Supported: elite-C V4
-* Hardware Availability: [Bastardkb.com](https://bastardkb.com/)
+Make example for this keyboard (after setting up your build environment):
-## Building the firmware
+ make bastardkb/tbkmini/blackpill:default
+ make bastardkb/tbkmini/promicro:default
-**You must specify the shield version when compiling/flashing the firmware.**
+Flashing example for this keyboard:
-The template is:
+ make bastardkb/tbkmini/blackpill:default:flash
+ make bastardkb/tbkmini/promicro:default:flash
-```shell
-qmk compile -kb bastardkb/tbkmini/{VERSION}/elitec -km {KEYMAP}
-```
-
-| Shield Version | default | via |
-| --------------- | -------------------------------------------------------------- | ---------------------------------------------------------- |
-| v1 (Elite-C) | `qmk compile -kb bastardkb/tbkmini/v1/elitec -km default` | `qmk compile -kb bastardkb/tbkmini/v1/elitec -km via` |
-| v2 (Elite-C) | `qmk compile -kb bastardkb/tbkmini/v2/elitec -km default` | `qmk compile -kb bastardkb/tbkmini/v2/elitec -km via` |
-| v2 (Splinky v2) | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v2 -km default` | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v2 -km via` |
-| v2 (Splinky v3) | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v3 -km default` | `qmk compile -kb bastardkb/tbkmini/v2/splinky/v3 -km via` |
-| v2 (STeMCell) | `qmk compile -kb bastardkb/tbkmini/v2/stemcell -km default` | `qmk compile -kb bastardkb/tbkmini/v2/stemcell -km via` |
+Note if using the `promicro` version: If you are using an Elite-C compatible development board, see [here](../readme.md#handedness-pin-on-elite-c-holder) for setting handedness by pin.
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-See the [keyboard build instructions](http://docs.bastardkb.com/)
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the adapter PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/bastardkb/tbkmini/tbkmini.c b/keyboards/bastardkb/tbkmini/tbkmini.c
deleted file mode 100644
index 51baefb737..0000000000
--- a/keyboards/bastardkb/tbkmini/tbkmini.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-led_config_t g_led_config = { {
- // left
- { 0, 5, 6, 11, 12, 15 },
- { 1, 4, 7, 10, 13, 16 },
- { 2, 3, 8, 9, 14, 17 },
- { NO_LED, 18, NO_LED, 19, 20, NO_LED },
- // right
- { 21, 26, 27, 32, 33, 36 },
- { 22, 25, 28, 31, 34, 37 },
- { 23, 24, 29, 30, 35, 38 },
- { NO_LED, 39, NO_LED, 40, 41, NO_LED }
-}, {
- // left
- { 0, 0 }, { 0, 21 }, { 0, 42 }, // col 1
- { 20, 42 }, { 20, 21 }, { 20, 0 }, // col 2
- { 41, 0 }, { 41, 21 }, { 41, 42 },
- { 61, 42 }, { 61, 21 }, { 61, 0 },
- { 81, 0 }, { 81, 21 }, { 81, 42 },
- { 102, 0 }, { 102, 21 }, { 102, 42 },
- { 61, 64 }, { 81, 64 }, { 102, 64 }, // left thumb cluster
- // right
- { 224, 0 }, { 224, 21 }, { 224, 42 }, // col 12
- { 204, 42 }, { 204, 21 }, { 204, 0 }, // col 11
- { 183, 0 }, { 183, 21 }, { 183, 42 },
- { 163, 42 }, { 163, 21 }, { 163, 0 },
- { 142, 0 }, { 142, 21 }, { 142, 42 },
- { 122, 0 }, { 122, 21 }, { 122, 42 },
- { 163, 64 }, { 142, 64 }, { 122, 64 } // right thumb cluster
-}, {
- // left
- 2, 2, 2, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 2, 2, 2,
- // right
- 2, 2, 2, 4, 4, 4, 4, 4, 4,
- 4, 4, 4, 4, 4, 4, 4, 4, 4,
- 2, 2, 2
-} };
-#endif
-// clang-format on
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/config.h b/keyboards/bastardkb/tbkmini/v1/elitec/config.h
deleted file mode 100644
index 41b5aa1c66..0000000000
--- a/keyboards/bastardkb/tbkmini/v1/elitec/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2021 Quentin LEBASTARD <[email protected]>
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
deleted file mode 100644
index 5110ea0d74..0000000000
--- a/keyboards/bastardkb/tbkmini/v1/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "TBK Mini Elite-C",
- "usb": {
- "device_version": "1.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D2"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["B4", "E6", "C6", "B1", "B3", "B2"],
- "rows": ["B5", "F7", "F6", "B6"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D0"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/tbkmini/v1/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/config.h b/keyboards/bastardkb/tbkmini/v2/elitec/config.h
deleted file mode 100644
index e6b7fefa66..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/elitec/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json b/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
deleted file mode 100644
index 701ec6af28..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/elitec/keyboard.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
- "keyboard_name": "TBK Mini Elite-C",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "ws2812": {
- "pin": "D3"
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["F6", "F5", "B6", "D7", "E6", "B4"],
- "rows": ["F7", "C6", "D4", "B5"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
- },
- "processor": "atmega32u4",
- "bootloader": "atmel-dfu"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk b/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
deleted file mode 100644
index 1868c4bb02..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/elitec/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
deleted file mode 100644
index 977fb0a6e8..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP13
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
deleted file mode 100644
index 15db3db6e8..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "TBK Mini Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP15", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_2/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h b/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
deleted file mode 100644
index e496023656..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/config.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define SPLIT_HAND_PIN GP15
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* Reset. */
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
-#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json b/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
deleted file mode 100644
index 3936b9368a..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/keyboard.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "keyboard_name": "TBK Mini Splinky",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": false,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "matrix_pins": {
- "cols": ["GP27", "GP28", "GP21", "GP6", "GP7", "GP8"],
- "rows": ["GP26", "GP5", "GP4", "GP9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "GP1"
- }
- },
- "ws2812": {
- "pin": "GP0",
- "driver": "vendor"
- },
- "processor": "RP2040",
- "bootloader": "rp2040"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md b/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md
deleted file mode 100644
index 662eb5825c..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Splinky controller
-
-The splinky is a Pro-Micro/Elite-C replacement with USB-C and RP2040.
-
-See [plut0nium/0xB2](https://github.com/plut0nium/0xB2/#releases) to figure out the right version for you (v2 or v3).
diff --git a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk b/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
deleted file mode 100644
index 077573eb76..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/splinky_3/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = vendor
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h b/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
deleted file mode 100644
index ca1cc0f719..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2022 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Handedness. */
-#define MASTER_RIGHT
-
-// To use the handedness pin, resistors need to be installed on the adapter PCB.
-// If so, uncomment the following code, and undefine MASTER_RIGHT above.
-// #define A0 PAL_LINE(GPIOA, 0)
-// #define SPLIT_HAND_PIN A0
-// #define SPLIT_HAND_PIN_LOW_IS_LEFT // High -> right, Low -> left.
-
-/* RGB settings. */
-#define WS2812_PWM_DRIVER PWMD2
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 1
-#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_PWM_DMA_CHANNEL 3
-
-/* CRC. */
-#define CRC8_USE_TABLE
-#define CRC8_OPTIMIZE_SPEED
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h b/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h
deleted file mode 100644
index dbeb6aeaa0..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/halconf.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-#define HAL_USE_SERIAL TRUE
-
-#include_next <halconf.h>
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json b/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
deleted file mode 100644
index 2cbee7fe17..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/keyboard.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
- "keyboard_name": "TBK Mini STeMCell",
- "usb": {
- "device_version": "2.0.0"
- },
- "features": {
- "bootmagic": true,
- "mousekey": true,
- "extrakey": true,
- "rgb_matrix": true
- },
- "rgb_matrix": {
- "driver": "ws2812"
- },
- "ws2812": {
- "pin": "A2",
- "driver": "pwm"
- },
- "build": {
- "debounce_type": "asym_eager_defer_pk"
- },
- "matrix_pins": {
- "cols": ["B1", "B2", "A4", "B4", "B5", "B8"],
- "rows": ["B0", "B3", "A15", "B9"]
- },
- "diode_direction": "ROW2COL",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "A3"
- }
- },
- "development_board": "stemcell"
-}
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h b/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h
deleted file mode 100644
index 6afebade36..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/mcuconf.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2021 Charly Delay <[email protected]> (@0xcharly)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include_next <mcuconf.h>
-
-#undef STM32_SERIAL_USE_USART1
-#define STM32_SERIAL_USE_USART1 FALSE
-
-#undef STM32_PWM_USE_TIM2
-#define STM32_PWM_USE_TIM2 TRUE
-
-#undef STM32_ST_USE_TIMER
-#define STM32_ST_USE_TIMER 5
diff --git a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk b/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
deleted file mode 100644
index 3fe3e4ffbe..0000000000
--- a/keyboards/bastardkb/tbkmini/v2/stemcell/rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-AUDIO_SUPPORTED = no # Audio is not supported
-
-SERIAL_DRIVER = usart
diff --git a/keyboards/bbrfkr/dynamis/dynamis.c b/keyboards/bbrfkr/dynamis/dynamis.c
index f21bf24900..9bf7fb6ae1 100644
--- a/keyboards/bbrfkr/dynamis/dynamis.c
+++ b/keyboards/bbrfkr/dynamis/dynamis.c
@@ -20,9 +20,9 @@
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (clockwise) {
- tap_code(layer_state == 0 ? KC_WH_D : KC_VOLD);
+ tap_code(layer_state == 0 ? MS_WHLD : KC_VOLD);
} else {
- tap_code(layer_state == 0 ? KC_WH_U : KC_VOLU);
+ tap_code(layer_state == 0 ? MS_WHLU : KC_VOLU);
}
return true;
}
diff --git a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
index e27d17827c..301a9003c8 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/default/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_BTN3, MS_BTN2, MS_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE
),
diff --git a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
index 38a56f56f4..ecd1d69c11 100644
--- a/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
+++ b/keyboards/bbrfkr/dynamis/keymaps/iso/keymap.c
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN2, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_BTN3, MS_BTN2, MS_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_LGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(3), KC_RGUI, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE
),
diff --git a/keyboards/beatervan/keyboard.json b/keyboards/beatervan/keyboard.json
index f1a6380727..685f713501 100644
--- a/keyboards/beatervan/keyboard.json
+++ b/keyboards/beatervan/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D1", "D0", "D4", "C6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/biacco42/ergo42/rev1/keyboard.json b/keyboards/biacco42/ergo42/rev1/keyboard.json
index 4639bf9639..2ccf9887df 100644
--- a/keyboards/biacco42/ergo42/rev1/keyboard.json
+++ b/keyboards/biacco42/ergo42/rev1/keyboard.json
@@ -36,8 +36,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x14"
},
diff --git a/keyboards/biacco42/meishi/keyboard.json b/keyboards/biacco42/meishi/keyboard.json
index 99f7c5debb..08f2edcb38 100644
--- a/keyboards/biacco42/meishi/keyboard.json
+++ b/keyboards/biacco42/meishi/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/biacco42/meishi2/keyboard.json b/keyboards/biacco42/meishi2/keyboard.json
index 137c429ff1..9e630c7df8 100644
--- a/keyboards/biacco42/meishi2/keyboard.json
+++ b/keyboards/biacco42/meishi2/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D7", "E6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/binepad/bnr1/keymaps/default/keymap.c b/keyboards/binepad/bnr1/keymaps/default/keymap.c
index 4e7b0cf6eb..3ba547b2af 100644
--- a/keyboards/binepad/bnr1/keymaps/default/keymap.c
+++ b/keyboards/binepad/bnr1/keymaps/default/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_L0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_L1] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP) }
+ [_L1] = { ENCODER_CCW_CW(MS_WHLD, MS_WHLU) }
};
#endif
diff --git a/keyboards/binepad/kn01/keymaps/default/keymap.json b/keyboards/binepad/kn01/keymaps/default/keymap.json
index d6a3835f6c..f4e436cbc6 100644
--- a/keyboards/binepad/kn01/keymaps/default/keymap.json
+++ b/keyboards/binepad/kn01/keymaps/default/keymap.json
@@ -13,8 +13,8 @@
],
[
{
- "ccw": "KC_MS_WH_DOWN",
- "cw": "KC_MS_WH_UP"
+ "ccw": "MS_WHLD",
+ "cw": "MS_WHLU"
}
]
],
diff --git a/keyboards/binepad/pixie/keymaps/default/keymap.c b/keyboards/binepad/pixie/keymaps/default/keymap.c
index b49c4db6de..a8e2a12303 100644
--- a/keyboards/binepad/pixie/keymaps/default/keymap.c
+++ b/keyboards/binepad/pixie/keymaps/default/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = {
ENCODER_CCW_CW(KC_VOLD, KC_VOLU),
- ENCODER_CCW_CW(KC_WH_U, KC_WH_D)
+ ENCODER_CCW_CW(MS_WHLU, MS_WHLD)
}
};
diff --git a/keyboards/blockey/keyboard.json b/keyboards/blockey/keyboard.json
index e9c5ceafa1..a8d7113846 100644
--- a/keyboards/blockey/keyboard.json
+++ b/keyboards/blockey/keyboard.json
@@ -46,8 +46,7 @@
"rows": ["D3", "D1", "D4", "E6", "B5", "D2", "F6", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/bluebell/swoop/keyboard.json b/keyboards/bluebell/swoop/keyboard.json
index 08f61ac20d..1ab8cd090a 100644
--- a/keyboards/bluebell/swoop/keyboard.json
+++ b/keyboards/bluebell/swoop/keyboard.json
@@ -53,8 +53,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/bt66tech/bt66tech60/keyboard.json b/keyboards/bt66tech/bt66tech60/keyboard.json
index 9f747397c3..2b476a6eea 100644
--- a/keyboards/bt66tech/bt66tech60/keyboard.json
+++ b/keyboards/bt66tech/bt66tech60/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4254",
"pid": "0x7070",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
index 5f4acc1b9d..c8bc919a86 100644
--- a/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
+++ b/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
@@ -34,9 +34,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_60_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- KC_MS_ACCEL0, KC_MS_BTN1, KC_MS_UP, KC_MS_BTN2, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
- KC_MS_ACCEL1, KC_MS_LEFT, KC_MS_DOWN,KC_MS_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- KC_MS_ACCEL2, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, MO(_FN1),
+ MS_ACL0, MS_BTN1, MS_UP, MS_BTN2, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
+ MS_ACL1, MS_LEFT, MS_DOWN,MS_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ MS_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP, MO(_FN1),
_______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______
),
diff --git a/keyboards/bthlabs/geekpad/keyboard.json b/keyboards/bthlabs/geekpad/keyboard.json
index 1ea302612a..2519925333 100644
--- a/keyboards/bthlabs/geekpad/keyboard.json
+++ b/keyboards/bthlabs/geekpad/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["F4", "F5", "F6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/bubble75/hotswap/keyboard.json b/keyboards/bubble75/hotswap/keyboard.json
index 92f57144ce..47f658349f 100644
--- a/keyboards/bubble75/hotswap/keyboard.json
+++ b/keyboards/bubble75/hotswap/keyboard.json
@@ -6,9 +6,13 @@
"vid": "0x4242",
"pid": "0x5A4C",
"device_version": "0.0.1",
- "force_nkro": true,
"no_startup_check": true
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"mousekey": false,
diff --git a/keyboards/buzzard/keymaps/default/keymap.c b/keyboards/buzzard/keymaps/default/keymap.c
index 7ca3ddc7de..9e9fe20577 100644
--- a/keyboards/buzzard/keymaps/default/keymap.c
+++ b/keyboards/buzzard/keymaps/default/keymap.c
@@ -52,13 +52,13 @@ enum layers {
#define SFT_TAB MT(MOD_LSFT, KC_TAB)
// Thumbcluster
-#define UC_TL1 KC_BTN1
+#define UC_TL1 MS_BTN1
#define UC_TL2 LT(NAVR, KC_SPC)
#define UC_TL3 LT(NUMR, KC_TAB)
#define UC_TR3 LT(FUNL, KC_BSPC)
#define UC_TR2 LT(SYMB, KC_ENT)
-#define UC_TR1 KC_BTN2
+#define UC_TR1 MS_BTN2
// Shortcuts
#define UC_COPY LCTL(KC_C)
@@ -90,7 +90,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P ,
UC_OSFT, GUI_A , ALT_S , CTL_D , SFT_F , KC_G , KC_H , SFT_J , CTL_K , ALT_L , GUI_SCL, KC_DEL,
CTL_ESC, KC_Z , RALT_X , KC_C , KC_V , KC_B , KC_N , KC_M , KC_COMM, RALT_DT, KC_SLSH, ADJL ,
- KC_BTN1, UC_TL2 , UC_TL3 , UC_TR3 , UC_TR2 , UC_TR1
+ MS_BTN1, UC_TL2 , UC_TL3 , UC_TR3 , UC_TR2 , UC_TR1
),
// /*
@@ -113,7 +113,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAVR] = LAYOUT(
_______, _______, _______, _______, _______, KC_INS , UC_CUT , KC_PGUP, KC_PGDN, _______,
_______, _______, _______, _______, _______, _______, UC_COPY, KC_LEFT, KC_UP , KC_DOWN, KC_RGHT, _______,
- _______, _______, _______, _______, _______, _______, UC_PSTE, KC_HOME, KC_WH_U, KC_WH_D, KC_END , _______,
+ _______, _______, _______, _______, _______, _______, UC_PSTE, KC_HOME, MS_WHLU, MS_WHLD, KC_END , _______,
_______, _______, _______, KC_BSPC, KC_ENT , _______
),
// --------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -264,7 +264,7 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
bool get_haptic_enabled_key(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
- case KC_BTN1 ... KC_BTN5:
+ case MS_BTN1 ... MS_BTN5:
return true;
break;
}
diff --git a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c
index 7bfc7a5cf0..b961c50e36 100644
--- a/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/ortho48v2/keymaps/default/keymap.c
@@ -86,7 +86,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LOWER] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
- [_RAISE] = { ENCODER_CCW_CW(KC_MS_WH_LEFT, KC_MS_WH_RIGHT) },
+ [_LOWER] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
+ [_RAISE] = { ENCODER_CCW_CW(MS_WHLL, MS_WHLR) },
};
#endif
diff --git a/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c b/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
index a97574c774..5dbb6b8b87 100644
--- a/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
+++ b/keyboards/cannonkeys/sagittarius/keymaps/default/keymap.c
@@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(UG_HUED, UG_HUEU), ENCODER_CCW_CW(UG_SATD, UG_SATU) },
- [1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU), ENCODER_CCW_CW(UG_SPDD, UG_SPDU), ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(UG_HUED, UG_HUEU), ENCODER_CCW_CW(UG_SATD, UG_SATU) },
+ [1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU), ENCODER_CCW_CW(UG_SPDD, UG_SPDU), ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif
diff --git a/keyboards/cannonkeys/satisfaction75/rules.mk b/keyboards/cannonkeys/satisfaction75/rules.mk
index c92469d1bd..25eebb9054 100644
--- a/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -5,5 +5,3 @@ VPATH += keyboards/cannonkeys/lib/satisfaction75
SRC += satisfaction_encoder.c \
satisfaction_oled.c \
satisfaction_core.c
-
-DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1 \ No newline at end of file
diff --git a/keyboards/catch22/keyboard.json b/keyboards/catch22/keyboard.json
index 3c1d9c5777..22aebe844a 100644
--- a/keyboards/catch22/keyboard.json
+++ b/keyboards/catch22/keyboard.json
@@ -38,8 +38,7 @@
"rows": ["B6", "B2", "B3", "B1", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/cest73/tkm/keyboard.json b/keyboards/cest73/tkm/keyboard.json
index 5fc85d0e75..31e592ec05 100644
--- a/keyboards/cest73/tkm/keyboard.json
+++ b/keyboards/cest73/tkm/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xBADD",
"pid": "0xAA55",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/chaos65/keyboard.json b/keyboards/chaos65/keyboard.json
index c2a3d4b1a5..87f03b3a75 100644
--- a/keyboards/chaos65/keyboard.json
+++ b/keyboards/chaos65/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xB23B",
"pid": "0x1688",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/checkerboards/quark_plus/quark_plus.c b/keyboards/checkerboards/quark_plus/quark_plus.c
index 84e2375a74..66b210ad7a 100644
--- a/keyboards/checkerboards/quark_plus/quark_plus.c
+++ b/keyboards/checkerboards/quark_plus/quark_plus.c
@@ -20,9 +20,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 1) { /* left encoder*/
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 0) { /* right encoder */
if (clockwise){
diff --git a/keyboards/checkerboards/snop60/snop60.c b/keyboards/checkerboards/snop60/snop60.c
index 641815f919..18445174f3 100644
--- a/keyboards/checkerboards/snop60/snop60.c
+++ b/keyboards/checkerboards/snop60/snop60.c
@@ -22,9 +22,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 1) { /* left encoder*/
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 0) { /* right encoder */
if (clockwise){
diff --git a/keyboards/cheshire/curiosity/keymaps/default/keymap.c b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
index 18d371c58a..85bb51b7fd 100644
--- a/keyboards/cheshire/curiosity/keymaps/default/keymap.c
+++ b/keyboards/cheshire/curiosity/keymaps/default/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FNMS] = LAYOUT_default(
UG_TOGG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
- UG_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______, _______, _______, _______, QK_BOOT,
- _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN2, _______, _______,
+ UG_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, MS_UP, _______, _______, _______, _______, QK_BOOT,
+ _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN2, _______, _______,
_______, _______, _______, _______, _______, _______, UG_SATU, UG_HUEU, UG_VALU, UG_SATD, UG_HUED, UG_VALD, _______, _______,
AG_TOGG, _______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/chocofly/v1/keyboard.json b/keyboards/chocofly/v1/keyboard.json
index ae2a710070..7765d721f4 100644
--- a/keyboards/chocofly/v1/keyboard.json
+++ b/keyboards/chocofly/v1/keyboard.json
@@ -25,8 +25,7 @@
{"pin_a": "D3", "pin_b": "D2", "resolution": 2}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/chosfox/cf81/keyboard.json b/keyboards/chosfox/cf81/keyboard.json
index 9ff5e35fbd..333841fdf1 100644
--- a/keyboards/chosfox/cf81/keyboard.json
+++ b/keyboards/chosfox/cf81/keyboard.json
@@ -3,12 +3,16 @@
"manufacturer": "CHOSFOX",
"maintainer": "jonylee@hfd",
"usb": {
- "force_nkro": true,
"vid": "0xFFFE",
"pid": "0x0012",
"device_version": "1.0.0",
"suspend_wakeup_delay": 400
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"eeprom": {
"driver": "wear_leveling",
"wear_leveling": {
diff --git a/keyboards/ckeys/handwire_101/keyboard.json b/keyboards/ckeys/handwire_101/keyboard.json
index 781cd25c83..088d3b5227 100644
--- a/keyboards/ckeys/handwire_101/keyboard.json
+++ b/keyboards/ckeys/handwire_101/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x4"
},
diff --git a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
index 0b26d61322..74f7cf6f2c 100755
--- a/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
+++ b/keyboards/ckeys/handwire_101/keymaps/default/keymap.c
@@ -117,10 +117,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------'
*/
[_MOUSE] = LAYOUT_ortho_4x4(
- KC_BTN5, _______, KC_WH_U, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2,
- KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R,
- KC_BTN3, KC_WH_L, KC_WH_D, KC_WH_R
+ MS_BTN5, _______, MS_WHLU, _______,
+ _______, MS_BTN1, MS_UP, MS_BTN2,
+ MS_BTN4, MS_LEFT, MS_DOWN, MS_RGHT,
+ MS_BTN3, MS_WHLL, MS_WHLD, MS_WHLR
),
/* TERMINAL
* ,---------------------------------------.
diff --git a/keyboards/ckeys/thedora/keymaps/default/keymap.c b/keyboards/ckeys/thedora/keymaps/default/keymap.c
index 9c0d756562..dd856ea23e 100755
--- a/keyboards/ckeys/thedora/keymaps/default/keymap.c
+++ b/keyboards/ckeys/thedora/keymaps/default/keymap.c
@@ -123,10 +123,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// └─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘
[_MOUSE] = LAYOUT(
- KC_BTN5, _______, KC_WH_U, _______, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, TG(_MOUSE),
- KC_BTN4, KC_MS_L, KC_MS_D, KC_MS_R, _______,
- _______, KC_BTN3, KC_WH_L, KC_WH_D, KC_WH_R, _______
+ MS_BTN5, _______, MS_WHLU, _______, _______,
+ _______, MS_BTN1, MS_UP, MS_BTN2, TG(_MOUSE),
+ MS_BTN4, MS_LEFT, MS_DOWN, MS_RGHT, _______,
+ _______, MS_BTN3, MS_WHLL, MS_WHLD, MS_WHLR, _______
),
// ADMIN LAYER
diff --git a/keyboards/clawsome/coupe/keyboard.json b/keyboards/clawsome/coupe/keyboard.json
index 576b8e7164..8910221eb6 100644
--- a/keyboards/clawsome/coupe/keyboard.json
+++ b/keyboards/clawsome/coupe/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D7", "D2", "C6", "B5", "D4", "B4", "D0", "D3", "D1", "E6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["60_ansi"],
"layouts": {
"LAYOUT_60_ansi": {
diff --git a/keyboards/clawsome/doodle/keyboard.json b/keyboards/clawsome/doodle/keyboard.json
index 0b3f4cc4e7..51eeacc02c 100644
--- a/keyboards/clawsome/doodle/keyboard.json
+++ b/keyboards/clawsome/doodle/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D4", "C6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/clawsome/fightpad/keyboard.json b/keyboards/clawsome/fightpad/keyboard.json
index ac5f83af23..2ac2fdff0d 100644
--- a/keyboards/clawsome/fightpad/keyboard.json
+++ b/keyboards/clawsome/fightpad/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["B5", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/clawsome/gamebuddy/v1_0/keyboard.json b/keyboards/clawsome/gamebuddy/v1_0/keyboard.json
index 978a3ad974..ebfd7970c4 100644
--- a/keyboards/clawsome/gamebuddy/v1_0/keyboard.json
+++ b/keyboards/clawsome/gamebuddy/v1_0/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D1", "D0", "E6", "B3", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/clawsome/gamebuddy/v1_m/keyboard.json b/keyboards/clawsome/gamebuddy/v1_m/keyboard.json
index dd9f39f97e..1a0014a1ac 100644
--- a/keyboards/clawsome/gamebuddy/v1_m/keyboard.json
+++ b/keyboards/clawsome/gamebuddy/v1_m/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["C6", "D7", "B5", "B3", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/clawsome/numeros/keyboard.json b/keyboards/clawsome/numeros/keyboard.json
index 728a1a1853..2b9e0331ab 100644
--- a/keyboards/clawsome/numeros/keyboard.json
+++ b/keyboards/clawsome/numeros/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D0", "C6", "B2", "B6", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
diff --git a/keyboards/clawsome/roadster/keyboard.json b/keyboards/clawsome/roadster/keyboard.json
index 895b97721b..1300a29623 100644
--- a/keyboards/clawsome/roadster/keyboard.json
+++ b/keyboards/clawsome/roadster/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D2", "D3", "D0", "D1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/clueboard/2x1800/2019/2019.c b/keyboards/clueboard/2x1800/2019/2019.c
index b7fb799ecb..c192f64175 100644
--- a/keyboards/clueboard/2x1800/2019/2019.c
+++ b/keyboards/clueboard/2x1800/2019/2019.c
@@ -41,12 +41,12 @@ void check_encoder_buttons(void) {
dprintf("Turning drawing mode off.\n");
drawing_mode = false;
gpio_write_pin_low(D6);
- unregister_code(KC_BTN1);
+ unregister_code(MS_BTN1);
} else {
dprintf("Turning drawing mode on.\n");
drawing_mode = true;
gpio_write_pin_high(D6);
- register_code(KC_BTN1);
+ register_code(MS_BTN1);
}
}
}
@@ -88,37 +88,37 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (keycode == ENC_BTN1) {
if (record->event.pressed) {
btn1_pressed = true;
- register_code(KC_BTN1);
+ register_code(MS_BTN1);
} else {
btn1_pressed = false;
- unregister_code(KC_BTN1);
+ unregister_code(MS_BTN1);
}
}
if (keycode == ENC_BTN2) {
if (record->event.pressed) {
btn2_pressed = true;
- register_code(KC_BTN2);
+ register_code(MS_BTN2);
} else {
btn2_pressed = false;
- unregister_code(KC_BTN2);
+ unregister_code(MS_BTN2);
}
}
if (keycode == ENC_BTN3) {
if (record->event.pressed) {
btn3_pressed = true;
- register_code(KC_BTN3);
+ register_code(MS_BTN3);
} else {
btn3_pressed = false;
- unregister_code(KC_BTN3);
+ unregister_code(MS_BTN3);
}
}
if (keycode == ENC_BTN4) {
if (record->event.pressed) {
btn4_pressed = true;
- register_code(KC_BTN4);
+ register_code(MS_BTN4);
} else {
btn4_pressed = false;
- unregister_code(KC_BTN4);
+ unregister_code(MS_BTN4);
}
}
@@ -132,16 +132,16 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (encoder_update_user(index, clockwise)) {
// Encoder 1, outside left
if (index == 0 && clockwise) {
- tap_code(KC_MS_U); // turned right
+ tap_code(MS_UP); // turned right
} else if (index == 0) {
- tap_code(KC_MS_D); // turned left
+ tap_code(MS_DOWN); // turned left
}
// Encoder 2, inside left
else if (index == 1 && clockwise) {
- tap_code(KC_WH_D); // turned right
+ tap_code(MS_WHLD); // turned right
} else if (index == 1) {
- tap_code(KC_WH_U); // turned left
+ tap_code(MS_WHLU); // turned left
}
// Encoder 3, inside right
@@ -153,9 +153,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
// Encoder 4, outside right
else if (index == 3 && clockwise) {
- tap_code(KC_MS_R); // turned right
+ tap_code(MS_RGHT); // turned right
} else if (index == 3) {
- tap_code(KC_MS_L); // turned left
+ tap_code(MS_LEFT); // turned left
}
}
return true;
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
index b2456225f1..b14b6f1878 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_ansi/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_1u_ansi(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
index 70e38efcba..37dabfb7e3 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_1u_iso/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_1u_iso(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
index cb41bf9a7d..d7ebfb029b 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_ansi/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_2u_ansi(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
index af3e7f96c7..e1f0c97c94 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_2u_iso/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_2u_iso(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
index fd7723d3de..79a32c74bb 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_4u_iso/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_4u_iso(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_INS,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
index 761423bfc4..9d056dac26 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_ansi/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_7u_ansi(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
index b499999954..738c4792a5 100644
--- a/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
+++ b/keyboards/clueboard/2x1800/2019/keymaps/default_7u_iso/keymap.c
@@ -17,7 +17,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_7u_iso(
- KC_BTN1, KC_BTN2, KC_BTN3, KC_BTN4,
+ MS_BTN1, MS_BTN2, MS_BTN3, MS_BTN4,
KC_HOME, KC_END, KC_PGUP, KC_PGDN, KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_PMNS, KC_NUM, KC_PSLS, KC_PAST, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_PPLS, KC_P7, KC_P8, KC_P9, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_P7, KC_P8, KC_P9, KC_PSLS,
diff --git a/keyboards/clueboard/2x1800/2021/2021.c b/keyboards/clueboard/2x1800/2021/2021.c
index 511c40a699..bd072c14b2 100644
--- a/keyboards/clueboard/2x1800/2021/2021.c
+++ b/keyboards/clueboard/2x1800/2021/2021.c
@@ -134,16 +134,16 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
#else
// Encoder 1, left
if (index == 0 && clockwise) {
- tap_code(KC_MS_R); // turned right
+ tap_code(MS_RGHT); // turned right
} else if (index == 0) {
- tap_code(KC_MS_L); // turned left
+ tap_code(MS_LEFT); // turned left
}
// Encoder 2, right
else if (index == 1 && clockwise) {
- tap_code(KC_MS_U); // turned right
+ tap_code(MS_UP); // turned right
} else if (index == 1) {
- tap_code(KC_MS_D); // turned left
+ tap_code(MS_DOWN); // turned left
}
#endif
}
diff --git a/keyboards/coban/pad9a/keymaps/default/keymap.c b/keyboards/coban/pad9a/keymaps/default/keymap.c
index 9ef5fc54d7..2638b2c2e7 100644
--- a/keyboards/coban/pad9a/keymaps/default/keymap.c
+++ b/keyboards/coban/pad9a/keymaps/default/keymap.c
@@ -26,6 +26,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
};
#endif
diff --git a/keyboards/contra/keyboard.json b/keyboards/contra/keyboard.json
index b3179564fe..5c02afd061 100644
--- a/keyboards/contra/keyboard.json
+++ b/keyboards/contra/keyboard.json
@@ -13,8 +13,7 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["F4", "F5", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
diff --git a/keyboards/converter/adb_usb/rules.mk b/keyboards/converter/adb_usb/rules.mk
index 28df56c337..b4a73249dd 100644
--- a/keyboards/converter/adb_usb/rules.mk
+++ b/keyboards/converter/adb_usb/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c adb.c led.c
# OPT_DEFS += -DADB_MOUSE_ENABLE -DMOUSE_ENABLE
-
-DEFAULT_FOLDER = converter/adb_usb/rev1
diff --git a/keyboards/converter/sun_usb/rules.mk b/keyboards/converter/sun_usb/rules.mk
index d3ec00c5d5..0268798cc0 100644
--- a/keyboards/converter/sun_usb/rules.mk
+++ b/keyboards/converter/sun_usb/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = yes
SRC += matrix.c led.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = converter/sun_usb/type5
diff --git a/keyboards/converter/usb_usb/rules.mk b/keyboards/converter/usb_usb/rules.mk
index 1e278514f6..682fa821ef 100644
--- a/keyboards/converter/usb_usb/rules.mk
+++ b/keyboards/converter/usb_usb/rules.mk
@@ -1,5 +1,3 @@
CUSTOM_MATRIX = yes
SRC += custom_matrix.cpp
-
-DEFAULT_FOLDER = converter/usb_usb/hasu
diff --git a/keyboards/cornia/keymaps/fire/keymap.c b/keyboards/cornia/keymaps/fire/keymap.c
index 9215c61f9c..ff63df801a 100644
--- a/keyboards/cornia/keymaps/fire/keymap.c
+++ b/keyboards/cornia/keymaps/fire/keymap.c
@@ -41,11 +41,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAV] = LAYOUT_split_3x6_3(
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, G(KC_L), XXXXXXX, CK_SCRL, C(KC_A), XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN3, XXXXXXX, XXXXXXX, KC_DEL,
+ _______, G(KC_L), XXXXXXX, CK_SCRL, C(KC_A), XXXXXXX, MS_BTN1, MS_BTN2, MS_BTN3, XXXXXXX, XXXXXXX, KC_DEL,
//|--------+--------+ GUI V +--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, C(KC_X), G(KC_V), C(KC_V), C(KC_C), C(KC_Z), KC_WH_U, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, _______,
+ _______, C(KC_X), G(KC_V), C(KC_V), C(KC_C), C(KC_Z), MS_WHLU, KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT, _______,
//|ALT LEFT+--------+ ALT SFT+scrnshot+--------+--------| |--------+--------+--------+--------+--------+--------|
- A(KC_LEFT),C(KC_S),S(KC_LALT), CK_SSHT,C(KC_F), C(KC_Y), KC_WH_D, KC_HOME, CK_SELL, CK_SELR, KC_END, _______,
+ A(KC_LEFT),C(KC_S),S(KC_LALT), CK_SSHT,C(KC_F), C(KC_Y), MS_WHLD, KC_HOME, CK_SELL, CK_SELR, KC_END, _______,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_LGUI, _______, _______, _______,MO(_ADJUST),_______
//`--------------------------' `--------------------------'
diff --git a/keyboards/cradio/keymaps/default/keymap.c b/keyboards/cradio/keymaps/default/keymap.c
index e6cbe763ba..3d624cd009 100644
--- a/keyboards/cradio/keymaps/default/keymap.c
+++ b/keyboards/cradio/keymaps/default/keymap.c
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, KC_DEL, MO(3)
),
[3] = LAYOUT_split_3x5_2(
- _______, KC_F1, KC_F2, KC_F3, KC_F10, _______, KC_WH_U, KC_WH_D, _______, QK_BOOT,
- _______, KC_F4, KC_F5, KC_F6, KC_F11, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_INS,
- _______, KC_F7, KC_F8, KC_F9, KC_F12, _______, KC_BTN1, KC_BTN2, _______, _______,
+ _______, KC_F1, KC_F2, KC_F3, KC_F10, _______, MS_WHLU, MS_WHLD, _______, QK_BOOT,
+ _______, KC_F4, KC_F5, KC_F6, KC_F11, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_INS,
+ _______, KC_F7, KC_F8, KC_F9, KC_F12, _______, MS_BTN1, MS_BTN2, _______, _______,
_______, _______, _______, _______
)
};
diff --git a/keyboards/craftwalk/keymaps/default/keymap.c b/keyboards/craftwalk/keymaps/default/keymap.c
index b212425bcf..019e99faf9 100644
--- a/keyboards/craftwalk/keymaps/default/keymap.c
+++ b/keyboards/craftwalk/keymaps/default/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT(
KC_Q, KC_W, KC_E,
KC_LCTL, KC_A, KC_S, KC_D,
- KC_LSFT, MO_ADJ, KC_WH_U, KC_WH_D, KC_F, MO_NUM, KC_SPC
+ KC_LSFT, MO_ADJ, MS_WHLU, MS_WHLD, KC_F, MO_NUM, KC_SPC
),
/* Number */
[_NUM] = LAYOUT(
diff --git a/keyboards/crbn/keyboard.json b/keyboards/crbn/keyboard.json
index a2666c6c52..a0fd785111 100644
--- a/keyboards/crbn/keyboard.json
+++ b/keyboards/crbn/keyboard.json
@@ -31,8 +31,7 @@
{"pin_a": "F5", "pin_b": "F4", "resolution": 2}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x12", "planck_mit"],
"layout_aliases": {
"LAYOUT_crbn_1x2u": "LAYOUT_planck_mit",
diff --git a/keyboards/custommk/elysian/keyboard.json b/keyboards/custommk/elysian/keyboard.json
index 4fc842149d..9055b70025 100644
--- a/keyboards/custommk/elysian/keyboard.json
+++ b/keyboards/custommk/elysian/keyboard.json
@@ -30,8 +30,12 @@
"usb": {
"device_version": "1.0.0",
"pid": "0xFABB",
- "vid": "0xF35B",
- "force_nkro": true
+ "vid": "0xF35B"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"encoder": {
"rotary": [
diff --git a/keyboards/custommk/elysian/keymaps/default/keymap.c b/keyboards/custommk/elysian/keymaps/default/keymap.c
index fcb617ad9e..f7cb4924c9 100644
--- a/keyboards/custommk/elysian/keymaps/default/keymap.c
+++ b/keyboards/custommk/elysian/keymaps/default/keymap.c
@@ -14,6 +14,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_WH_D, KC_WH_U) }
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MS_WHLD, MS_WHLU) }
};
#endif \ No newline at end of file
diff --git a/keyboards/custommk/evo70/evo70.c b/keyboards/custommk/evo70/evo70.c
index a8df4a7d1d..c20c25d3f0 100644
--- a/keyboards/custommk/evo70/evo70.c
+++ b/keyboards/custommk/evo70/evo70.c
@@ -93,8 +93,8 @@ uint16_t enc_ccw[] = { KC_VOLD, KC_VOLD, KC_MEDIA_PREV_TRACK, KC_VOLD, 0, 0, 0,
"Scroll Wheel"
};
-uint16_t enc_cw[] = { KC_VOLU, KC_VOLU, KC_MEDIA_NEXT_TRACK, KC_VOLU, 0, 0, 0, 0, 0, KC_WH_U };
-uint16_t enc_ccw[] = { KC_VOLD, KC_VOLD, KC_MEDIA_PREV_TRACK, KC_VOLD, 0, 0, 0, 0, 0, KC_WH_D };
+uint16_t enc_cw[] = { KC_VOLU, KC_VOLU, KC_MEDIA_NEXT_TRACK, KC_VOLU, 0, 0, 0, 0, 0, MS_WHLU };
+uint16_t enc_ccw[] = { KC_VOLD, KC_VOLD, KC_MEDIA_PREV_TRACK, KC_VOLD, 0, 0, 0, 0, 0, MS_WHLD };
#endif //bongocat
uint8_t num_enc_modes = 10;
diff --git a/keyboards/cybergear/macro25/keyboard.json b/keyboards/cybergear/macro25/keyboard.json
index 14ea5cc77d..8b0bcc8ef4 100644
--- a/keyboards/cybergear/macro25/keyboard.json
+++ b/keyboards/cybergear/macro25/keyboard.json
@@ -8,8 +8,7 @@
"pid": "0x69A1",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"layouts": {
"LAYOUT_ortho_2x5": {
diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json
index 90e14e3434..a8b6f83792 100644
--- a/keyboards/dailycraft/bat43/info.json
+++ b/keyboards/dailycraft/bat43/info.json
@@ -18,6 +18,5 @@
"rows": ["E6", "D7", "C6", "D4", "F7", "F6", "F5", "F4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/dailycraft/claw44/rev1/keyboard.json b/keyboards/dailycraft/claw44/rev1/keyboard.json
index 2391bc262f..c10fa57cb3 100644
--- a/keyboards/dailycraft/claw44/rev1/keyboard.json
+++ b/keyboards/dailycraft/claw44/rev1/keyboard.json
@@ -18,8 +18,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/dailycraft/sandbox/rev1/keyboard.json b/keyboards/dailycraft/sandbox/rev1/keyboard.json
index 50a114457d..19e4e924b2 100644
--- a/keyboards/dailycraft/sandbox/rev1/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev1/keyboard.json
@@ -12,8 +12,7 @@
"rows": ["B5", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dailycraft/sandbox/rev2/keyboard.json b/keyboards/dailycraft/sandbox/rev2/keyboard.json
index b1991cf56c..d94593cced 100644
--- a/keyboards/dailycraft/sandbox/rev2/keyboard.json
+++ b/keyboards/dailycraft/sandbox/rev2/keyboard.json
@@ -18,8 +18,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dailycraft/wings42/rev1/keyboard.json b/keyboards/dailycraft/wings42/rev1/keyboard.json
index 307b675d06..3f71586581 100644
--- a/keyboards/dailycraft/wings42/rev1/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1/keyboard.json
@@ -18,8 +18,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
index ef5b4331b1..a3ea3c2b45 100644
--- a/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev1_extkeys/keyboard.json
@@ -18,8 +18,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dailycraft/wings42/rev2/keyboard.json b/keyboards/dailycraft/wings42/rev2/keyboard.json
index 4d41f54f3b..7ed0fb9967 100644
--- a/keyboards/dailycraft/wings42/rev2/keyboard.json
+++ b/keyboards/dailycraft/wings42/rev2/keyboard.json
@@ -24,8 +24,7 @@
{ "pin_a": "B6", "pin_b": "B2" }
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"encoder": true,
diff --git a/keyboards/delikeeb/flatbread60/keyboard.json b/keyboards/delikeeb/flatbread60/keyboard.json
index eabb301dc0..2536df862d 100644
--- a/keyboards/delikeeb/flatbread60/keyboard.json
+++ b/keyboards/delikeeb/flatbread60/keyboard.json
@@ -46,8 +46,7 @@
"rows": ["F6", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
diff --git a/keyboards/delikeeb/vaneela/keyboard.json b/keyboards/delikeeb/vaneela/keyboard.json
index 8e30581e70..7a467a59aa 100644
--- a/keyboards/delikeeb/vaneela/keyboard.json
+++ b/keyboards/delikeeb/vaneela/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["F6", "F7", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_5x12": {
"layout": [
diff --git a/keyboards/delikeeb/vaneelaex/keyboard.json b/keyboards/delikeeb/vaneelaex/keyboard.json
index 1890c860e6..295ad722b5 100644
--- a/keyboards/delikeeb/vaneelaex/keyboard.json
+++ b/keyboards/delikeeb/vaneelaex/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ss_6x12": {
"layout": [
diff --git a/keyboards/deltasplit75/v2/keyboard.json b/keyboards/deltasplit75/v2/keyboard.json
index 031d2b9185..efd4217f13 100644
--- a/keyboards/deltasplit75/v2/keyboard.json
+++ b/keyboards/deltasplit75/v2/keyboard.json
@@ -24,8 +24,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/dm9records/ergoinu/keyboard.json b/keyboards/dm9records/ergoinu/keyboard.json
index 0e124d1a21..05150f5e06 100644
--- a/keyboards/dm9records/ergoinu/keyboard.json
+++ b/keyboards/dm9records/ergoinu/keyboard.json
@@ -25,8 +25,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/doio/kb16/info.json b/keyboards/doio/kb16/info.json
index 08c19819bb..7b27370707 100644
--- a/keyboards/doio/kb16/info.json
+++ b/keyboards/doio/kb16/info.json
@@ -4,8 +4,12 @@
"maintainer": "HorrorTroll",
"usb": {
"vid": "0xD010",
- "pid": "0x1601",
- "force_nkro": true
+ "pid": "0x1601"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"diode_direction": "COL2ROW",
"build": {
diff --git a/keyboards/doio/kb38/kb38.c b/keyboards/doio/kb38/kb38.c
index 55a88a068b..2eaf62fa73 100644
--- a/keyboards/doio/kb38/kb38.c
+++ b/keyboards/doio/kb38/kb38.c
@@ -52,9 +52,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
} else if (index == 1) {
// Mouse Wheel Up/Down
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
} else if (index == 2) {
// Volume Up/Down
diff --git a/keyboards/doio/kb3x/keymaps/default/keymap.c b/keyboards/doio/kb3x/keymaps/default/keymap.c
index 02dddfe517..7791a19f95 100644
--- a/keyboards/doio/kb3x/keymaps/default/keymap.c
+++ b/keyboards/doio/kb3x/keymaps/default/keymap.c
@@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPLY, KC_DOWN, KC_DOWN),
[_LAY1] = LAYOUT(
TO(2), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_WH_U, S(KC_RBRC), C(KC_L),
- C(KC_WH_D), KC_TRNS, C(KC_WH_U), KC_DOT, KC_TRNS, KC_COMM, C(KC_B), KC_TRNS, C(KC_U),
- KC_WH_D, S(KC_LBRC), C(KC_M)),
+ MS_WHLU, S(KC_RBRC), C(KC_L),
+ C(MS_WHLD), KC_TRNS, C(MS_WHLU), KC_DOT, KC_TRNS, KC_COMM, C(KC_B), KC_TRNS, C(KC_U),
+ MS_WHLD, S(KC_LBRC), C(KC_M)),
[_LAY2] = LAYOUT(
TO(0), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_B, KC_UP, S(KC_I),
diff --git a/keyboards/doodboard/duckboard/keyboard.json b/keyboards/doodboard/duckboard/keyboard.json
index 7e88a22e10..b5f07ead98 100644
--- a/keyboards/doodboard/duckboard/keyboard.json
+++ b/keyboards/doodboard/duckboard/keyboard.json
@@ -37,8 +37,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/doodboard/duckboard_r2/keyboard.json b/keyboards/doodboard/duckboard_r2/keyboard.json
index 6cbf51bcb4..cffb2904e3 100644
--- a/keyboards/doodboard/duckboard_r2/keyboard.json
+++ b/keyboards/doodboard/duckboard_r2/keyboard.json
@@ -40,8 +40,7 @@
"bootmagic": {
"matrix": [0, 1]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/dotmod/dymium65/keyboard.json b/keyboards/dotmod/dymium65/keyboard.json
index 301b69edc5..a76bc91cd6 100644
--- a/keyboards/dotmod/dymium65/keyboard.json
+++ b/keyboards/dotmod/dymium65/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x5678",
"pid": "0x5058",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"diode_direction": "ROW2COL",
"matrix_pins": {
diff --git a/keyboards/draculad/keyboard.json b/keyboards/draculad/keyboard.json
index c72bda7c38..9c21b2a97d 100644
--- a/keyboards/draculad/keyboard.json
+++ b/keyboards/draculad/keyboard.json
@@ -48,8 +48,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/draculad/keymaps/default/keymap.c b/keyboards/draculad/keymaps/default/keymap.c
index a7b5261904..16df3ebac3 100644
--- a/keyboards/draculad/keymaps/default/keymap.c
+++ b/keyboards/draculad/keymaps/default/keymap.c
@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MUS] = LAYOUT(
KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- KC_LALT, KC_BTN3, KC_BTN2, KC_BTN1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ KC_LALT, MS_BTN3, MS_BTN2, MS_BTN1, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX,
XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
@@ -218,9 +218,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
else if (index == 3 ) {
// Page up/Page down
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/drhigsby/bkf/keyboard.json b/keyboards/drhigsby/bkf/keyboard.json
index 76808f93de..17f1adc364 100644
--- a/keyboards/drhigsby/bkf/keyboard.json
+++ b/keyboards/drhigsby/bkf/keyboard.json
@@ -31,8 +31,7 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_625uC": {
"layout": [
diff --git a/keyboards/drhigsby/dubba175/keyboard.json b/keyboards/drhigsby/dubba175/keyboard.json
index 0f395d10ff..f1d55d1855 100644
--- a/keyboards/drhigsby/dubba175/keyboard.json
+++ b/keyboards/drhigsby/dubba175/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["B1", "B3", "B2", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json
index 7e65e924e2..bc43e1563a 100644
--- a/keyboards/drhigsby/ogurec/info.json
+++ b/keyboards/drhigsby/ogurec/info.json
@@ -25,6 +25,5 @@
"rows": ["F6", "B6", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/drhigsby/packrat/keyboard.json b/keyboards/drhigsby/packrat/keyboard.json
index b41b383aee..8713ec034d 100644
--- a/keyboards/drhigsby/packrat/keyboard.json
+++ b/keyboards/drhigsby/packrat/keyboard.json
@@ -31,8 +31,7 @@
{"pin_a": "F5", "pin_b": "F4"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_3uc": {
"layout": [
diff --git a/keyboards/ducky/one2mini/1861st/keyboard.json b/keyboards/ducky/one2mini/1861st/keyboard.json
index e1ab218846..9f0010e6a7 100644
--- a/keyboards/ducky/one2mini/1861st/keyboard.json
+++ b/keyboards/ducky/one2mini/1861st/keyboard.json
@@ -4,8 +4,12 @@
"usb": {
"vid": "0x0416",
"pid": "0x0123",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"matrix_pins": {
"cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B8"],
diff --git a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
index 2b42eb6e95..a80da0b114 100644
--- a/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/ansi/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_60_ansi(
// 2 3 4 5 6 7 8 9 10 11 12 13 14
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_ENT,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_ENT,
_______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
_______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______
),
diff --git a/keyboards/ducky/one2mini/keymaps/ansi_tsangan/keymap.c b/keyboards/ducky/one2mini/keymaps/ansi_tsangan/keymap.c
index 259df16ab1..e28b4b7df0 100644
--- a/keyboards/ducky/one2mini/keymaps/ansi_tsangan/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/ansi_tsangan/keymap.c
@@ -53,8 +53,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_60_ansi_tsangan(
// 2 3 4 5 6 7 8 9 10 11 12 13 14
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_ENT,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_ENT,
_______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, KC_APP, MO(_CLR), _______, KC_APP, _______, _______
),
diff --git a/keyboards/ducky/one2mini/keymaps/default/keymap.c b/keyboards/ducky/one2mini/keymaps/default/keymap.c
index d8941bacdc..69fcc295ad 100644
--- a/keyboards/ducky/one2mini/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/default/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_all(
// 2 3 4 5 6 7 8 9 10 11 12 13 14
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
_______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
_______, _______, MO(_CLR), KC_MPLY, _______, KC_APP, _______, _______
),
diff --git a/keyboards/ducky/one2mini/keymaps/iso/keymap.c b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
index 585655d554..4f45273b8b 100644
--- a/keyboards/ducky/one2mini/keymaps/iso/keymap.c
+++ b/keyboards/ducky/one2mini/keymaps/iso/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_60_iso(
// 2 3 4 5 6 7 8 9 10 11 12 13 14
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_ENT,
_______, _______, _______, KC_APP, _______, _______, _______, KC_CALC, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
_______, KC_APP, MO(_CLR), _______, _______, KC_APP, _______, _______
),
diff --git a/keyboards/ducky/one2sf/1967st/keyboard.json b/keyboards/ducky/one2sf/1967st/keyboard.json
index 3bb58fd48f..093793d4c8 100644
--- a/keyboards/ducky/one2sf/1967st/keyboard.json
+++ b/keyboards/ducky/one2sf/1967st/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x445B",
"pid": "0x07AF",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"matrix_pins": {
"cols": ["B10", "B9", "C13", "C12", "C11", "C10", "C9", "C8", "A15", "A14", "A13", "D0", "D1", "D2", "B15", "B8"],
diff --git a/keyboards/ducky/one2sf/keymaps/default/keymap.c b/keyboards/ducky/one2sf/keymaps/default/keymap.c
index bfa354f508..91a644d972 100644
--- a/keyboards/ducky/one2sf/keymaps/default/keymap.c
+++ b/keyboards/ducky/one2sf/keymaps/default/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUSE, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_END, _______, _______, KC_END,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUSE, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_END, _______, _______, KC_END,
_______, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
),
diff --git a/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c b/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c
index fd65bd543a..d353f005ed 100644
--- a/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c
+++ b/keyboards/ducky/one2sf/keymaps/default_ansi/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_ansi(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_END,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, _______, KC_HOME,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, KC_END,
_______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
),
diff --git a/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c b/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c
index 94963fcab5..3ec27fa54f 100644
--- a/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c
+++ b/keyboards/ducky/one2sf/keymaps/default_iso/keymap.c
@@ -38,8 +38,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FUNCTION] = LAYOUT_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, KC_HOME,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, _______, KC_END,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, KC_INS, _______, KC_UP, KC_PAUS, KC_PGUP, KC_HOME, KC_PSCR, KC_HOME,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, KC_SCRL, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, _______, _______, KC_END,
_______, _______, RM_TOGG, RM_NEXT, RM_HUEU, RM_HUED, RM_SATU, RM_SATD, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
_______, _______, _______, _______, MO(2), _______, _______, _______, _______, _______
),
diff --git a/keyboards/dumbo/keyboard.json b/keyboards/dumbo/keyboard.json
index 8026f22790..4f8f04c06c 100644
--- a/keyboards/dumbo/keyboard.json
+++ b/keyboards/dumbo/keyboard.json
@@ -32,8 +32,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/dumbpad/v0x/keyboard.json b/keyboards/dumbpad/v0x/keyboard.json
index f0cecd8063..9d25d80494 100644
--- a/keyboards/dumbpad/v0x/keyboard.json
+++ b/keyboards/dumbpad/v0x/keyboard.json
@@ -15,8 +15,7 @@
"bootmagic": {
"matrix": [3, 0]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v0x/keymaps/default/keymap.c b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
index 9787c24f0f..13c8777274 100644
--- a/keyboards/dumbpad/v0x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_7, KC_8, KC_9, KC_BSPC,
KC_4, KC_5, KC_6, KC_ESC,
KC_1, KC_2, KC_3, KC_TAB,
- KC_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
+ MS_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
),
/*
SUB LAYER
@@ -87,9 +87,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v0x/v0x.c b/keyboards/dumbpad/v0x/v0x.c
index 5a61096606..ba68a75eaa 100644
--- a/keyboards/dumbpad/v0x/v0x.c
+++ b/keyboards/dumbpad/v0x/v0x.c
@@ -69,9 +69,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v0x_dualencoder/keyboard.json b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
index 71b501cedd..0754f301b7 100644
--- a/keyboards/dumbpad/v0x_dualencoder/keyboard.json
+++ b/keyboards/dumbpad/v0x_dualencoder/keyboard.json
@@ -16,8 +16,7 @@
"bootmagic": {
"matrix": [3, 0]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c b/keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c
index 28b71cd8e7..c7f7d6fcee 100644
--- a/keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x_dualencoder/keymaps/default/keymap.c
@@ -95,9 +95,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
index 1c622f7bf4..26ebb70acd 100644
--- a/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
+++ b/keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.c
@@ -69,9 +69,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v0x_right/keyboard.json b/keyboards/dumbpad/v0x_right/keyboard.json
index 883f2f785d..f581dd8e87 100644
--- a/keyboards/dumbpad/v0x_right/keyboard.json
+++ b/keyboards/dumbpad/v0x_right/keyboard.json
@@ -15,8 +15,7 @@
"bootmagic": {
"matrix": [3, 4]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
index a0f4e3a669..cb916b7edc 100644
--- a/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v0x_right/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_7, KC_8, KC_9, KC_BSPC,
KC_4, KC_5, KC_6, KC_ESC,
KC_1, KC_2, KC_3, KC_TAB,
- TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER, KC_BTN1
+ TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER, MS_BTN1
),
/*
SUB LAYER
@@ -87,9 +87,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v0x_right/v0x_right.c b/keyboards/dumbpad/v0x_right/v0x_right.c
index 5a61096606..ba68a75eaa 100644
--- a/keyboards/dumbpad/v0x_right/v0x_right.c
+++ b/keyboards/dumbpad/v0x_right/v0x_right.c
@@ -69,9 +69,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x/keyboard.json b/keyboards/dumbpad/v1x/keyboard.json
index 9ab78e1a9f..c78bbfef04 100644
--- a/keyboards/dumbpad/v1x/keyboard.json
+++ b/keyboards/dumbpad/v1x/keyboard.json
@@ -15,8 +15,7 @@
"bootmagic": {
"matrix": [3, 0]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v1x/keymaps/default/keymap.c b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
index 9787c24f0f..13c8777274 100644
--- a/keyboards/dumbpad/v1x/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_7, KC_8, KC_9, KC_BSPC,
KC_4, KC_5, KC_6, KC_ESC,
KC_1, KC_2, KC_3, KC_TAB,
- KC_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
+ MS_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
),
/*
SUB LAYER
@@ -87,9 +87,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x/v1x.c b/keyboards/dumbpad/v1x/v1x.c
index 3fec6cb7e6..650f9230cf 100644
--- a/keyboards/dumbpad/v1x/v1x.c
+++ b/keyboards/dumbpad/v1x/v1x.c
@@ -81,9 +81,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x_dualencoder/keyboard.json b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
index f3aeafe625..413d1970a0 100644
--- a/keyboards/dumbpad/v1x_dualencoder/keyboard.json
+++ b/keyboards/dumbpad/v1x_dualencoder/keyboard.json
@@ -16,8 +16,7 @@
"bootmagic": {
"matrix": [3, 0]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
index 805815253a..d144278f8b 100644
--- a/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_dualencoder/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_7, KC_8, KC_9, KC_BSPC,
KC_4, KC_5, KC_6, KC_ESC,
KC_1, KC_2, KC_3, KC_TAB,
- KC_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
+ MS_BTN1, TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER
),
/*
SUB LAYER
@@ -95,9 +95,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
index 31137ce775..f4aef72f46 100644
--- a/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
+++ b/keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.c
@@ -81,9 +81,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x_oled/keyboard.json b/keyboards/dumbpad/v1x_oled/keyboard.json
index 3a437699b8..6547b9ca39 100644
--- a/keyboards/dumbpad/v1x_oled/keyboard.json
+++ b/keyboards/dumbpad/v1x_oled/keyboard.json
@@ -13,8 +13,7 @@
{"pin_a": "E6", "pin_b": "D7"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/dumbpad/v1x_right/keyboard.json b/keyboards/dumbpad/v1x_right/keyboard.json
index 583d60bc5d..b9a62f2e69 100644
--- a/keyboards/dumbpad/v1x_right/keyboard.json
+++ b/keyboards/dumbpad/v1x_right/keyboard.json
@@ -15,8 +15,7 @@
"bootmagic": {
"matrix": [3, 4]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
index a0f4e3a669..cb916b7edc 100644
--- a/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
+++ b/keyboards/dumbpad/v1x_right/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_7, KC_8, KC_9, KC_BSPC,
KC_4, KC_5, KC_6, KC_ESC,
KC_1, KC_2, KC_3, KC_TAB,
- TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER, KC_BTN1
+ TT(1), KC_0, LSFT_T(KC_DOT), KC_ENTER, MS_BTN1
),
/*
SUB LAYER
@@ -87,9 +87,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 0:
// main layer - move mouse right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v1x_right/v1x_right.c b/keyboards/dumbpad/v1x_right/v1x_right.c
index 3fec6cb7e6..650f9230cf 100644
--- a/keyboards/dumbpad/v1x_right/v1x_right.c
+++ b/keyboards/dumbpad/v1x_right/v1x_right.c
@@ -81,9 +81,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
switch (get_highest_layer(layer_state)) {
case 0:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
diff --git a/keyboards/dumbpad/v3x/keyboard.json b/keyboards/dumbpad/v3x/keyboard.json
index 7ea29cd9ad..58b8da5b3a 100644
--- a/keyboards/dumbpad/v3x/keyboard.json
+++ b/keyboards/dumbpad/v3x/keyboard.json
@@ -55,8 +55,7 @@
"ws2812": {
"pin": "D1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": false,
diff --git a/keyboards/durgod/dgk6x/rules.mk b/keyboards/durgod/dgk6x/rules.mk
index 597f5bbcf9..c74ac83e91 100644
--- a/keyboards/durgod/dgk6x/rules.mk
+++ b/keyboards/durgod/dgk6x/rules.mk
@@ -1,4 +1,2 @@
# Do not put the microcontroller into power saving mode
NO_SUSPEND_POWER_DOWN = yes
-
-DEFAULT_FOLDER=durgod/dgk6x/hades_ansi
diff --git a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
index 1479d14398..4d1815eea8 100644
--- a/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
+++ b/keyboards/dz60/keymaps/iso_split-spacebar/keymap.c
@@ -93,8 +93,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1 2 3 4 5 6 7 8 9 10 11 12 13 14
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
_______ , _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
- _______, KC_MS_LEFT,KC_MS_DOWN,KC_MS_UP, KC_MS_RIGHT,_______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
- _______, _______, _______, _______, _______, KC_MS_BTN1,KC_MS_BTN2,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______,
+ _______, MS_LEFT,MS_DOWN,MS_UP, MS_RGHT,_______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______,
+ _______, _______, _______, _______, _______, MS_BTN1,MS_BTN2,_______, KC_HOME, KC_PGDN, KC_PGUP, KC_END, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
/* Keymap NL: Numpad Layer
diff --git a/keyboards/earth_rover/keyboard.json b/keyboards/earth_rover/keyboard.json
index 516585ca24..b3f5d2bae4 100644
--- a/keyboards/earth_rover/keyboard.json
+++ b/keyboards/earth_rover/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/eason/aeroboard/keyboard.json b/keyboards/eason/aeroboard/keyboard.json
index 1c15e600c4..d48b9819d0 100644
--- a/keyboards/eason/aeroboard/keyboard.json
+++ b/keyboards/eason/aeroboard/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x8954",
"pid": "0x8870",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 20,
diff --git a/keyboards/eason/meow65/keyboard.json b/keyboards/eason/meow65/keyboard.json
index 013e7daf4b..20285b66c6 100644
--- a/keyboards/eason/meow65/keyboard.json
+++ b/keyboards/eason/meow65/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x68F4",
"pid": "0x70A0",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/eason/void65h/keyboard.json b/keyboards/eason/void65h/keyboard.json
index 006cdb28b8..484b939871 100644
--- a/keyboards/eason/void65h/keyboard.json
+++ b/keyboards/eason/void65h/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x51D7",
"pid": "0x5517",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json
index f62d91a01f..a234ea2399 100644
--- a/keyboards/eco/info.json
+++ b/keyboards/eco/info.json
@@ -6,8 +6,7 @@
"vid": "0x1337",
"pid": "0x6006"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"qmk": {
"locking": {
"enabled": true,
diff --git a/keyboards/elephant42/keyboard.json b/keyboards/elephant42/keyboard.json
index d1d321623e..60b135b086 100644
--- a/keyboards/elephant42/keyboard.json
+++ b/keyboards/elephant42/keyboard.json
@@ -54,8 +54,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": false,
diff --git a/keyboards/emajesty/eiri/keyboard.json b/keyboards/emajesty/eiri/keyboard.json
index 2ad711bf9e..3dd0ab0888 100644
--- a/keyboards/emajesty/eiri/keyboard.json
+++ b/keyboards/emajesty/eiri/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["B4", "B5", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/emptystring/nqg/keyboard.json b/keyboards/emptystring/nqg/keyboard.json
index 17116704c7..226ab34303 100644
--- a/keyboards/emptystring/nqg/keyboard.json
+++ b/keyboards/emptystring/nqg/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["B6", "B2", "B3", "B1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c b/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
index 1fdcc9d4db..ef0570a6b3 100644
--- a/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
+++ b/keyboards/ep/comsn/tf_longeboye/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, SGUI(KC_S), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, LSG(KC_S), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS
),
diff --git a/keyboards/epomaker/tide65/keyboard.json b/keyboards/epomaker/tide65/keyboard.json
index 7a384f180f..47561f8af0 100644
--- a/keyboards/epomaker/tide65/keyboard.json
+++ b/keyboards/epomaker/tide65/keyboard.json
@@ -143,11 +143,15 @@
},
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0xE463",
"suspend_wakeup_delay": 1000,
"vid": "0x342D"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/ergodox_ez/glow/keymaps/default/keymap.c b/keyboards/ergodox_ez/glow/keymaps/default/keymap.c
index 13b2cee50a..edcb75dc1c 100644
--- a/keyboards/ergodox_ez/glow/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/glow/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT),
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC),
KC_HOME, KC_PGUP,
@@ -101,10 +101,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MDIA] = LAYOUT_ergodox_pretty(
// left hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c
index 555e203370..2ec7a02920 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT, KC_RGHT, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB), TG(SYMB), KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSLS,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MDIA, KC_SCLN), GUI_T(KC_QUOT),
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO), MEH_T(KC_NO), KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT,
LT(SYMB,KC_GRV), KC_QUOT, LALT(KC_LSFT), KC_LEFT, KC_RGHT, KC_UP, KC_DOWN, KC_LBRC, KC_RBRC, TT(SYMB),
ALT_T(KC_APP), KC_LGUI, KC_LALT, CTL_T(KC_ESC),
KC_HOME, KC_PGUP,
@@ -101,10 +101,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MDIA] = LAYOUT_ergodox_pretty(
// left hand
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
index 3ab66078fe..3008726acd 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO),
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
@@ -119,10 +119,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
index 47c2612e35..6072fbb5f0 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/keymap.c
@@ -51,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO),
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
@@ -132,10 +132,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ergodox_ez/keymaps/testing/keymap.c b/keyboards/ergodox_ez/keymaps/testing/keymap.c
index 300c2457c4..3f724fc2df 100644
--- a/keyboards/ergodox_ez/keymaps/testing/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/testing/keymap.c
@@ -20,11 +20,11 @@ enum custom_keycodes {
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+ [0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,HYPR_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
[1] = LAYOUT_ergodox(KC_TRANSPARENT,KC_F1,KC_F2,KC_F3,KC_F4,KC_F5,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_W),KC_LBRC,KC_RBRC,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,LCTL(KC_PGUP),LCTL(KC_PGDN),UG_NEXT,KC_TRANSPARENT,KC_TRANSPARENT,UG_VALD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F6,KC_F7,KC_F8,KC_F9,KC_F10,KC_F11,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_F12,KC_AMPR,KC_UNDS,KC_MINUS,KC_SCLN,KC_PLUS,KC_TRANSPARENT,KC_TRANSPARENT,KC_PIPE,KC_AT,KC_EQUAL,KC_PERC,KC_BSLS,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,UG_TOGG,RGB_SLD,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,UG_HUEU),
- [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_LEFT,KC_MS_DOWN,KC_MS_RIGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MS_BTN1,KC_MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
+ [2] = LAYOUT_ergodox(KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,MS_UP,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,MS_LEFT,MS_DOWN,MS_RGHT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,MS_BTN1,MS_BTN2,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_MEDIA_PREV_TRACK,KC_MEDIA_NEXT_TRACK,KC_TRANSPARENT,KC_TRANSPARENT,KC_AUDIO_VOL_UP,KC_AUDIO_VOL_DOWN,KC_AUDIO_MUTE,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_TRANSPARENT,KC_WWW_BACK),
};
diff --git a/keyboards/ergodox_ez/rules.mk b/keyboards/ergodox_ez/rules.mk
index 187d9dd8e2..9c0392f5d0 100644
--- a/keyboards/ergodox_ez/rules.mk
+++ b/keyboards/ergodox_ez/rules.mk
@@ -14,5 +14,3 @@ AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
MOUSE_SHARED_EP = no
-
-DEFAULT_FOLDER = ergodox_ez/base
diff --git a/keyboards/ergodox_ez/util/keymap_beautifier/README.md b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
index e7c7096f77..849e61fc9b 100644
--- a/keyboards/ergodox_ez/util/keymap_beautifier/README.md
+++ b/keyboards/ergodox_ez/util/keymap_beautifier/README.md
@@ -7,7 +7,7 @@ This Python 3 script, by [Tsan-Kuang Lee](https://github.com/tsankuanglee) takes
For example, the original `keymap.c` looks like
```
-[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,ALL_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
+[0] = LAYOUT_ergodox(KC_EQUAL,KC_1,KC_2,KC_3,KC_4,KC_5,LCTL(KC_MINUS),KC_DELETE,KC_Q,KC_W,KC_E,KC_R,KC_T,KC_LBRC,KC_BSPC,KC_A,KC_S,KC_D,KC_F,KC_G,SC_LSPO,CTL_T(KC_Z),KC_X,KC_C,KC_V,KC_B,HYPR_T(KC_NO),LT(1,KC_GRAVE),KC_QUOTE,LALT(KC_LSFT),KC_LEFT,KC_RIGHT,ALT_T(KC_APPLICATION),KC_LGUI,KC_HOME,KC_SPACE,KC_UNDS,KC_END,LCTL(KC_EQUAL),KC_6,KC_7,KC_8,KC_9,KC_0,KC_MINUS,KC_RBRC,KC_Y,KC_U,KC_I,KC_O,KC_P,KC_BSLS,KC_H,ALT_T(KC_J),KC_K,KC_L,LT(2,KC_SCLN),GUI_T(KC_QUOTE),MEH_T(KC_NO),KC_N,KC_M,KC_COMMA,KC_DOT,CTL_T(KC_SLASH),SC_RSPC,KC_UP,KC_DOWN,KC_LBRC,KC_RBRC,TT(1),KC_LALT,CTL_T(KC_ESCAPE),KC_PGUP,KC_PGDN,LT(1,KC_TAB),KC_ENTER),
```
The beautifier parses it and outputs:
@@ -19,7 +19,7 @@ The beautifier parses it and outputs:
KC_EQUAL , KC_1 , KC_2 , KC_3 , KC_4 , KC_5, LCTL(KC_MINUS),
KC_DELETE , KC_Q , KC_W , KC_E , KC_R , KC_T, KC_LBRC ,
KC_BSPC , KC_A , KC_S , KC_D , KC_F , KC_G,
-SC_LSPO , CTL_T(KC_Z), KC_X , KC_C , KC_V , KC_B, ALL_T(KC_NO) ,
+SC_LSPO , CTL_T(KC_Z), KC_X , KC_C , KC_V , KC_B, HYPR_T(KC_NO) ,
LT(1,KC_GRAVE), KC_QUOTE , LALT(KC_LSFT) , KC_LEFT, KC_RIGHT,
// left thumb
diff --git a/keyboards/ergoslab/keymaps/default/keymap.c b/keyboards/ergoslab/keymaps/default/keymap.c
index 01ea4ba36c..019a6fc17c 100644
--- a/keyboards/ergoslab/keymaps/default/keymap.c
+++ b/keyboards/ergoslab/keymaps/default/keymap.c
@@ -41,10 +41,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MOUS] = LAYOUT(
- _______, _______, KC_MS_U, _______, _______, _______, _______, KC_WH_U, _______, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN3, KC_WH_D, _______, _______,
+ _______, _______, MS_UP, _______, _______, _______, _______, MS_WHLU, _______, _______,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, MS_BTN3, MS_WHLD, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, KC_ACL0, _______, KC_BTN2, KC_BTN1, _______, _______, _______, _______,
+ _______, _______, _______, _______, MS_ACL0, _______, MS_BTN2, MS_BTN1, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
};
diff --git a/keyboards/ergoslab/rev1/keyboard.json b/keyboards/ergoslab/rev1/keyboard.json
index 0d017d7a97..59e3e038e9 100644
--- a/keyboards/ergoslab/rev1/keyboard.json
+++ b/keyboards/ergoslab/rev1/keyboard.json
@@ -25,8 +25,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/ergotravel/rev1/keyboard.json b/keyboards/ergotravel/rev1/keyboard.json
index 0c34bf04bd..803653fb70 100644
--- a/keyboards/ergotravel/rev1/keyboard.json
+++ b/keyboards/ergotravel/rev1/keyboard.json
@@ -25,8 +25,7 @@
"ws2812": {
"pin": "D3"
},
- "bootloader": "caterina",
- "processor": "atmega32u4",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/etiennecollin/wave/keymaps/default/keymap.c b/keyboards/etiennecollin/wave/keymaps/default/keymap.c
index 24bc85d5b4..8de48fb016 100644
--- a/keyboards/etiennecollin/wave/keymaps/default/keymap.c
+++ b/keyboards/etiennecollin/wave/keymaps/default/keymap.c
@@ -115,10 +115,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// --------+-------+-------+-------+-------| |-------+-------+-------+-------+-------|
// | | | ___ | | left | right | mid |
// --------+-------+-------- --------+-------+--------
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_ACL0, KC_ACL1, KC_ACL2, XXXXXXX,
- KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R,
- XXXXXXX, XXXXXXX, _______, KC_BTN1, KC_BTN2, KC_BTN3
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_ACL0, MS_ACL1, MS_ACL2, XXXXXXX,
+ KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, XXXXXXX, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_WHLL, MS_WHLD, MS_WHLU, MS_WHLR,
+ XXXXXXX, XXXXXXX, _______, MS_BTN1, MS_BTN2, MS_BTN3
),
[SYM] = LAYOUT_split_3x5_3(
// ----------------------------------------- -----------------------------------------
diff --git a/keyboards/evancookaudio/sleepingdinosaur/keyboard.json b/keyboards/evancookaudio/sleepingdinosaur/keyboard.json
index c6b77a26c8..4bedb82481 100644
--- a/keyboards/evancookaudio/sleepingdinosaur/keyboard.json
+++ b/keyboards/evancookaudio/sleepingdinosaur/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/evancookaudio/tenpad/keyboard.json b/keyboards/evancookaudio/tenpad/keyboard.json
index 46107a1c9b..c52556b4f4 100644
--- a/keyboards/evancookaudio/tenpad/keyboard.json
+++ b/keyboards/evancookaudio/tenpad/keyboard.json
@@ -21,8 +21,7 @@
"rows": ["D0", "D1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_2x5": {
"layout": [
diff --git a/keyboards/evyd13/ta65/keymaps/default/keymap.c b/keyboards/evyd13/ta65/keymaps/default/keymap.c
index 697215510b..bde9290afb 100644
--- a/keyboards/evyd13/ta65/keymaps/default/keymap.c
+++ b/keyboards/evyd13/ta65/keymaps/default/keymap.c
@@ -22,9 +22,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
switch(get_highest_layer(layer_state)){
case 1: //Layer 1
if (!clockwise) { // Remove ! to reverse direction
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
default: //Layer 0
diff --git a/keyboards/fancytech/fancyalice66/keyboard.json b/keyboards/fancytech/fancyalice66/keyboard.json
index 869ebe7465..c1f0a93f26 100644
--- a/keyboards/fancytech/fancyalice66/keyboard.json
+++ b/keyboards/fancytech/fancyalice66/keyboard.json
@@ -162,10 +162,14 @@
"url": "https://www.aliexpress.com/item/1005004272392611.html",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x3663",
"vid": "0xECED"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"pin": "B0"
},
diff --git a/keyboards/ferris/0_2/rules.mk b/keyboards/ferris/0_2/rules.mk
index 11b9d33a69..c04c3c92ed 100644
--- a/keyboards/ferris/0_2/rules.mk
+++ b/keyboards/ferris/0_2/rules.mk
@@ -2,5 +2,3 @@ CUSTOM_MATRIX = lite
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = ferris/0_2/base
diff --git a/keyboards/ferris/keymaps/default/keymap.json b/keyboards/ferris/keymaps/default/keymap.json
index 3f927ae5b1..0d081e4d8f 100644
--- a/keyboards/ferris/keymaps/default/keymap.json
+++ b/keyboards/ferris/keymaps/default/keymap.json
@@ -18,13 +18,13 @@
"LT(7,KC_SPC)", "KC_P1"
],
["KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN1" , "KC_WH_U" , "KC_BTN2" , "KC_TRNS",
+ "KC_TRNS" , "MS_BTN1" , "MS_WHLU" , "MS_BTN2" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN2" , "KC_NO" , "KC_BTN1" , "KC_TRNS",
- "KC_TRNS" , "KC_MS_L" , "KC_MS_D" , "KC_MS_U" , "KC_MS_R",
+ "KC_TRNS" , "MS_BTN2" , "KC_NO" , "MS_BTN1" , "KC_TRNS",
+ "KC_TRNS" , "MS_LEFT" , "MS_DOWN" , "MS_UP" , "MS_RGHT",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
- "KC_TRNS" , "KC_WH_L" , "KC_WH_D" , "KC_WH_R" , "KC_TRNS",
+ "KC_TRNS" , "MS_WHLL" , "MS_WHLD" , "MS_WHLR" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS"
diff --git a/keyboards/ffkeebs/puca/keyboard.json b/keyboards/ffkeebs/puca/keyboard.json
index e79032593a..3e3acdb1e1 100644
--- a/keyboards/ffkeebs/puca/keyboard.json
+++ b/keyboards/ffkeebs/puca/keyboard.json
@@ -54,8 +54,7 @@
"ws2812": {
"pin": "D4"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/flehrad/numbrero/keyboard.json b/keyboards/flehrad/numbrero/keyboard.json
index ac21bb0fbb..353712358a 100644
--- a/keyboards/flehrad/numbrero/keyboard.json
+++ b/keyboards/flehrad/numbrero/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["F6", "B5", "B4", "E6", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_numbrero_numpad": "LAYOUT_numpad",
"LAYOUT_numbrero_ortho": "LAYOUT_ortho"
diff --git a/keyboards/flehrad/snagpad/keyboard.json b/keyboards/flehrad/snagpad/keyboard.json
index d1a2f3ddee..641e6efedd 100644
--- a/keyboards/flehrad/snagpad/keyboard.json
+++ b/keyboards/flehrad/snagpad/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": {
"LAYOUT_ortho_5x4": {
diff --git a/keyboards/flehrad/tradestation/keyboard.json b/keyboards/flehrad/tradestation/keyboard.json
index b753ce2f8e..55b75c4d51 100644
--- a/keyboards/flehrad/tradestation/keyboard.json
+++ b/keyboards/flehrad/tradestation/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D1", "C6", "D4", "D0"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x4"],
"layout_aliases": {
"LAYOUT_tradestation": "LAYOUT_4x2u"
diff --git a/keyboards/for_science/keyboard.json b/keyboards/for_science/keyboard.json
index 5ae7808d42..62718933cd 100644
--- a/keyboards/for_science/keyboard.json
+++ b/keyboards/for_science/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D4", "D7", "E6", "B4", "B5"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_split_4x5_3": {
"layout": [
diff --git a/keyboards/fr4/southpaw75/keyboard.json b/keyboards/fr4/southpaw75/keyboard.json
index dc919b2ee4..c5d5094c96 100644
--- a/keyboards/fr4/southpaw75/keyboard.json
+++ b/keyboards/fr4/southpaw75/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/fr4/unix60/keyboard.json b/keyboards/fr4/unix60/keyboard.json
index 97da97dd0e..7f7bc3fbc7 100644
--- a/keyboards/fr4/unix60/keyboard.json
+++ b/keyboards/fr4/unix60/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": [
"60_hhkb"
],
diff --git a/keyboards/fractal/keyboard.json b/keyboards/fractal/keyboard.json
index 1e322e63b4..38a8bf4593 100644
--- a/keyboards/fractal/keyboard.json
+++ b/keyboards/fractal/keyboard.json
@@ -13,8 +13,7 @@
"rows": ["B1", "F7", "F6", "F5", "F4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/free_willy/keyboard.json b/keyboards/free_willy/keyboard.json
index 815f5808f5..d6d7d2d155 100644
--- a/keyboards/free_willy/keyboard.json
+++ b/keyboards/free_willy/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/frobiac/blackbowl/keymaps/default/keymap.c b/keyboards/frobiac/blackbowl/keymaps/default/keymap.c
index d85215ea04..c895ceb53c 100644
--- a/keyboards/frobiac/blackbowl/keymaps/default/keymap.c
+++ b/keyboards/frobiac/blackbowl/keymaps/default/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MOUSE] = LAYOUT(
- KC_WH_L, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX, KC_BTN3, XXXXXXX, KC_BTN5,
- KC_WH_R, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, KC_ACL1, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN4,
- MOUSE_X, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_D, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ MS_WHLL, XXXXXXX, MS_UP, XXXXXXX, XXXXXXX, MS_ACL0, XXXXXXX, MS_BTN3, XXXXXXX, MS_BTN5,
+ MS_WHLR, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLU, MS_ACL1, XXXXXXX, MS_BTN1, MS_BTN2, MS_BTN4,
+ MOUSE_X, MS_BTN1, MS_BTN3, MS_BTN2, MS_WHLD, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/frobiac/blackflat/keymaps/default/keymap.c b/keyboards/frobiac/blackflat/keymaps/default/keymap.c
index 8cf73b9316..f5591d6934 100644
--- a/keyboards/frobiac/blackflat/keymaps/default/keymap.c
+++ b/keyboards/frobiac/blackflat/keymaps/default/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MOUSE] = LAYOUT(
- KC_WH_L, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX, KC_BTN3, XXXXXXX, KC_BTN5,
- KC_WH_R, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, KC_ACL1, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN4,
- MOUSE_X, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_D, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ MS_WHLL, XXXXXXX, MS_UP, XXXXXXX, XXXXXXX, MS_ACL0, XXXXXXX, MS_BTN3, XXXXXXX, MS_BTN5,
+ MS_WHLR, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLU, MS_ACL1, XXXXXXX, MS_BTN1, MS_BTN2, MS_BTN4,
+ MOUSE_X, MS_BTN1, MS_BTN3, MS_BTN2, MS_WHLD, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/frobiac/hypernano/keymaps/default/keymap.c b/keyboards/frobiac/hypernano/keymaps/default/keymap.c
index 5e5277805f..5af1391461 100644
--- a/keyboards/frobiac/hypernano/keymaps/default/keymap.c
+++ b/keyboards/frobiac/hypernano/keymaps/default/keymap.c
@@ -74,9 +74,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MOUSE] = LAYOUT(
- KC_WH_L, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX, KC_BTN3, XXXXXXX, KC_BTN5,
- KC_WH_R, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, KC_ACL1, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN4,
- MOUSE_X, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_D, XXXXXXX, XXXXXXX, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ MS_WHLL, XXXXXXX, MS_UP, XXXXXXX, XXXXXXX, MS_ACL0, XXXXXXX, MS_BTN3, XXXXXXX, MS_BTN5,
+ MS_WHLR, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLU, MS_ACL1, XXXXXXX, MS_BTN1, MS_BTN2, MS_BTN4,
+ MOUSE_X, MS_BTN1, MS_BTN3, MS_BTN2, MS_WHLD, XXXXXXX, XXXXXXX, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______
),
diff --git a/keyboards/frobiac/redtilt/keymaps/default/keymap.c b/keyboards/frobiac/redtilt/keymaps/default/keymap.c
index d6df7a9db3..71c7dd49c8 100644
--- a/keyboards/frobiac/redtilt/keymaps/default/keymap.c
+++ b/keyboards/frobiac/redtilt/keymaps/default/keymap.c
@@ -76,9 +76,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_MOUSE] = LAYOUT(
- XXXXXXX, KC_WH_L, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, KC_ACL0, XXXXXXX, KC_BTN3, XXXXXXX, KC_BTN5, XXXXXXX,
- XXXXXXX, KC_WH_R, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, KC_ACL1, XXXXXXX, KC_BTN1, KC_BTN2, KC_BTN4, XXXXXXX,
- XXXXXXX, MOUSE_X, KC_BTN1, KC_BTN3, KC_BTN2, KC_WH_D, KC_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, MS_WHLL, XXXXXXX, MS_UP, XXXXXXX, XXXXXXX, MS_ACL0, XXXXXXX, MS_BTN3, XXXXXXX, MS_BTN5, XXXXXXX,
+ XXXXXXX, MS_WHLR, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLU, MS_ACL1, XXXXXXX, MS_BTN1, MS_BTN2, MS_BTN4, XXXXXXX,
+ XXXXXXX, MOUSE_X, MS_BTN1, MS_BTN3, MS_BTN2, MS_WHLD, MS_ACL2, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX
),
diff --git a/keyboards/fungo/keymaps/default/keymap.c b/keyboards/fungo/keymaps/default/keymap.c
index 6dc4e97f1b..9225514452 100644
--- a/keyboards/fungo/keymaps/default/keymap.c
+++ b/keyboards/fungo/keymaps/default/keymap.c
@@ -145,9 +145,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[SAM4] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_ESC, KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_BSPC, KC_ACL0, KC_BTN1, KC_MS_U, KC_BTN2, KC_NO, KC_NO,
- KC_TAB, KC_F6, MTC_F7, MTC_F8, MTC_F9, KC_F10, KC_F12, KC_CAPS, KC_ACL1, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_TAB,
- KC_NO, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_NO, KC_NO, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_NO, KC_ACL2, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_RCTL,
+ KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F11, KC_BSPC, MS_ACL0, MS_BTN1, MS_UP, MS_BTN2, KC_NO, KC_NO,
+ KC_TAB, KC_F6, MTC_F7, MTC_F8, MTC_F9, KC_F10, KC_F12, KC_CAPS, MS_ACL1, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO, KC_TAB,
+ KC_NO, KC_NO, MS_ACL0, MS_ACL1, MS_ACL2, KC_NO, KC_NO, TT(SAM3), KC_NO, KC_NO, TT(SAM2), KC_NO, MS_ACL2, MS_WHLL, MS_WHLU, MS_WHLD, MS_WHLR, KC_RCTL,
KC_NO, TT(SAM1), KC_NO, KC_LALT, KC_SPC, TT(SAM2), KC_ENT, MO(SAM4), KC_NO, KC_ENT, TT(SAM3), KC_SPC, KC_RALT, KC_NO, TT(SAM1), KC_NO
),
};
diff --git a/keyboards/fungo/rev1/keyboard.json b/keyboards/fungo/rev1/keyboard.json
index 0b0abec8e7..e494bce0ad 100644
--- a/keyboards/fungo/rev1/keyboard.json
+++ b/keyboards/fungo/rev1/keyboard.json
@@ -40,8 +40,7 @@
"resync": true
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"debounce": 3,
"tapping": {
"toggle": 3
diff --git a/keyboards/funky40/keyboard.json b/keyboards/funky40/keyboard.json
index 0658fc4974..856a9262f0 100644
--- a/keyboards/funky40/keyboard.json
+++ b/keyboards/funky40/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D4", "C6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/gboards/butterstick/keyboard.json b/keyboards/gboards/butterstick/keyboard.json
index b1401eb87c..5b5cf773c8 100644
--- a/keyboards/gboards/butterstick/keyboard.json
+++ b/keyboards/gboards/butterstick/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x1337",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"build": {
"lto": true
diff --git a/keyboards/gboards/butterstick/keymaps/default/keymap.c b/keyboards/gboards/butterstick/keymaps/default/keymap.c
index d0c6af65df..d80169a2b8 100644
--- a/keyboards/gboards/butterstick/keymaps/default/keymap.c
+++ b/keyboards/gboards/butterstick/keymaps/default/keymap.c
@@ -49,8 +49,8 @@ uint32_t processQwerty(bool lookup) {
P( LSD | RZ, SEND(KC_SPC));
// Dual chords
- P( LP | LH, CLICK_MOUSE(KC_MS_BTN2));
- P( ST1 | RF, CLICK_MOUSE(KC_MS_BTN1));
+ P( LP | LH, CLICK_MOUSE(MS_BTN2));
+ P( ST1 | RF, CLICK_MOUSE(MS_BTN1));
P( LSU | LFT, SEND(KC_ESC));
P( LSD | LK, SEND(KC_LSFT));
P( RZ | RS, SEND(KC_LSFT));
diff --git a/keyboards/gboards/combos/germ-mouse-keys.def b/keyboards/gboards/combos/germ-mouse-keys.def
index c0aff412e5..55d3afc4ff 100644
--- a/keyboards/gboards/combos/germ-mouse-keys.def
+++ b/keyboards/gboards/combos/germ-mouse-keys.def
@@ -1,2 +1,2 @@
-COMB(gbClick, KC_BTN1, KC_G, KC_B)
-COMB(fvClick, KC_BTN2, KC_F, KC_V)
+COMB(gbClick, MS_BTN1, KC_G, KC_B)
+COMB(fvClick, MS_BTN2, KC_F, KC_V)
diff --git a/keyboards/gboards/georgi/keyboard.json b/keyboards/gboards/georgi/keyboard.json
index 0b403a5a44..1262201f88 100644
--- a/keyboards/gboards/georgi/keyboard.json
+++ b/keyboards/gboards/georgi/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x1337",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index 932d48959c..339622aa9c 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -55,8 +55,8 @@ uint32_t processQwerty(bool lookup) {
P( LFT | LK | LP | LW, REPEAT());
// Mouse Keys
- /* P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2)); */
- /* P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1)); */
+ /* P( LO | LSD | LK, CLICK_MOUSE(MS_BTN2)); */
+ /* P( LO | LR | LW, CLICK_MOUSE(MS_BTN1)); */
/* Function layer
diff --git a/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
index 19683179f3..f22fac75d8 100644
--- a/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/default-flipped/keymap.c
@@ -46,8 +46,8 @@ uint32_t processQwerty(bool lookup) {
P( ST1 | ST2 | LW | ST4, SEND(KC_BSPC));
// Mouse Keys
- P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2));
- P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1));
+ P( LO | LSD | LK, CLICK_MOUSE(MS_BTN2));
+ P( LO | LR | LW, CLICK_MOUSE(MS_BTN1));
// Thumb Chords
P( LA | LO | RE | RU, SEND(KC_CAPS));
diff --git a/keyboards/gboards/georgi/keymaps/default/keymap.c b/keyboards/gboards/georgi/keymaps/default/keymap.c
index 955ec0e406..32f144914c 100644
--- a/keyboards/gboards/georgi/keymaps/default/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/default/keymap.c
@@ -52,8 +52,8 @@ uint32_t processQwerty(bool lookup) {
P( ST1 | ST2 | LW | ST4, SEND(KC_BSPC));
// Mouse Keys
- P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2));
- P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1));
+ P( LO | LSD | LK, CLICK_MOUSE(MS_BTN2));
+ P( LO | LR | LW, CLICK_MOUSE(MS_BTN1));
// Thumb Chords
P( LA | LO | RE | RU, SEND(KC_CAPS));
diff --git a/keyboards/gboards/georgi/keymaps/minimal/keymap.c b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
index 2f089866b2..3827089532 100644
--- a/keyboards/gboards/georgi/keymaps/minimal/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/minimal/keymap.c
@@ -44,8 +44,8 @@ uint32_t processQwerty(bool lookup) {
P( ST1 | ST2 | LW | ST4, SEND(KC_BSPC));
// Mouse Keys
- P( LO | LSD | LK, CLICK_MOUSE(KC_MS_BTN2));
- P( LO | LR | LW, CLICK_MOUSE(KC_MS_BTN1));
+ P( LO | LSD | LK, CLICK_MOUSE(MS_BTN2));
+ P( LO | LR | LW, CLICK_MOUSE(MS_BTN1));
// Thumb Chords
P( LA | LO | RE | RU, SEND(KC_CAPS));
diff --git a/keyboards/gboards/georgi/keymaps/norman/keymap.c b/keyboards/gboards/georgi/keymaps/norman/keymap.c
index 1b53cddd8b..8f607bca1c 100644
--- a/keyboards/gboards/georgi/keymaps/norman/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/norman/keymap.c
@@ -111,8 +111,8 @@ uint32_t processQwerty(bool lookup) {
P( MEDIA | RU, SEND(KC_RALT); SEND(KC_T); SEND(KC_A); SEND(KC_D));
// Mouse Keys and Printscreen
- P( LFT | LH, CLICK_MOUSE(KC_MS_BTN1));
- P( LK | LR, CLICK_MOUSE(KC_MS_BTN2));
+ P( LFT | LH, CLICK_MOUSE(MS_BTN1));
+ P( LK | LR, CLICK_MOUSE(MS_BTN2));
P( RF | RT, SEND(KC_PSCR););
// Number Row Left
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index 0783578804..5aa7a4a1e8 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -47,7 +47,7 @@ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, OSM(MOD_LALT), KC
ALT_T(KC_DEL), KC_BSPC, KC_SPC, CMD_T(KC_DEL),
- KC_BTN3, KC_COLON,
+ MS_BTN3, KC_COLON,
LT(SYMB, KC_ESC), LT(NUMB, KC_F13), LT(NUMB, KC_F14), LT(SYMB, KC_ENT)),
/* Keymap 1: Symbols layer
*
@@ -100,8 +100,8 @@ KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL, KC_TRN
*/
[NUMB] = LAYOUT_gergo(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_PGUP,
-KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_BTN1, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_PGDN,
-KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BTN2, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS,
+KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, MS_BTN1, KC_HOME, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_END, KC_PGDN,
+KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, MS_BTN2, KC_TRNS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_RALT, KC_TRNS,
diff --git a/keyboards/gboards/gergo/keymaps/default/keymap.c b/keyboards/gboards/gergo/keymaps/default/keymap.c
index da6486c97a..6335b51df8 100644
--- a/keyboards/gboards/gergo/keymaps/default/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/default/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[BASE] = LAYOUT(
LT(NUMB, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
- MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BTN1, KC_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+ MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, MS_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MS_BTN1, MS_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
MT(MOD_LGUI, KC_DEL), MT(MOD_LALT, KC_ENT), LT(SYMB, KC_SPC), LT(NUMB, KC_ESC), LT(SYMB, KC_ENT), LT(NUMB, KC_SPC), KC_TAB, KC_BSPC
),
/* Keymap 1: Symbols layer
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[NUMB] = LAYOUT(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLD, KC_VOLU,
- KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_MPLY, KC_MNXT,
+ KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_MPLY, KC_MNXT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/gboards/gergo/keymaps/germ/keymap.c b/keyboards/gboards/gergo/keymaps/germ/keymap.c
index 8e26223f17..066b8674bc 100644
--- a/keyboards/gboards/gergo/keymaps/germ/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/germ/keymap.c
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[BASE] = LAYOUT_gergo(
LT(NUMB, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
- MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BTN1, KC_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+ MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, MS_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MS_BTN1, MS_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
MT(MOD_LGUI, KC_DEL), MT(MOD_LALT, KC_ENT), LT(SYMB, KC_SPC), LT(NUMB, KC_ESC), LT(SYMB, KC_ENT), LT(NUMB, KC_SPC), KC_TAB, KC_BSPC
),
/* Keymap 1: Symbols layer
@@ -95,7 +95,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[NUMB] = LAYOUT_gergo(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLD, KC_VOLU,
- KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_MPLY, KC_MNXT,
+ KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_MPLY, KC_MNXT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/gboards/gergo/keymaps/oled/keymap.c b/keyboards/gboards/gergo/keymaps/oled/keymap.c
index ab374b9332..3e8fce15ef 100644
--- a/keyboards/gboards/gergo/keymaps/oled/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/oled/keymap.c
@@ -40,8 +40,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[BASE] = LAYOUT_gergo(
LT(NUMB, KC_ESC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_PIPE,
- MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_BTN1, KC_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
+ MT(MOD_LCTL, KC_BSPC), KC_A, KC_S, KC_D, KC_F, KC_G, MS_BTN2, KC_TRNS, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
+ KC_RSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, MS_BTN1, MS_BTN3, KC_PGDN, KC_BSPC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_MINS,
MT(MOD_LGUI, KC_DEL), MT(MOD_LALT, KC_ENT), LT(SYMB, KC_SPC), LT(NUMB, KC_ESC), LT(SYMB, KC_ENT), LT(NUMB, KC_SPC), KC_TAB, KC_BSPC
),
/* Keymap 1: Symbols layer
@@ -93,7 +93,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[NUMB] = LAYOUT_gergo(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS,
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLD, KC_VOLU,
- KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_MPLY, KC_MNXT,
+ KC_TRNS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_MPLY, KC_MNXT,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
};
diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/gergoplex.def b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/gergoplex.def
index 7ed0122c4b..2aada19b75 100644
--- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/gergoplex.def
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/gergoplex.def
@@ -5,7 +5,7 @@ COMB(eiGreat, KC_GT, KC_E, KC_I)
COMB(xcDash, KC_MINS, KC_X, KC_C)
COMB(hcUnds, KC_UNDS, KC_H, KC_COMM)
COMB(khQuot, KC_QUOT, KC_K, KC_H)
-COMB(gvClic, KC_BTN1, KC_G, KC_V)
-COMB(tdClic, KC_BTN2, KC_T, KC_D)
+COMB(gvClic, MS_BTN1, KC_G, KC_V)
+COMB(tdClic, MS_BTN2, KC_T, KC_D)
SUBS(pasta, "I would just like to interject for a moment.", KC_H, KC_J, KC_K, KC_L)
diff --git a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
index 4303ef4165..0c25914540 100644
--- a/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/colemak-dhm/keymap.c
@@ -74,8 +74,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_SPECIAL] = LAYOUT_split_3x5_3(
KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS,
- KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
- KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS,
+ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, MS_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
+ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, MS_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS,
CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL),
/* Keymap 2: Numbers/Function/Motion layer
@@ -94,6 +94,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUMBERS] = LAYOUT_split_3x5_3(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD,
+ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_VOLD,
KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT)
};
diff --git a/keyboards/gboards/gergoplex/keymaps/default/keymap.c b/keyboards/gboards/gergoplex/keymaps/default/keymap.c
index 7728304a9a..e3b762485d 100644
--- a/keyboards/gboards/gergoplex/keymaps/default/keymap.c
+++ b/keyboards/gboards/gergoplex/keymaps/default/keymap.c
@@ -88,8 +88,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_SPECIAL] = LAYOUT_split_3x5_3(
KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV, KC_TILD, KC_TRNS, KC_TRNS, KC_BSLS,
- KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
- KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS,
+ KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, MS_BTN2, KC_PLUS, KC_MINS, KC_SLSH, KC_ASTR, KC_QUOT,
+ KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, MS_BTN1, KC_AMPR, KC_EQL, KC_COMM, KC_DOT, KC_MINS,
CM_TOGG, KC_SCLN, KC_EQL, KC_EQL, KC_SCLN, KC_DEL),
/* Keymap 2: Numbers/Function/Motion layer
@@ -108,6 +108,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NUMBERS] = LAYOUT_split_3x5_3(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU,
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_VOLD,
+ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_VOLD,
KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_MPLY, KC_MNXT)
};
diff --git a/keyboards/gl516/a52gl/keyboard.json b/keyboards/gl516/a52gl/keyboard.json
index ad4921f635..4167f7ffc1 100644
--- a/keyboards/gl516/a52gl/keyboard.json
+++ b/keyboards/gl516/a52gl/keyboard.json
@@ -8,8 +8,7 @@
"pid": "0xE8D1",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/gl516/j73gl/keyboard.json b/keyboards/gl516/j73gl/keyboard.json
index 5fba198a71..06f1a8d763 100644
--- a/keyboards/gl516/j73gl/keyboard.json
+++ b/keyboards/gl516/j73gl/keyboard.json
@@ -26,8 +26,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/gl516/n51gl/keyboard.json b/keyboards/gl516/n51gl/keyboard.json
index c1ea4ab579..388541c23a 100644
--- a/keyboards/gl516/n51gl/keyboard.json
+++ b/keyboards/gl516/n51gl/keyboard.json
@@ -31,8 +31,7 @@
{"pin_a": "D7", "pin_b": "E6", "resolution": 3}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/gopolar/gg86/keyboard.json b/keyboards/gopolar/gg86/keyboard.json
index a9944beea9..3412a7c63c 100644
--- a/keyboards/gopolar/gg86/keyboard.json
+++ b/keyboards/gopolar/gg86/keyboard.json
@@ -6,9 +6,13 @@
"vid": "0x0007",
"pid": "0x0007",
"device_version": "0.0.1",
- "force_nkro": true,
"no_startup_check": true
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"pin": "E2"
},
diff --git a/keyboards/gowla/keyboard.json b/keyboards/gowla/keyboard.json
index f4f0b96838..0922862146 100644
--- a/keyboards/gowla/keyboard.json
+++ b/keyboards/gowla/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_3x3": {
"layout": [
diff --git a/keyboards/green_keys/gravity_45/keymaps/default/keymap.c b/keyboards/green_keys/gravity_45/keymaps/default/keymap.c
index b1031461d5..d7ef16b0e6 100644
--- a/keyboards/green_keys/gravity_45/keymaps/default/keymap.c
+++ b/keyboards/green_keys/gravity_45/keymaps/default/keymap.c
@@ -7,7 +7,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, LT(7, KC_Q), KC_W, KC_E, LT(6, KC_R), KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, RGB_TOG, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
+ KC_LCTL, KC_A, KC_S, LT(6, KC_D), KC_F, KC_G, UG_TOGG, KC_H, KC_J, LT(6, KC_K), KC_L, KC_ENT, KC_ENT,
KC_LSFT, LSFT_T(KC_Z), LGUI_T(KC_X), KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, LCTL_T(KC_DOT), KC_BSPC, KC_DEL,
KC_LCTL, KC_LGUI, LALT_T(KC_LNG2), LSFT_T(KC_TAB), LT(2, KC_SPC), LT(1, KC_LNG1), KC_RALT, KC_RGUI
),
diff --git a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
index adc3d89f39..c2cdf55d3c 100644
--- a/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
+++ b/keyboards/gregandcin/teaqueen/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAV] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN2, KC_MS_U, KC_BTN1, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_BTN2, MS_UP, MS_BTN1, MS_WHLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
diff --git a/keyboards/h0oni/deskpad/deskpad.c b/keyboards/h0oni/deskpad/deskpad.c
index 0f22eda152..8f9c97c97d 100644
--- a/keyboards/h0oni/deskpad/deskpad.c
+++ b/keyboards/h0oni/deskpad/deskpad.c
@@ -29,16 +29,16 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
else if(curr_layer == 1) {
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
else if(curr_layer == 2) {
if (clockwise) {
- tap_code16(C(KC_WH_U));
+ tap_code16(C(MS_WHLU));
} else {
- tap_code16(C(KC_WH_D));
+ tap_code16(C(MS_WHLD));
}
}
else {
diff --git a/keyboards/h0oni/deskpad/keymaps/default/keymap.c b/keyboards/h0oni/deskpad/keymaps/default/keymap.c
index eea54cf6b1..4ab51b657e 100644
--- a/keyboards/h0oni/deskpad/keymaps/default/keymap.c
+++ b/keyboards/h0oni/deskpad/keymaps/default/keymap.c
@@ -180,7 +180,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[2] = LAYOUT(
- A(KC_F4), SGUI(KC_S), KC_MYCM, LCA(KC_DEL), KC_CALC, TD(QUAD_LAYER_SWITCH)
+ A(KC_F4), LSG(KC_S), KC_MYCM, LCA(KC_DEL), KC_CALC, TD(QUAD_LAYER_SWITCH)
),
[3] = LAYOUT(
diff --git a/keyboards/hadron/ver2/keymaps/default/keymap.c b/keyboards/hadron/ver2/keymaps/default/keymap.c
index 951cacb423..825ec698b2 100644
--- a/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -165,11 +165,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_MOUSECURSOR] = LAYOUT(
- KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R,DEMOMACRO,_______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______,
- _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______
+ MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, MS_WHLL, MS_UP, MS_WHLR,DEMOMACRO,_______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_BTN2, MS_BTN3, MS_BTN4, MS_BTN5, _______, _______,
+ _______, _______, _______, _______, _______, MS_BTN1, _______, _______, _______, MS_BTN1, _______, _______, _______, _______, _______
),
/* Adjust (Lower + Raise)
diff --git a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 1e8523d94c..884ca0ed62 100644
--- a/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -164,11 +164,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_MOUSECURSOR] = LAYOUT(
- _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R, DEMOMACRO, _______, _______, _______, _______,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______
+ _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, MS_WHLL, MS_UP, MS_WHLR, DEMOMACRO, _______, _______, _______, _______,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_END , KC_PGDN, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, _______,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, MS_BTN2, MS_BTN3, MS_BTN4, MS_BTN5, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, MS_BTN1, MS_BTN1, _______, _______, _______, _______, _______, _______, _______, _______
),
/* Adjust (Lower + Raise)
diff --git a/keyboards/hadron/ver3/keymaps/default/keymap.c b/keyboards/hadron/ver3/keymaps/default/keymap.c
index 1e3f3191c2..df835454d3 100644
--- a/keyboards/hadron/ver3/keymaps/default/keymap.c
+++ b/keyboards/hadron/ver3/keymaps/default/keymap.c
@@ -162,11 +162,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_MOUSECURSOR] = LAYOUT(
- KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_WH_L, KC_MS_U, KC_WH_R,DEMOMACRO,_______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN2, KC_BTN3, KC_BTN4, KC_BTN5, _______, _______,
- _______, _______, _______, _______, _______, KC_BTN1, _______, _______, _______, KC_BTN1, _______, _______, _______, _______, _______
+ MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGUP, MS_WHLL, MS_UP, MS_WHLR,DEMOMACRO,_______,
+ _______, _______, _______, _______, _______, _______, _______, _______, KC_END , KC_PGDN, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_BTN2, MS_BTN3, MS_BTN4, MS_BTN5, _______, _______,
+ _______, _______, _______, _______, _______, MS_BTN1, _______, _______, _______, MS_BTN1, _______, _______, _______, _______, _______
),
/* Adjust (Lower + Raise)
diff --git a/keyboards/halfcliff/halfcliff.c b/keyboards/halfcliff/halfcliff.c
index de636f22fe..30d1ef36e6 100644
--- a/keyboards/halfcliff/halfcliff.c
+++ b/keyboards/halfcliff/halfcliff.c
@@ -81,15 +81,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 0) { /* Left side encoder */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 1) { /* Right side encoder */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/halfcliff/keyboard.json b/keyboards/halfcliff/keyboard.json
index 7d780c016a..3cc2b0de33 100644
--- a/keyboards/halfcliff/keyboard.json
+++ b/keyboards/halfcliff/keyboard.json
@@ -29,8 +29,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
index 3dcd4b3f6c..47e9d1d120 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/default/keymap.c
@@ -9,6 +9,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_APP, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT,
- KC_BTN1, KC_BTN3, KC_BTN2
+ MS_BTN1, MS_BTN3, MS_BTN2
)
};
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
index b22f797273..da85321a33 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/dvorak/keymap.c
@@ -9,6 +9,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_APP, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT,
- KC_BTN1, KC_BTN3, KC_BTN2
+ MS_BTN1, MS_BTN3, MS_BTN2
)
};
diff --git a/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c b/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
index 89e36d9fdc..bfb7a151d9 100644
--- a/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
+++ b/keyboards/handwired/108key_trackpoint/keymaps/dvorak_media/keymap.c
@@ -9,6 +9,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPLY, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS,
KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_LSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_APP, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT,
- KC_BTN1, KC_BTN3, KC_BTN2
+ MS_BTN1, MS_BTN3, MS_BTN2
)
};
diff --git a/keyboards/handwired/42/keymaps/default/keymap.c b/keyboards/handwired/42/keymaps/default/keymap.c
index 3c31ef89d1..457d599b4f 100644
--- a/keyboards/handwired/42/keymaps/default/keymap.c
+++ b/keyboards/handwired/42/keymaps/default/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
// Mouse Layer
LAYOUT(
- _______, _______, KC_WREF, KC_WH_U, KC_WSCH, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______,
- _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
+ _______, _______, KC_WREF, MS_WHLU, KC_WSCH, _______, _______, MS_BTN1, MS_UP, MS_BTN2, _______, _______,
+ _______, _______, MS_WHLL, MS_WHLD, MS_WHLR, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______
)
diff --git a/keyboards/handwired/acacia/keymaps/default/keymap.c b/keyboards/handwired/acacia/keymaps/default/keymap.c
index a33a3880a6..0b19c698de 100644
--- a/keyboards/handwired/acacia/keymaps/default/keymap.c
+++ b/keyboards/handwired/acacia/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAVI_FN] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
KC_TAB, KC_HOME, KC_PGUP, KC_PGDN, KC_END, KC_TILD, KC_GRV, KC_LEFT, KC_UP, KC_RGHT, KC_WREF, KC_ENT,
- KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_BTN1, KC_DOWN, KC_BTN2, KC_WBAK,
+ KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, MS_BTN1, KC_DOWN, MS_BTN2, KC_WBAK,
KC_MPRV, _______, BS_GUI, _______, _______, _______, _______, _______, _______, KC_PWR, _______
),
[_SYM_NUM] = LAYOUT(
diff --git a/keyboards/handwired/arrow_pad/keyboard.json b/keyboards/handwired/arrow_pad/keyboard.json
index f70645fe2a..a9d0c0d818 100644
--- a/keyboards/handwired/arrow_pad/keyboard.json
+++ b/keyboards/handwired/arrow_pad/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x4096",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/handwired/chiron/keymaps/default/keymap.c b/keyboards/handwired/chiron/keymaps/default/keymap.c
index 2889bd8b05..dead617e31 100644
--- a/keyboards/handwired/chiron/keymaps/default/keymap.c
+++ b/keyboards/handwired/chiron/keymaps/default/keymap.c
@@ -24,10 +24,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_CAPS, KC_INS, KC_LCTL, /*, */KC_LALT, LGUI_T(KC_SPC), KC_HYPR, KC_HYPR, RGUI_T(KC_SPC), KC_RALT, /*, */KC_LBRC, KC_RBRC, KC_SLSH
),
[1] = LAYOUT(
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_U, XXXXXXX, XXXXXXX, QK_BOOT,
- XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, EE_CLR,
- XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, KC_MUTE, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_BTN2,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLD, XXXXXXX, KC_WH_D, XXXXXXX, KC_BTN3, KC_BTN4,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_WHLU, XXXXXXX, XXXXXXX, QK_BOOT,
+ XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_VOLU, MS_WHLL, MS_UP, MS_WHLR, XXXXXXX, EE_CLR,
+ XXXXXXX, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, _______, _______, KC_MUTE, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN1, MS_BTN2,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, KC_VOLD, XXXXXXX, MS_WHLD, XXXXXXX, MS_BTN3, MS_BTN4,
XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX
),
[2] = LAYOUT(
diff --git a/keyboards/handwired/cmd60/keymaps/default/keymap.c b/keyboards/handwired/cmd60/keymaps/default/keymap.c
index 15084365fe..5fe199247e 100644
--- a/keyboards/handwired/cmd60/keymaps/default/keymap.c
+++ b/keyboards/handwired/cmd60/keymaps/default/keymap.c
@@ -31,9 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[4] = LAYOUT( /* CMD60 - Mouse */
KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, KC_BTN3, KC_WH_D, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_UP, MS_BTN2, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLU, MS_BTN3, MS_WHLD, _______,
_______, _______, _______, _______, _______, _______, _______, _______
),
[5] = LAYOUT( /* CMD60 - Media */
diff --git a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
index c9f6384440..968e2168b5 100644
--- a/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
+++ b/keyboards/handwired/concertina/64key/keymaps/default/keymap.c
@@ -80,14 +80,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_NUMERIC] = LAYOUT(
- _______, _______, _______, KC_ACL1, KC_ACL2, _______,
- _______, _______, LAYER_C, _______, KC_ACL0, _______, _______, _______,
+ _______, _______, _______, MS_ACL1, MS_ACL2, _______,
+ _______, _______, LAYER_C, _______, MS_ACL0, _______, _______, _______,
_______, _______, _______, KC_SLEP, _______, _______,
KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
- KC_INS, KC_EXLM, KC_BTN1, KC_BTN3, KC_BTN2, KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, QK_BOOT,
- LAYER_G, KC_MS_D
+ KC_INS, KC_EXLM, MS_BTN1, MS_BTN3, MS_BTN2, MS_LEFT, MS_UP, MS_RGHT, KC_PSCR, QK_BOOT,
+ LAYER_G, MS_DOWN
)
};
diff --git a/keyboards/handwired/dactyl/keymaps/default/keymap.c b/keyboards/handwired/dactyl/keymaps/default/keymap.c
index 669f358530..fd21b7e1e8 100644
--- a/keyboards/handwired/dactyl/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/default/keymap.c
@@ -118,10 +118,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
index 59cb7b34f8..6d90b6825f 100644
--- a/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl/keymaps/dvorak/keymap.c
@@ -118,10 +118,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c
index 6422699684..bc882bca4a 100644
--- a/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_cc/keymaps/default/keymap.c
@@ -26,12 +26,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NAV] = LAYOUT(
QK_BOOT, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_BRIU, KC_P7, KC_P8, KC_P9, KC_NO, QK_BOOT,
- _______, KC_VOLU, KC_WBAK, KC_MS_U, KC_WFWD, KC_WH_U, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______,
- _______, KC_VOLD, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______,
+ _______, KC_VOLU, KC_WBAK, MS_UP, KC_WFWD, MS_WHLU, KC_BRID, KC_P4, KC_P5, KC_P6, KC_PMNS, _______,
+ _______, KC_VOLD, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, KC_PPLS, KC_P1, KC_P2, KC_P3, KC_PSLS, _______,
KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_NO, KC_PAST, KC_PCMM, KC_P0, KC_PDOT, KC_PENT, _______,
KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
_______, _______, KC_HOME, _______,
- KC_BTN1, KC_BTN2, _______, KC_END, _______, _______,
+ MS_BTN1, MS_BTN2, _______, KC_END, _______, _______,
_______, ALT_BSP
)
};
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
index 630b106ca7..47c344eb14 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
@@ -29,12 +29,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define ALT_SPC ALT_T(KC_SPC)
#define SFT_ENT SFT_T(KC_ENT)
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN2
+#define KC_ML MS_LEFT
+#define KC_MR MS_RGHT
+#define KC_MU MS_UP
+#define KC_MD MS_DOWN
+#define KC_MB1 MS_BTN1
+#define KC_MB2 MS_BTN2
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index d0136c4c51..c8c087f267 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -15,12 +15,12 @@ extern keymap_config_t keymap_config;
#define ALT_SPC ALT_T(KC_SPC)
#define SFT_ENT SFT_T(KC_ENT)
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN1
+#define KC_ML MS_LEFT
+#define KC_MR MS_RGHT
+#define KC_MU MS_UP
+#define KC_MD MS_DOWN
+#define KC_MB1 MS_BTN1
+#define KC_MB2 MS_BTN1
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
index 942128d3f2..043f118ecc 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
@@ -9,12 +9,12 @@
#define ALT_SPC ALT_T(KC_SPC)
#define SFT_ENT SFT_T(KC_ENT)
-#define KC_ML KC_MS_LEFT
-#define KC_MR KC_MS_RIGHT
-#define KC_MU KC_MS_UP
-#define KC_MD KC_MS_DOWN
-#define KC_MB1 KC_MS_BTN1
-#define KC_MB2 KC_MS_BTN1
+#define KC_ML MS_LEFT
+#define KC_MR MS_RGHT
+#define KC_MU MS_UP
+#define KC_MD MS_DOWN
+#define KC_MB1 MS_BTN1
+#define KC_MB2 MS_BTN1
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
index a2760f42bb..24f5be6010 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keymaps/default/keymap.json
@@ -461,40 +461,40 @@
"KC_NO",
"KC_TRNS",
- "KC_ACL1",
+ "MS_ACL1",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
- "KC_WH_U",
- "KC_WH_L",
- "KC_MS_U",
- "KC_WH_R",
+ "MS_WHLU",
+ "MS_WHLL",
+ "MS_UP",
+ "MS_WHLR",
"KC_NO",
"KC_NO",
"KC_TRNS",
- "KC_ACL2",
- "KC_BTN2",
- "KC_BTN3",
- "KC_BTN1",
- "KC_BTN1",
- "KC_MS_L",
- "KC_MS_L",
- "KC_MS_D",
- "KC_MS_R",
+ "MS_ACL2",
+ "MS_BTN2",
+ "MS_BTN3",
+ "MS_BTN1",
+ "MS_BTN1",
+ "MS_LEFT",
+ "MS_LEFT",
+ "MS_DOWN",
+ "MS_RGHT",
"KC_NO",
"KC_NO",
"KC_TRNS",
- "KC_ACL0",
+ "MS_ACL0",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
- "KC_WH_D",
+ "MS_WHLD",
"KC_NO",
- "KC_MS_D",
+ "MS_DOWN",
"KC_NO",
"KC_NO",
"KC_TRNS",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
index 3cb115ffd5..bd58984eef 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keymaps/default/keymap.json
@@ -447,40 +447,40 @@
"KC_NO",
"KC_TRNS",
- "KC_ACL1",
+ "MS_ACL1",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
- "KC_WH_U",
- "KC_WH_L",
- "KC_MS_U",
- "KC_WH_R",
+ "MS_WHLU",
+ "MS_WHLL",
+ "MS_UP",
+ "MS_WHLR",
"KC_NO",
"KC_NO",
"KC_TRNS",
- "KC_ACL2",
- "KC_BTN2",
- "KC_BTN3",
- "KC_BTN1",
- "KC_BTN1",
- "KC_MS_L",
- "KC_MS_L",
- "KC_MS_D",
- "KC_MS_R",
+ "MS_ACL2",
+ "MS_BTN2",
+ "MS_BTN3",
+ "MS_BTN1",
+ "MS_BTN1",
+ "MS_LEFT",
+ "MS_LEFT",
+ "MS_DOWN",
+ "MS_RGHT",
"KC_NO",
"KC_NO",
"KC_TRNS",
- "KC_ACL0",
+ "MS_ACL0",
"KC_NO",
"KC_NO",
"KC_NO",
"KC_NO",
- "KC_WH_D",
+ "MS_WHLD",
"KC_NO",
- "KC_MS_D",
+ "MS_DOWN",
"KC_NO",
"KC_NO",
"KC_TRNS",
diff --git a/keyboards/handwired/dactyl_manuform_pi_pico/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform_pi_pico/keymaps/default/keymap.c
index cd78aef7a9..fed363a22d 100644
--- a/keyboards/handwired/dactyl_manuform_pi_pico/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform_pi_pico/keymaps/default/keymap.c
@@ -54,11 +54,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_WINMGR] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_F1, LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), KC_F4, KC_F7, SGUI(KC_7), SGUI(KC_8), SGUI(KC_9), KC_F10, KC_TRNS,
- TO(_QWERTY), KC_F2, LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), KC_F5, KC_F8, SGUI(KC_4), SGUI(KC_5), SGUI(KC_6), KC_F11, KC_TRNS,
- KC_TRNS, KC_F3, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), KC_F6, KC_F9, SGUI(KC_1), SGUI(KC_2), SGUI(KC_3), KC_F12, KC_TRNS,
- KC_TRNS, LGUI(KC_0), SGUI(KC_0), KC_TRNS,
- LGUI(KC_0), KC_TRNS, KC_TRNS, SGUI(KC_0),
+ KC_TRNS, KC_F1, LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), KC_F4, KC_F7, LSG(KC_7), LSG(KC_8), LSG(KC_9), KC_F10, KC_TRNS,
+ TO(_QWERTY), KC_F2, LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), KC_F5, KC_F8, LSG(KC_4), LSG(KC_5), LSG(KC_6), KC_F11, KC_TRNS,
+ KC_TRNS, KC_F3, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), KC_F6, KC_F9, LSG(KC_1), LSG(KC_2), LSG(KC_3), KC_F12, KC_TRNS,
+ KC_TRNS, LGUI(KC_0), LSG(KC_0), KC_TRNS,
+ LGUI(KC_0), KC_TRNS, KC_TRNS, LSG(KC_0),
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
LCTL(LGUI(KC_Q)), KC_TRNS, KC_TRNS, KC_TRNS)
};
diff --git a/keyboards/handwired/dactyl_maximus/keymaps/default/keymap.c b/keyboards/handwired/dactyl_maximus/keymaps/default/keymap.c
index cfd95db563..efd5f1a058 100644
--- a/keyboards/handwired/dactyl_maximus/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_maximus/keymaps/default/keymap.c
@@ -41,12 +41,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] = LAYOUT(
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
- KC_TRNS, KC_NO, KC_NO, KC_ACL2, KC_ACL1, KC_ACL0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
- KC_TRNS, KC_NO, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, KC_NO, KC_SLEP, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_TRNS,
- KC_TRNS, KC_NO, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_NO, KC_NO, MS_ACL2, MS_ACL1, MS_ACL0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, KC_NO, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_NO, KC_NO, KC_SLEP, KC_NO, KC_NO, QK_BOOT, KC_NO, KC_TRNS,
+ KC_TRNS, KC_NO, MS_WHLL, MS_WHLD, MS_WHLU, MS_WHLR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_BTN1, KC_BTN2, KC_NO, KC_NO, KC_TRNS,
+ KC_NO, MS_BTN1, MS_BTN2, KC_NO, KC_NO, KC_TRNS,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
)
};
diff --git a/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c b/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
index 1dd2f47841..2e5545c700 100644
--- a/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_promicro/keymaps/default/keymap.c
@@ -57,10 +57,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_RAISE] = LAYOUT_6x6(
_______,_______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,
- _______,_______,_______,KC_MS_U,_______,_______, _______,_______,_______,_______,_______,_______,
- _______,_______,KC_MS_L,KC_MS_D,KC_MS_R,_______, _______,_______,_______,_______,_______,KC_MPLY,
+ _______,_______,_______,MS_UP, _______,_______, _______,_______,_______,_______,_______,_______,
+ _______,_______,MS_LEFT,MS_DOWN,MS_RGHT,_______, _______,_______,_______,_______,_______,KC_MPLY,
_______,_______,_______,_______,_______,_______, _______,_______,KC_MPRV,KC_MNXT,_______,_______,
- QK_BOOT ,_______,_______,KC_BTN1,KC_BTN2,_______, KC_WBAK,KC_VOLU,KC_VOLD,KC_MUTE,_______,_______,
+ QK_BOOT ,_______,_______,MS_BTN1,MS_BTN2,_______, KC_WBAK,KC_VOLU,KC_VOLD,KC_MUTE,_______,_______,
_______,_______,_______, _______,_______,_______,
_______, _______,
_______, _______
diff --git a/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c b/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c
index 6f0c25a4dd..447ff3c0a7 100644
--- a/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c
@@ -36,12 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NAV] = LAYOUT_6x6(
QK_BOOT , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO , KC_BRIU, KC_7 , KC_8 , KC_9 , KC_NO , QK_BOOT ,
- _______,KC_VOLU,KC_WBAK,KC_MS_U,KC_WFWD,KC_WH_U, KC_BRID, KC_4 , KC_5 , KC_6 , KC_NO , KC_F9 ,
- _______,KC_VOLD,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D, KC_PPLS, KC_1 , KC_2 , KC_3 ,KC_PMNS, KC_F10,
+ _______,KC_VOLU,KC_WBAK,MS_UP, KC_WFWD,MS_WHLU, KC_BRID, KC_4 , KC_5 , KC_6 , KC_NO , KC_F9 ,
+ _______,KC_VOLD,MS_LEFT,MS_DOWN,MS_RGHT,MS_WHLD, KC_PPLS, KC_1 , KC_2 , KC_3 ,KC_PMNS, KC_F10,
KC_NO , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO , KC_PAST, KC_0 , KC_NO ,_______,KC_PSLS, KC_F11,
_______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , _______,_______,_______,_______, KC_F12,
_______,_______, KC_HOME,_______,
_______, KC_END ,
- KC_BTN1,KC_BTN2,_______, ALT_BSP,_______,_______
+ MS_BTN1,MS_BTN2,_______, ALT_BSP,_______,_______
)
};
diff --git a/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c b/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
index 6f0c25a4dd..447ff3c0a7 100644
--- a/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
+++ b/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
@@ -36,12 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NAV] = LAYOUT_6x6(
QK_BOOT , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO , KC_BRIU, KC_7 , KC_8 , KC_9 , KC_NO , QK_BOOT ,
- _______,KC_VOLU,KC_WBAK,KC_MS_U,KC_WFWD,KC_WH_U, KC_BRID, KC_4 , KC_5 , KC_6 , KC_NO , KC_F9 ,
- _______,KC_VOLD,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D, KC_PPLS, KC_1 , KC_2 , KC_3 ,KC_PMNS, KC_F10,
+ _______,KC_VOLU,KC_WBAK,MS_UP, KC_WFWD,MS_WHLU, KC_BRID, KC_4 , KC_5 , KC_6 , KC_NO , KC_F9 ,
+ _______,KC_VOLD,MS_LEFT,MS_DOWN,MS_RGHT,MS_WHLD, KC_PPLS, KC_1 , KC_2 , KC_3 ,KC_PMNS, KC_F10,
KC_NO , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO , KC_PAST, KC_0 , KC_NO ,_______,KC_PSLS, KC_F11,
_______, KC_F5 , KC_F6 , KC_F7 , KC_F8 , _______,_______,_______,_______, KC_F12,
_______,_______, KC_HOME,_______,
_______, KC_END ,
- KC_BTN1,KC_BTN2,_______, ALT_BSP,_______,_______
+ MS_BTN1,MS_BTN2,_______, ALT_BSP,_______,_______
)
};
diff --git a/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
index 65c7f445b7..bcb4e2016a 100644
--- a/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactylmacropad/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_BASE] = LAYOUT
(pvt, LCTL(KC_V), KC_UP, LCTL(KC_C),
LSFT_T(KC_ESC), KC_LEFT, KC_DOWN, KC_RGHT,
- TO(1), KC_LCTL, ALT_TAB, KC_APP, KC_BTN3),
+ TO(1), KC_LCTL, ALT_TAB, KC_APP, MS_BTN3),
/*
* ┌────┬────┬────┬────┐
* │mte │ BI │ up │pgu │
@@ -71,9 +71,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else {
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
return false;
diff --git a/keyboards/handwired/datahand/keyboard.json b/keyboards/handwired/datahand/keyboard.json
index 1f1ebc07ee..3684dcc706 100644
--- a/keyboards/handwired/datahand/keyboard.json
+++ b/keyboards/handwired/datahand/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x13BA",
"pid": "0x0017",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "at90usb1286",
"bootloader": "halfkay",
diff --git a/keyboards/handwired/datahand/keymaps/default/keymap.c b/keyboards/handwired/datahand/keymaps/default/keymap.c
index 608c45dea3..828aed1d2e 100644
--- a/keyboards/handwired/datahand/keymaps/default/keymap.c
+++ b/keyboards/handwired/datahand/keymaps/default/keymap.c
@@ -85,9 +85,9 @@ _______, _______, _______, _______, _______, _______, _______, _______, ______
#endif
[FUNCTION_MOUSE] = LAYOUT(
- KC_F2, KC_F4, KC_F6, KC_MS_U, KC_MS_U, KC_F8, KC_F10, KC_PGUP,
-_______, KC_NO, KC_SCRL, _______, KC_BTN3, NLK, KC_BTN1, MS, KC_BTN2, KC_MS_L, KC_BTN1, KC_MS_R, KC_MS_L, KC_BTN2, KC_MS_R, KC_END, AR, KC_LSFT, KC_INS, KC_9, KC_ENT, KC_F11, KC_0, KC_F12,
- KC_F1, KC_F3, KC_F5, KC_MS_D, KC_MS_D, KC_F7, KC_F9, KC_PGDN,
+ KC_F2, KC_F4, KC_F6, MS_UP, MS_UP, KC_F8, KC_F10, KC_PGUP,
+_______, KC_NO, KC_SCRL, _______, MS_BTN3, NLK, MS_BTN1, MS, MS_BTN2, MS_LEFT, MS_BTN1, MS_RGHT, MS_LEFT, MS_BTN2, MS_RGHT, KC_END, AR, KC_LSFT, KC_INS, KC_9, KC_ENT, KC_F11, KC_0, KC_F12,
+ KC_F1, KC_F3, KC_F5, MS_DOWN, MS_DOWN, KC_F7, KC_F9, KC_PGDN,
_______, _______, _______, _______,
_______, _______,
_______, _______,
diff --git a/keyboards/handwired/dmote/keymaps/default/keymap.c b/keyboards/handwired/dmote/keymaps/default/keymap.c
index 0c9ceb8722..632ccb87dc 100644
--- a/keyboards/handwired/dmote/keymaps/default/keymap.c
+++ b/keyboards/handwired/dmote/keymaps/default/keymap.c
@@ -65,9 +65,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYER_C, KC_INS, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, QK_BOOT, KC_WAKE, // *
KC_F12, KC_F1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_F10, KC_F11,
_______, KC_1, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_APP, KC_0, PASTE,
- KC_GRV, KC_EXLM, KC_BTN1, KC_WH_U, KC_BTN2, KC_MS_L, KC_MS_U, KC_MS_R, KC_PSCR, UG_TOGG,
- KC_WH_D, UG_NEXT, _______, KC_ACL1, KC_ACL2, KC_MS_D,
- _______, _______, EMDASH, KC_ACL0, _______, _______,
+ KC_GRV, KC_EXLM, MS_BTN1, MS_WHLU, MS_BTN2, MS_LEFT, MS_UP, MS_RGHT, KC_PSCR, UG_TOGG,
+ MS_WHLD, UG_NEXT, _______, MS_ACL1, MS_ACL2, MS_DOWN,
+ _______, _______, EMDASH, MS_ACL0, _______, _______,
_______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c b/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c
index 2a4ca0c703..9488bbfde6 100644
--- a/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c
+++ b/keyboards/handwired/dqz11n1g/keymaps/default/keymap.c
@@ -37,11 +37,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* Maltron, so just putting some "Quantum" keycodes here for testing that
* the layer exists and Fun Lock LED works. */
[_FUNCTION] = LAYOUT(
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,KC_TRNS,KC_BTN3,KC_MS_U,KC_WH_U,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,KC_TRNS,MS_BTN3,MS_UP, MS_WHLU,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_UP, AU_ON, KC_MS_L,KC_BTN1,KC_MS_R,KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_DOWN,AU_OFF, KC_BTN2,KC_MS_D,KC_WH_D,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
- KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_TOGG,KC_NO, KC_ACL0,KC_ACL1,KC_ACL2,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_UP, AU_ON, MS_LEFT,MS_BTN1,MS_RGHT,KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_DOWN,AU_OFF, MS_BTN2,MS_DOWN,MS_WHLD,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, CK_TOGG,KC_NO, MS_ACL0,MS_ACL1,MS_ACL2,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
/* */ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, /* */
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index cd02f80200..195edabcae 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -7,5 +7,3 @@ CUSTOM_MATRIX = lite
I2C_DRIVER_REQUIRED = yes
SRC += matrix.c
-
-DEFAULT_FOLDER = handwired/dygma/raise/ansi
diff --git a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
index b43c75cf2d..d43f390586 100644
--- a/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
+++ b/keyboards/handwired/elrgo_s/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_RAISE] = LAYOUT_split_3x6_5(
- KC_ESC , KC_PDOT , M_BBSLS , KC_BSLS , LSFT(KC_MINS), LSFT(KC_EQL), KC_HOME , KC_WH_L , KC_UP , KC_WH_R , KC_PGUP , KC_BSPC ,
+ KC_ESC , KC_PDOT , M_BBSLS , KC_BSLS , LSFT(KC_MINS), LSFT(KC_EQL), KC_HOME , MS_WHLL , KC_UP , MS_WHLR , KC_PGUP , KC_BSPC ,
KC_TAB , LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4) , LSFT(KC_5) , M_FLEFT , KC_LEFT , KC_DOWN , KC_RIGHT, M_FRIGHT, KC_DEL ,
LSFT(KC_TAB), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9) , LSFT(KC_0) , KC_END , KC_F22 , KC_F23 , KC_CAPS , KC_PGDN , MO(_ADJUST),
KC_LGUI , KC_LCTL , KC_LSFT , KC_LALT , M_SHLL , M_SHLA , KC_TRNS , KC_SPC , KC_RALT , KC_ENT
diff --git a/keyboards/handwired/ergocheap/keymaps/default/keymap.c b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
index 15753dabd7..efb7955c09 100644
--- a/keyboards/handwired/ergocheap/keymaps/default/keymap.c
+++ b/keyboards/handwired/ergocheap/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_UP, _______, _______, _______,
KC_LCTL, _______, KC_S, _______, _______, _______, _______, KC_VOLD, KC_MUTE, KC_VOLU, KC_LEFT, KC_RGHT, _______, _______,
- KC_LSFT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_DOWN, TO(_BASE), KC_WH_U, _______,
- _______, KC_LGUI, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R
+ KC_LSFT, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, KC_DOWN, TO(_BASE), MS_WHLU, _______,
+ _______, KC_LGUI, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR
)
};
diff --git a/keyboards/handwired/fivethirteen/keymaps/default/keymap.c b/keyboards/handwired/fivethirteen/keymaps/default/keymap.c
index b68e81e81c..63e5798e81 100644
--- a/keyboards/handwired/fivethirteen/keymaps/default/keymap.c
+++ b/keyboards/handwired/fivethirteen/keymaps/default/keymap.c
@@ -30,9 +30,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[MOS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_WH_D, KC_WH_U, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MS_WHLD, MS_WHLU, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/floorboard/keymaps/default/keymap.c b/keyboards/handwired/floorboard/keymaps/default/keymap.c
index 161dbea030..2d519bee03 100644
--- a/keyboards/handwired/floorboard/keymaps/default/keymap.c
+++ b/keyboards/handwired/floorboard/keymaps/default/keymap.c
@@ -18,6 +18,6 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ortho_4x12(KC_TAB, KC_SCLN, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL, KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_ENT, KC_LSFT, KC_QUOT, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, LT(2,KC_CAPS), MO(3), KC_LGUI, KC_LALT, KC_SPC, MO(1), MO(2), KC_BSPC, KC_RALT, KC_VOLD, KC_VOLU, LT(2,KC_MPLY)),
[1] = LAYOUT_ortho_4x12(KC_PERC, KC_LBRC, KC_LCBR, KC_RCBR, KC_LPRN, KC_PEQL, KC_ASTR, KC_RPRN, KC_PLUS, KC_EXLM, KC_RBRC, KC_GRV, KC_LCTL, KC_7, KC_5, KC_3, KC_1, KC_9, KC_0, KC_2, KC_4, KC_6, KC_8, KC_MINS, KC_LSFT, KC_LBRC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLSH, KC_NO, KC_TRNS, KC_NO, KC_LGUI, KC_LALT, KC_SPC, KC_TRNS, KC_NO, KC_DEL, KC_RALT, KC_PSCR, KC_APP, KC_NO),
- [2] = LAYOUT_ortho_4x12(KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_SLEP, KC_LCTL, KC_NO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_LGUI, KC_LALT, KC_BTN1, KC_BTN2, KC_TRNS, KC_NO, KC_RALT, KC_NO, KC_APP, KC_NO),
+ [2] = LAYOUT_ortho_4x12(KC_WAKE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_SLEP, KC_LCTL, KC_NO, KC_CUT, KC_COPY, KC_PSTE, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ENT, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_LGUI, KC_LALT, MS_BTN1, MS_BTN2, KC_TRNS, KC_NO, KC_RALT, KC_NO, KC_APP, KC_NO),
[3] = LAYOUT_ortho_4x12(KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_LCTL, KC_F7, KC_F5, KC_F3, KC_F1, KC_F9, KC_F10, KC_F2, KC_F4, KC_F6, KC_F8, KC_NO, KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_NO, KC_DEL, KC_RALT, KC_BRID, KC_BRIU, KC_NO)
};
diff --git a/keyboards/handwired/franky36/keyboard.json b/keyboards/handwired/franky36/keyboard.json
index 038fc1eb67..871e6abf9d 100644
--- a/keyboards/handwired/franky36/keyboard.json
+++ b/keyboards/handwired/franky36/keyboard.json
@@ -23,8 +23,8 @@
"url": "https://github.com/avdyushin/franky36",
"usb": {
"device_version": "0.2.0",
- "pid": "0x0001",
- "vid": "0xFEED"
+ "pid": "0x3336",
+ "vid": "0x1209"
},
"community_layouts": ["split_3x5_3"],
"layouts": {
diff --git a/keyboards/handwired/frenchdev/keymaps/default/keymap.c b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
index 67c0072a08..aa622c5ddb 100644
--- a/keyboards/handwired/frenchdev/keymaps/default/keymap.c
+++ b/keyboards/handwired/frenchdev/keymaps/default/keymap.c
@@ -103,9 +103,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, M_UN, M_CUT, M_CP, M_PS, M_SE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BP_DLR, BP_EQL, KC_PGUP, BP_PIPE, BP_SLSH, KC_TRNS,
KC_TRNS, KC_TRNS, BP_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGDN, KC_END, KC_TRNS, KC_TRNS,
//left pedals
- KC_TRNS, KC_BTN1, KC_TRNS,
+ KC_TRNS, MS_BTN1, KC_TRNS,
//right pedals
- KC_TRNS, KC_BTN1, KC_TRNS
+ KC_TRNS, MS_BTN1, KC_TRNS
),
/* MEDIA, mouse and numpad.
@@ -130,14 +130,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MEDIA] = LAYOUT(
QK_BOOT, KC_SCRL, KC_PAUS, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_VOLD, KC_VOLU, KC_PSCR, KC_CALC, KC_NUM,
KC_TRNS, KC_TRNS, KC_TRNS, KC_MSTP, KC_MPRV, KC_MNXT, KC_MPLY, KC_MPLY, KC_MPRV, KC_MNXT, KC_MSTP, KC_TRNS, KC_PMNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_U, KC_TRNS, KC_BTN4, KC_BTN5, KC_BTN4, KC_BTN5, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_BTN3, KC_BTN2, KC_BTN1, KC_BTN1, KC_BTN2, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, KC_TRNS,
- KC_TRNS, M_UN, M_CUT, M_CP, M_PS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, KC_KP_1, KC_KP_2, KC_KP_3, KC_PSLS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_WHLU, KC_TRNS, MS_BTN4, MS_BTN5, MS_BTN4, MS_BTN5, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_WHLD, MS_BTN3, MS_BTN2, MS_BTN1, MS_BTN1, MS_BTN2, KC_KP_4, KC_KP_5, KC_KP_6, KC_PAST, KC_TRNS,
+ KC_TRNS, M_UN, M_CUT, M_CP, M_PS, MS_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN3, KC_KP_1, KC_KP_2, KC_KP_3, KC_PSLS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_PDOT, BP_DOT, BP_COMM, KC_TRNS,
//left pedals
- KC_BTN3, M_RP, KC_TRNS,
+ MS_BTN3, M_RP, KC_TRNS,
//right pedals
- KC_BTN3, M_RP, KC_TRNS
+ MS_BTN3, M_RP, KC_TRNS
),
/* TRNS - skeleton for laters
@@ -167,9 +167,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
//left pedals
- KC_BTN3, M_RP, KC_TRNS,
+ MS_BTN3, M_RP, KC_TRNS,
//right pedals
- KC_BTN3, M_RP, KC_TRNS
+ MS_BTN3, M_RP, KC_TRNS
),
};
@@ -239,7 +239,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
key_timer_left_pedal = timer_read(); // if the key is being pressed, we start the timer.
} else {
if (timer_elapsed(key_timer_left_pedal) < KEY_DELAY) {
- tap_code (KC_BTN2);
+ tap_code (MS_BTN2);
}
unregister_code (KC_SCRL);
layer_off(1);
@@ -251,7 +251,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
key_timer_right_pedal = timer_read(); // if the key is being pressed, we start the timer.
} else {
if (timer_elapsed(key_timer_right_pedal) < PEDAL_DELAY) {
- tap_code (KC_BTN1);
+ tap_code (MS_BTN1);
}
layer_off(2);
}
diff --git a/keyboards/handwired/k8split/keymaps/left/keymap.c b/keyboards/handwired/k8split/keymaps/left/keymap.c
index 8d7559065a..c40b1c7b4f 100644
--- a/keyboards/handwired/k8split/keymaps/left/keymap.c
+++ b/keyboards/handwired/k8split/keymaps/left/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_AUDIO_MUTE,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_AUDIO_MMUTE,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_INT5, KC_MS_WH_UP,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_COMP, KC_MS_WH_DOWN,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_INT5, MS_WHLU,
+ KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_COMP, MS_WHLD,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_F13, KC_F14,
KC_LCTL, KC_CAPS, KC_LWIN, KC_LALT, KC_SPC, KC_F15, KC_F16, KC_F17
)
diff --git a/keyboards/handwired/kbod/keymaps/default/keymap.c b/keyboards/handwired/kbod/keymaps/default/keymap.c
index 24fc4c20af..1976769052 100644
--- a/keyboards/handwired/kbod/keymaps/default/keymap.c
+++ b/keyboards/handwired/kbod/keymaps/default/keymap.c
@@ -46,15 +46,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
TO(0), KC_1, KC_2, KC_3, ALT_F4, KC_5, KC_6, KC_P7, KC_P8, KC_P9, KC_P0, KC_PMNS, KC_PPLS, KC_BSPC,
_______, _______, _______, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, KC_BTN1, KC_MS_U, KC_BTN2,
- _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN3
+ _______, _______, _______, _______, _______, _______, _______, KC_P0, KC_PDOT, MS_BTN1, MS_UP, MS_BTN2,
+ _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN3
),
LAYOUT( /* Multimedia layer */
TO(0), _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
_______, _______, KC_WAKE, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_MNXT, _______,
_______, _______, KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_PWR, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_WH_U, KC_BTN2,
- _______, _______, _______, KC_MPLY, KC_WH_L, KC_WH_D, KC_WH_R, KC_BTN3
+ _______, _______, KC_PWR, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_WHLU, MS_BTN2,
+ _______, _______, _______, KC_MPLY, MS_WHLL, MS_WHLD, MS_WHLR, MS_BTN3
),
};
diff --git a/keyboards/handwired/mutepad/keyboard.json b/keyboards/handwired/mutepad/keyboard.json
index fd16cd7447..fdbfa025df 100644
--- a/keyboards/handwired/mutepad/keyboard.json
+++ b/keyboards/handwired/mutepad/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
index ccc445be42..8a8cda6ea2 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
+++ b/keyboards/handwired/obuwunkunubi/spaget/keymaps/default/keymap.c
@@ -391,15 +391,15 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
else if(IS_LAYER_ON(ONE)) {
if (index == 0) { /* First encoder */
if (clockwise) {
- tap_code(KC_WH_R);
+ tap_code(MS_WHLR);
} else {
- tap_code(KC_WH_L);
+ tap_code(MS_WHLL);
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
}
diff --git a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
index 752eda0fde..d0c8c610b1 100644
--- a/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/2u/keymap.c
@@ -539,10 +539,10 @@ KC_PAUS
*/
[_MOUSE] = LAYOUT(
_______ , XXXXXXX , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12,
- _______ , XXXXXXX , XXXXXXX , XXXXXXX , KC_MS_UP , XXXXXXX , KC_MS_ACCEL0 , XXXXXXX, XXXXXXX , KC_MS_WH_UP , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX,
- _______ , XXXXXXX , XXXXXXX , KC_MS_LEFT , KC_MS_DOWN , KC_MS_RIGHT, KC_MS_ACCEL1 , XXXXXXX, KC_MS_WH_LEFT , KC_MS_WH_DOWN, KC_MS_WH_RIGHT, XXXXXXX , XXXXXXX , XXXXXXX,
- XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , KC_MS_ACCEL2 , XXXXXXX, KC_MS_BTN1 , KC_MS_BTN2 , KC_MS_BTN3 , XXXXXXX , XXXXXXX , XXXXXXX,
- TD(CTL_OSL1), OSM(MOD_LGUI), TD(ALT_OSL1), TD(TD_LayerDn) ,TD(TD_LayerUp), TD(TD_SPC_ENT) , KC_MS_BTN1 , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT, TD(TD_ESC_GRAVE)
+ _______ , XXXXXXX , XXXXXXX , XXXXXXX , MS_UP , XXXXXXX , MS_ACL0 , XXXXXXX, XXXXXXX , MS_WHLU , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX,
+ _______ , XXXXXXX , XXXXXXX , MS_LEFT , MS_DOWN , MS_RGHT , MS_ACL1 , XXXXXXX, MS_WHLL , MS_WHLD , MS_WHLR , XXXXXXX , XXXXXXX , XXXXXXX,
+ XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX , MS_ACL2 , XXXXXXX, MS_BTN1 , MS_BTN2 , MS_BTN3 , XXXXXXX , XXXXXXX , XXXXXXX,
+ TD(CTL_OSL1), OSM(MOD_LGUI), TD(ALT_OSL1), TD(TD_LayerDn) ,TD(TD_LayerUp), TD(TD_SPC_ENT) , MS_BTN1 , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT, TD(TD_ESC_GRAVE)
)
};
diff --git a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
index a2f7befd9f..30e107f336 100644
--- a/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/default/keymap.c
@@ -130,7 +130,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
KC_PGDN ,TD(TD_SHIFT_CAPS),KC_Z ,KC_X ,KC_C ,KC_V ,KC_B,KC_N,KC_M ,TD(TD_COMM_LABK),TD(TD_DOT_RABK),TD(TD_SLSH_QUES),TD(TD_BSLS_PIPE),KC_RSFT ,
//|---------------+-----------------+-------+-------+----------+------+----+----+------+----------------+---------------+----------------+----------------+----------------|
- KC_END , KC_LCTL ,KC_LGUI,KC_LALT, KC_L1 , KC_SPACE , KC_SPACE , KC_L2 ,KC_RALT ,KC_BTN2 ,KC_RCTL ,TD(TD_ESC_GRAVE)
+ KC_END , KC_LCTL ,KC_LGUI,KC_LALT, KC_L1 , KC_SPACE , KC_SPACE , KC_L2 ,KC_RALT ,MS_BTN2 ,KC_RCTL ,TD(TD_ESC_GRAVE)
//`---------------+-----------------+-------+-------+----------+------+----+-----------+----------------+---------------+----------------+----------------+----------------'
),
diff --git a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
index a5222eecfa..be7940bcfd 100644
--- a/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
+++ b/keyboards/handwired/ortho5x14/keymaps/split1/keymap.c
@@ -474,9 +474,9 @@ KC_PAUS
*/
[_MOUSE] = LAYOUT(
_______ , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , XXXXXXX, XXXXXXX, KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11,
- KC_MS_ACCEL0, XXXXXXX , KC_MS_UP , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , KC_MS_WH_UP , XXXXXXX , XXXXXXX , KC_F12,
- KC_MS_ACCEL1, KC_MS_LEFT, KC_MS_DOWN , KC_MS_RIGHT , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_WH_LEFT, KC_MS_WH_DOWN, KC_MS_WH_RIGHT, XXXXXXX , XXXXXXX,
- KC_MS_ACCEL2, XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_BTN1 , KC_MS_BTN2 , KC_MS_BTN3 , XXXXXXX , XXXXXXX,
+ MS_ACL0 , XXXXXXX , MS_UP , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX , MS_WHLU , XXXXXXX , XXXXXXX , KC_F12,
+ MS_ACL1 , MS_LEFT , MS_DOWN , MS_RGHT , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_WHLL , MS_WHLD , MS_WHLR , XXXXXXX , XXXXXXX,
+ MS_ACL2 , XXXXXXX , XXXXXXX , XXXXXXX , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1 , MS_BTN2 , MS_BTN3 , XXXXXXX , XXXXXXX,
TD(CTL_OSL1), KC_LGUI , TD(ALT_OSL1), TD(TD_LayerDn) , KC_L2 , TD(TD_SPC_ENT) , KC_SPACE , KC_LEFT , KC_DOWN , KC_UP , KC_RIGHT, TD(TD_ESC_GRAVE)
)
diff --git a/keyboards/handwired/petruziamini/keymaps/default/keymap.c b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
index 5265bb218e..5a49827379 100644
--- a/keyboards/handwired/petruziamini/keymaps/default/keymap.c
+++ b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
@@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[3] = LAYOUT(
KC_NO, KC_NO, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_VOLD, KC_MUTE, KC_VOLU,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_BTN1, KC_UP, KC_BTN2,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_LEFT, KC_DOWN, KC_RGHT,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLU, MS_BTN1, KC_UP, MS_BTN2,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLD, KC_LEFT, KC_DOWN, KC_RGHT,
KC_NO, KC_NO, KC_NO, KC_LGUI, KC_NO, KC_NO
),
[4] = LAYOUT(
diff --git a/keyboards/handwired/pilcrow/keymaps/default/keymap.c b/keyboards/handwired/pilcrow/keymaps/default/keymap.c
index 8882fdb3ea..f287754478 100644
--- a/keyboards/handwired/pilcrow/keymaps/default/keymap.c
+++ b/keyboards/handwired/pilcrow/keymaps/default/keymap.c
@@ -46,9 +46,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[3] = LAYOUT(
- QK_BOOT, KC_UP, _______, _______, _______, _______, _______, KC_WH_D, KC_MS_U, KC_WH_U,
- KC_LEFT, KC_DOWN, KC_RGHT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, KC_MS_L, KC_MS_D, KC_MS_R,
+ QK_BOOT, KC_UP, _______, _______, _______, _______, _______, MS_WHLD, MS_UP, MS_WHLU,
+ KC_LEFT, KC_DOWN, KC_RGHT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, MS_LEFT, MS_DOWN, MS_RGHT,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______
+ _______, _______, _______, _______, MS_BTN1, MS_BTN2, _______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/pterodactyl/keymaps/default/keymap.c b/keyboards/handwired/pterodactyl/keymaps/default/keymap.c
index c53f6841ce..a8204aa1bf 100644
--- a/keyboards/handwired/pterodactyl/keymaps/default/keymap.c
+++ b/keyboards/handwired/pterodactyl/keymaps/default/keymap.c
@@ -101,10 +101,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[_MDIA] = LAYOUT(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2, KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_WBAK
diff --git a/keyboards/handwired/pytest/basic/keymaps/default/keymap.c b/keyboards/handwired/pytest/basic/keymaps/default/keymap.c
index a5782f7a13..264de943c9 100644
--- a/keyboards/handwired/pytest/basic/keymaps/default/keymap.c
+++ b/keyboards/handwired/pytest/basic/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/handwired/pytest/has_community/keymaps/default/keymap.c b/keyboards/handwired/pytest/has_community/keymaps/default/keymap.c
new file mode 100644
index 0000000000..264de943c9
--- /dev/null
+++ b/keyboards/handwired/pytest/has_community/keymaps/default/keymap.c
@@ -0,0 +1,7 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ LAYOUT_ortho_1x1(KC_A)
+};
diff --git a/keyboards/handwired/retro_refit/keyboard.json b/keyboards/handwired/retro_refit/keyboard.json
index 73e747fffa..cc1904cb0c 100644
--- a/keyboards/handwired/retro_refit/keyboard.json
+++ b/keyboards/handwired/retro_refit/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index 7c8bd5b8b4..bdb3180152 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+ _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT
),
/* Raise
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index 15c706089d..98268da221 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -120,7 +120,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
_______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,S(KC_NUHS),S(KC_NUBS),KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+ _______, _______, _______, _______, _______, MS_BTN1, MS_BTN2, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT
),
/* Raise
diff --git a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c
index 6cc4d90144..967526afa6 100644
--- a/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c
+++ b/keyboards/handwired/scottokeebs/scottomouse/keymaps/default/keymap.c
@@ -19,6 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- KC_MS_BTN1, KC_MS_BTN2, KC_MS_LEFT, KC_MS_UP, KC_MS_DOWN, KC_MS_RIGHT
+ MS_BTN1, MS_BTN2, MS_LEFT, MS_UP, MS_DOWN, MS_RGHT
)
}; \ No newline at end of file
diff --git a/keyboards/handwired/sick68/keymaps/default/keymap.c b/keyboards/handwired/sick68/keymaps/default/keymap.c
index 121fc3956e..faa2a67d46 100644
--- a/keyboards/handwired/sick68/keymaps/default/keymap.c
+++ b/keyboards/handwired/sick68/keymaps/default/keymap.c
@@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
_______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, MS_BTN1, MS_UP, MS_BTN2,
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
};
diff --git a/keyboards/handwired/snatchpad/keymaps/default/keymap.c b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
index db8305129d..923b0d29f1 100644
--- a/keyboards/handwired/snatchpad/keymaps/default/keymap.c
+++ b/keyboards/handwired/snatchpad/keymaps/default/keymap.c
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
QK_LOCK, KC_UP , _______,
KC_LEFT, KC_DOWN, KC_RGHT,
- KC_BTN1, KC_BTN2
+ MS_BTN1, MS_BTN2
),
[2] = LAYOUT(
_______, _______, _______,
diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c
index 89d32c036b..cedc0357a5 100644
--- a/keyboards/handwired/snatchpad/snatchpad.c
+++ b/keyboards/handwired/snatchpad/snatchpad.c
@@ -29,9 +29,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
default:
if (clockwise) {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
} else {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
}
break;
}
@@ -54,9 +54,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
default:
if (clockwise) {
- tap_code(KC_MS_D);
+ tap_code(MS_DOWN);
} else {
- tap_code(KC_MS_U);
+ tap_code(MS_UP);
}
break;
}
diff --git a/keyboards/handwired/sono1/keymaps/default/keymap.c b/keyboards/handwired/sono1/keymaps/default/keymap.c
index cd9f9bcdb6..e12a1c44d0 100644
--- a/keyboards/handwired/sono1/keymaps/default/keymap.c
+++ b/keyboards/handwired/sono1/keymaps/default/keymap.c
@@ -100,8 +100,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MUS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, MS_WHLU, MS_BTN1, MS_UP, MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, MS_WHLD, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______
diff --git a/keyboards/handwired/space_oddity/keymaps/default/keymap.c b/keyboards/handwired/space_oddity/keymaps/default/keymap.c
index c278953f46..d41eb871e4 100644
--- a/keyboards/handwired/space_oddity/keymaps/default/keymap.c
+++ b/keyboards/handwired/space_oddity/keymaps/default/keymap.c
@@ -72,7 +72,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
CTL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
TD(SFT_CAPS), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT),
- MO(2), MO(1), KC_LGUI, KC_RALT, KC_LCTL, KC_SPC, ALT_T(KC_LEFT), ALL_T(KC_RGHT), LT(1, KC_UP), LT(2, KC_DOWN)
+ MO(2), MO(1), KC_LGUI, KC_RALT, KC_LCTL, KC_SPC, ALT_T(KC_LEFT), HYPR_T(KC_RGHT), LT(1, KC_UP), LT(2, KC_DOWN)
),
/* Function layer.
@@ -135,8 +135,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[2] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
+ _______, _______, _______, MS_UP, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, MS_BTN1, MS_BTN3, MS_BTN2, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, TG(2)
diff --git a/keyboards/handwired/split_cloud/keyboard.json b/keyboards/handwired/split_cloud/keyboard.json
index fc1d2498df..b1e716ecde 100644
--- a/keyboards/handwired/split_cloud/keyboard.json
+++ b/keyboards/handwired/split_cloud/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xCC43",
"pid": "0x0001",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"diode_direction": "ROW2COL",
"matrix_pins": {
diff --git a/keyboards/handwired/t111/keymaps/oleg/keymap.c b/keyboards/handwired/t111/keymaps/oleg/keymap.c
index b372de027b..2a75376ff2 100644
--- a/keyboards/handwired/t111/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/t111/keymaps/oleg/keymap.c
@@ -118,9 +118,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
VRSN, KC_SLEP, _______, UC_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, UM(UAT), UM(UHSH), UM(UDLR), UM(USCT), UM(UCFX), UM(UAMP), UM(UAST), _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS, UP(ULSB, ULCB), UP(URSB, URCB), _______, _______, _______, _______, _______, _______, _______,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, UP(USCO, UCLN), UP(UAPO, UQOT), _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, KC_BTN4, _______, _______, _______, _______, UP(UCOM, ULTH), UP(UDOT, UGTH), UP(USLS, UQUE), KC_APP, _______, _______, _______, _______, _______, _______, _______,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS, UP(ULSB, ULCB), UP(URSB, URCB), _______, _______, _______, _______, _______, _______, _______,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN5, _______, _______, _______, _______, _______, UP(USCO, UCLN), UP(UAPO, UQOT), _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, MS_BTN4, _______, _______, _______, _______, UP(UCOM, ULTH), UP(UDOT, UGTH), UP(USLS, UQUE), KC_APP, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 8659b49544..90fdf8796d 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -175,10 +175,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[_MOUSE] = LAYOUT(
- KC_ESC, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, XXXXXXX, XXXXXXX, KC_BTN3, KC_BTN4, KC_BTN5, XXXXXXX, XXXXXXX,
- KC_BSPC, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
+ KC_ESC, MS_WHLU, MS_WHLL, MS_UP, MS_WHLR, XXXXXXX, XXXXXXX, MS_BTN3, MS_BTN4, MS_BTN5, XXXXXXX, XXXXXXX,
+ KC_BSPC, MS_WHLD, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SC_RSPC,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_ACL2, KC_ACL0, XXXXXXX, MO(6), XXXXXXX, KC_RCTL
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, MS_ACL2, MS_ACL0, XXXXXXX, MO(6), XXXXXXX, KC_RCTL
),
/* Adjust (Lower + Raise)
diff --git a/keyboards/handwired/tkk/keymaps/default/keymap.c b/keyboards/handwired/tkk/keymaps/default/keymap.c
index 220daab627..94c1c771fe 100644
--- a/keyboards/handwired/tkk/keymaps/default/keymap.c
+++ b/keyboards/handwired/tkk/keymaps/default/keymap.c
@@ -45,7 +45,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_PGDN, KC_PGUP, KC_HOME, KC_END, KC_NO, KC_6, KC_7, KC_8, KC_9, KC_0
),
[11] = LAYOUT(
- KC_WH_D, KC_WH_U, KC_WH_L, KC_WH_R, KC_BTN2, KC_BTN1, KC_MS_L, KC_MS_R, KC_MS_U, KC_MS_D
+ MS_WHLD, MS_WHLU, MS_WHLL, MS_WHLR, MS_BTN2, MS_BTN1, MS_LEFT, MS_RGHT, MS_UP, MS_DOWN
)
};
diff --git a/keyboards/handwired/trackpoint/keymaps/default/keymap.c b/keyboards/handwired/trackpoint/keymaps/default/keymap.c
index 1792cb4271..f23c9b7608 100644
--- a/keyboards/handwired/trackpoint/keymaps/default/keymap.c
+++ b/keyboards/handwired/trackpoint/keymaps/default/keymap.c
@@ -2,6 +2,6 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- KC_BTN1, KC_BTN3, KC_BTN2
+ MS_BTN1, MS_BTN3, MS_BTN2
)
};
diff --git a/keyboards/handwired/traveller/keymaps/default/keymap.c b/keyboards/handwired/traveller/keymaps/default/keymap.c
index 86ffee985d..fe571c4a53 100644
--- a/keyboards/handwired/traveller/keymaps/default/keymap.c
+++ b/keyboards/handwired/traveller/keymaps/default/keymap.c
@@ -90,10 +90,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-------------------------------------------------------------------------------------------------'
*/
[_NAV] = LAYOUT(
- TG(_NAV), XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, RGUI(KC_RGHT), KC_WH_U, M_MUL, KC_MS_U, M_MUR, XXXXXXX, KC_ACL2,
- _______, RGUI(KC_LEFT), KC_LEFT, KC_DOWN, KC_RGHT, LCTL(KC_E), KC_BTN3, KC_MS_L, KC_MS_U, KC_MS_R, XXXXXXX, KC_ACL1,
- _______, LCTL(KC_A), LGUI(KC_X), RGUI(KC_C), RGUI(KC_V), XXXXXXX, KC_WH_D, M_MDL, KC_MS_D, M_MDR, KC_UP, KC_ACL0,
- _______, RGUI(KC_Z), _______, _______, _______, _______, KC_ENT, KC_BTN2, KC_BTN1, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
+ TG(_NAV), XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, RGUI(KC_RGHT), MS_WHLU, M_MUL, MS_UP, M_MUR, XXXXXXX, MS_ACL2,
+ _______, RGUI(KC_LEFT), KC_LEFT, KC_DOWN, KC_RGHT, LCTL(KC_E), MS_BTN3, MS_LEFT, MS_UP, MS_RGHT, XXXXXXX, MS_ACL1,
+ _______, LCTL(KC_A), LGUI(KC_X), RGUI(KC_C), RGUI(KC_V), XXXXXXX, MS_WHLD, M_MDL, MS_DOWN, M_MDR, KC_UP, MS_ACL0,
+ _______, RGUI(KC_Z), _______, _______, _______, _______, KC_ENT, MS_BTN2, MS_BTN1, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT
),
/* FKEYS - Funtion keys & mac stuff
@@ -138,41 +138,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// from algernon's ErgoDox EZ layout,
case M_MUL:
if (record->event.pressed) {
- mousekey_on(KC_MS_UP);
- mousekey_on(KC_MS_LEFT);
+ mousekey_on(MS_UP);
+ mousekey_on(MS_LEFT);
} else {
- mousekey_off(KC_MS_UP);
- mousekey_off(KC_MS_LEFT);
+ mousekey_off(MS_UP);
+ mousekey_off(MS_LEFT);
}
mousekey_send();
return false;
case M_MUR:
if (record->event.pressed) {
- mousekey_on(KC_MS_UP);
- mousekey_on(KC_MS_RIGHT);
+ mousekey_on(MS_UP);
+ mousekey_on(MS_RGHT);
} else {
- mousekey_off(KC_MS_UP);
- mousekey_off(KC_MS_RIGHT);
+ mousekey_off(MS_UP);
+ mousekey_off(MS_RGHT);
}
mousekey_send();
return false;
case M_MDL:
if (record->event.pressed) {
- mousekey_on(KC_MS_DOWN);
- mousekey_on(KC_MS_LEFT);
+ mousekey_on(MS_DOWN);
+ mousekey_on(MS_LEFT);
} else {
- mousekey_off(KC_MS_DOWN);
- mousekey_off(KC_MS_LEFT);
+ mousekey_off(MS_DOWN);
+ mousekey_off(MS_LEFT);
}
mousekey_send();
return false;
case M_MDR:
if (record->event.pressed) {
- mousekey_on(KC_MS_DOWN);
- mousekey_on(KC_MS_RIGHT);
+ mousekey_on(MS_DOWN);
+ mousekey_on(MS_RGHT);
} else {
- mousekey_off(KC_MS_DOWN);
- mousekey_off(KC_MS_RIGHT);
+ mousekey_off(MS_DOWN);
+ mousekey_off(MS_RGHT);
}
mousekey_send();
return false;
diff --git a/keyboards/handwired/tsubasa/keymaps/default/keymap.c b/keyboards/handwired/tsubasa/keymaps/default/keymap.c
index 96b66d2a3f..6d641a2b52 100644
--- a/keyboards/handwired/tsubasa/keymaps/default/keymap.c
+++ b/keyboards/handwired/tsubasa/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_FN] = LAYOUT(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, UG_TOGG, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX,
- _______, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, UG_NEXT, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, UG_TOGG, KC_PGUP, XXXXXXX, KC_UP, XXXXXXX, KC_PSCR, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, UG_NEXT, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,
_______, XXXXXXX, XXXXXXX, XXXXXXX, UG_VALU, UG_HUEU, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
_______, _______, _______, _______, _______, KC_DEL, _______, _______, _______, _______
)
@@ -42,8 +42,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_BASE] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
- [_FN] = { ENCODER_CCW_CW( KC_VOLU, KC_VOLD)}
+ [_BASE] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
+ [_FN] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)}
};
#endif
diff --git a/keyboards/handwired/twadlee/tp69/keymaps/default/keymap.c b/keyboards/handwired/twadlee/tp69/keymaps/default/keymap.c
index f250c3fc62..63bd0697fa 100644
--- a/keyboards/handwired/twadlee/tp69/keymaps/default/keymap.c
+++ b/keyboards/handwired/twadlee/tp69/keymaps/default/keymap.c
@@ -23,6 +23,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LALT, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LCTL, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, KC_MS_BTN1, KC_MS_BTN3, KC_MS_BTN2, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL
+ KC_LCTL, KC_LGUI, KC_LALT, KC_BSPC, MS_BTN1, MS_BTN3, MS_BTN2, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL
)
};
diff --git a/keyboards/handwired/twig/twig50/keyboard.json b/keyboards/handwired/twig/twig50/keyboard.json
index 836caf3ebc..6fc90a97c1 100644
--- a/keyboards/handwired/twig/twig50/keyboard.json
+++ b/keyboards/handwired/twig/twig50/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.2.1",
- "force_nkro": true
+ "device_version": "0.2.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"tapping": {
"term": 150
diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
index 954c8e5637..25af2b6caa 100644
--- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
+++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c
@@ -42,12 +42,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, LT2_F, KC_G, KC_H, KC_J, KC_K, KC_L, RSF_SCL, LT3_QOT, KC_ENT,
KC_LSFT, TG4, KC_Z, KC_X, KC_C, LT3_V, KC_B, LT2_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_BTN1, KC_BTN2, KC_LALT, LGU_NCV, LT1_SPC, RCT_ESC, RGU_ENT, RAL_CNV, KC_INT1, KC_DEL, MU_TOGG
+ MS_BTN1, MS_BTN2, KC_LALT, LGU_NCV, LT1_SPC, RCT_ESC, RGU_ENT, RAL_CNV, KC_INT1, KC_DEL, MU_TOGG
),
// Layer 1, Space-modifiers: Basic keys
LAYOUT_diag_4x14(
- QK_BOOT, KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP, KC_BTN2, KC_INT1, KC_MINS, KC_EQL, KC_INT3, SFT_LBR, KC_TRNS,
+ QK_BOOT, KC_EXEC, KC_HELP, KC_MENU, KC_SLCT, KC_STOP, MS_BTN2, KC_INT1, KC_MINS, KC_EQL, KC_INT3, SFT_LBR, KC_TRNS,
KC_TRNS, KC_AGIN, KC_FIND, KC_PGUP, KC_PGDN, KC_F19, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_ENT, SFT_7, SFT_2,
KC_TRNS, KC_TRNS, KC_UNDO, KC_CUT, KC_COPY, KC_PSTE, KC_APP, KC_BSPC, KC_DEL, KC_RBRC, KC_BSLS, KC_HOME, KC_END,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RCT_IN7, RGU_IN8, KC_TRNS, KC_INT2, KC_INT4, MU_NEXT
@@ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Layer 3, V,:-modifiers: Functions and mouse keys
LAYOUT_diag_4x14(
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS,
- KC_MPLY, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN3, KC_TRNS, KC_TRNS,
+ KC_MPLY, KC_MRWD, KC_MFFD, KC_MUTE, KC_VOLD, KC_VOLU, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, MS_BTN3, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN2, KC_BTN1, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN2, MS_BTN1, MS_WHLD, MS_WHLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
// Layer 4, Toggles: One handed mode
diff --git a/keyboards/handwired/videowriter/keymaps/default/keymap.c b/keyboards/handwired/videowriter/keymaps/default/keymap.c
index d1c9e26655..09cc4f6bac 100644
--- a/keyboards/handwired/videowriter/keymaps/default/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/default/keymap.c
@@ -65,8 +65,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
- _______, KC_WH_U, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, KC_WH_D, KC_MS_L, KC_MS_D, KC_MS_R, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______,
+ _______, MS_WHLU, MS_BTN1, MS_UP, MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
+ _______, MS_WHLD, MS_LEFT, MS_DOWN, MS_RGHT, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______
)
diff --git a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index e9adc11ad7..b30ac967ea 100644
--- a/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -70,8 +70,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN1] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_PAUS, KC_HOME, KC_PGDN, KC_PGUP, KC_END,
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_RCTL,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,
+ _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU ,_______, _______, _______, KC_UP, _______, _______, _______, _______, KC_RCTL,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______
)
diff --git a/keyboards/handwired/wulkan/keyboard.json b/keyboards/handwired/wulkan/keyboard.json
index c804409b7d..c79b71ce49 100644
--- a/keyboards/handwired/wulkan/keyboard.json
+++ b/keyboards/handwired/wulkan/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"matrix_pins": {
"cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"],
diff --git a/keyboards/handwired/wulkan/keymaps/default/keymap.c b/keyboards/handwired/wulkan/keymaps/default/keymap.c
index e38c0322c9..a065a94acf 100644
--- a/keyboards/handwired/wulkan/keymaps/default/keymap.c
+++ b/keyboards/handwired/wulkan/keymaps/default/keymap.c
@@ -95,9 +95,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `-----------------------------------------------------------------------------------'
*/
[_ADJUST] = LAYOUT_ortho_4x12(
- _______, QK_BOOT, _______, _______, KC_WH_U, _______, _______, KC_MS_U, _______, _______, UP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL,
- _______, _______, _______, _______, KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, UP(SE_ODIA_LOW, SE_ODIA_HIGH), UP(SE_ADIA_LOW, SE_ADIA_HIGH), _______,
- _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, KC_BTN1, _______, KC_BTN2, _______, _______, _______,
+ _______, QK_BOOT, _______, _______, MS_WHLU, _______, _______, MS_UP, _______, _______, UP(SE_ARNG_LOW, SE_ARNG_HIGH), KC_DEL,
+ _______, _______, _______, _______, MS_WHLD, _______, MS_LEFT, MS_DOWN, MS_RGHT, UP(SE_ODIA_LOW, SE_ODIA_HIGH), UP(SE_ADIA_LOW, SE_ADIA_HIGH), _______,
+ _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, MS_BTN1, _______, MS_BTN2, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
};
diff --git a/keyboards/handwired/wwa/soyuz/keyboard.json b/keyboards/handwired/wwa/soyuz/keyboard.json
index 4b3a015a35..b922af10a2 100644
--- a/keyboards/handwired/wwa/soyuz/keyboard.json
+++ b/keyboards/handwired/wwa/soyuz/keyboard.json
@@ -8,7 +8,8 @@
"bootmagic": true,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "encoder" : true
},
"matrix_pins": {
"cols": ["GP0", "GP1", "GP2", "GP3", "GP4", "GP5", "GP6"],
@@ -20,6 +21,13 @@
"pid": "0x0004",
"vid": "0x5757"
},
+ "encoder": {
+ "rotary": [
+ {"pin_a": "GP16", "pin_b": "GP17"},
+ {"pin_a": "GP18", "pin_b": "GP19"},
+ {"pin_a": "GP20", "pin_b": "GP21"}
+ ]
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
index af0eb592dc..c1d75ffc54 100644
--- a/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/keymap.c
@@ -3,11 +3,17 @@
#include QMK_KEYBOARD_H
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17,
KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24
)
-}; \ No newline at end of file
+};
+
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+ [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+};
+#endif
diff --git a/keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk b/keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/handwired/wwa/soyuz/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/handwired/wwa/soyuz/readme.md b/keyboards/handwired/wwa/soyuz/readme.md
index 69f8ef9d76..01a3b60dfe 100644
--- a/keyboards/handwired/wwa/soyuz/readme.md
+++ b/keyboards/handwired/wwa/soyuz/readme.md
@@ -2,7 +2,7 @@
![soyuz](https://i.imgur.com/KwwORGSh.jpeg)
-21 Key and 3 MIDI Potentiometers Macro Keyboard
+21 Key, 3 Encoder
* Keyboard Maintainer: [spacehangover](https://github.com/spacehangover)
* Hardware Supported: RP2040 Handwired
diff --git a/keyboards/handwired/xealous/rev1/keyboard.json b/keyboards/handwired/xealous/rev1/keyboard.json
index 55e99eeb54..ac7b27208f 100644
--- a/keyboards/handwired/xealous/rev1/keyboard.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4131",
"pid": "0x5141",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"build": {
"debounce_type": "sym_eager_pk"
diff --git a/keyboards/hardwareabstraction/handwire/handwire.c b/keyboards/hardwareabstraction/handwire/handwire.c
index b31c0a7091..758cfd8885 100644
--- a/keyboards/hardwareabstraction/handwire/handwire.c
+++ b/keyboards/hardwareabstraction/handwire/handwire.c
@@ -132,7 +132,7 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// Variables for display layer and haptic status on OLED
static uint8_t layer = 0;
-haptic_config_t haptic_config;
+extern haptic_config_t haptic_config;
// Variables for frames, timer, and sleep
uint32_t anim_timer = 0;
diff --git a/keyboards/helix/beta/beta.c b/keyboards/helix/beta/beta.c
new file mode 100644
index 0000000000..8020772b96
--- /dev/null
+++ b/keyboards/helix/beta/beta.c
@@ -0,0 +1,77 @@
+// Copyright 2020 Yushakobo
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+#ifdef OLED_ENABLE
+void render_status(void) {
+ static const char os_logo[][2][3] PROGMEM = {{{0x95, 0x96, 0}, {0xb5, 0xb6, 0}}, {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}}};
+ if (!keymap_config.swap_lalt_lgui) {
+ oled_write_P(os_logo[0][0], false);
+ oled_write_P(PSTR("\n"), false);
+ oled_write_P(os_logo[0][1], false);
+ } else {
+ oled_write_P(os_logo[1][0], false);
+ oled_write_P(PSTR("\n"), false);
+ oled_write_P(os_logo[1][1], false);
+ }
+
+ oled_write_P(PSTR(" Layer: "), false);
+ switch (get_highest_layer(layer_state)) {
+ case 0:
+ oled_write_ln_P(PSTR("Default"), false);
+ break;
+ case 1:
+ oled_write_ln_P(PSTR("Lower"), false);
+ break;
+ case 2:
+ oled_write_ln_P(PSTR("Raise"), false);
+ break;
+ case 3:
+ oled_write_ln_P(PSTR("Adjust"), false);
+ break;
+ default:
+ oled_write_ln_P(PSTR("Undefined"), false);
+ }
+ oled_write_P(PSTR("\n"), false);
+
+ led_t led_state = host_keyboard_led_state();
+ oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR(" "), false);
+ oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR(" "), false);
+ oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR(" "), false);
+}
+
+static void render_logo(void) {
+ static const char PROGMEM qmk_logo[] = {
+ // clang-format off
+ 0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+ 0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+ 0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+ // clang-format on
+ };
+ oled_write_P(qmk_logo, false);
+}
+
+static void render_rgblight_status(void) {
+ oled_write_P(PSTR(" LED"), false);
+ oled_write(get_u8_str(rgblight_get_mode(), ' '), false);
+ oled_write_char(':', false);
+ oled_write(get_u8_str(rgblight_get_hue() / RGBLIGHT_HUE_STEP, ' '), false);
+ oled_write_char(',', false);
+ oled_write(get_u8_str(rgblight_get_sat() / RGBLIGHT_SAT_STEP, ' '), false);
+ oled_write_char(',', false);
+ oled_write(get_u8_str(rgblight_get_val() / RGBLIGHT_VAL_STEP, ' '), false);
+}
+
+bool oled_task_kb(void) {
+ if (!oled_task_user()) {
+ return false;
+ }
+ if (is_keyboard_master()) {
+ render_status();
+ } else {
+ render_logo();
+ render_rgblight_status();
+ }
+ return false;
+}
+#endif
diff --git a/keyboards/helix/beta/config.h b/keyboards/helix/beta/config.h
new file mode 100644
index 0000000000..dac611de9a
--- /dev/null
+++ b/keyboards/helix/beta/config.h
@@ -0,0 +1,5 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#define OLED_FONT_H "keyboards/helix/common/glcdfont.c"
diff --git a/keyboards/helix/rev2/info.json b/keyboards/helix/beta/keyboard.json
index a8bdb23e41..240a0a8869 100644
--- a/keyboards/helix/rev2/info.json
+++ b/keyboards/helix/beta/keyboard.json
@@ -1,52 +1,105 @@
{
- "keyboard_name": "Helix Beta",
"manufacturer": "Yushakobo",
- "url": "https://github.com/MakotoKurauchi/helix",
+ "keyboard_name": "Helix Beta",
"maintainer": "MakotoKurauchi",
- "usb": {
- "vid": "0x3265",
- "pid": "0x0000",
- "device_version": "0.0.1"
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "oled": true,
+ "rgblight": true
},
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
},
- "diode_direction": "COL2ROW",
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- },
- "transport": {
- "sync": {
- "indicators": true,
- "layer_state": true
- }
- }
- },
- "tapping": {
- "term": 100
- },
"rgblight": {
- "hue_steps": 10,
"animations": {
"breathing": true,
+ "christmas": true,
+ "knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"snake": true,
- "knight": true,
- "christmas": true,
"static_gradient": true
+ },
+ "led_count": 64,
+ "max_brightness": 45,
+ "split_count": [32, 32]
+ },
+ "split": {
+ "enabled": true,
+ "serial": {
+ "pin": "D2"
}
},
+ "url": "https://shop.yushakobo.jp/products/oss_pcb?variant=39452554231969",
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x0000",
+ "vid": "0x3265"
+ },
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
"layouts": {
- "LAYOUT": {
+ "LAYOUT_4row": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [4, 5], "x": 9, "y": 0},
+ {"matrix": [4, 4], "x": 10, "y": 0},
+ {"matrix": [4, 3], "x": 11, "y": 0},
+ {"matrix": [4, 2], "x": 12, "y": 0},
+ {"matrix": [4, 1], "x": 13, "y": 0},
+ {"matrix": [4, 0], "x": 14, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [5, 5], "x": 9, "y": 1},
+ {"matrix": [5, 4], "x": 10, "y": 1},
+ {"matrix": [5, 3], "x": 11, "y": 1},
+ {"matrix": [5, 2], "x": 12, "y": 1},
+ {"matrix": [5, 1], "x": 13, "y": 1},
+ {"matrix": [5, 0], "x": 14, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [6, 5], "x": 9, "y": 2},
+ {"matrix": [6, 4], "x": 10, "y": 2},
+ {"matrix": [6, 3], "x": 11, "y": 2},
+ {"matrix": [6, 2], "x": 12, "y": 2},
+ {"matrix": [6, 1], "x": 13, "y": 2},
+ {"matrix": [6, 0], "x": 14, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3},
+ {"matrix": [3, 6], "x": 6, "y": 3},
+ {"matrix": [7, 6], "x": 8, "y": 3},
+ {"matrix": [7, 5], "x": 9, "y": 3},
+ {"matrix": [7, 4], "x": 10, "y": 3},
+ {"matrix": [7, 3], "x": 11, "y": 3},
+ {"matrix": [7, 2], "x": 12, "y": 3},
+ {"matrix": [7, 1], "x": 13, "y": 3},
+ {"matrix": [7, 0], "x": 14, "y": 3}
+ ]
+ },
+ "LAYOUT_5row": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
@@ -54,42 +107,36 @@
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
-
{"matrix": [5, 5], "x": 9, "y": 0},
{"matrix": [5, 4], "x": 10, "y": 0},
{"matrix": [5, 3], "x": 11, "y": 0},
{"matrix": [5, 2], "x": 12, "y": 0},
{"matrix": [5, 1], "x": 13, "y": 0},
{"matrix": [5, 0], "x": 14, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
-
{"matrix": [6, 5], "x": 9, "y": 1},
{"matrix": [6, 4], "x": 10, "y": 1},
{"matrix": [6, 3], "x": 11, "y": 1},
{"matrix": [6, 2], "x": 12, "y": 1},
{"matrix": [6, 1], "x": 13, "y": 1},
{"matrix": [6, 0], "x": 14, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
-
{"matrix": [7, 5], "x": 9, "y": 2},
{"matrix": [7, 4], "x": 10, "y": 2},
{"matrix": [7, 3], "x": 11, "y": 2},
{"matrix": [7, 2], "x": 12, "y": 2},
{"matrix": [7, 1], "x": 13, "y": 2},
{"matrix": [7, 0], "x": 14, "y": 2},
-
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
@@ -97,7 +144,6 @@
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3},
{"matrix": [3, 6], "x": 6, "y": 3},
-
{"matrix": [8, 6], "x": 8, "y": 3},
{"matrix": [8, 5], "x": 9, "y": 3},
{"matrix": [8, 4], "x": 10, "y": 3},
@@ -105,7 +151,6 @@
{"matrix": [8, 2], "x": 12, "y": 3},
{"matrix": [8, 1], "x": 13, "y": 3},
{"matrix": [8, 0], "x": 14, "y": 3},
-
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
@@ -113,7 +158,6 @@
{"matrix": [4, 4], "x": 4, "y": 4},
{"matrix": [4, 5], "x": 5, "y": 4},
{"matrix": [4, 6], "x": 6, "y": 4},
-
{"matrix": [9, 6], "x": 8, "y": 4},
{"matrix": [9, 5], "x": 9, "y": 4},
{"matrix": [9, 4], "x": 10, "y": 4},
diff --git a/keyboards/helix/beta/keymaps/default/keymap.json b/keyboards/helix/beta/keymaps/default/keymap.json
new file mode 100644
index 0000000000..1719abca5b
--- /dev/null
+++ b/keyboards/helix/beta/keymaps/default/keymap.json
@@ -0,0 +1,28 @@
+{
+ "keyboard": "helix/beta",
+ "keymap": "default",
+ "layout": "LAYOUT_5row",
+ "layers": [
+ [
+ "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_DEL",
+ "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC",
+ "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
+ "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_LBRC", "KC_RBRC", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_ENT" ,
+ "MO(3)", "KC_ESC", "KC_LALT", "KC_LGUI", "LALT(KC_GRV)", "MO(1)", "KC_SPC", "KC_SPC", "MO(2)", "LALT(KC_GRV)", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_DEL",
+ "_______", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_MINS", "KC_EQL", "KC_LBRC", "KC_RBRC", "KC_BSLS",
+ "KC_CAPS", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "_______", "_______", "KC_F12", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MPLY"
+ ],
+ [
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12",
+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "AG_NORM", "AG_SWAP", "_______", "_______", "UG_TOGG", "UG_HUEU", "UG_SATU", "UG_VALU",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "UG_NEXT", "UG_HUED", "UG_SATD", "UG_VALD"
+ ]
+ ]
+}
diff --git a/keyboards/helix/pico/back/keyboard.json b/keyboards/helix/pico/back/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/pico/back/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/pico/back/rules.mk b/keyboards/helix/pico/back/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/pico/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/base/keyboard.json b/keyboards/helix/pico/base/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/pico/base/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/pico/config.h b/keyboards/helix/pico/config.h
index 6ba88a559c..13de9d5178 100644
--- a/keyboards/helix/pico/config.h
+++ b/keyboards/helix/pico/config.h
@@ -1,96 +1,5 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-Copyright 2018 MakotoKurauchi
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#define QUICK_TAP_TERM 0
-
-#define SERIAL_SLAVE_BUFFER_LENGTH ((MATRIX_ROWS)/2)
-#define SERIAL_MASTER_BUFFER_LENGTH ((MATRIX_ROWS)/2)
-
-/* key matrix size */
-// Rows are doubled-up
-#define MATRIX_ROWS 8
-#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COLS 7
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* Audio */
-#ifdef AUDIO_ENABLE
- #define AUDIO_PIN B5
-#endif
-
-// Helix keyboard RGB LED support
-// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
-#ifdef RGBLED_BACK
- #define RGBLIGHT_LED_COUNT 25
-#else
- #define RGBLIGHT_LED_COUNT 6
-#endif
-
-#ifndef IOS_DEVICE_ENABLE
- #if RGBLIGHT_LED_COUNT <= 6
- #define RGBLIGHT_LIMIT_VAL 255
- #else
- #define RGBLIGHT_LIMIT_VAL 130
- #endif
- #define RGBLIGHT_VAL_STEP 17
-#else
- #if RGBLIGHT_LED_COUNT <= 6
- #define RGBLIGHT_LIMIT_VAL 90
- #else
- #define RGBLIGHT_LIMIT_VAL 45
- #endif
- #define RGBLIGHT_VAL_STEP 4
-#endif
-
-#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
-// USB_MAX_POWER_CONSUMPTION value for Helix keyboard
-// 120 RGBoff
-// 330 RGB 6
-// 300 RGB 32
-// 310 OLED & RGB 32
- #define USB_MAX_POWER_CONSUMPTION 400
-#else
- // fix iPhone and iPad power adapter issue
- // iOS device need lessthan 100
- #define USB_MAX_POWER_CONSUMPTION 100
-#endif
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
+#define AUDIO_PIN B5
diff --git a/keyboards/helix/pico/info.json b/keyboards/helix/pico/keyboard.json
index 7909bb0b30..61ea537576 100644
--- a/keyboards/helix/pico/info.json
+++ b/keyboards/helix/pico/keyboard.json
@@ -1,39 +1,49 @@
{
- "keyboard_name": "HelixPico",
"manufacturer": "Yushakobo",
- "url": "https://github.com/MakotoKurauchi/helix",
+ "keyboard_name": "Helix Pico",
"maintainer": "MakotoKurauchi",
- "usb": {
- "vid": "0x3265",
- "pid": "0x0001",
- "device_version": "0.0.2"
- },
- "split": {
- "enabled": true,
- "serial": {
- "pin": "D2"
- }
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "audio": false,
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "rgblight": true
},
- "tapping": {
- "term": 100
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
+ "rows": ["D4", "C6", "D7", "E6"]
},
"rgblight": {
- "hue_steps": 10,
"animations": {
"breathing": true,
+ "christmas": true,
+ "knight": true,
"rainbow_mood": true,
"rainbow_swirl": true,
"snake": true,
- "knight": true,
- "christmas": true,
"static_gradient": true
+ },
+ "led_count": 50,
+ "max_brightness": 45,
+ "split_count": [25, 25]
+ },
+ "split": {
+ "enabled": true,
+ "serial": {
+ "pin": "D2"
}
},
+ "url": "https://shop.yushakobo.jp/products/helixpico-pcb",
+ "usb": {
+ "device_version": "0.0.2",
+ "pid": "0x0001",
+ "vid": "0x3265"
+ },
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
@@ -43,42 +53,36 @@
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0},
{"matrix": [0, 5], "x": 5, "y": 0},
-
{"matrix": [4, 5], "x": 9, "y": 0},
{"matrix": [4, 4], "x": 10, "y": 0},
{"matrix": [4, 3], "x": 11, "y": 0},
{"matrix": [4, 2], "x": 12, "y": 0},
{"matrix": [4, 1], "x": 13, "y": 0},
{"matrix": [4, 0], "x": 14, "y": 0},
-
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [1, 5], "x": 5, "y": 1},
-
{"matrix": [5, 5], "x": 9, "y": 1},
{"matrix": [5, 4], "x": 10, "y": 1},
{"matrix": [5, 3], "x": 11, "y": 1},
{"matrix": [5, 2], "x": 12, "y": 1},
{"matrix": [5, 1], "x": 13, "y": 1},
{"matrix": [5, 0], "x": 14, "y": 1},
-
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [2, 5], "x": 5, "y": 2},
-
{"matrix": [6, 5], "x": 9, "y": 2},
{"matrix": [6, 4], "x": 10, "y": 2},
{"matrix": [6, 3], "x": 11, "y": 2},
{"matrix": [6, 2], "x": 12, "y": 2},
{"matrix": [6, 1], "x": 13, "y": 2},
{"matrix": [6, 0], "x": 14, "y": 2},
-
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
@@ -86,7 +90,6 @@
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [3, 5], "x": 5, "y": 3},
{"matrix": [3, 6], "x": 6, "y": 3},
-
{"matrix": [7, 6], "x": 8, "y": 3},
{"matrix": [7, 5], "x": 9, "y": 3},
{"matrix": [7, 4], "x": 10, "y": 3},
diff --git a/keyboards/helix/pico/keymaps/default/config.h b/keyboards/helix/pico/keymaps/default/config.h
deleted file mode 100644
index 0bd76a18b4..0000000000
--- a/keyboards/helix/pico/keymaps/default/config.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-#ifdef AUDIO_ENABLE
- #define STARTUP_SONG SONG(STARTUP_SOUND)
- #define AUDIO_CLICKY
-#endif
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
- #define RGBLIGHT_EFFECT_BREATHING
- #define RGBLIGHT_EFFECT_RAINBOW_MOOD
- #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- #define RGBLIGHT_EFFECT_SNAKE
- #define RGBLIGHT_EFFECT_KNIGHT
- #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- //#define RGBLIGHT_EFFECT_RGB_TEST
- //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/helix/pico/keymaps/default/keymap.c b/keyboards/helix/pico/keymaps/default/keymap.c
deleted file mode 100644
index 28f6a20f9b..0000000000
--- a/keyboards/helix/pico/keymaps/default/keymap.c
+++ /dev/null
@@ -1,329 +0,0 @@
-/* Copyright 2018 MakotoKurauchi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _QWERTY = 0,
- _COLEMAK,
- _DVORAK,
- _LOWER,
- _RAISE,
- _ADJUST
-};
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- COLEMAK,
- DVORAK,
- LOWER,
- RAISE,
- ADJUST,
- BACKLIT,
- EISU,
- KANA,
- RGBRST
-};
-
-enum macro_keycodes {
- KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
-
-[_QWERTY] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
- /* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_COLEMAK] = LAYOUT(
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_DVORAK] = LAYOUT(
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_BSPC,
- KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc | Home | End | |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc |PageDn|PageUp| |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, KC_PSCR, KC_PGDN, KC_PGUP, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | Reset|RGBRST| | | | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | |Aud on|Audoff|MU TOG|MU MOD| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | |CK TOG|CK RST| CK UP|CK DWN| | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, AU_ON, AU_OFF, MU_TOGG, MU_NEXT, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, CK_TOGG, CK_RST, CK_UP, CK_DOWN, _______, _______, _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD
- )
-};
-
-
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
-float tone_plover[][2] = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
- if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode);
- #endif
- layer_on(layer3);
- } else {
- layer_off(layer3);
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
- case COLEMAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_colemak);
- #endif
- set_single_persistent_default_layer(_COLEMAK);
- }
- return false;
- break;
- case DVORAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
- set_single_persistent_default_layer(_DVORAK);
- }
- return false;
- break;
- case LOWER:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
- #endif
- }
- layer_on(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- TOG_STATUS = false;
- layer_off(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case RAISE:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE);
- #endif
- }
- layer_on(_RAISE);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- layer_off(_RAISE);
- TOG_STATUS = false;
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case ADJUST:
- if (record->event.pressed) {
- layer_on(_ADJUST);
- } else {
- layer_off(_ADJUST);
- }
- return false;
- break;
- //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
- case QK_UNDERGLOW_MODE_NEXT:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- rgblight_mode(RGB_current_mode);
- rgblight_step();
- RGB_current_mode = rgblight_config.mode;
- }
- #endif
- return false;
- break;
- case EISU:
- if (record->event.pressed) {
- if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LNG2);
- }else{
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG2);
- }
- return false;
- break;
- case KANA:
- if (record->event.pressed) {
- if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LNG1);
- }else{
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG1);
- }
- return false;
- break;
- case RGBRST:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- eeconfig_update_rgblight_default();
- rgblight_enable();
- RGB_current_mode = rgblight_config.mode;
- }
- #endif
- break;
- }
- return true;
-}
-
-void matrix_init_user(void) {
- #ifdef RGBLIGHT_ENABLE
- RGB_current_mode = rgblight_config.mode;
- #endif
-}
diff --git a/keyboards/helix/pico/keymaps/default/keymap.json b/keyboards/helix/pico/keymaps/default/keymap.json
new file mode 100644
index 0000000000..031ca79677
--- /dev/null
+++ b/keyboards/helix/pico/keymaps/default/keymap.json
@@ -0,0 +1,25 @@
+{
+ "keyboard": "helix/pico",
+ "keymap": "default",
+ "layout": "LAYOUT",
+ "layers": [
+ [
+ "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_BSPC",
+ "KC_LCTL", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT",
+ "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_ENT" ,
+ "MO(3)", "KC_ESC", "KC_LALT", "KC_LGUI", "LALT(KC_GRV)", "MO(1)", "KC_SPC", "KC_SPC", "MO(2)", "LALT(KC_GRV)", "KC_LEFT", "KC_DOWN", "KC_UP", "KC_RGHT"
+ ],
+ [
+ "KC_GRV", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_DEL",
+ "_______", "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_MINS", "KC_EQL", "KC_LBRC", "KC_RBRC", "KC_BSLS",
+ "KC_CAPS", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12", "_______", "_______", "KC_PGDN", "KC_PGUP", "_______",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "KC_MNXT", "KC_VOLD", "KC_VOLU", "KC_MPLY"
+ ],
+ [
+ "KC_F1", "KC_F2", "KC_F3", "KC_F4", "KC_F5", "KC_F6", "KC_F7", "KC_F8", "KC_F9", "KC_F10", "KC_F11", "KC_F12",
+ "QK_BOOT", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+ "EE_CLR", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "UG_TOGG", "UG_HUEU", "UG_SATU", "UG_VALU",
+ "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "UG_NEXT", "UG_HUED", "UG_SATD", "UG_VALD"
+ ]
+ ]
+}
diff --git a/keyboards/helix/pico/keymaps/default/readme.md b/keyboards/helix/pico/keymaps/default/readme.md
deleted file mode 100644
index a6c81651a3..0000000000
--- a/keyboards/helix/pico/keymaps/default/readme.md
+++ /dev/null
@@ -1,137 +0,0 @@
-# The Default HelixPico Layout
-## Layout
-
-### Qwerty
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Colemak
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | | K | M | , | . | / |Enter |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Dvorak
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Tab | ' | , | . | P | Y | | F | G | C | R | L | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Shift| ; | Q | J | K | X | | B | M | W | V | Z |Enter |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## Layers
-
-|Priority|number|name|description|
-| ---- | ---- | --- | --- |
-|high|16|Adjust|Functions|
-||4|Raise|Numeric charactors|
-||3|Lower|Other charactors|
-||2|Dvorak|Dvorak leyout|
-||1|Colemak|Colemak leyout|
-|low|0|Qwerty|QWERTY leyout(base)|
-
-### Lower
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc | Home | End | |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Raise
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc |PageDn|PageUp| |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Adjust (Lower + Raise)
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | Reset| | | | | | | | | | | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |Aud on|Audoff|MU TOG|MU MOD| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |CK TOG|CK RST| CK UP|CK DWN| | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## Customize
-
-see `qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk`
-
-```
-# Helix Spacific Build Options
-# you can uncomment and edit follows 4 Variables
-# jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-## Compile
-
-go to qmk top directory.
-```
-$ cd qmk_firmware
-```
-
-build
-```
-$ make helix/pico:default
-$ make helix/pico/back:default # with backlight
-$ make HELIX=no-ani helix/pico/back:default # with backlight without animation
-$ make helix/pico/under:default # with underglow
-```
-
-build (experimental use of split_common with backlight)
-```
-$ make helix/pico/sc:default
-```
-
-flash to keyboard
-```
-$ make helix/pico:default:flash
-$ make helix/pico/back:default:flash # with backlight
-$ make HELIX=no_ani helix/pico/back:default:flash # with backlight without animation
-$ make helix/pico/under:default:flash # with underglow
-
-```
-
-## Link
-* more detail wrote in Japanese [helix/Doc/firmware_jp.md](https://github.com/MakotoKurauchi/helix/blob/master/Doc/firmware_jp.md)
-* [Helix top](https://github.com/MakotoKurauchi/helix)
diff --git a/keyboards/helix/pico/keymaps/default/readme_jp.md b/keyboards/helix/pico/keymaps/default/readme_jp.md
deleted file mode 100644
index 73f97ad9a6..0000000000
--- a/keyboards/helix/pico/keymaps/default/readme_jp.md
+++ /dev/null
@@ -1,138 +0,0 @@
-# The Default HelixPico Layout
-## 配列
-
-### Qwerty配列
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | | N | M | , | . | / |Enter |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Lower
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc | Home | End | |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Raise
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | | F12 | | PrSc |PageDn|PageUp| |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Adjust (Lower + Raise)
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | Reset| | | | | | | | | | | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |Aud on|Audoff|MU TOG|MU MOD| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |CK TOG|CK RST| CK UP|CK DWN| | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- |------+------+------+------+------+------+-------------+------+------+------+------+------+------|
- | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- `-------------------------------------------------------------------------------------------------'
-```
-
-他の配列(Colemak,Dvorak)は、[readme.md](readme.md) を参照
-
-## カスタマイズ
-
-RGB バックライトまたは、RGB Underglow をつけた場合は、
-`qmk_firmware/keyboards/helix/pico/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
-
-```
-# Helix Spacific Build Options
-# you can uncomment and edit follows 4 Variables
-# jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-
-## RGB バックライトを有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-
-```
-LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
-```
-
-## RGB Underglow を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.)
-```
-
-## iPad/iPhoneサポートを有効にする。
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone にも接続できるようになります。
-
-```
-IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-
-## コンパイルの仕方
-
-コンパイルは、qmk_firmware のトップディレクトリで行います。
-
-```
-$ cd qmk_firmware
-```
-qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
-
-```
-$ make helix/pico:default
-```
-
-キーボードへの書き込みまで同時に行うには下記のように`:flash`を付けます。
-
-```
-$ make helix/pico:default:flash
-```
-
-コンパイル結果と中間生成物を消去したい場合は以下のようにします。
-
-```
-$ make helix/pico:default:clean
-```
-
-上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
-
-RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make helix/pico/back:default:flash
-```
-
-RGB Underglow を有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make helix/pico/under:default:flash
-```
-
-## リンク
-
-* さらに詳細は、[こちら helix/Doc/firmware_jp.md](https://github.com/MakotoKurauchi/helix/blob/master/Doc/firmware_jp.md)をご覧ください。
-* [Helix top](https://github.com/MakotoKurauchi/helix)
diff --git a/keyboards/helix/pico/keymaps/default/rules.mk b/keyboards/helix/pico/keymaps/default/rules.mk
deleted file mode 100644
index 9a29406c17..0000000000
--- a/keyboards/helix/pico/keymaps/default/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRAKEY_ENABLE = yes # Audio control and System control
-AUDIO_ENABLE = yes # Audio output
-LTO_ENABLE = no # if firmware size over limit, try this option
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 4 Variables
-# jp: 以下の4つの変数を必要に応じて編集し、コメントアウトをはずします。
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
diff --git a/keyboards/helix/pico/override_helix_options.mk-maintenance b/keyboards/helix/pico/override_helix_options.mk-maintenance
deleted file mode 100644
index 0ff930957e..0000000000
--- a/keyboards/helix/pico/override_helix_options.mk-maintenance
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# This file is not normally used. It is used for maintenance testing purposes.
-# To use it, do the following:
-#
-# $ cp override_helix_options.mk-maintenance override_helix_options.mk
-#
-$(info -------------------------)
-$(info override_helix_options.mk)
-$(info -------------------------)
-
-define HELIX_OVERRIDE_PARSE
- ifeq ($(strip $1),back)
- LED_BACK_ENABLE = yes
- LED_UNDERGLOW_ENABLE = no
- endif
- ifeq ($(strip $1),under)
- LED_BACK_ENABLE = no
- LED_UNDERGLOW_ENABLE = yes
- endif
- ifneq ($(filter noled led-off led_off,$(strip $1)),)
- LED_BACK_ENABLE = no
- LED_UNDERGLOW_ENABLE = no
- endif
- ifneq ($(filter noaudio audio-off audio_off,$(strip $1)),)
- AUDIO_ENABLE = no
- endif
- ifneq ($(filter audio audio-on audio_on,$(strip $1)),)
- AUDIO_ENABLE = yes
- endif
- ifneq ($(filter sc split-common split_common,$(strip $1)),)
- SPLIT_KEYBOARD = yes
- endif
- ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
- SPLIT_KEYBOARD = no
- endif
- ifeq ($(strip $1),scan)
- DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
- endif
- ifeq ($(strip $1),scan-api)
- DEBUG_MATRIX_SCAN_RATE_ENABLE = api
- endif
-endef # end of HELIX_OVERRIDE_PARSE
diff --git a/keyboards/helix/pico/pico.c b/keyboards/helix/pico/pico.c
deleted file mode 100644
index cc98fe8f61..0000000000
--- a/keyboards/helix/pico/pico.c
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2018 MakotoKurauchi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "pico.h"
-
-// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
-// But keep 'is_master' for a while for backwards compatibility
-// for the old keymap.c.
-uint8_t is_master = false;
-
-void matrix_init_kb(void) {
- // Each keymap.c should use is_keyboard_master() instead of is_master.
- // But keep is_master for a while for backwards compatibility
- // for the old keymap.c.
- is_master = is_keyboard_master();
-
- matrix_init_user();
-};
-
-void keyboard_post_init_kb(void) {
-#if defined(DEBUG_MATRIX_SCAN_RATE)
- debug_enable = true;
-#endif
- keyboard_post_init_user();
-}
diff --git a/keyboards/helix/pico/pico.h b/keyboards/helix/pico/pico.h
deleted file mode 100644
index 7f2d795ca8..0000000000
--- a/keyboards/helix/pico/pico.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Copyright 2018 MakotoKurauchi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
-// But keep 'is_master' for a while for backwards compatibility
-// for the old keymap.c.
-extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to use 'is_keyboard_master ()' instead.
-#define has_usb() is_keyboard_master()
diff --git a/keyboards/helix/pico/post_config.h b/keyboards/helix/pico/post_config.h
deleted file mode 100644
index dda73d5d22..0000000000
--- a/keyboards/helix/pico/post_config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(SPLIT_KEYBOARD) /* if use split_common */
-# if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_SPLIT)
-# define RGBLIGHT_SPLIT /* helix hardware need this */
-# endif
-#endif
diff --git a/keyboards/helix/pico/post_rules.mk b/keyboards/helix/pico/post_rules.mk
deleted file mode 100644
index 88bb5482ba..0000000000
--- a/keyboards/helix/pico/post_rules.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#
-# post_rules.mk contains post-processing rules for the Helix keyboard.
-#
-# Post-processing rules convert keyboard-specific shortcuts (that represent
-# combinations of standard options) into QMK standard options.
-#
--include $(strip $(HELIX_TOP_DIR)/pico/override_helix_options.mk) ## File dedicated to maintenance
-
-# Parse 'HELIX=xx,yy,zz' option
-ifneq ($(strip $(HELIX)),)
- # make HELIX=ios helix/pico:AKEYMAP
- # make HELIX=no-ani helix/pico:AKEYMAP
- # make HELIX=ios,no-ani helix/pico:AKEYMAP
- define HELIX_OPTION_PARSE
- # parce 'no-ani' 'ios'
- $(if $(SHOW_PARCE),$(info parse .$1.)) #debug
- $(if $(HELIX_OVERRIDE_PARSE),$(call HELIX_OVERRIDE_PARSE,$1))
-
- ifeq ($(strip $1),ios)
- IOS_DEVICE_ENABLE = yes
- endif
- ifneq ($(filter na no_ani no-ani,$(strip $1)),)
- LED_ANIMATIONS = no
- endif
- endef # end of HELIX_OPTION_PARSE
-
- COMMA=,
- $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)), \
- $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME))))
- SHOW_HELIX_OPTIONS = yes
-endif
-
-########
-# convert Helix-specific options (that represent combinations of standard options)
-# into QMK standard options.
-
-ifeq ($(strip $(LED_BACK_ENABLE)), yes)
- RGBLIGHT_ENABLE = yes
- OPT_DEFS += -DRGBLED_BACK
- ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
- $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes')
- endif
-else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
- RGBLIGHT_ENABLE = yes
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
- OPT_DEFS += -DIOS_DEVICE_ENABLE
-endif
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
- OPT_DEFS += -DLED_ANIMATIONS
-endif
-
-ifeq ($(strip $(AUDIO_ENABLE)),yes)
- ifeq ($(strip $(RGBLIGHT_ENABLE)),yes)
- LTO_ENABLE = yes
- endif
-endif
-
-ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
- $(info Helix Spacific Build Options)
- $(info - LED_BACK_ENABLE = $(LED_BACK_ENABLE))
- $(info - LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
- $(info - LED_ANIMATIONS = $(LED_ANIMATIONS))
- $(info - IOS_DEVICE_ENABLE = $(IOS_DEVICE_ENABLE))
- $(info )
- $(info QMK Build Options)
- $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
- $(info -- AUDIO_ENABLE = $(AUDIO_ENABLE))
- $(info -- RGBLIGHT_ENABLE = $(RGBLIGHT_ENABLE))
- $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
- $(info -- OPT_DEFS = $(OPT_DEFS))
- $(info -- LTO_ENABLE = $(LTO_ENABLE))
- $(info -- DEBUG_MATRIX_SCAN_RATE_ENABLE = $(DEBUG_MATRIX_SCAN_RATE_ENABLE))
- $(info )
-endif
diff --git a/keyboards/helix/pico/qmk_conf/config.h b/keyboards/helix/pico/qmk_conf/config.h
deleted file mode 100644
index 15b3392895..0000000000
--- a/keyboards/helix/pico/qmk_conf/config.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-#ifdef AUDIO_ENABLE
- #define STARTUP_SONG SONG(STARTUP_SOUND)
- #define AUDIO_CLICKY
-#endif
diff --git a/keyboards/helix/pico/qmk_conf/keyboard.json b/keyboards/helix/pico/qmk_conf/keyboard.json
deleted file mode 100644
index ddb7220342..0000000000
--- a/keyboards/helix/pico/qmk_conf/keyboard.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "features": {
- "audio": true,
- "extrakey": true
- }
-}
diff --git a/keyboards/helix/pico/rules.mk b/keyboards/helix/pico/rules.mk
deleted file mode 100644
index 449df9caa6..0000000000
--- a/keyboards/helix/pico/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Helix Spacific Build Options default values
-LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes # LED animations
-IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-DEFAULT_FOLDER = helix/pico/base
diff --git a/keyboards/helix/pico/sc/keyboard.json b/keyboards/helix/pico/sc/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/pico/sc/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/pico/sc/rules.mk b/keyboards/helix/pico/sc/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/pico/sc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/pico/under/keyboard.json b/keyboards/helix/pico/under/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/pico/under/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/pico/under/rules.mk b/keyboards/helix/pico/under/rules.mk
deleted file mode 100644
index a37aa6fab3..0000000000
--- a/keyboards/helix/pico/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev2/back/keyboard.json b/keyboards/helix/rev2/back/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/rev2/back/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/rev2/back/rules.mk b/keyboards/helix/rev2/back/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/rev2/back/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/base/keyboard.json b/keyboards/helix/rev2/base/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/rev2/base/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/rev2/config.h b/keyboards/helix/rev2/config.h
deleted file mode 100644
index 67af503882..0000000000
--- a/keyboards/helix/rev2/config.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-Copyright 2018 MakotoKurauchi
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define QUICK_TAP_TERM 0
-
-#define OLED_UPDATE_INTERVAL 50
-
-// Helix keyboard RGB LED support
-// see ./rules.mk: LED_BACK_ENABLE or LED_UNDERGLOW_ENABLE set yes
-#ifdef RGBLED_BACK
- #define RGBLIGHT_LED_COUNT 32
-#else
- #define RGBLIGHT_LED_COUNT 6
-#endif
-
-#ifndef IOS_DEVICE_ENABLE
- #if RGBLIGHT_LED_COUNT <= 6
- #define RGBLIGHT_LIMIT_VAL 255
- #else
- #define RGBLIGHT_LIMIT_VAL 120
- #endif
- #define RGBLIGHT_VAL_STEP 17
-#else
- #if RGBLIGHT_LED_COUNT <= 6
- #define RGBLIGHT_LIMIT_VAL 90
- #else
- #define RGBLIGHT_LIMIT_VAL 35
- #endif
- #define RGBLIGHT_VAL_STEP 4
-#endif
-
-#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
-// USB_MAX_POWER_CONSUMPTION value for Helix keyboard
-// 120 RGBoff, OLEDoff
-// 120 OLED
-// 330 RGB 6
-// 300 RGB 32
-// 310 OLED & RGB 32
- #define USB_MAX_POWER_CONSUMPTION 400
-#else
- // fix iPhone and iPad power adapter issue
- // iOS device need lessthan 100
- #define USB_MAX_POWER_CONSUMPTION 100
-#endif
-
-/*
- * Feature disable options
- * These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/helix/rev2/keymaps/default/config.h b/keyboards/helix/rev2/keymaps/default/config.h
deleted file mode 100644
index b8c1041cdc..0000000000
--- a/keyboards/helix/rev2/keymaps/default/config.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-// place overrides here
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
- #define RGBLIGHT_EFFECT_BREATHING
- #define RGBLIGHT_EFFECT_RAINBOW_MOOD
- #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- #define RGBLIGHT_EFFECT_SNAKE
- #define RGBLIGHT_EFFECT_KNIGHT
- #define RGBLIGHT_EFFECT_CHRISTMAS
- #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- //#define RGBLIGHT_EFFECT_RGB_TEST
- //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
diff --git a/keyboards/helix/rev2/keymaps/default/keymap.c b/keyboards/helix/rev2/keymaps/default/keymap.c
deleted file mode 100644
index a48a855e02..0000000000
--- a/keyboards/helix/rev2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* Copyright 2020 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _QWERTY = 0,
- _COLEMAK,
- _DVORAK,
- _LOWER,
- _RAISE,
- _ADJUST
-};
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- COLEMAK,
- DVORAK,
- LOWER,
- RAISE,
- ADJUST,
- BACKLIT,
- EISU,
- KANA,
- RGBRST
-};
-
-enum macro_keycodes {
- KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | [ | ] | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_QWERTY] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | [ | ] | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_COLEMAK] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | [ | ] | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_DVORAK] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL,
- KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LBRC, KC_RBRC, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | F7 | F8 | F9 | F10 | F11 | ( | ) | F12 | | | Home | End | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_LPRN, KC_RPRN, KC_F12, _______, _______, KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | F7 | F8 | F9 | F10 | F11 | | | F12 | | |PageDn|PageUp| |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | Reset|RGBRST| | | | | | | | | | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD
- )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
-float tone_plover[][2] = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
- if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode);
- #endif
- layer_on(layer3);
- } else {
- layer_off(layer3);
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
- case COLEMAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_colemak);
- #endif
- set_single_persistent_default_layer(_COLEMAK);
- }
- return false;
- break;
- case DVORAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
- set_single_persistent_default_layer(_DVORAK);
- }
- return false;
- break;
- case LOWER:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
- #endif
- }
- layer_on(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- TOG_STATUS = false;
- layer_off(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case RAISE:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE);
- #endif
- }
- layer_on(_RAISE);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- layer_off(_RAISE);
- TOG_STATUS = false;
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case ADJUST:
- if (record->event.pressed) {
- layer_on(_ADJUST);
- } else {
- layer_off(_ADJUST);
- }
- return false;
- break;
- //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
- case QK_UNDERGLOW_MODE_NEXT:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- rgblight_mode(RGB_current_mode);
- rgblight_step();
- RGB_current_mode = rgblight_get_mode();
- }
- #endif
- return false;
- break;
- case EISU:
- if (record->event.pressed) {
- if (is_mac_mode()) {
- register_code(KC_LNG2);
- } else {
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG2);
- }
- return false;
- break;
- case KANA:
- if (record->event.pressed) {
- if (is_mac_mode()) {
- register_code(KC_LNG1);
- } else {
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG1);
- }
- return false;
- break;
- case RGBRST:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- eeconfig_update_rgblight_default();
- rgblight_enable();
- RGB_current_mode = rgblight_get_mode();
- }
- #endif
- break;
- }
- return true;
-}
-
-void matrix_init_user(void) {
- #ifdef RGBLIGHT_ENABLE
- RGB_current_mode = rgblight_get_mode();
- #endif
-}
diff --git a/keyboards/helix/rev2/keymaps/default/oled_display.c b/keyboards/helix/rev2/keymaps/default/oled_display.c
deleted file mode 100644
index 4eb815ce48..0000000000
--- a/keyboards/helix/rev2/keymaps/default/oled_display.c
+++ /dev/null
@@ -1,138 +0,0 @@
-/* Copyright 2020 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _QWERTY = 0,
- _COLEMAK,
- _DVORAK,
- _LOWER,
- _RAISE,
- _ADJUST
-};
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-
-//OLED update loop
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master()) {
- return OLED_ROTATION_0;
- } else {
- return OLED_ROTATION_180;
- }
-}
-
-static void render_rgbled_status(bool full) {
-# ifdef RGBLIGHT_ENABLE
- char buf[30];
- if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
- if (full) {
- snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
- rgblight_get_mode(),
- rgblight_get_hue()/RGBLIGHT_HUE_STEP,
- rgblight_get_sat()/RGBLIGHT_SAT_STEP,
- rgblight_get_val()/RGBLIGHT_VAL_STEP);
- } else {
- snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
- }
- oled_write(buf, false);
- }
-# endif
-}
-
-static void render_layer_status(void) {
- // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
- char buf[10];
- oled_write_P(PSTR("Layer: "), false);
- switch (layer_state) {
- case L_BASE:
- oled_write_P(PSTR("Default"), false);
- break;
- case L_RAISE:
- oled_write_P(PSTR("Raise"), false);
- break;
- case L_LOWER:
- oled_write_P(PSTR("Lower"), false);
- break;
- case L_ADJUST:
- case L_ADJUST_TRI:
- oled_write_P(PSTR("Adjust"), false);
- break;
- default:
- oled_write_P(PSTR("Undef-"), false);
- snprintf(buf,sizeof(buf), "%u", layer_state);
- oled_write(buf, false);
- }
- oled_write_P(PSTR("\n"), false);
-}
-
-void render_status(void) {
- // Render to mode icon
- static const char os_logo[][2][3] PROGMEM = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
- if (is_mac_mode()) {
- oled_write_P(os_logo[0][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write_P(os_logo[0][1], false);
- } else {
- oled_write_P(os_logo[1][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write_P(os_logo[1][1], false);
- }
-
- oled_write_P(PSTR(" "), false);
- render_layer_status();
-
- // Host Keyboard LED Status
- led_t led_state = host_keyboard_led_state();
- oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR(" "), false);
- oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR(" "), false);
- oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR(" "), false);
- oled_advance_page(true);
- render_rgbled_status(true);
- oled_write_P(PSTR("\n"), false);
-}
-
-bool oled_task_user(void) {
-
-# if DEBUG_TO_SCREEN
- if (debug_enable) {
- return;
- }
-# endif
-
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_helix_logo();
- render_rgbled_status(false);
- render_layer_status();
- }
- return false;
-}
-#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/default/readme.md b/keyboards/helix/rev2/keymaps/default/readme.md
deleted file mode 100644
index f1917a100a..0000000000
--- a/keyboards/helix/rev2/keymaps/default/readme.md
+++ /dev/null
@@ -1,154 +0,0 @@
-# The Default Helix Layout
-## Layout
-
-### Qwerty
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | [ | ] | N | M | , | . | / |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Colemak
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | [ | ] | K | M | , | . | / |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Dvorak
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| ; | Q | J | K | X | [ | ] | B | M | W | V | Z |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## Layers
-
-|Priority|number|name|description|
-| ---- | ---- | --- | --- |
-|high|16|Adjust|Functions|
-||4|Raise|Numeric charactors|
-||3|Lower|Other charactors|
-||2|Dvorak|Dvorak leyout|
-||1|Colemak|Colemak leyout|
-|low|0|Qwerty|QWERTY leyout(base)|
-
-### Lower
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | ( | ) | F12 | | | Home | End | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Raise
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | F7 | F8 | F9 | F10 | F11 | | | F12 | | |PageDn|PageUp| |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- `-------------------------------------------------------------------------------------------------'
-```
-
-### Adjust (Lower + Raise)
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | Reset|RGBRST| | | | | | | | | | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## Customize
-
-see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk`
-
-```
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = yes # OLED_ENABLE
-# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-## Compile
-
-go to qmk top directory.
-```
-$ cd qmk_firmware
-```
-
-build
-```
-$ make helix:default # with oled
-$ make helix/rev2/back:default # with oled and backlight
-$ make HELIX=no-ani helix/rev2/back:default # with oled and backlight without animation
-$ make helix/rev2/under:default # with oled and underglow
-$ make HELIX=no-oled helix:default # without oled
-```
-
-build (experimental use of split_common with backlight and oled)
-```
-$ make helix/rev2/sc:default
-```
-
-flash to keyboard
-```
-$ make helix:default:flash # with oled
-$ make helix/rev2/back:default:flash # with oled and backlight
-$ make HELIX=no-ani helix/rev2/back:default:flash # with oled and backlight without animation
-$ make helix/rev2/under:default:flash # with oled and underglow
-$ make HELIX=no-oled helix:default:flash # without oled
-```
-
-## Link
-* more detail wrote in Japanese [helix/Doc/firmware_jp.md](https://github.com/MakotoKurauchi/helix/blob/master/Doc/firmware_jp.md)
-* [Helix top](https://github.com/MakotoKurauchi/helix)
-
diff --git a/keyboards/helix/rev2/keymaps/default/readme_jp.md b/keyboards/helix/rev2/keymaps/default/readme_jp.md
deleted file mode 100644
index 6ecac8f25d..0000000000
--- a/keyboards/helix/rev2/keymaps/default/readme_jp.md
+++ /dev/null
@@ -1,127 +0,0 @@
-# The Default Helix Layout
-## 配列
-
-### Qwerty配列
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | [ | ] | N | M | , | . | / |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-他の配列(Colemak,Dvorak)は、[readme.md](readme.md) を参照
-
-## カスタマイズ
-
-Helix キーボードを4行版として製作したり、オプションの OLED をつけたり、
-RGB バックライトまたは、RGB Underglow をつけた場合は、
-`qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk` の以下の部分を編集して機能を有効化してください。
-
-```
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = yes # OLED_ENABLE
-# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-
-## RGB バックライトを有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-
-```
-LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
-```
-
-## RGB Underglow を有効にする
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-```
-LED_UNDERGLOW_ENABLE = yes # LED underglow (Enable WS2812 RGB underlight.)
-```
-
-## OLEDを無効にする
-
-OLED はデフォルトで有効になっています。
-無効にしたいときは rules.mk の下記の部分を編集して yes を no に変更してください。
-```
-OLED_ENABLE = no # OLED_ENABLE
-```
-
-## iPad/iPhoneサポートを有効にする。
-
-rules.mk の下記の部分を編集して no を yes に変更してください。
-RBG Underglow や RGBバックライトの輝度を抑えて、iPad, iPhone にも接続できるようになります。
-
-```
-IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-```
-
-## コンパイルの仕方
-
-コンパイルは、qmk_firmware のトップディレクトリで行います。
-
-```
-$ cd qmk_firmware
-```
-qmk_firmwareでは各キーボードのコンパイルは、`<キーボード名>:<キーマップ名>`という指定で行います。
-
-```
-$ make helix:default
-```
-
-キーボードへの書き込みまで同時に行うには下記のように`:flash`を付けます。
-
-```
-$ make helix:default:flash
-```
-
-コンパイル結果と中間生成物を消去したい場合は以下のようにします。
-
-```
-$ make helix:default:clean
-```
-
-上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
-
-OLED を無効にしてコンパイルしてキーボードへの書き込む。
-```
-$ make HELIX=no-oled helix/rev2:default:flash
-```
-
-RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make helix/rev2/back:default:flash
-```
-
-RGB Underglow を有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make helix/rev2/under:default:flash
-```
-
-OLED を無効にして、RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make HELIX=no-oled helix/rev2/back:default:flash
-```
-
-OLED を無効にして、RGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
-```
-$ make HELIX=no-oled helix/rev2/under:default:flash
-```
-
-## リンク
-
-* さらに詳細は、[こちら helix/Doc/firmware_jp.md](https://github.com/MakotoKurauchi/helix/blob/master/Doc/firmware_jp.md)をご覧ください。
-* [Helix top](https://github.com/MakotoKurauchi/helix)
diff --git a/keyboards/helix/rev2/keymaps/default/rules.mk b/keyboards/helix/rev2/keymaps/default/rules.mk
deleted file mode 100644
index 83029d1e0b..0000000000
--- a/keyboards/helix/rev2/keymaps/default/rules.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LTO_ENABLE = yes # if firmware size over limit, try this option
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no # OLED_ENABLE
-# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
-
-ifeq ($(strip $(OLED_ENABLE)), yes)
- SRC += oled_display.c
-endif
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/config.h b/keyboards/helix/rev2/keymaps/five_rows_jis/config.h
deleted file mode 100644
index 97494c937f..0000000000
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-// place overrides here
-
-#ifdef MOUSEKEY_ENABLE
- #undef MOUSEKEY_INTERVAL
- #define MOUSEKEY_INTERVAL 0
-
- #undef MOUSEKEY_TIME_TO_MAX
- #define MOUSEKEY_TIME_TO_MAX 150
-
- #undef MOUSEKEY_MAX_SPEED
- #define MOUSEKEY_MAX_SPEED 3
-
- #undef MOUSEKEY_MOVE_DELTA
- #define MOUSEKEY_MOVE_DELTA 5
-
- #undef MOUSEKEY_DELAY
- #define MOUSEKEY_DELAY 0
-#endif
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
- #define RGBLIGHT_EFFECT_BREATHING
- #define RGBLIGHT_EFFECT_RAINBOW_MOOD
- #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- #define RGBLIGHT_EFFECT_SNAKE
- #define RGBLIGHT_EFFECT_KNIGHT
- #define RGBLIGHT_EFFECT_CHRISTMAS
- #define RGBLIGHT_EFFECT_STATIC_GRADIENT
- //#define RGBLIGHT_EFFECT_RGB_TEST
- //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
-
-#endif /* CONFIG_USER_H */
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c b/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
deleted file mode 100644
index 70430894ef..0000000000
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/keymap.c
+++ /dev/null
@@ -1,410 +0,0 @@
-#include QMK_KEYBOARD_H
-#include "keymap_japanese.h"
-#include <stdio.h>
-#include <string.h>
-
-// * If you want to recognize that you pressed the Adjust key with the Lower / Raise key you can enable this comment out. However, the binary size may be over. *
-// #define ADJUST_MACRO_ENABLE
-
-// * If you want to use the Kana key you can enable this comment out. However, the binary size may be over. *
-// #define KANA_ENABLE
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _BASE = 0,
- _BAS_E,
- _LOWER,
- _LOW_E,
- _RAISE,
- _RAI_E,
- _ADJUST,
-};
-
-enum custom_keycodes {
- RGBRST = SAFE_RANGE,
- #ifdef KANA_ENABLE
- EISU,
- KANA,
- #endif
-};
-
-// Layer Mode aliases
-#define DL_BAS DF(_BASE)
-#define DL_BASE DF(_BAS_E)
-#define ML_LOW MO(_LOWER)
-#define ML_LOWE MO(_LOW_E)
-#define ML_RAI MO(_RAISE)
-#define ML_RAIE MO(_RAI_E)
-#define ML_ADJ MO(_ADJUST)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- /* Qwerty JIS Normal
- * ,-----------------------------------------. ,-----------------------------------------.
- * | Esc | 1! | 2" | 3# | 4$ | 5% | | 6& | 7' | 8( | 9) | 0 | -= |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | KANJI| Q | W | E | R | T | | Y | U | I | O | P | @` |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | A | S | D | F | G | | H | J | K | L | ;+ | :* |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | N | B | N | M | ,< | .> | Up |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Ctrl | GUI | Alt |Adjust|Lower |Space |Bksp |Space |Space |Raise | APP | Left | Down |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_BASE] = LAYOUT(
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
- JP_ZKHK, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, JP_COLN,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT,
- KC_LCTL, KC_LALT, KC_LGUI, ML_ADJ, ML_LOW, KC_SPC, KC_BSPC, KC_SPC, KC_SPC, ML_RAI, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT
- ),
-
- /* Qwerty JIS Exchange L and R
- * ,-----------------------------------------. ,-----------------------------------------.
- * | 6& | 7' | 8( | 9) | 0 | -= | | Esc | 1! | 2" | 3# | 4$ | 5% |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Y | U | I | O | P | @` | | Tab | Q | W | E | R | T |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | H | J | K | L | ;+ | :* | | | A | S | D | F | G |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | N | M | ,< | .> | /? | Up |Enter |KANJI | Shift| Z | X | C | V | B |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Space |Raise | }] | APP | Left | Down |Right |Adjust| Ctrl | GUI | Alt | [{ |Lower | Bksp |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_BAS_E] = LAYOUT(
- KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,
- KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T,
- KC_H, KC_J, KC_K, KC_L, KC_SCLN, JP_COLN, XXXXXXX, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_UP, KC_ENT, JP_ZKHK, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B,
- KC_SPC, ML_RAIE, JP_RBRC, KC_APP, KC_LEFT, KC_DOWN, KC_RGHT, ML_ADJ, KC_LCTL, KC_LALT, KC_LGUI, JP_LBRC, ML_LOWE, KC_BSPC
- ),
-
- /* Lower JIS Normal
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | | | | | | | | | | -= | ^~ | \| |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | | | | @` | [{ |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | | | | ;+ | :* | ]} |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | ,< | .> | /? | \_ |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | Del | | | | | | | |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MINS, JP_CIRC, JP_YEN,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, JP_AT, JP_LBRC,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_SCLN, JP_COLN, JP_RBRC,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS,
- _______, _______, _______, _______, XXXXXXX, XXXXXXX, KC_DEL, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
- ),
-
- /* Lower JIS Exchange L and R
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | | | -= | ^~ | \| | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | @` | [{ | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | ;+ | :* | ]} | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | ,< | .> | /? | \_ |PageUp| | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | Home |PageDn| End | | | | | | | Del |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOW_E] = LAYOUT(
- _______, XXXXXXX, XXXXXXX, KC_MINS, JP_CIRC, JP_YEN, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, JP_AT, JP_LBRC, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, XXXXXXX, XXXXXXX, KC_SCLN, JP_COLN, JP_RBRC, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, KC_COMM, KC_DOT, KC_SLSH, JP_BSLS, KC_PGUP, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, _______, XXXXXXX, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, _______, _______, XXXXXXX, _______, KC_DEL
- ),
-
- /* Raise JIS Normal
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | |MsWhL |MsWhU | Home |PageUp| F12 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | | | | | | |MsWhR |MsWhD | End |PageDn| |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | |MsBtn1|MsBtn2| MsUp | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | |MsLeft|MsDown|MsRght|
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, KC_F12,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX,
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX,
- _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R
- ),
-
- /* Raise JIS Exchange L and R
- * ,-----------------------------------------. ,-----------------------------------------.
- * | F6 | F7 | F8 | F9 | F10 | F11 | | | F1 | F2 | F3 | F4 | F5 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |MsWhL |MsWhU | F12 | | | | | | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |MsWhR |MsWhD | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | |MsBtn1|MsBtn2| MsUp | | | | | | | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | |MsLeft|MsDown|MsRght| | | | | | | |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAI_E] = LAYOUT(
- KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, KC_F1 , KC_F2, KC_F3, KC_F4, KC_F5,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_F12, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
- _______, _______, XXXXXXX, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, XXXXXXX, _______, XXXXXXX
- ),
-
- /* Adjust (Lower + Raise) Common map for Normal and Exchange
- * ,-----------------------------------------. ,-----------------------------------------.
- * | | Reset|RGBRST| | | | | | Reset|RGBRST| | | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | |ModNrm|ModExc| Mac | Win | | | |ModNrm|ModExc| Mac | Win | |
- * |------+------+------+------+------+------| |------+------+------+------+------|------+
- * | |RGB ON| HUE+ | SAT+ | VAL+ | | | |RGB ON| HUE+ | SAT+ | VAL+ | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------|------+
- * | | MODE | HUE- | SAT- | VAL- | | | | | MODE | HUE- | SAT- | VAL- | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | | | | |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- XXXXXXX, QK_BOOT, RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, QK_BOOT, RGBRST, XXXXXXX, XXXXXXX, XXXXXXX,
- XXXXXXX, DL_BAS, DL_BASE, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, DL_BAS, DL_BASE, AG_NORM, AG_SWAP, XXXXXXX,
- XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX,
- XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
- ),
-};
-
-#if defined(OLED_ENABLE)
-char keylog[24] = {};
-const char code_to_name[60] = {
- ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
- 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
- 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
- '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
- 'R', 'E', 'B', 'T', ' ', '-', ' ', '@', ' ', ' ',
- ' ', ';', ':', ' ', ',', '.', '/', ' ', ' ', ' '};
-
-static inline void set_keylog(uint16_t keycode, keyrecord_t *record)
-{
- char name = ' ';
- led_t led_state = host_keyboard_led_state();
-
- if (keycode < 60)
- {
- name = code_to_name[keycode];
- }
-
- // update keylog
- snprintf(keylog, sizeof(keylog), "\n%dx%d %2x %c %c %c %c",
- record->event.key.row,
- record->event.key.col,
- keycode,
- name,
- led_state.num_lock ? 'N' : ' ',
- led_state.caps_lock ? 'C' : ' ',
- led_state.scroll_lock ? 'S' : ' '
- );
-}
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-#define RGBLIGHT(mode) rgblight_mode(mode)
-#else
-#define RGBLIGHT(mode)
-#endif
-
-// define variables for reactive RGB
-int RGB_current_mode;
-#ifdef ADJUST_MACRO_ENABLE
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
- if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
- RGBLIGHT(RGB_current_mode);
- layer_on(layer3);
- } else {
- layer_off(layer3);
- }
-}
-#define ADJUST_MACRO(layer1, layer2, layer3) update_tri_layer_RGB(layer1, layer2, layer3)
-#else
-#define ADJUST_MACRO(layer1, layer2, layer3)
-#endif
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- #if defined(OLED_ENABLE)
- if (record->event.pressed) {
- set_keylog(keycode, record);
- }
- #endif
-
- switch (keycode) {
- #ifdef RGBLIGHT_ENABLE
- //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
- case QK_UNDERGLOW_MODE_NEXT:
- if (record->event.pressed) {
- rgblight_mode(RGB_current_mode);
- rgblight_step();
- RGB_current_mode = rgblight_get_mode();
- }
- break;
- #endif
- #ifdef KANA_ENABLE
- case EISU:
- if (record->event.pressed) {
- if (keymap_config.swap_lalt_lgui==false) {
- register_code(KC_LNG2);
- } else {
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG2);
- }
- break;
- case KANA:
- if (record->event.pressed) {
- if(keymap_config.swap_lalt_lgui==false){
- register_code(KC_LNG1);
- }else{
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG1);
- }
- break;
- #endif
- #ifdef RGBLIGHT_ENABLE
- case RGBRST:
- if (record->event.pressed) {
- eeconfig_update_rgblight_default();
- rgblight_enable();
- RGB_current_mode = rgblight_get_mode();
- }
- break;
- #endif
- default:
- return true;
- }
-
- return false;
-}
-
-void matrix_init_user(void) {
- #ifdef RGBLIGHT_ENABLE
- RGB_current_mode = rgblight_get_mode();
- #endif
-}
-
-//OLED update loop
-#ifdef OLED_ENABLE
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
- if (is_keyboard_master()) {
- return OLED_ROTATION_0;
- } else {
- return OLED_ROTATION_180;
- }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE _BASE
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-#define L_LOW_E (1<<_LOW_E)
-#define L_RAI_E (1<<_RAI_E)
-#define L_ADJUST_TRIE (L_ADJUST|L_RAI_E|L_LOW_E)
-
-const char helix_logo[]={
- 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
- 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
- 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
- 0};
-
-static inline void render_logo(void) {
- oled_write(helix_logo, false);
-}
-
-const char mac_win_logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-
-static inline void render_status(void) {
- char buf[20];
- // Render to mode icon
- if(keymap_config.swap_lalt_lgui==false){
- oled_write(mac_win_logo[0][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write(mac_win_logo[0][1], false);
- } else {
- oled_write(mac_win_logo[1][0], false);
- oled_write_P(PSTR("\n"), false);
- oled_write(mac_win_logo[1][1], false);
- }
-
- #ifdef RGBLIGHT_ENABLE
- snprintf(buf, sizeof(buf), " LED mode:%d", (short)RGB_current_mode);
- oled_write(buf, false);
- #endif
-
- // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
- oled_write_P(PSTR("\nLayer: "), false);
- switch (layer_state) {
- case L_BASE:
- oled_write_P(default_layer_state == (1UL<<_BAS_E) ? PSTR("BaseEx") : PSTR("Base"), false);
- break;
- case L_RAISE:
- oled_write_P(PSTR("Raise"), false);
- break;
- case L_RAI_E:
- oled_write_P(PSTR("RaiseEx"), false);
- break;
- case L_LOWER:
- oled_write_P(PSTR("Lower"), false);
- break;
- case L_LOW_E:
- oled_write_P(PSTR("LowerEx"), false);
- break;
- case L_ADJUST:
- case L_ADJUST_TRI:
- case L_ADJUST_TRIE:
- oled_write_P(PSTR("Adjust"), false);
- break;
- default:
- snprintf(buf, sizeof(buf), "%d", (short)layer_state);
- oled_write(buf, false);
- }
-
- oled_write(keylog, false);
-}
-
-bool oled_task_user(void) {
-
-# if DEBUG_TO_SCREEN
- if (debug_enable) {
- return;
- }
-# endif
-
- if (is_keyboard_master()) {
- render_status();
- } else {
- render_logo();
- }
-
- return false;
-}
-
-#endif // end of OLED_ENABLE
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/readme.md b/keyboards/helix/rev2/keymaps/five_rows_jis/readme.md
deleted file mode 100644
index ca408e3913..0000000000
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/readme.md
+++ /dev/null
@@ -1,150 +0,0 @@
-# Helix 5 rows JIS layout
-
-This keymap was created with the concept that users using Japanese JIS keyboard layout can operate without difficulty. It has the following features.
-
-* We are considering to be able to input long Japanese notes without moving the layer
-* We are arranging the relation of symbols that can not fit in the Lower layer keeping the positional relationship
-* The four-way key is in a convex arrangement
-* Ctrl, Shift, Tab, Kanji, Esc, GUI (Win), App keys are arranged keeping positional relationship
-* Lower / Raise keymap is considering easy placement so that it can be used without memorizing
-
-This keymap also includes a "NORMAL" keymap that uses Helix's split keyboard as usual, and an "EXCHANGE" key that exchanges left and right sides of Helix's split keyboard for key position optimization I am trying to switch maps. These have the following additional features.
-
-## NORMAL Keymap
-
-* It is possible to press the N key with the left index finger and the B key with the right index finger
-
-## EXCHANGE Keymap
-
-* By using the 2 key under Pro micro effectively add `` `[{` `` `` `]]` ``, `` `/?` `` Keys to NORMAL's base keymap And make inputs other than the `` `\ _` `` key possible with the base map
-* To avoid mistakes in pressing the Kanji key and the Enter key, we are moving to the 2 key.
-
-## 配列
-
-### NORMAL Keymap
-
- Adjust + ModExc key switches to the NORMAL keymap.
-
-Base Layer
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Esc | 1! | 2" | 3# | 4$ | 5% | | 6& | 7' | 8( | 9) | 0 | -= |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | KANJI| Q | W | E | R | T | | Y | U | I | O | P | @` |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | A | S | D | F | G | | H | J | K | L | ;+ | :* |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | N | B | N | M | ,< | .> | Up |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI | Alt |Adjust|Lower |Space |Bksp |Space |Space |Raise | APP | Left | Down |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-Lower Layer
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | | | | | | | | | | -= | ^~ | \| |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | | @` | [{ |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | ;+ | :* | ]} |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | ,< | .> | /? | \_ |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | Del | | | | | | | |
- `-------------------------------------------------------------------------------------------------'
-```
-
-Raise Layer
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | F12 | | | | Home |PageUp|
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | | End |PageDn|
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | |MsBtn1|MsBtn2| | | | | | | | | | MsUp | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | |MsLeft|MsDown|MsRght|
- `-------------------------------------------------------------------------------------------------'
-```
-
-### EXCHANGE Keymap
-
-Adjust + ModExc key switches to the EXCHANGE keymap.
-
-Base Layer
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | Esc | 1! | 2" | 3# | 4$ | 5% || 6& | 7' | 8( | 9) | 0 | -= |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | Tab | Q | W | E | R | T || Y | U | I | O | P | @` |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | A | S | D | F | G || H | J | K | L | ;+ | :* |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- |KANJI | Shift| Z | X | C | V | B || N | M | ,< | .> | /? | Up |Enter |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- |Adjust| Ctrl | GUI | Alt | [{ |Lower | Bksp ||Space |Raise | }] | APP | Left | Down |Right |
- `------------------------------------------------'`------------------------------------------------'
-```
-
-Lower Layer
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | | | | | | || | | | -= | ^~ | \| |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | | @` | [{ |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | ;+ | :* | ]} |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- | | | | | | | || | ,< | .> | /? | \_ |PageUp| |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- | | | | | | | Del || | | | | Home |PageDn| End |
- `------------------------------------------------'`------------------------------------------------'
-```
-
-Raise Layer
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F11 |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || F12 | | | | | |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | | | |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- | | |MsBtn1|MsBtn2| | | || | | | | | MsUp | |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- | | | | | | | || | | | |MsLeft|MsDown|MsRght|
- `------------------------------------------------'`------------------------------------------------'
-```
-
-### NORMAL/EXCHANGE common Layer
-
-Adjust Layer
-
- NORMAL / EXCHANGE This layer is used in common. The same items are arranged in the same row on both sides so that they can be used in common.
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | Reset|RGBRST|Aud on|Audoff| | | | Reset|RGBRST|Aud on|Audoff| |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |ModNrm|ModExc| Mac | Win | | | |ModNrm|ModExc| Mac | Win | |
- |------+------+------+------+------+------| |------+------+------+------+------|------+
- | |RGB ON| HUE+ | SAT+ | VAL+ | | | |RGB ON| HUE+ | SAT+ | VAL+ | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------|------+
- | | MODE | HUE- | SAT- | VAL- | | | | | MODE | HUE- | SAT- | VAL- | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | | | | |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## How to compile these program
-
- See the readme of the Default keymap.
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/readme_jp.md b/keyboards/helix/rev2/keymaps/five_rows_jis/readme_jp.md
deleted file mode 100644
index 442984f6ff..0000000000
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/readme_jp.md
+++ /dev/null
@@ -1,173 +0,0 @@
-# Helix 5 rows JIS layout
-
-## コンセプト
-
-このキーマップは日本語JISキーボード配列を利用しているユーザーが無理なく操作出来るというコンセプトで作成しました。以下の特徴があります。
-
-* 日本語の長音記号をレイヤーを移動せずに入力可能なように考慮しています
-* 入りきらない記号関連をLowerレイヤーに位置関係を維持して配置しています
-* 十字キーを凸配置にしています
-* Ctrl,Shift,Tab,漢字,Esc,GUI(Win),Appの各キーは位置関係を維持して配置しています
-* Lower/Raiseキーマップは暗記しないでも使えるようにわかりやすい配置を考慮しています
-
- またこのキーマップにはHelixの分割されたキーボードを通常通りに使用する「NORMAL」キーマップと、キー位置の最適化のためにHelixの分割されたキーボードの左右を交換して使う「EXCHANGE」キーマップをバイナリの書き換えなしに切り替えられるようにしています。これらにはさらに以下の特徴があります。
-
-### NORMALキーマップ
-
-* Nキーを左人差し指で、Bキーを右人差し指で押下することが可能
-
-### EXCHANGEキーマップ
-
-* Pro micro下の2キーを有効に使うことにより、NORMALのベースキーマップに```[{```,```}]```,```/?```の各キーを追加し、```\_```キー以外の入力をベースマップで可能にしています
-* 漢字キー,Enterキーの押し間違いを避けるためPro micro下の2キーに移動しています
-
-## カスタマイズ
-
-Normal/Exchangeにそれぞれ、Base,Lower,Raiseの各レイヤーを備え、2マップ3レイヤー、共通1レイヤー(Adjust)の全7種のレイヤーを備えています。
-ファームの書き換えなしにキーマップを別のものに切り替えられるので、片方は通常のキーマップ、もう片方は画像や動画編集用のキーマップや別の変態配置のキーマップにすれば、状況に応じて簡単に切り替えられます。
-
-## 配列
-
-### NORMAL
-
- Adjust + ModNrmキーでNORMALキーマップに切り替わります。
-
-#### Baseレイヤー
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | Esc | 1! | 2" | 3# | 4$ | 5% | | 6& | 7' | 8( | 9) | 0 | -= |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | KANJI| Q | W | E | R | T | | Y | U | I | O | P | @` |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | Tab | A | S | D | F | G | | H | J | K | L | ;+ | :* |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Shift| Z | X | C | V | B | N | B | N | M | ,< | .> | Up |Enter |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | Ctrl | GUI | Alt |Adjust|Lower |Space |Bksp |Space |Space |Raise | APP | Left | Down |Right |
- `-------------------------------------------------------------------------------------------------'
-```
-
-#### Lowerレイヤー
-
- 記号キーと、BackSpace位置にDeleteキーを配置しています。
- 例えば```|```キーを入力する場合、Lower + Shift + \キーで入力することが出来ます。
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | | | | | | | | | | -= | ^~ | \| |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | | @` | [{ |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | ;+ | :* | ]} |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | ,< | .> | /? | \_ |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | Del | | | | | | | |
- `-------------------------------------------------------------------------------------------------'
-```
-
-#### Raiseレイヤー
-
- rules.mkのMOUSEKEY_ENABLEをyesにした場合マウスキーを利用できます。ただしバイナリ容量を食いますのでmakeした時に確認できるバイナリサイズがオーバーしていないことに十分注意してください。
- また、F1-F12キーをHHKBライクに使えるように横並びにしました。
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | F11 |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | F12 | | | | Home |PageUp|
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | | | | | | | | | | | | End |PageDn|
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | |MsBtn1|MsBtn2| | | | | | | | | | MsUp | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | |MsLeft|MsDown|MsRght|
- `-------------------------------------------------------------------------------------------------'
-```
-
-### EXCHANGEキーマップ
-
- Adjust + ModExcキーでEXCHANGEキーマップに切り替わります。
- HelixのUSBやフォンケーブルの接続は変更せず、分割された左右のキーボードを入れ替えて使います。
-
-#### Baseレイヤー
-
- ちょっと無理やりですが```[{```,```}]```キーを突っ込んでいます。
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | Esc | 1! | 2" | 3# | 4$ | 5% || 6& | 7' | 8( | 9) | 0 | -= |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | Tab | Q | W | E | R | T || Y | U | I | O | P | @` |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | A | S | D | F | G || H | J | K | L | ;+ | :* |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- |KANJI | Shift| Z | X | C | V | B || N | M | ,< | .> | /? | Up |Enter |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- |Adjust| Ctrl | GUI | Alt | [{ |Lower | Bksp ||Space |Raise | }] | APP | Left | Down |Right |
- `------------------------------------------------'`------------------------------------------------'
-```
-
-#### Lowerレイヤー
-
- 記号キーと、BackSpace位置にDeleteキーを配置しています。
- PageDown/Up, Home/EndをCtrl+十字キーの延長線上で使用できるように配置しています。
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | | | | | | || | | | -= | ^~ | \| |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | | @` | [{ |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | ;+ | :* | ]} |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- | | | | | | | || | ,< | .> | /? | \_ |PageUp| |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- | | | | | | | Del || | | | | Home |PageDn| End |
- `------------------------------------------------'`------------------------------------------------'
-```
-
-#### Raiseレイヤー
-
- rules.mkのMOUSEKEY_ENABLEをyesにした場合マウスキーを利用できます。ただしバイナリ容量を食いますのでmakeした時に確認できるバイナリサイズがオーバーしていないことに十分注意してください。
- また、F1-F12キーをHHKBライクに使えるように横並びにしました。
- マウスキーは十字キーの延長線上で使用できるように配置しています。
-
-```
- ,-----------------------------------------.,-----------------------------------------.
- | | F1 | F2 | F3 | F4 | F5 || F6 | F7 | F8 | F9 | F10 | F11 |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || F12 | | | | | |
- |------+------+------+------+------+------||------+------+------+------+------+------|
- | | | | | | || | | | | | |
- ,------+------+------+------+------+------+------||------+------+------+------+------+------+------.
- | | |MsBtn1|MsBtn2| | | || | | | | | MsUp | |
- |------+------+------+------+------+------+------||------+------+------+------+------+------+------|
- | | | | | | | || | | | |MsLeft|MsDown|MsRght|
- `------------------------------------------------'`------------------------------------------------'
-```
-
-### NORMAL/EXCHANGE共通レイヤー
-
-Adjustレイヤー
-
- NORMAL/EXCHANGE共通で利用するレイヤーです。共通で使えるように両側同じ並びで同じものを配置しています。
-
-```
- ,-----------------------------------------. ,-----------------------------------------.
- | | Reset|RGBRST|Aud on|Audoff| | | | Reset|RGBRST|Aud on|Audoff| |
- |------+------+------+------+------+------| |------+------+------+------+------+------|
- | |ModNrm|ModExc| Mac | Win | | | |ModNrm|ModExc| Mac | Win | |
- |------+------+------+------+------+------| |------+------+------+------+------|------+
- | |RGB ON| HUE+ | SAT+ | VAL+ | | | |RGB ON| HUE+ | SAT+ | VAL+ | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------|------+
- | | MODE | HUE- | SAT- | VAL- | | | | | MODE | HUE- | SAT- | VAL- | |
- |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- | | | | | | | | | | | | | | |
- `-------------------------------------------------------------------------------------------------'
-```
-
-## コンパイルの仕方
-
- Defaultキーマップのreadmeを参照してください。
diff --git a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk b/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
deleted file mode 100644
index b4f8e27de4..0000000000
--- a/keyboards/helix/rev2/keymaps/five_rows_jis/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-LTO_ENABLE = no # if firmware size over limit, try this option
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-# OLED_ENABLE = no # OLED_ENABLE
-# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-# LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-# LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-# OLED_ENABLE が yes のとき
-# OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
-# OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
-# If OLED_ENABLE is 'yes'
-# If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
-# If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
-OLED_SELECT = core
diff --git a/keyboards/helix/rev2/keymaps/led_test/README.md b/keyboards/helix/rev2/keymaps/led_test/README.md
deleted file mode 100644
index 2fe6706452..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# LED test Keymap
-
-## Layout
-
-The layout is the same as default.
-
-## Feature
-
-* OLED is enabled.
-* LED backlight is enabled and always lit.
-* The lighting color of LED changes periodically. Red, Green and Blue.
-
-The user can check whether the LED is lit or not.
-
-## Compile
-
-```
-$ cd qmk_firmware
-$ make helix:led_test
-```
-
-## Flash QMK Firmware
-
-Execute the 'make' command and press the reset switch on the keyboard.
-```
-$ make helix:led_test:flash
-```
diff --git a/keyboards/helix/rev2/keymaps/led_test/config.h b/keyboards/helix/rev2/keymaps/led_test/config.h
deleted file mode 100644
index e2bdf2f329..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/config.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-This is the c configuration file for the keymap
-
-Copyright 2012 Jun Wako <[email protected]>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-// place overrides here
-
-// If you need more program area, try select and reduce rgblight modes to use.
-
-// Selection of RGBLIGHT MODE to use.
-#if defined(LED_ANIMATIONS)
- //#define RGBLIGHT_EFFECT_BREATHING
- //#define RGBLIGHT_EFFECT_RAINBOW_MOOD
- //#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
- //#define RGBLIGHT_EFFECT_SNAKE
- //#define RGBLIGHT_EFFECT_KNIGHT
- //#define RGBLIGHT_EFFECT_CHRISTMAS
- //#define RGBLIGHT_EFFECT_STATIC_GRADIENT
- #define RGBLIGHT_EFFECT_RGB_TEST // led_test keymap need only this.
- //#define RGBLIGHT_EFFECT_ALTERNATING
-#endif
-
-#endif /* CONFIG_USER_H */
diff --git a/keyboards/helix/rev2/keymaps/led_test/keymap.c b/keyboards/helix/rev2/keymaps/led_test/keymap.c
deleted file mode 100644
index a48a855e02..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/keymap.c
+++ /dev/null
@@ -1,341 +0,0 @@
-/* Copyright 2020 yushakobo
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include QMK_KEYBOARD_H
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
- _QWERTY = 0,
- _COLEMAK,
- _DVORAK,
- _LOWER,
- _RAISE,
- _ADJUST
-};
-
-enum custom_keycodes {
- QWERTY = SAFE_RANGE,
- COLEMAK,
- DVORAK,
- LOWER,
- RAISE,
- ADJUST,
- BACKLIT,
- EISU,
- KANA,
- RGBRST
-};
-
-enum macro_keycodes {
- KC_SAMPLEMACRO,
-};
-
-//Macros
-#define M_SAMPLE M(KC_SAMPLEMACRO)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | E | R | T | | Y | U | I | O | P | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | S | D | F | G | | H | J | K | L | ; | ' |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | [ | ] | N | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_QWERTY] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
- KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Colemak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | Q | W | F | P | G | | J | L | U | Y | ; | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | R | S | T | D | | H | N | E | I | O | ' |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| Z | X | C | V | B | [ | ] | K | M | , | . | / |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_COLEMAK] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_BSPC,
- KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_LBRC, KC_RBRC, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Dvorak
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Tab | ' | , | . | P | Y | | F | G | C | R | L | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | Ctrl | A | O | E | U | I | | D | H | T | N | S | / |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | Shift| ; | Q | J | K | X | [ | ] | B | M | W | V | Z |Enter |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * |Adjust| Esc | Alt | GUI | EISU |Lower |Space |Space |Raise | KANA | Left | Down | Up |Right |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_DVORAK] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_DEL,
- KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_SLSH,
- KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_LBRC, KC_RBRC, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_ENT ,
- ADJUST, KC_ESC, KC_LALT, KC_LGUI, EISU, LOWER, KC_SPC, KC_SPC, RAISE, KANA, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
- ),
-
- /* Lower
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | ~ | ! | @ | # | $ | % | | ^ | & | * | ( | ) | |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | _ | + | { | } | | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | F7 | F8 | F9 | F10 | F11 | ( | ) | F12 | | | Home | End | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_LOWER] = LAYOUT(
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
- KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_LPRN, KC_RPRN, KC_F12, _______, _______, KC_HOME, KC_END, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Raise
- * ,-----------------------------------------. ,-----------------------------------------.
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Bksp |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | ` | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | F1 | F2 | F3 | F4 | F5 | | F6 | - | = | [ | ] | \ |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | CAPS | F7 | F8 | F9 | F10 | F11 | | | F12 | | |PageDn|PageUp| |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | Next | Vol- | Vol+ | Play |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_RAISE] = LAYOUT(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
- KC_CAPS, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, _______, _______, KC_F12, _______, _______, KC_PGDN, KC_PGUP, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
- ),
-
- /* Adjust (Lower + Raise)
- * ,-----------------------------------------. ,-----------------------------------------.
- * | F1 | F2 | F3 | F4 | F5 | F6 | | F7 | F8 | F9 | F10 | F11 | F12 |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | Reset|RGBRST| | | | | | | | | | Del |
- * |------+------+------+------+------+------| |------+------+------+------+------+------|
- * | | | |Aud on|Audoff| Mac | | Win |Qwerty|Colemk|Dvorak| | |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | |RGB ON| HUE+ | SAT+ | VAL+ |
- * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
- * | | | | | | | | | | | MODE | HUE- | SAT- | VAL- |
- * `-------------------------------------------------------------------------------------------------'
- */
- [_ADJUST] = LAYOUT(
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- _______, QK_BOOT, RGBRST, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
- _______, _______, _______, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD
- )
-};
-
-#ifdef AUDIO_ENABLE
-
-float tone_qwerty[][2] = SONG(QWERTY_SOUND);
-float tone_dvorak[][2] = SONG(DVORAK_SOUND);
-float tone_colemak[][2] = SONG(COLEMAK_SOUND);
-float tone_plover[][2] = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2] = SONG(PLOVER_GOODBYE_SOUND);
-#endif
-
-// define variables for reactive RGB
-bool TOG_STATUS = false;
-int RGB_current_mode;
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
- if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode);
- #endif
- layer_on(layer3);
- } else {
- layer_off(layer3);
- }
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case QWERTY:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_qwerty);
- #endif
- set_single_persistent_default_layer(_QWERTY);
- }
- return false;
- break;
- case COLEMAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_colemak);
- #endif
- set_single_persistent_default_layer(_COLEMAK);
- }
- return false;
- break;
- case DVORAK:
- if (record->event.pressed) {
- #ifdef AUDIO_ENABLE
- PLAY_SONG(tone_dvorak);
- #endif
- set_single_persistent_default_layer(_DVORAK);
- }
- return false;
- break;
- case LOWER:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE + 1);
- #endif
- }
- layer_on(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- TOG_STATUS = false;
- layer_off(_LOWER);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case RAISE:
- if (record->event.pressed) {
- //not sure how to have keyboard check mode and set it to a variable, so my work around
- //uses another variable that would be set to true after the first time a reactive key is pressed.
- if (TOG_STATUS) { //TOG_STATUS checks is another reactive key currently pressed, only changes RGB mode if returns false
- } else {
- TOG_STATUS = !TOG_STATUS;
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGBLIGHT_MODE_SNAKE);
- #endif
- }
- layer_on(_RAISE);
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- } else {
- #ifdef RGBLIGHT_ENABLE
- //rgblight_mode(RGB_current_mode); // revert RGB to initial mode prior to RGB mode change
- #endif
- layer_off(_RAISE);
- TOG_STATUS = false;
- update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
- }
- return false;
- break;
- case ADJUST:
- if (record->event.pressed) {
- layer_on(_ADJUST);
- } else {
- layer_off(_ADJUST);
- }
- return false;
- break;
- //led operations - RGB mode change now updates the RGB_current_mode to allow the right RGB mode to be set after reactive keys are released
- case QK_UNDERGLOW_MODE_NEXT:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- rgblight_mode(RGB_current_mode);
- rgblight_step();
- RGB_current_mode = rgblight_get_mode();
- }
- #endif
- return false;
- break;
- case EISU:
- if (record->event.pressed) {
- if (is_mac_mode()) {
- register_code(KC_LNG2);
- } else {
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG2);
- }
- return false;
- break;
- case KANA:
- if (record->event.pressed) {
- if (is_mac_mode()) {
- register_code(KC_LNG1);
- } else {
- SEND_STRING(SS_LALT("`"));
- }
- } else {
- unregister_code(KC_LNG1);
- }
- return false;
- break;
- case RGBRST:
- #ifdef RGBLIGHT_ENABLE
- if (record->event.pressed) {
- eeconfig_update_rgblight_default();
- rgblight_enable();
- RGB_current_mode = rgblight_get_mode();
- }
- #endif
- break;
- }
- return true;
-}
-
-void matrix_init_user(void) {
- #ifdef RGBLIGHT_ENABLE
- RGB_current_mode = rgblight_get_mode();
- #endif
-}
diff --git a/keyboards/helix/rev2/keymaps/led_test/led_test_init.c b/keyboards/helix/rev2/keymaps/led_test/led_test_init.c
deleted file mode 100644
index 7f8813acdd..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/led_test_init.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include QMK_KEYBOARD_H
-
-void keyboard_post_init_user(void) {
- rgblight_enable_noeeprom();
- rgblight_mode_noeeprom(RGBLIGHT_MODE_RGB_TEST);
-}
diff --git a/keyboards/helix/rev2/keymaps/led_test/oled_display.c b/keyboards/helix/rev2/keymaps/led_test/oled_display.c
deleted file mode 100644
index 3261b6c581..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/oled_display.c
+++ /dev/null
@@ -1 +0,0 @@
-#include "../default/oled_display.c"
diff --git a/keyboards/helix/rev2/keymaps/led_test/rules.mk b/keyboards/helix/rev2/keymaps/led_test/rules.mk
deleted file mode 100644
index 5aa9439f4c..0000000000
--- a/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-# QMK Standard Build Options
-# change to "no" to disable the options, or define them in the Makefile in
-# the appropriate keymap folder that will get included automatically
-#
-# See TOP/keyboards/helix/rules.mk for a list of options that can be set.
-# See TOP/docs/config_options.md for more information.
-#
-
-LTO_ENABLE = no # if firmware size over limit, try this option
-
-# Helix Spacific Build Options
-# you can uncomment and edit follows 7 Variables
-# jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
-OLED_ENABLE = yes # OLED_ENABLE
-# LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes # LED animations
-# IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-OLED_SELECT = core
-ifeq ($(strip $(OLED_ENABLE)), yes)
- SRC += oled_display.c
-endif
-SRC += led_test_init.c
diff --git a/keyboards/helix/rev2/local_features.mk b/keyboards/helix/rev2/local_features.mk
deleted file mode 100644
index 4bfee0411d..0000000000
--- a/keyboards/helix/rev2/local_features.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-#
-# local_features.mk contains post-processing rules for the Helix keyboard.
-#
-# Post-processing rules convert keyboard-specific shortcuts (that represent
-# combinations of standard options) into QMK standard options.
-#
-
-KEYBOARD_LOCAL_FEATURES_MK :=
--include $(strip $(HELIX_TOP_DIR)/rev2/override_helix_options.mk) ## File dedicated to maintenance
-
-# Parse 'HELIX=xx,yy,zz' option
-ifneq ($(strip $(HELIX)),)
- # make HELIX=ios helix/pico:AKEYMAP
- # make HELIX=no-ani helix/pico:AKEYMAP
- # make HELIX=no-oled helix/pico:AKEYMAP
- # make HELIX=ios,no-ani,no-oled helix/pico:AKEYMAP
- define HELIX_OPTION_PARSE
- # parce 'no-ani' 'ios' 'no-oled'
- $(if $(SHOW_PARCE),$(info parse .$1.)) #debug
- $(if $(HELIX_OVERRIDE_PARSE),$(call HELIX_OVERRIDE_PARSE,$1))
-
- ifeq ($(strip $1),ios)
- IOS_DEVICE_ENABLE = yes
- endif
- ifneq ($(filter na no_ani no-ani,$(strip $1)),)
- LED_ANIMATIONS = no
- endif
- ifneq ($(filter nooled no-oled,$(strip $1)),)
- OLED_ENABLE = no
- endif
- ifeq ($(strip $1),oled)
- OLED_ENABLE = yes
- endif
- endef # end of HELIX_OPTION_PARSE
-
- COMMA=,
- $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)), \
- $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME))))
-
- SHOW_HELIX_OPTIONS = yes
-endif
-
-########
-# convert Helix-specific options (that represent combinations of standard options)
-# into QMK standard options.
-
-ifeq ($(strip $(LED_BACK_ENABLE)), yes)
- RGBLIGHT_ENABLE = yes
- OPT_DEFS += -DRGBLED_BACK
- ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
- $(error LED_BACK_ENABLE and LED_UNDERGLOW_ENABLE both 'yes')
- endif
-else ifeq ($(strip $(LED_UNDERGLOW_ENABLE)), yes)
- RGBLIGHT_ENABLE = yes
-endif
-
-ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
- OPT_DEFS += -DIOS_DEVICE_ENABLE
-endif
-
-ifeq ($(strip $(LED_ANIMATIONS)), yes)
- OPT_DEFS += -DLED_ANIMATIONS
-endif
-
-ifeq ($(strip $(OLED_ENABLE)), yes)
- ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
- OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
- else
- OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
- endif
-endif
-
-ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
- $(info Helix Spacific Build Options)
- $(info - OLED_ENABLE = $(OLED_ENABLE))
- $(info - LED_BACK_ENABLE = $(LED_BACK_ENABLE))
- $(info - LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
- $(info - LED_ANIMATIONS = $(LED_ANIMATIONS))
- $(info - IOS_DEVICE_ENABLE = $(IOS_DEVICE_ENABLE))
- $(info )
- $(info QMK Build Options)
- $(info -- SPLIT_KEYBOARD = $(SPLIT_KEYBOARD))
- $(info -- RGBLIGHT_ENABLE = $(RGBLIGHT_ENABLE))
- $(info -- OLED_DRIVER = $(OLED_DRIVER))
- $(info -- OLED_LOCAL_ENABLE = $(OLED_LOCAL_ENABLE))
- $(info -- CONSOLE_ENABLE = $(CONSOLE_ENABLE))
- $(info -- OPT_DEFS = $(OPT_DEFS))
- $(info -- LTO_ENABLE = $(LTO_ENABLE))
- $(info )
-endif
diff --git a/keyboards/helix/rev2/override_helix_options.mk-maintenance b/keyboards/helix/rev2/override_helix_options.mk-maintenance
deleted file mode 100644
index 56dee8ce78..0000000000
--- a/keyboards/helix/rev2/override_helix_options.mk-maintenance
+++ /dev/null
@@ -1,46 +0,0 @@
-ifneq ($(strip $(HELIX)),)
- $(info -------------------------)
- $(info override_helix_options.mk)
- $(info -------------------------)
-endif
-
-define HELIX_OVERRIDE_PARSE
- ifeq ($(strip $1),back)
- LED_BACK_ENABLE = yes
- LED_UNDERGLOW_ENABLE = no
- endif
- ifeq ($(strip $1),under)
- LED_BACK_ENABLE = no
- LED_UNDERGLOW_ENABLE = yes
- endif
- ifneq ($(filter led-off led_off noback no-back nounder no-under,$(strip $1)),)
- LED_BACK_ENABLE = no
- LED_UNDERGLOW_ENABLE = no
- endif
- ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
- OLED_ENABLE = yes
- OLED_SELECT = core
- endif
- ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
- OLED_ENABLE = yes
- OLED_SELECT = local
- endif
- ifneq ($(filter sc split-common split_common,$(strip $1)),)
- SPLIT_KEYBOARD = yes
- endif
- ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
- SPLIT_KEYBOARD = no
- endif
- ifeq ($(strip $1),scan)
- DEBUG_MATRIX_SCAN_RATE_ENABLE = yes
- endif
- ifeq ($(strip $1),scan-api)
- DEBUG_MATRIX_SCAN_RATE_ENABLE = api
- endif
- ifeq ($(strip $1),lto)
- LTO_ENABLE = yes
- endif
- ifneq ($(filter nolto no-lto no_lto,$(strip $1)),)
- LTO_ENABLE = no
- endif
-endef # end of HELIX_OVERRIDE_PARSE
diff --git a/keyboards/helix/rev2/post_config.h b/keyboards/helix/rev2/post_config.h
deleted file mode 100644
index dda73d5d22..0000000000
--- a/keyboards/helix/rev2/post_config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-#if defined(SPLIT_KEYBOARD) /* if use split_common */
-# if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_SPLIT)
-# define RGBLIGHT_SPLIT /* helix hardware need this */
-# endif
-#endif
diff --git a/keyboards/helix/rev2/post_rules.mk b/keyboards/helix/rev2/post_rules.mk
deleted file mode 100644
index 4c671d4515..0000000000
--- a/keyboards/helix/rev2/post_rules.mk
+++ /dev/null
@@ -1,3 +0,0 @@
-ifneq ($(strip $(KEYBOARD_LOCAL_FEATURES_MK)),)
- include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
-endif
diff --git a/keyboards/helix/rev2/qmk_conf/keyboard.json b/keyboards/helix/rev2/qmk_conf/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/rev2/qmk_conf/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/rev2/qmk_conf/rules.mk b/keyboards/helix/rev2/qmk_conf/rules.mk
deleted file mode 100644
index 67caab1ce6..0000000000
--- a/keyboards/helix/rev2/qmk_conf/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-LED_BACK_ENABLE = yes # LED backlight (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes # LED animations
-
-include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/keyboards/helix/rev2/readme.md b/keyboards/helix/rev2/readme.md
deleted file mode 100644
index e6a6f2e952..0000000000
--- a/keyboards/helix/rev2/readme.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# Helix rev2
-
-A compact split ortholinear keyboard.
-
-* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
-* Hardware Supported: Helix rev2 PCBs, Pro Micro
-* Hardware Availability: [PCB & Case Data](https://github.com/MakotoKurauchi/helix)
-
-Make example for this keyboard (after setting up your build environment):
-
- make helix/rev2:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/helix/rev2/rev2.c b/keyboards/helix/rev2/rev2.c
deleted file mode 100644
index 7502ad0552..0000000000
--- a/keyboards/helix/rev2/rev2.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright 2018 MakotoKurauchi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
-
-// Each keymap.c should use is_keyboard_master() instead of 'is_master'.
-// But keep 'is_master' for a while for backwards compatibility
-// for the old keymap.c.
-uint8_t is_master = false;
-
-bool is_mac_mode(void) {
- // This is the opposite of the QMK standard, but we'll leave it for backwards compatibility.
- return keymap_config.swap_lalt_lgui == false;
-}
-
-void set_mac_mode_kb(bool macmode) {
- /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI)/AG_SWAP(=MAGIC_SWAP_ALT_GUI) keys.
- * see
- * https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124
- * https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
- */
- keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
- eeconfig_update_keymap(&keymap_config);
-}
-
-void matrix_init_kb(void) {
- // Each keymap.c should use is_keyboard_master() instead of is_master.
- // But keep is_master for a while for backwards compatibility
- // for the old keymap.c.
- is_master = is_keyboard_master();
-
- matrix_init_user();
-};
-
-void keyboard_post_init_kb(void) {
-#if defined(DEBUG_MATRIX_SCAN_RATE)
- debug_enable = true;
-#endif
- keyboard_post_init_user();
-}
-
-#ifdef OLED_ENABLE
-void render_helix_logo(void) {
- static const char helix_logo[] PROGMEM ={
- 0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
- 0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
- 0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
- 0};
- oled_write_P(helix_logo, false);
-}
-
-bool oled_task_kb(void) {
- if (oled_task_user()) {
- /* keymap/user level oled_task_user() dose not exist */
- led_t led_state = host_keyboard_led_state();
- oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR(" "), false);
- oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR(" "), false);
- oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR(" "), false);
- oled_advance_page(true);
- render_helix_logo();
- }
- return false;
-}
-#endif /* end of OLED_ENABLE */
diff --git a/keyboards/helix/rev2/rev2.h b/keyboards/helix/rev2/rev2.h
deleted file mode 100644
index dad08c267e..0000000000
--- a/keyboards/helix/rev2/rev2.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2018 MakotoKurauchi
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-bool is_mac_mode(void);
-void set_mac_mode_kb(bool macmode);
-
-#ifdef OLED_ENABLE
-void render_helix_logo(void);
-#endif
-
-#ifndef SPLIT_KEYBOARD
- extern bool is_helix_master(void);
- #define is_keyboard_master() is_helix_master()
-#endif
-
-// Each keymap.c should use is_keyboard_master() instead of 'is_master', 'has_usb()'.
-// But keep 'is_master' for a while for backwards compatibility
-// for the old keymap.c.
-extern uint8_t is_master; // 'is_master' will be obsolete, it is recommended to use 'is_keyboard_master ()' instead.
-#define has_usb() is_keyboard_master()
diff --git a/keyboards/helix/rev2/rules.mk b/keyboards/helix/rev2/rules.mk
deleted file mode 100644
index 4f830403f4..0000000000
--- a/keyboards/helix/rev2/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.mk
-
-# Helix Spacific Build Options default values
-OLED_ENABLE = yes # OLED_ENABLE
-LOCAL_GLCDFONT = no # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
-LED_BACK_ENABLE = no # LED backlight (Enable WS2812 RGB underlight.)
-LED_UNDERGLOW_ENABLE = no # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes # LED animations
-IOS_DEVICE_ENABLE = no # connect to IOS device (iPad,iPhone)
-
-DEFAULT_FOLDER = helix/rev2/base
diff --git a/keyboards/helix/rev2/sc/keyboard.json b/keyboards/helix/rev2/sc/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/rev2/sc/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/rev2/sc/rules.mk b/keyboards/helix/rev2/sc/rules.mk
deleted file mode 100644
index 066fffb74a..0000000000
--- a/keyboards/helix/rev2/sc/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_BACK_ENABLE = yes
diff --git a/keyboards/helix/rev2/serial_config_simpleapi.h b/keyboards/helix/rev2/serial_config_simpleapi.h
deleted file mode 100644
index b51e6f281b..0000000000
--- a/keyboards/helix/rev2/serial_config_simpleapi.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define SERIAL_SLAVE_BUFFER_LENGTH MATRIX_ROWS/2
-#define SERIAL_MASTER_BUFFER_LENGTH MATRIX_ROWS/2
diff --git a/keyboards/helix/rev2/under/keyboard.json b/keyboards/helix/rev2/under/keyboard.json
deleted file mode 100644
index 0967ef424b..0000000000
--- a/keyboards/helix/rev2/under/keyboard.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/keyboards/helix/rev2/under/rules.mk b/keyboards/helix/rev2/under/rules.mk
deleted file mode 100644
index a37aa6fab3..0000000000
--- a/keyboards/helix/rev2/under/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LED_UNDERGLOW_ENABLE = yes
diff --git a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
index 0537235c4e..342ee77e99 100644
--- a/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
+++ b/keyboards/helix/rev3_5rows/keymaps/default/keymap.c
@@ -123,9 +123,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LOWER] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_HOME, KC_END) },
- [_RAISE] = { ENCODER_CCW_CW(UG_VALD, UG_VALU), ENCODER_CCW_CW(UG_SPDD, UG_SPDU) },
+ [_QWERTY] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_LOWER] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_HOME, KC_END) },
+ [_RAISE] = { ENCODER_CCW_CW(UG_VALD, UG_VALU), ENCODER_CCW_CW(UG_SPDD, UG_SPDU) },
[_ADJUST] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif
diff --git a/keyboards/helix/rules.mk b/keyboards/helix/rules.mk
index f743d48d0e..a2f233cf91 100644
--- a/keyboards/helix/rules.mk
+++ b/keyboards/helix/rules.mk
@@ -1,3 +1 @@
-DEFAULT_FOLDER = helix/rev2
-
HELIX_TOP_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
diff --git a/keyboards/hfdkb/ac001/keyboard.json b/keyboards/hfdkb/ac001/keyboard.json
index 8d96cad375..ee9aab074b 100644
--- a/keyboards/hfdkb/ac001/keyboard.json
+++ b/keyboards/hfdkb/ac001/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFFFE",
"pid": "0x0001",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/hhkb/yang/keymaps/kanru/keymap.c b/keyboards/hhkb/yang/keymaps/kanru/keymap.c
index ea020de126..85aad22962 100644
--- a/keyboards/hhkb/yang/keymaps/kanru/keymap.c
+++ b/keyboards/hhkb/yang/keymaps/kanru/keymap.c
@@ -118,9 +118,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MOUSE] = LAYOUT_60_hhkb(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN1, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN2, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_BTN1, MS_WHLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_BTN2, MS_WHLD, KC_TRNS, KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
// clang-format on
diff --git a/keyboards/hifumi/keyboard.json b/keyboards/hifumi/keyboard.json
index 320c14a2be..e859ceef69 100644
--- a/keyboards/hifumi/keyboard.json
+++ b/keyboards/hifumi/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/hnahkb/vn66/keymaps/default/keymap.c b/keyboards/hnahkb/vn66/keymaps/default/keymap.c
index 3af2332c19..f50050bdc5 100644
--- a/keyboards/hnahkb/vn66/keymaps/default/keymap.c
+++ b/keyboards/hnahkb/vn66/keymaps/default/keymap.c
@@ -43,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise == 0) {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
#else
tap_code(KC_VOLD);
#endif
} else {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
#else
tap_code(KC_VOLU);
#endif
diff --git a/keyboards/horizon/keyboard.json b/keyboards/horizon/keyboard.json
index 8dabea33a3..cb70b74470 100644
--- a/keyboards/horizon/keyboard.json
+++ b/keyboards/horizon/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D1", "F4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json
index c0946cf3a6..fd655f0c0d 100644
--- a/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json
+++ b/keyboards/horrortroll/chinese_pcb/black_e65/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x7516",
"pid": "0x7000",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json
index f10703ab5a..250cceb3e7 100644
--- a/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json
+++ b/keyboards/horrortroll/chinese_pcb/devil68_pro/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x7516",
"pid": "0x7001",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/horrortroll/handwired_k552/keyboard.json b/keyboards/horrortroll/handwired_k552/keyboard.json
index 97f8ec822c..ecbcb4b779 100644
--- a/keyboards/horrortroll/handwired_k552/keyboard.json
+++ b/keyboards/horrortroll/handwired_k552/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x7516",
"pid": "0x5104",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"ws2812": {
"pin": "C14"
diff --git a/keyboards/horrortroll/lemon40/keyboard.json b/keyboards/horrortroll/lemon40/keyboard.json
index 1c9993ca77..f2ff5be067 100644
--- a/keyboards/horrortroll/lemon40/keyboard.json
+++ b/keyboards/horrortroll/lemon40/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x7516",
"pid": "0x2434",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 15,
diff --git a/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
index a723f77452..920584caf6 100644
--- a/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
+++ b/keyboards/horrortroll/nyx/rev1/keymaps/default/keymap.c
@@ -77,8 +77,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Row: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
[_FN] = LAYOUT_65_ansi_blocker(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RM_TOGG,
- QK_BOOT, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, RM_SATD, RM_SATU, RM_SPDD, RM_SPDU, _______, RM_NEXT,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ QK_BOOT, _______, MS_UP, _______, _______, _______, _______, _______, _______, RM_SATD, RM_SATU, RM_SPDD, RM_SPDU, _______, RM_NEXT,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, KC_CALC, _______, _______, NK_TOGG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, RM_VALU, _______,
_______, _______, _______, _______, _______, _______, RM_HUED, RM_VALD, RM_HUEU
)
diff --git a/keyboards/horrortroll/paws60/keyboard.json b/keyboards/horrortroll/paws60/keyboard.json
index da03d362f9..da6e3a4fa2 100644
--- a/keyboards/horrortroll/paws60/keyboard.json
+++ b/keyboards/horrortroll/paws60/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x7516",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/hotdox/keymaps/default/keymap.c b/keyboards/hotdox/keymaps/default/keymap.c
index 45e81b7fcf..7de954e9ed 100644
--- a/keyboards/hotdox/keymaps/default/keymap.c
+++ b/keyboards/hotdox/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO),
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
@@ -119,10 +119,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c b/keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c
index 8e28b4e449..66db19400f 100644
--- a/keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c
+++ b/keyboards/ibm/model_m/mschwingen/keymaps/default/keymap.c
@@ -63,11 +63,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_MS] = LAYOUT( /* mouse key layer */
// Cursor: mouse, INS/HOME/PgUp: Mouse Accel, Del, End, PageDn: mouse buttons
TG(_MS), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_BTN3, MS_BTN2, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_UP, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______
)
};
diff --git a/keyboards/ibm/model_m/mschwingen/rules.mk b/keyboards/ibm/model_m/mschwingen/rules.mk
index 65761bcf9a..e9091cdbae 100644
--- a/keyboards/ibm/model_m/mschwingen/rules.mk
+++ b/keyboards/ibm/model_m/mschwingen/rules.mk
@@ -5,5 +5,3 @@ UART_DRIVER_REQUIRED = yes
SPI_DRIVER_REQUIRED = yes
OPT_DEFS += -DSLEEP_LED_ENABLE
-
-DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
diff --git a/keyboards/ibnuda/alicia_cook/keyboard.json b/keyboards/ibnuda/alicia_cook/keyboard.json
index ba9e22f63b..d8a98f92ed 100644
--- a/keyboards/ibnuda/alicia_cook/keyboard.json
+++ b/keyboards/ibnuda/alicia_cook/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["D2", "D3", "F4", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/ibnuda/gurindam/keyboard.json b/keyboards/ibnuda/gurindam/keyboard.json
index f136c8ecb2..72fdba4f7f 100644
--- a/keyboards/ibnuda/gurindam/keyboard.json
+++ b/keyboards/ibnuda/gurindam/keyboard.json
@@ -43,8 +43,7 @@
"rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ibnuda/squiggle/rev1/keyboard.json b/keyboards/ibnuda/squiggle/rev1/keyboard.json
index 41061674a9..e614da39bd 100644
--- a/keyboards/ibnuda/squiggle/rev1/keyboard.json
+++ b/keyboards/ibnuda/squiggle/rev1/keyboard.json
@@ -19,8 +19,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/idank/spankbd/keymaps/default/keymap.json b/keyboards/idank/spankbd/keymaps/default/keymap.json
index 10bb42e108..a07be80076 100644
--- a/keyboards/idank/spankbd/keymaps/default/keymap.json
+++ b/keyboards/idank/spankbd/keymaps/default/keymap.json
@@ -59,7 +59,7 @@
"KC_DLR",
"KC_LPRN",
"KC_RPRN",
- "KC_BTN2",
+ "MS_BTN2",
"KC_PPLS",
"KC_MINS",
"KC_SLSH",
@@ -69,7 +69,7 @@
"KC_CIRC",
"KC_LBRC",
"KC_RBRC",
- "KC_BTN1",
+ "MS_BTN1",
"KC_AMPR",
"KC_EQL",
"KC_COMM",
@@ -108,10 +108,10 @@
"KC_F8",
"KC_F9",
"KC_F10",
- "KC_MS_L",
- "KC_MS_D",
- "KC_MS_U",
- "KC_MS_R",
+ "MS_LEFT",
+ "MS_DOWN",
+ "MS_UP",
+ "MS_RGHT",
"KC_VOLD",
"KC_F11",
"KC_F12",
diff --git a/keyboards/idank/sweeq/keymaps/default/keymap.json b/keyboards/idank/sweeq/keymaps/default/keymap.json
index efd87277c7..d869668fdc 100644
--- a/keyboards/idank/sweeq/keymaps/default/keymap.json
+++ b/keyboards/idank/sweeq/keymaps/default/keymap.json
@@ -19,13 +19,13 @@
"LT(7,KC_SPC)", "KC_P1"
],
["KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN1" , "KC_WH_U" , "KC_BTN2" , "KC_TRNS",
+ "KC_TRNS" , "MS_BTN1" , "MS_WHLU" , "MS_BTN2" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN2" , "KC_NO" , "KC_BTN1" , "KC_TRNS",
- "KC_TRNS" , "KC_MS_L" , "KC_MS_D" , "KC_MS_U" , "KC_MS_R",
+ "KC_TRNS" , "MS_BTN2" , "KC_NO" , "MS_BTN1" , "KC_TRNS",
+ "KC_TRNS" , "MS_LEFT" , "MS_DOWN" , "MS_UP" , "MS_RGHT",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS",
- "KC_TRNS" , "KC_WH_L" , "KC_WH_D" , "KC_WH_R" , "KC_TRNS",
+ "KC_TRNS" , "MS_WHLL" , "MS_WHLD" , "MS_WHLR" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS"
diff --git a/keyboards/idobao/id42/keyboard.json b/keyboards/idobao/id42/keyboard.json
index 2b075a7ba1..0f1cecd16a 100644
--- a/keyboards/idobao/id42/keyboard.json
+++ b/keyboards/idobao/id42/keyboard.json
@@ -69,9 +69,13 @@
"vid": "0x6964",
"pid": "0x0042",
"device_version": "1.0.0",
- "force_nkro": true,
"polling_interval": 2
- },
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/inland/kb83/keyboard.json b/keyboards/inland/kb83/keyboard.json
index 2920da52e1..cd454cb93d 100644
--- a/keyboards/inland/kb83/keyboard.json
+++ b/keyboards/inland/kb83/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFFFE",
"pid": "0x0007",
- "device_version": "1.0.0",
- "force_nkro": true
+ "device_version": "1.0.0"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/inland/mk47/keyboard.json b/keyboards/inland/mk47/keyboard.json
index a69ec2ac4a..c777f54d52 100644
--- a/keyboards/inland/mk47/keyboard.json
+++ b/keyboards/inland/mk47/keyboard.json
@@ -6,9 +6,13 @@
"vid": "0xFFFE",
"pid": "0x0002",
"device_version": "0.0.1",
- "force_nkro": true,
"suspend_wakeup_delay": 1000
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"features": {
diff --git a/keyboards/inland/v83p/keyboard.json b/keyboards/inland/v83p/keyboard.json
index 5fad1a96d4..de93c5f372 100644
--- a/keyboards/inland/v83p/keyboard.json
+++ b/keyboards/inland/v83p/keyboard.json
@@ -8,9 +8,13 @@
"vid": "0xFFFE",
"pid": "0x001B",
"device_version": "1.0.3",
- "force_nkro": true,
"suspend_wakeup_delay": 1000
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"diode_direction": "ROW2COL",
"eeprom": {
"driver": "wear_leveling",
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
index 8b3d110c88..f6def2c8e8 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO),
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
@@ -123,10 +123,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
index 550eea0d31..69f831c2f2 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
+++ b/keyboards/input_club/ergodox_infinity/keymaps/halfkeyboard/keymap.c
@@ -48,21 +48,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Otherwise, it needs KC_*
[QWERTY] = LAYOUT_ergodox( // layer 0 : default
// left hand
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_BTN2,
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, MS_BTN2,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_EQL,
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_MINUS,
KC_LCTL, KC_LALT, LCTL(LSFT(KC_TAB)),LCTL(KC_TAB), MO(SHORTCUTS),
- KC_LGUI, KC_BTN1,
+ KC_LGUI, MS_BTN1,
MU_ON,
KC_SPACE,KC_DEL,KC_END,
// right hand
- KC_BTN2, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
+ MS_BTN2, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC,
KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLASH,
KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
KC_EQL,KC_N, KC_M, KC_COMM,KC_DOT, KC_SLASH, KC_RSFT,
MO(SHORTCUTS), KC_UP,KC_DOWN,KC_RALT, KC_RCTL,
- KC_BTN1, KC_RGUI,
+ MS_BTN1, KC_RGUI,
MU_OFF,
KC_PGDN,KC_TAB, LT(HALFQWERTY, KC_ENT)
),
diff --git a/keyboards/input_club/infinity60/keymaps/hasu/keymap.c b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
index 4200eaf1c2..7837a0cd5d 100644
--- a/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
+++ b/keyboards/input_club/infinity60/keymaps/hasu/keymap.c
@@ -80,10 +80,10 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[3] = LAYOUT_60_ansi_split_bs_rshift(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_MS_U, KC_WH_U, KC_WH_R, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB),
- KC_LCTL, KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO, KC_NO, KC_MS_L,KC_MS_D, KC_MS_R, LT(3, KC_SCLN), KC_NO, KC_ENT,
- KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_TRNS,
- KC_TRNS, KC_LGUI,KC_LALT, KC_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLL,MS_WHLD,MS_UP, MS_WHLU, MS_WHLR, ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB),
+ KC_LCTL, MS_ACL0,MS_ACL1,MS_ACL2,MS_ACL2,KC_NO, KC_NO, MS_LEFT,MS_DOWN, MS_RGHT, LT(3, KC_SCLN), KC_NO, KC_ENT,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, MS_BTN3,MS_BTN2,MS_BTN1,ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_TRNS,
+ KC_TRNS, KC_LGUI,KC_LALT, MS_BTN1, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
/* Layer 4: Mouse mode(IJKL)[Space]
@@ -102,9 +102,9 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
*/
[4] = LAYOUT_60_ansi_split_bs_rshift(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,
- LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L, KC_WH_D, KC_MS_U, KC_WH_U, KC_WH_R, KC_BTN4, KC_BTN5, LALT(KC_TAB),
- KC_LCTL, KC_VOLD, KC_VOLU, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_NO, KC_ENT,
- KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN3, KC_BTN2, KC_BTN1, ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_NO,
+ LALT(KC_TAB), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLL, MS_WHLD, MS_UP, MS_WHLU, MS_WHLR, MS_BTN4, MS_BTN5, LALT(KC_TAB),
+ KC_LCTL, KC_VOLD, KC_VOLU, KC_MUTE, KC_NO, KC_NO, KC_NO, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN1, KC_NO, KC_ENT,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, MS_BTN3, MS_BTN2, MS_BTN1, ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO, KC_RSFT, KC_NO,
KC_NO, KC_LGUI, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
diff --git a/keyboards/ivndbt/late9/rev1/keyboard.json b/keyboards/ivndbt/late9/rev1/keyboard.json
index a9bc229588..523ae83492 100644
--- a/keyboards/ivndbt/late9/rev1/keyboard.json
+++ b/keyboards/ivndbt/late9/rev1/keyboard.json
@@ -24,8 +24,7 @@
"nkro": true,
"oled": true
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ivndbt/neopad/rev1/keyboard.json b/keyboards/ivndbt/neopad/rev1/keyboard.json
index a07852acf0..f40f06549b 100755
--- a/keyboards/ivndbt/neopad/rev1/keyboard.json
+++ b/keyboards/ivndbt/neopad/rev1/keyboard.json
@@ -28,8 +28,7 @@
{"pin_a": "D4", "pin_b": "C6"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"tapping": {
"toggle": 2
},
diff --git a/keyboards/ivndbt/neopad/rev1/keymaps/default/keymap.c b/keyboards/ivndbt/neopad/rev1/keymaps/default/keymap.c
index 721c21ef3c..17c9d9db9b 100755
--- a/keyboards/ivndbt/neopad/rev1/keymaps/default/keymap.c
+++ b/keyboards/ivndbt/neopad/rev1/keymaps/default/keymap.c
@@ -104,9 +104,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 3:
// layer 3 - pan right (CW) and left (CCW)
if (clockwise) {
- tap_code(KC_WH_R);
+ tap_code(MS_WHLR);
} else {
- tap_code(KC_WH_L);
+ tap_code(MS_WHLL);
}
break;
}
@@ -134,18 +134,18 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case 2:
// layer 2 - wheel up (CW) and down (CCW)
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
case 3:
// layer 3 - wheel up (CW) and down (CCW)
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
}
diff --git a/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c b/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
index 2330caf6ff..95a9e1e555 100644
--- a/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
+++ b/keyboards/jacky_studio/piggy60/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_60_ansi_tsangan_split_bs_rshift(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_PSCR,
- KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_PGUP, KC_HOME, KC_TRNS, KC_VOLU, KC_BRIU, KC_TRNS, KC_WH_U, KC_TRNS, KC_TRNS, KC_DEL,
- KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_TRNS, KC_VOLD, KC_BRID, KC_TRNS, KC_WH_D, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_PGUP, KC_HOME, KC_TRNS, KC_VOLU, KC_BRIU, KC_TRNS, MS_WHLU, KC_TRNS, KC_TRNS, KC_DEL,
+ KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, KC_TRNS, KC_VOLD, KC_BRID, KC_TRNS, MS_WHLD, KC_TRNS, KC_TRNS,
RM_TOGG, RM_NEXT, RM_HUEU, RM_SATU, RM_VALU, RM_SPDU, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json
index b06266ec8c..00c4239781 100644
--- a/keyboards/jiran/info.json
+++ b/keyboards/jiran/info.json
@@ -19,6 +19,5 @@
"pin": "D1"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/jorne/rev1/keyboard.json b/keyboards/jorne/rev1/keyboard.json
index 4e905e4bfc..7fffc8be02 100644
--- a/keyboards/jorne/rev1/keyboard.json
+++ b/keyboards/jorne/rev1/keyboard.json
@@ -32,8 +32,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/junco/keymaps/default/keymap.c b/keyboards/junco/keymaps/default/keymap.c
index 8fe73e035a..f1726791e3 100644
--- a/keyboards/junco/keymaps/default/keymap.c
+++ b/keyboards/junco/keymaps/default/keymap.c
@@ -146,7 +146,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
// Base layer encoder mappings:
// index 0: mouse wheel up (CCW)/down (CW) index 1: volume down/up index 2: mouse wheel up/down index 3: mouse wheel left/right
- [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
+ [_QWERTY] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(MS_WHLL, MS_WHLR) },
[_COLEMAK_DH] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
// Passes through to base layers
diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c
index 4d09b121dd..cfadf90c6b 100644
--- a/keyboards/k34/keymaps/default/keymap.c
+++ b/keyboards/k34/keymaps/default/keymap.c
@@ -25,8 +25,8 @@ enum layer_names {
#define S_SLSH SFT_T(KC_SLSH)
// combos for application shortcuts
-#define SG_LBRC SGUI(KC_LBRC)
-#define SG_RBRC SGUI(KC_RBRC)
+#define SG_LBRC LSG(KC_LBRC)
+#define SG_RBRC LSG(KC_RBRC)
#define G_LBRC G(KC_LBRC)
#define G_RBRC G(KC_RBRC)
#define A_SLSH A(KC_SLSH)
diff --git a/keyboards/kabedon/kabedon98e/keyboard.json b/keyboards/kabedon/kabedon98e/keyboard.json
index 731c03dd74..70d0bb8ca4 100644
--- a/keyboards/kabedon/kabedon98e/keyboard.json
+++ b/keyboards/kabedon/kabedon98e/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4B44",
"pid": "0x3935",
- "device_version": "0.0.2",
- "force_nkro": true
+ "device_version": "0.0.2"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 24,
diff --git a/keyboards/kakunpc/angel17/info.json b/keyboards/kakunpc/angel17/info.json
index a8a4f2c148..c0d7287052 100644
--- a/keyboards/kakunpc/angel17/info.json
+++ b/keyboards/kakunpc/angel17/info.json
@@ -8,7 +8,6 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["numpad_5x4"]
}
diff --git a/keyboards/kakunpc/rabbit_capture_plan/keyboard.json b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
index dce62c64d8..357d1a1ed1 100644
--- a/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
+++ b/keyboards/kakunpc/rabbit_capture_plan/keyboard.json
@@ -55,8 +55,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_all": "LAYOUT_ansi_split_rshift"
},
diff --git a/keyboards/kapcave/paladin64/keymaps/default/keymap.c b/keyboards/kapcave/paladin64/keymaps/default/keymap.c
index f4f1873919..e69ef22288 100644
--- a/keyboards/kapcave/paladin64/keymaps/default/keymap.c
+++ b/keyboards/kapcave/paladin64/keymaps/default/keymap.c
@@ -53,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* AutoMouse */
LAYOUT_all(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
diff --git a/keyboards/kapl/rev1/keyboard.json b/keyboards/kapl/rev1/keyboard.json
index 820c647ccf..843847d8fe 100644
--- a/keyboards/kapl/rev1/keyboard.json
+++ b/keyboards/kapl/rev1/keyboard.json
@@ -72,8 +72,7 @@
}
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kb_elmo/gamehand/keyboard.json b/keyboards/kb_elmo/gamehand/keyboard.json
index 39795bf250..9c2b847c1a 100644
--- a/keyboards/kb_elmo/gamehand/keyboard.json
+++ b/keyboards/kb_elmo/gamehand/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xA68C",
"pid": "0x4D90",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "atmega32u2",
"bootloader": "atmel-dfu",
diff --git a/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c b/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c
index 46d68182f4..e1674d43ff 100644
--- a/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c
+++ b/keyboards/kbdclack/kaishi65/keymaps/default/keymap.c
@@ -32,8 +32,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_65_ansi(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
- _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
+ _______, MS_BTN1, MS_UP, MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INS,
+ _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
_______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, KC_VOLU, KC_END,
_______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT)
};
diff --git a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
index d4a3cad12f..f34c94523f 100644
--- a/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
+++ b/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
@@ -54,8 +54,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_PSCR,
KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, KC_INS,
_______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, KC_HOME,
- _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ _______, UG_TOGG, UG_NEXT, UG_HUEU, UG_HUED, UG_SATU, UG_SATD, _______, _______, _______, _______, _______, MS_BTN1, MS_UP, KC_END,
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
};
diff --git a/keyboards/kbdfans/kbd75hs/keyboard.json b/keyboards/kbdfans/kbd75hs/keyboard.json
index cba3e17e9a..45773d07aa 100644
--- a/keyboards/kbdfans/kbd75hs/keyboard.json
+++ b/keyboards/kbdfans/kbd75hs/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4B42",
"pid": "0x6062",
- "device_version": "0.0.3",
- "force_nkro": true
+ "device_version": "0.0.3"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/keaboard/rev1/keyboard.json b/keyboards/keaboard/rev1/keyboard.json
index 1b5b492075..c8dea471f6 100644
--- a/keyboards/keaboard/rev1/keyboard.json
+++ b/keyboards/keaboard/rev1/keyboard.json
@@ -13,8 +13,7 @@
"rows": ["D7", "E6", "B4", "B5"],
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
- "bootloader": "caterina",
- "processor": "atmega32u4",
+ "development_board": "promicro",
"split": {
"enabled": true,
"serial": {
diff --git a/keyboards/keebformom/keyboard.json b/keyboards/keebformom/keyboard.json
index 7fbaa5737f..bcc3a7d8b2 100644
--- a/keyboards/keebformom/keyboard.json
+++ b/keyboards/keebformom/keyboard.json
@@ -28,8 +28,7 @@
"rows": ["F5", "F6", "F7", "B1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keebformom/keymaps/default/keymap.c b/keyboards/keebformom/keymaps/default/keymap.c
index f1c4b29429..727e429d74 100644
--- a/keyboards/keebformom/keymaps/default/keymap.c
+++ b/keyboards/keebformom/keymaps/default/keymap.c
@@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `---------------------------------------------------------------------'
*/
[_THIRD] = LAYOUT_ortho_4x10(
- KC_INS, KC_HOME, KC_PGUP, KC_NO, SGUI(KC_S), LCTL(KC_A), KC_NO, KC_NO, KC_UP, KC_NO,
+ KC_INS, KC_HOME, KC_PGUP, KC_NO, LSG(KC_S), LCTL(KC_A), KC_NO, KC_NO, KC_UP, KC_NO,
KC_DEL, KC_END, KC_PGDN, KC_NO, LCTL(KC_S), LCTL(KC_C), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT,
KC_NO, KC_NO, KC_NO, KC_NO, LWIN(KC_E), LCTL(KC_V), KC_NO, KC_NO, KC_NO, KC_NO,
TO(0), _______, _______, _______, _______, _______, _______, KC_VOLD, _______, KC_VOLU
diff --git a/keyboards/keebio/bdn9/rev1/keyboard.json b/keyboards/keebio/bdn9/rev1/keyboard.json
index 1deecf0d5b..5c677db78d 100644
--- a/keyboards/keebio/bdn9/rev1/keyboard.json
+++ b/keyboards/keebio/bdn9/rev1/keyboard.json
@@ -36,8 +36,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keebio/bfo9000/keyboard.json b/keyboards/keebio/bfo9000/keyboard.json
index 08d9997d43..159334cc07 100644
--- a/keyboards/keebio/bfo9000/keyboard.json
+++ b/keyboards/keebio/bfo9000/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "B4"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/dilly/keyboard.json b/keyboards/keebio/dilly/keyboard.json
index 82a565ae62..0f7bce7d3f 100644
--- a/keyboards/keebio/dilly/keyboard.json
+++ b/keyboards/keebio/dilly/keyboard.json
@@ -49,8 +49,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_3x10"],
"layouts": {
"LAYOUT_ortho_3x10": {
diff --git a/keyboards/keebio/fourier/keyboard.json b/keyboards/keebio/fourier/keyboard.json
index ae4985787d..74620068a2 100644
--- a/keyboards/keebio/fourier/keyboard.json
+++ b/keyboards/keebio/fourier/keyboard.json
@@ -61,8 +61,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/iris/rev1/keyboard.json b/keyboards/keebio/iris/rev1/keyboard.json
index fbccf0de84..74dc366413 100644
--- a/keyboards/keebio/iris/rev1/keyboard.json
+++ b/keyboards/keebio/iris/rev1/keyboard.json
@@ -53,8 +53,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/iris/rev1_led/keyboard.json b/keyboards/keebio/iris/rev1_led/keyboard.json
index cb171fcec3..4dc003f271 100644
--- a/keyboards/keebio/iris/rev1_led/keyboard.json
+++ b/keyboards/keebio/iris/rev1_led/keyboard.json
@@ -52,8 +52,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/iris/rev2/keyboard.json b/keyboards/keebio/iris/rev2/keyboard.json
index 37a4764c6b..9ea21851ee 100644
--- a/keyboards/keebio/iris/rev2/keyboard.json
+++ b/keyboards/keebio/iris/rev2/keyboard.json
@@ -38,8 +38,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keebio/laplace/keyboard.json b/keyboards/keebio/laplace/keyboard.json
index 3a2ed70905..3ae9f6474b 100644
--- a/keyboards/keebio/laplace/keyboard.json
+++ b/keyboards/keebio/laplace/keyboard.json
@@ -38,8 +38,7 @@
"rows": ["D3", "F4", "D2", "F5", "D7", "B4", "C6", "E6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keebio/levinson/info.json b/keyboards/keebio/levinson/info.json
index 29ae8be8cb..1f4541a5e9 100644
--- a/keyboards/keebio/levinson/info.json
+++ b/keyboards/keebio/levinson/info.json
@@ -9,7 +9,6 @@
"split": {
"enabled": true
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x12"]
}
diff --git a/keyboards/keebio/nyquist/rev1/keyboard.json b/keyboards/keebio/nyquist/rev1/keyboard.json
index f684332bdb..b7cf0ae0d5 100644
--- a/keyboards/keebio/nyquist/rev1/keyboard.json
+++ b/keyboards/keebio/nyquist/rev1/keyboard.json
@@ -35,8 +35,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_5x12"
},
diff --git a/keyboards/keebio/nyquist/rev2/keyboard.json b/keyboards/keebio/nyquist/rev2/keyboard.json
index dede204981..69639db6bf 100644
--- a/keyboards/keebio/nyquist/rev2/keyboard.json
+++ b/keyboards/keebio/nyquist/rev2/keyboard.json
@@ -40,8 +40,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_5x12"
},
diff --git a/keyboards/keebio/quefrency/rev1/keyboard.json b/keyboards/keebio/quefrency/rev1/keyboard.json
index 73f6d0d660..651e3f1362 100644
--- a/keyboards/keebio/quefrency/rev1/keyboard.json
+++ b/keyboards/keebio/quefrency/rev1/keyboard.json
@@ -46,8 +46,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
@@ -63,8 +62,11 @@
"build": {
"lto": true
},
+ "layout_aliases": {
+ "LAYOUT": "LAYOUT_60"
+ },
"layouts": {
- "LAYOUT": {
+ "LAYOUT_60": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/keebio/rorschach/rev1/keyboard.json b/keyboards/keebio/rorschach/rev1/keyboard.json
index 63fe877246..6f07992f1e 100644
--- a/keyboards/keebio/rorschach/rev1/keyboard.json
+++ b/keyboards/keebio/rorschach/rev1/keyboard.json
@@ -43,8 +43,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/keebio/stick/keyboard.json b/keyboards/keebio/stick/keyboard.json
index 93d78837eb..b8d1184ec1 100644
--- a/keyboards/keebio/stick/keyboard.json
+++ b/keyboards/keebio/stick/keyboard.json
@@ -83,8 +83,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"encoder": true,
diff --git a/keyboards/keebio/tragicforce68/keyboard.json b/keyboards/keebio/tragicforce68/keyboard.json
index 3173ed3f50..f257cc26a8 100644
--- a/keyboards/keebio/tragicforce68/keyboard.json
+++ b/keyboards/keebio/tragicforce68/keyboard.json
@@ -31,8 +31,7 @@
"levels": 7,
"breathing": true
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["68_ansi"],
"layout_aliases": {
"LAYOUT": "LAYOUT_68_ansi"
diff --git a/keyboards/keebio/tukey/keyboard.json b/keyboards/keebio/tukey/keyboard.json
index a030f041b7..3f4e5e947a 100644
--- a/keyboards/keebio/tukey/keyboard.json
+++ b/keyboards/keebio/tukey/keyboard.json
@@ -28,8 +28,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"command": true,
diff --git a/keyboards/keebio/viterbi/info.json b/keyboards/keebio/viterbi/info.json
index 8b1063ea98..f547514cdb 100644
--- a/keyboards/keebio/viterbi/info.json
+++ b/keyboards/keebio/viterbi/info.json
@@ -8,7 +8,6 @@
"split": {
"enabled": true
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_5x14"]
}
diff --git a/keyboards/keebio/wavelet/keyboard.json b/keyboards/keebio/wavelet/keyboard.json
index 70430e0f4d..fa14bfd62c 100644
--- a/keyboards/keebio/wavelet/keyboard.json
+++ b/keyboards/keebio/wavelet/keyboard.json
@@ -23,8 +23,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/keybage/radpad/keyboard.json b/keyboards/keybage/radpad/keyboard.json
index 24f84477a8..d8a3c827df 100644
--- a/keyboards/keybage/radpad/keyboard.json
+++ b/keyboards/keybage/radpad/keyboard.json
@@ -52,8 +52,7 @@
"ws2812": {
"pin": "F4"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_4x4_encoders": {
"layout": [
diff --git a/keyboards/keyboardio/model01/keymaps/default/keymap.c b/keyboards/keyboardio/model01/keymaps/default/keymap.c
index 756cffcf23..9540d76513 100644
--- a/keyboards/keyboardio/model01/keymaps/default/keymap.c
+++ b/keyboards/keyboardio/model01/keymaps/default/keymap.c
@@ -48,9 +48,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[FUN] = LAYOUT(
_______, KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 ,
- KC_TAB , _______, KC_MS_U, _______, KC_BTN3, _______, RM_TOGG, KC_MPRV, KC_MNXT, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_F12 ,
- KC_HOME, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, _______, _______, KC_MPLY, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______, _______,
- KC_END , KC_PSCR, KC_INS , _______, KC_BTN2, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSLS, KC_PIPE,
+ KC_TAB , _______, MS_UP, _______, MS_BTN3, _______, RM_TOGG, KC_MPRV, KC_MNXT, KC_LCBR, KC_RCBR, KC_LBRC, KC_RBRC, KC_F12 ,
+ KC_HOME, MS_LEFT, MS_DOWN, MS_RGHT, MS_BTN1, _______, _______, KC_MPLY, KC_LEFT, KC_DOWN, KC_UP , KC_RGHT, _______, _______,
+ KC_END , KC_PSCR, KC_INS , _______, MS_BTN2, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_BSLS, KC_PIPE,
_______, _______,
KC_DEL , KC_ENT ,
_______, _______,
diff --git a/keyboards/keycapsss/o4l_5x12/keyboard.json b/keyboards/keycapsss/o4l_5x12/keyboard.json
index 5a516adca0..7425dc7a0b 100644
--- a/keyboards/keycapsss/o4l_5x12/keyboard.json
+++ b/keyboards/keycapsss/o4l_5x12/keyboard.json
@@ -48,8 +48,7 @@
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
diff --git a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
index 944f822fb3..3b28233ab7 100644
--- a/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
+++ b/keyboards/keycapsss/plaid_pad/keymaps/oled/keymap.c
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Navigation layer
*/
[_NAVIGATION] = LAYOUT_ortho_4x4(
- KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,
- KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX,
+ MS_BTN1, MS_UP, MS_BTN2, XXXXXXX,
+ MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX,
XXXXXXX, KC_UP, XXXXXXX, XXXXXXX,
KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX
),
@@ -144,7 +144,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_MEDIA] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19) }
#else
[_NUMPAD] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_F22, KC_F21), ENCODER_CCW_CW(KC_F24, KC_F23) },
- [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_NAVIGATION] = { ENCODER_CCW_CW(C(S(KC_TAB)), C(KC_TAB)), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[_MEDIA] = { ENCODER_CCW_CW(KC_F18, KC_F17), ENCODER_CCW_CW(KC_F20, KC_F19), ENCODER_CCW_CW(KC_BRID, KC_BRIU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }
#endif
};
diff --git a/keyboards/keychron/c2_pro_v2/ansi/rgb/keymaps/default/keymap.c b/keyboards/keychron/c2_pro_v2/ansi/rgb/keymaps/default/keymap.c
index 7e09d028f7..4d18d2fc6e 100644
--- a/keyboards/keychron/c2_pro_v2/ansi/rgb/keymaps/default/keymap.c
+++ b/keyboards/keychron/c2_pro_v2/ansi/rgb/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ enum layers{
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_104_ansi(
- KC_ESC, KC_BRID, KC_BRIU, _______, _______, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, RM_NEXT,
+ KC_ESC, KC_BRID, KC_BRIU, _______, _______, RM_VALD, RM_VALU, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, RM_NEXT,
KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS,
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6,
diff --git a/keyboards/keychron/c3_pro/c3_pro.c b/keyboards/keychron/c3_pro/c3_pro.c
index 905eb86f5a..0c584b0938 100644
--- a/keyboards/keychron/c3_pro/c3_pro.c
+++ b/keyboards/keychron/c3_pro/c3_pro.c
@@ -16,6 +16,26 @@
#include "c3_pro.h"
+void keyboard_post_init_kb(void) {
+ gpio_set_pin_output_push_pull(LED_MAC_OS_PIN);
+ gpio_set_pin_output_push_pull(LED_WIN_OS_PIN);
+ gpio_write_pin(LED_MAC_OS_PIN, !LED_OS_PIN_ON_STATE);
+ gpio_write_pin(LED_WIN_OS_PIN, !LED_OS_PIN_ON_STATE);
+
+ keyboard_post_init_user();
+}
+
+void housekeeping_task_kb(void) {
+ if (get_highest_layer(default_layer_state) == 0) {
+ gpio_write_pin(LED_MAC_OS_PIN, LED_OS_PIN_ON_STATE);
+ gpio_write_pin(LED_WIN_OS_PIN, !LED_OS_PIN_ON_STATE);
+ }
+ if (get_highest_layer(default_layer_state) == 2) {
+ gpio_write_pin(LED_MAC_OS_PIN, !LED_OS_PIN_ON_STATE);
+ gpio_write_pin(LED_WIN_OS_PIN, LED_OS_PIN_ON_STATE);
+ }
+}
+
bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) {
return false;
@@ -61,9 +81,12 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
#endif
case KC_OSSW:
if (record->event.pressed) {
- default_layer_xor(1U << 0);
- default_layer_xor(1U << 2);
- eeconfig_update_default_layer(default_layer_state);
+ // Switches default layer between `MAC_BASE` and `WIN_BASE` (0 and 2)
+ if (get_highest_layer(default_layer_state) == 2 ) {
+ set_single_persistent_default_layer(0);
+ } else {
+ set_single_persistent_default_layer(2);
+ }
}
return false;
default:
@@ -71,42 +94,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
}
}
-#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
-
-bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
- if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
- return false;
- }
- // RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
-
- if (host_keyboard_led_state().caps_lock) {
- RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
- } else {
- if (!rgb_matrix_get_flags()) {
- RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
- }
- }
- return true;
-}
-
-#endif // RGB_MATRIX_ENABLE && CAPS_LOCK_LED_INDEX
-
-#if defined(LED_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
-
-bool led_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
- if (!led_matrix_indicators_advanced_user(led_min, led_max)) {
- return false;
- }
-
- if (host_keyboard_led_state().caps_lock) {
- led_matrix_set_value(CAPS_LOCK_LED_INDEX, 255);
-
- } else {
- if (!led_matrix_get_flags()) {
- led_matrix_set_value(CAPS_LOCK_LED_INDEX, 0);
- }
- }
- return true;
+void suspend_power_down_kb(void) {
+ gpio_write_pin(LED_WIN_OS_PIN, !LED_OS_PIN_ON_STATE);
+ gpio_write_pin(LED_MAC_OS_PIN, !LED_OS_PIN_ON_STATE);
+ suspend_power_down_user();
}
-
-#endif // LED_MATRIX_ENABLE && CAPS_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q0/info.json b/keyboards/keychron/q0/info.json
index 666a797411..d7a7317e3f 100644
--- a/keyboards/keychron/q0/info.json
+++ b/keyboards/keychron/q0/info.json
@@ -45,7 +45,11 @@
},
"url": "https://github.com/Keychron",
"usb": {
- "force_nkro": true,
"vid": "0x3434"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
}
} \ No newline at end of file
diff --git a/keyboards/keychron/q1v1/info.json b/keyboards/keychron/q1v1/info.json
index b8ab503b07..034bb4357f 100644
--- a/keyboards/keychron/q1v1/info.json
+++ b/keyboards/keychron/q1v1/info.json
@@ -52,7 +52,11 @@
},
"url": "https://github.com/Keychron",
"usb": {
- "force_nkro": true,
"vid": "0x3434"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
}
} \ No newline at end of file
diff --git a/keyboards/keyhive/ergosaurus/keyboard.json b/keyboards/keyhive/ergosaurus/keyboard.json
index 9a4810a9a5..754201c2b1 100644
--- a/keyboards/keyhive/ergosaurus/keyboard.json
+++ b/keyboards/keyhive/ergosaurus/keyboard.json
@@ -42,8 +42,7 @@
"rows": ["B5", "B4", "E6", "D4", "F6", "D3", "D2", "F4", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["alice_split_bs"],
"layout_aliases": {
"LAYOUT": "LAYOUT_alice_split_bs"
diff --git a/keyboards/keyhive/maypad/keyboard.json b/keyboards/keyhive/maypad/keyboard.json
index d0dad2b6cf..adc04dc386 100644
--- a/keyboards/keyhive/maypad/keyboard.json
+++ b/keyboards/keyhive/maypad/keyboard.json
@@ -27,8 +27,7 @@
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
diff --git a/keyboards/keyhive/navi10/rev0/keyboard.json b/keyboards/keyhive/navi10/rev0/keyboard.json
index ab0e63ef1e..9e362651ef 100644
--- a/keyboards/keyhive/navi10/rev0/keyboard.json
+++ b/keyboards/keyhive/navi10/rev0/keyboard.json
@@ -7,8 +7,7 @@
"rows": ["B6", "B2", "B3", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keyhive/navi10/rev2/keyboard.json b/keyboards/keyhive/navi10/rev2/keyboard.json
index ac5148b787..df4d11b6e3 100644
--- a/keyboards/keyhive/navi10/rev2/keyboard.json
+++ b/keyboards/keyhive/navi10/rev2/keyboard.json
@@ -7,8 +7,7 @@
"rows": ["B6", "B2", "B3", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keyhive/navi10/rev3/keyboard.json b/keyboards/keyhive/navi10/rev3/keyboard.json
index 9f403a3513..8fa609c52f 100644
--- a/keyboards/keyhive/navi10/rev3/keyboard.json
+++ b/keyboards/keyhive/navi10/rev3/keyboard.json
@@ -7,8 +7,7 @@
"rows": ["B6", "B2", "B3", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/keyhive/opus/keyboard.json b/keyboards/keyhive/opus/keyboard.json
index 6072a59f5d..58bd2238db 100644
--- a/keyboards/keyhive/opus/keyboard.json
+++ b/keyboards/keyhive/opus/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keyhive/opus/keymaps/default/keymap.c b/keyboards/keyhive/opus/keymaps/default/keymap.c
index aaa1a899a2..868b611a81 100644
--- a/keyboards/keyhive/opus/keymaps/default/keymap.c
+++ b/keyboards/keyhive/opus/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO, KC_NO, KC_NO, KC_SPC, KC_BSPC
),
[_NAV] = LAYOUT(
- KC_NO, KC_NO, LALT(KC_RGHT), SGUI(KC_LBRC), SGUI(KC_RBRC), KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_NO, LALT(KC_RGHT), LSG(KC_LBRC), LSG(KC_RBRC), KC_NO, KC_HOME, KC_PGDN, KC_PGUP, KC_NO, KC_NO, KC_NO,
KC_NO, KC_LCTL, KC_LALT, KC_LSFT, KC_LGUI, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, LALT(KC_LEFT), KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_NO, KC_NO, KC_NO, KC_SPC, KC_BSPC
diff --git a/keyboards/keyhive/ut472/keymaps/default/keymap.c b/keyboards/keyhive/ut472/keymaps/default/keymap.c
index c31b2b7d61..37bd3b37b3 100644
--- a/keyboards/keyhive/ut472/keymaps/default/keymap.c
+++ b/keyboards/keyhive/ut472/keymaps/default/keymap.c
@@ -95,6 +95,6 @@ LAYOUT( /* Tab */
KC_ESC, KC_CALC, KC_WHOM, KC_MAIL, KC_MYCM, _______, _______, _______, _______, _______, KC_PSCR, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT
),
};
diff --git a/keyboards/keyprez/unicorn/keyboard.json b/keyboards/keyprez/unicorn/keyboard.json
index 20aa2e3e73..9a8d39a416 100644
--- a/keyboards/keyprez/unicorn/keyboard.json
+++ b/keyboards/keyprez/unicorn/keyboard.json
@@ -42,8 +42,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keysofkings/twokey/keyboard.json b/keyboards/keysofkings/twokey/keyboard.json
index 2ec17f2b93..f0c46e34a6 100644
--- a/keyboards/keysofkings/twokey/keyboard.json
+++ b/keyboards/keysofkings/twokey/keyboard.json
@@ -53,8 +53,7 @@
{"pin_a": "D7", "pin_b": "E6", "resolution": 1}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/keyspensory/kp60/keyboard.json b/keyboards/keyspensory/kp60/keyboard.json
index 2072186e9d..6634b522bb 100644
--- a/keyboards/keyspensory/kp60/keyboard.json
+++ b/keyboards/keyspensory/kp60/keyboard.json
@@ -7,8 +7,12 @@
"vid": "0x4B50",
"pid": "0x0060",
"device_version": "0.0.1",
- "no_startup_check": true,
- "force_nkro": true
+ "no_startup_check": true
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"diode_direction": "COL2ROW",
"matrix_pins": {
diff --git a/keyboards/kikoslab/kl90/keymaps/default/keymap.c b/keyboards/kikoslab/kl90/keymaps/default/keymap.c
index 5cf7c75503..b84022f583 100644
--- a/keyboards/kikoslab/kl90/keymaps/default/keymap.c
+++ b/keyboards/kikoslab/kl90/keymaps/default/keymap.c
@@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
diff --git a/keyboards/kin80/keymaps/default/keymap.c b/keyboards/kin80/keymaps/default/keymap.c
index 50bad2a974..2e4077e60c 100644
--- a/keyboards/kin80/keymaps/default/keymap.c
+++ b/keyboards/kin80/keymaps/default/keymap.c
@@ -85,13 +85,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NM] = LAYOUT(
KC_F1, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,
_______, _______, _______, _______, _______, _______, KC_SCRL, KC_NUM, KC_PEQL, KC_PSLS, KC_PAST, _______,
- _______, _______, KC_BTN1, KC_MS_U, KC_BTN2, _______, KC_CAPS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
- _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
+ _______, _______, MS_BTN1, MS_UP, MS_BTN2, _______, KC_CAPS, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
+ _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
_______, _______, _______, _______, _______, _______, KC_PDOT, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
QK_BOOT, _______, _______, _______, _______, _______, _______, _______,
_______, _______, KC_RALT, _______,
- KC_WH_U, _______,
- _______, _______, KC_WH_D, _______, _______, KC_P0
+ MS_WHLU, _______,
+ _______, _______, MS_WHLD, _______, _______, KC_P0
)
};
diff --git a/keyboards/kinesis/keymaps/dvorak/keymap.c b/keyboards/kinesis/keymaps/dvorak/keymap.c
index f8a5b4ed4f..af68841b1c 100644
--- a/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -25,10 +25,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// left hand
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PWR,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, KC_MS_U, KC_VOLD, KC_NO, KC_NO,
- KC_NO, KC_BTN4, KC_BTN3, KC_BTN2, KC_BTN1, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_VOLU, MS_UP, KC_VOLD, KC_NO, KC_NO,
+ KC_NO, MS_BTN4, MS_BTN3, MS_BTN2, MS_BTN1, KC_NO, KC_NO, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO, KC_NO,
KC_NO, KC_NO, KC_MUTE, KC_VOLD, KC_VOLU, KC_NO, KC_NO, KC_MPRV, KC_MPLY, KC_MNXT, KC_NO, KC_NO,
- KC_NO, KC_NO, KC_MS_D, KC_MS_U, KC_MS_L, KC_MS_R, KC_NO, KC_NO,
+ KC_NO, KC_NO, MS_DOWN, MS_UP, MS_LEFT, MS_RGHT, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NO,
KC_NO, KC_NO,
diff --git a/keyboards/kinesis/kint32/keyboard.json b/keyboards/kinesis/kint32/keyboard.json
index 4f403c2ffa..2a46bbe12b 100644
--- a/keyboards/kinesis/kint32/keyboard.json
+++ b/keyboards/kinesis/kint32/keyboard.json
@@ -9,8 +9,6 @@
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
- "command": false,
- "console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
diff --git a/keyboards/kingly_keys/little_foot/keyboard.json b/keyboards/kingly_keys/little_foot/keyboard.json
index 2af4432d47..2ff3fd89cd 100644
--- a/keyboards/kingly_keys/little_foot/keyboard.json
+++ b/keyboards/kingly_keys/little_foot/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"hue_steps": 6,
@@ -47,8 +51,7 @@
"rows": ["F6", "B6", "B2", "B3", "B1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_split_space_base": {
"layout": [
diff --git a/keyboards/kingly_keys/romac/keyboard.json b/keyboards/kingly_keys/romac/keyboard.json
index 40c8dea64f..d9993f9917 100644
--- a/keyboards/kingly_keys/romac/keyboard.json
+++ b/keyboards/kingly_keys/romac/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D4", "C6", "D7", "E6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/kingly_keys/romac_plus/keyboard.json b/keyboards/kingly_keys/romac_plus/keyboard.json
index b0b2f487cb..db34d4b465 100644
--- a/keyboards/kingly_keys/romac_plus/keyboard.json
+++ b/keyboards/kingly_keys/romac_plus/keyboard.json
@@ -53,8 +53,7 @@
"ws2812": {
"pin": "F7"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
index 3ee0b5646b..9a3c6a0115 100644
--- a/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/ropro/keymaps/default/keymap.c
@@ -77,9 +77,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
- tap_code(KC_WH_L);
+ tap_code(MS_WHLL);
} else {
- tap_code(KC_WH_R);
+ tap_code(MS_WHLR);
}
}
return true;
diff --git a/keyboards/kingly_keys/smd_milk/keyboard.json b/keyboards/kingly_keys/smd_milk/keyboard.json
index 943599dad1..2da20bf978 100644
--- a/keyboards/kingly_keys/smd_milk/keyboard.json
+++ b/keyboards/kingly_keys/smd_milk/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0xB195",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"hue_steps": 6,
diff --git a/keyboards/kingly_keys/soap/keymaps/default/keymap.c b/keyboards/kingly_keys/soap/keymaps/default/keymap.c
index d8fa6a963c..309c6686f3 100644
--- a/keyboards/kingly_keys/soap/keymaps/default/keymap.c
+++ b/keyboards/kingly_keys/soap/keymaps/default/keymap.c
@@ -53,9 +53,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
- tap_code(KC_WH_L);
+ tap_code(MS_WHLL);
} else {
- tap_code(KC_WH_R);
+ tap_code(MS_WHLR);
}
}
return true;
diff --git a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
index 09c9d3a2ff..984fd9e9b9 100644
--- a/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
+++ b/keyboards/kiserdesigns/madeline/keymaps/default/keymap.c
@@ -48,6 +48,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [1] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+ [1] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/knobgoblin/keyboard.json b/keyboards/knobgoblin/keyboard.json
index 4cc00e26cd..d20191c82d 100644
--- a/keyboards/knobgoblin/keyboard.json
+++ b/keyboards/knobgoblin/keyboard.json
@@ -30,8 +30,7 @@
"bootmagic": {
"matrix": [0, 1]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"debounce": 2,
"layouts": {
"LAYOUT_ortho": {
diff --git a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json
index e9e330b160..187816b660 100644
--- a/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json
+++ b/keyboards/kprepublic/bm65hsrgb_iso/rev1/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4B50",
"pid": "0x0653",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"saturation_steps": 8,
diff --git a/keyboards/kprepublic/cstc40/daughterboard/keyboard.json b/keyboards/kprepublic/cstc40/daughterboard/keyboard.json
deleted file mode 100644
index cdba7942df..0000000000
--- a/keyboards/kprepublic/cstc40/daughterboard/keyboard.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B15", "B14", "B13", "B10", "B12", "A5", "C4", "A7", "A15", "C10", "C11", "C0"],
- "rows": ["B1", "B0", "C5", "A6"]
- }
-} \ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/info.json b/keyboards/kprepublic/cstc40/info.json
index 8e4e640b7e..83a653cc1c 100644
--- a/keyboards/kprepublic/cstc40/info.json
+++ b/keyboards/kprepublic/cstc40/info.json
@@ -2,9 +2,7 @@
"manufacturer": "kprepublic",
"keyboard_name": "cstc40",
"maintainer": "itsvar8",
- "bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
- "debounce": 2,
"features": {
"bootmagic": true,
"extrakey": true,
@@ -14,63 +12,9 @@
},
"processor": "STM32F401",
"usb": {
- "device_version": "1.0.0",
"pid": "0x0040",
"vid": "0x586A"
},
- "layouts": {
- "LAYOUT_planck_mit": {
- "layout": [
- { "matrix": [0, 0], "x": 0, "y": 0 },
- { "matrix": [0, 1], "x": 1, "y": 0 },
- { "matrix": [0, 2], "x": 2, "y": 0 },
- { "matrix": [0, 3], "x": 3, "y": 0 },
- { "matrix": [0, 4], "x": 4, "y": 0 },
- { "matrix": [0, 5], "x": 5, "y": 0 },
- { "matrix": [0, 6], "x": 6, "y": 0 },
- { "matrix": [0, 7], "x": 7, "y": 0 },
- { "matrix": [0, 8], "x": 8, "y": 0 },
- { "matrix": [0, 9], "x": 9, "y": 0 },
- { "matrix": [0, 10], "x": 10, "y": 0 },
- { "matrix": [0, 11], "x": 11, "y": 0 },
- { "matrix": [1, 0], "x": 0, "y": 1 },
- { "matrix": [1, 1], "x": 1, "y": 1 },
- { "matrix": [1, 2], "x": 2, "y": 1 },
- { "matrix": [1, 3], "x": 3, "y": 1 },
- { "matrix": [1, 4], "x": 4, "y": 1 },
- { "matrix": [1, 5], "x": 5, "y": 1 },
- { "matrix": [1, 6], "x": 6, "y": 1 },
- { "matrix": [1, 7], "x": 7, "y": 1 },
- { "matrix": [1, 8], "x": 8, "y": 1 },
- { "matrix": [1, 9], "x": 9, "y": 1 },
- { "matrix": [1, 10], "x": 10, "y": 1 },
- { "matrix": [1, 11], "x": 11, "y": 1 },
- { "matrix": [2, 0], "x": 0, "y": 2 },
- { "matrix": [2, 1], "x": 1, "y": 2 },
- { "matrix": [2, 2], "x": 2, "y": 2 },
- { "matrix": [2, 3], "x": 3, "y": 2 },
- { "matrix": [2, 4], "x": 4, "y": 2 },
- { "matrix": [2, 5], "x": 5, "y": 2 },
- { "matrix": [2, 6], "x": 6, "y": 2 },
- { "matrix": [2, 7], "x": 7, "y": 2 },
- { "matrix": [2, 8], "x": 8, "y": 2 },
- { "matrix": [2, 9], "x": 9, "y": 2 },
- { "matrix": [2, 10], "x": 10, "y": 2 },
- { "matrix": [2, 11], "x": 11, "y": 2 },
- { "matrix": [3, 0], "x": 0, "y": 3 },
- { "matrix": [3, 1], "x": 1, "y": 3 },
- { "matrix": [3, 2], "x": 2, "y": 3 },
- { "matrix": [3, 3], "x": 3, "y": 3 },
- { "matrix": [3, 4], "x": 4, "y": 3 },
- { "matrix": [3, 5], "w": 2, "x": 5, "y": 3 },
- { "matrix": [3, 7], "x": 7, "y": 3 },
- { "matrix": [3, 8], "x": 8, "y": 3 },
- { "matrix": [3, 9], "x": 9, "y": 3 },
- { "matrix": [3, 10], "x": 10, "y": 3 },
- { "matrix": [3, 11], "x": 11, "y": 3 }
- ]
- }
- },
"rgb_matrix": {
"animations": {
"alphas_mods": true,
@@ -94,6 +38,7 @@
"dual_beacon": true,
"rainbow_beacon": true,
"rainbow_pinwheels": true,
+ "flower_blooming": true,
"raindrops": true,
"jellybean_raindrops": true,
"hue_breathing": true,
@@ -115,59 +60,66 @@
"splash": true,
"multisplash": true,
"solid_splash": true,
- "solid_multisplash": true
+ "solid_multisplash": true,
+ "starlight": true,
+ "starlight_dual_hue": true,
+ "starlight_dual_sat": true,
+ "riverflow": true
},
- "driver": "is31fl3733",
- "layout": [
- {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
- {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
- {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
- {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
- {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
- {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
- {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
- {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
- {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
- {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
- {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
- {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
- {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
- {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
- {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
- {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
- {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
- {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
- {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
- {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
- {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
- {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
- {"matrix": [1, 10], "x": 203, "y": 21, "flags": 4},
- {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
- {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
- {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
- {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
- {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
- {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
- {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
- {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
- {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
- {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
- {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
- {"matrix": [2, 10], "x": 203, "y": 42, "flags": 4},
- {"matrix": [2, 11], "x": 224, "y": 42, "flags": 1},
- {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
- {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
- {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
- {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
- {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
- {"matrix": [3, 5], "x": 111, "y": 64, "flags": 1},
- {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
- {"matrix": [3, 8], "x": 162, "y": 64, "flags": 1},
- {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1},
- {"matrix": [3, 10], "x": 203, "y": 64, "flags": 1},
- {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}
- ],
- "max_brightness": 200,
"sleep": true
+ },
+ "community_layouts": ["planck_mit"],
+ "layouts": {
+ "LAYOUT_planck_mit": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [2, 1], "x": 1, "y": 2},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2},
+ {"matrix": [2, 4], "x": 4, "y": 2},
+ {"matrix": [2, 5], "x": 5, "y": 2},
+ {"matrix": [2, 6], "x": 6, "y": 2},
+ {"matrix": [2, 7], "x": 7, "y": 2},
+ {"matrix": [2, 8], "x": 8, "y": 2},
+ {"matrix": [2, 9], "x": 9, "y": 2},
+ {"matrix": [2, 10], "x": 10, "y": 2},
+ {"matrix": [2, 11], "x": 11, "y": 2},
+ {"matrix": [3, 0], "x": 0, "y": 3},
+ {"matrix": [3, 1], "x": 1, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 4], "x": 4, "y": 3},
+ {"matrix": [3, 5], "x": 5, "y": 3, "w": 2},
+ {"matrix": [3, 7], "x": 7, "y": 3},
+ {"matrix": [3, 8], "x": 8, "y": 3},
+ {"matrix": [3, 9], "x": 9, "y": 3},
+ {"matrix": [3, 10], "x": 10, "y": 3},
+ {"matrix": [3, 11], "x": 11, "y": 3}
+ ]
+ }
}
-} \ No newline at end of file
+}
diff --git a/keyboards/kprepublic/cstc40/readme.md b/keyboards/kprepublic/cstc40/readme.md
index 211c078cc2..e6493b28a0 100644
--- a/keyboards/kprepublic/cstc40/readme.md
+++ b/keyboards/kprepublic/cstc40/readme.md
@@ -1,26 +1,25 @@
-# cstc40
+# CSTC40
-A 40% hotswap ortholinear RGB keyboard from KP Republic.
+## This keyboard has 3 known hardware revisions, please be sure to flash the correct firmware for your PCB
-* Keyboard Maintainer: [Var](https://github.com/itsvar8)
-* Hardware Supported: CSTC40
-* Hardware Availability: kprepublic.com
+A 40% hotswap ortholinear RGB keyboard from KP Republic
-The differences between the two versions are just the rows and columns pins and the additional small pcb for the daughterboard version.
+### Revision 1: "daughterboard"
-Make example for this keyboard (after setting up your build environment):
+* STM32F402RCT6 MCU with IS31FL3733 LED driver, using `stm32-dfu` bootloader. Uses a separate daughterboard for USB connection.
- for daughterboard version: make kprepublic/cstc40/daughterboard:default
- for single pcb version: make kprepublic/cstc40/single_pcb:default
+* Upon entering bootloader mode QMK Toolbox will display this message:
+`STM32 DFU device connected (WinUSB): STMicroelectronics STM32 BOOTLOADER (0483:DF11:2200)`
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+### Revision 2: "single pcb"
-## Bootloader
+* STM32F402RCT6 MCU with IS31FL3733 LED driver, using `stm32-dfu` bootloader. Integrated USB connection.
-Enter the bootloader in 3 ways:
+* Upon entering bootloader mode QMK Toolbox will display this message:
+`STM32 DFU device connected (WinUSB): STMicroelectronics STM32 BOOTLOADER (0483:DF11:2200)`
-* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
-* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+### Revision 3: "FXTwink single pcb"
-The single_pcb uses pin A10, which apparently is a design flaw that prevent the bootloader to start every time - https://docs.qmk.fm/#/platformdev_blackpill_f4x1?id=pins-to-be-avoided. There is a simple workaround that works most of the time - press the pin key (generally the letter R) during the boot.
+* STM32F402RCT6 MCU without separate LED driver, using `tinyuf2` bootloader. Integrated USB connection.
+
+* Upon entering bootloader mode the board will appear in your computer's file system as a new USB mass storage device.
diff --git a/keyboards/kprepublic/cstc40/config.h b/keyboards/kprepublic/cstc40/rev1/config.h
index 4f845a84af..4f845a84af 100644
--- a/keyboards/kprepublic/cstc40/config.h
+++ b/keyboards/kprepublic/cstc40/rev1/config.h
diff --git a/keyboards/kprepublic/cstc40/halconf.h b/keyboards/kprepublic/cstc40/rev1/halconf.h
index 0f279040aa..049b29a046 100644
--- a/keyboards/kprepublic/cstc40/halconf.h
+++ b/keyboards/kprepublic/cstc40/rev1/halconf.h
@@ -17,4 +17,4 @@
#define HAL_USE_I2C TRUE
-#include_next <halconf.h> \ No newline at end of file
+#include_next <halconf.h>
diff --git a/keyboards/kprepublic/cstc40/rev1/keyboard.json b/keyboards/kprepublic/cstc40/rev1/keyboard.json
new file mode 100644
index 0000000000..9574e0bd22
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev1/keyboard.json
@@ -0,0 +1,63 @@
+{
+ "bootloader": "stm32-dfu",
+ "matrix_pins": {
+ "cols": ["B15", "B14", "B13", "B10", "B12", "A5", "C4", "A7", "A15", "C10", "C11", "C0"],
+ "rows": ["B1", "B0", "C5", "A6"]
+ },
+ "rgb_matrix": {
+ "driver": "is31fl3733",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+ {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+ {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+ {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
+ {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+ {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+ {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
+ {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+ {"matrix": [1, 10], "x": 203, "y": 21, "flags": 4},
+ {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
+ {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+ {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+ {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+ {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
+ {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
+ {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
+ {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
+ {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
+ {"matrix": [2, 10], "x": 203, "y": 42, "flags": 4},
+ {"matrix": [2, 11], "x": 224, "y": 42, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+ {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
+ {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
+ {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
+ {"matrix": [3, 5], "x": 111, "y": 64, "flags": 1},
+ {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
+ {"matrix": [3, 8], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1},
+ {"matrix": [3, 10], "x": 203, "y": 64, "flags": 1},
+ {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}
+ ],
+ "max_brightness": 200
+ },
+ "usb": {
+ "device_version": "1.0.0"
+ }
+}
diff --git a/keyboards/kprepublic/cstc40/mcuconf.h b/keyboards/kprepublic/cstc40/rev1/mcuconf.h
index a56e52fb8d..563b86d26d 100644
--- a/keyboards/kprepublic/cstc40/mcuconf.h
+++ b/keyboards/kprepublic/cstc40/rev1/mcuconf.h
@@ -18,4 +18,4 @@
#include_next <mcuconf.h>
#undef STM32_I2C_USE_I2C1
-#define STM32_I2C_USE_I2C1 TRUE \ No newline at end of file
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/kprepublic/cstc40/rev1/readme.md b/keyboards/kprepublic/cstc40/rev1/readme.md
new file mode 100644
index 0000000000..1d688bc977
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev1/readme.md
@@ -0,0 +1,27 @@
+# Rev 1
+
+A 40% hotswap ortholinear RGB keyboard from KP Republic.
+
+* **Revision 1: "daughterboard"**
+* Keyboard Maintainer: [Var](https://github.com/itsvar8)
+* Hardware Supported: CSTC40 rev1
+* STM32F402RCT6 MCU with IS31FL3733 LED driver and using `stm32-dfu` bootloader. Uses a separate daughterboard for USB connection.
+* Hardware Availability: kprepublic.com
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kprepublic/cstc40/rev1:default
+
+Flashing example for this keyboard:
+
+ make kprepublic/cstc40/rev1:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c b/keyboards/kprepublic/cstc40/rev1/rev1.c
index 38fac99155..db063d3eba 100644
--- a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
+++ b/keyboards/kprepublic/cstc40/rev1/rev1.c
@@ -68,4 +68,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW3_CS11, SW2_CS11, SW1_CS11 },
{ 0, SW3_CS12, SW2_CS12, SW1_CS12 }
};
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/kprepublic/cstc40/rev2/config.h b/keyboards/kprepublic/cstc40/rev2/config.h
new file mode 100644
index 0000000000..4f845a84af
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev2/config.h
@@ -0,0 +1,9 @@
+// Copyright 2022 Var (@itsvar8)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define I2C1_SDA_PIN B9
+#define I2C1_SCL_PIN B8
+
+#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
diff --git a/keyboards/kprepublic/cstc40/rev2/halconf.h b/keyboards/kprepublic/cstc40/rev2/halconf.h
new file mode 100644
index 0000000000..049b29a046
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev2/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/kprepublic/cstc40/rev2/keyboard.json b/keyboards/kprepublic/cstc40/rev2/keyboard.json
new file mode 100644
index 0000000000..7516bfc205
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev2/keyboard.json
@@ -0,0 +1,63 @@
+{
+ "bootloader": "stm32-dfu",
+ "matrix_pins": {
+ "cols": ["C7", "C8", "C9", "A8", "A10", "B10", "A15", "C13", "B6", "B5", "B4", "B3"],
+ "rows": ["C12", "C10", "C11", "B0"]
+ },
+ "rgb_matrix": {
+ "driver": "is31fl3733",
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 40, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 81, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 101, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 162, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [0, 10], "x": 203, "y": 0, "flags": 4},
+ {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+ {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 40, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+ {"matrix": [1, 4], "x": 81, "y": 21, "flags": 4},
+ {"matrix": [1, 5], "x": 101, "y": 21, "flags": 4},
+ {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+ {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+ {"matrix": [1, 8], "x": 162, "y": 21, "flags": 4},
+ {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+ {"matrix": [1, 10], "x": 203, "y": 21, "flags": 4},
+ {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
+ {"matrix": [2, 0], "x": 0, "y": 42, "flags": 1},
+ {"matrix": [2, 1], "x": 20, "y": 42, "flags": 4},
+ {"matrix": [2, 2], "x": 40, "y": 42, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 42, "flags": 4},
+ {"matrix": [2, 4], "x": 81, "y": 42, "flags": 4},
+ {"matrix": [2, 5], "x": 101, "y": 42, "flags": 4},
+ {"matrix": [2, 6], "x": 122, "y": 42, "flags": 4},
+ {"matrix": [2, 7], "x": 142, "y": 42, "flags": 4},
+ {"matrix": [2, 8], "x": 162, "y": 42, "flags": 4},
+ {"matrix": [2, 9], "x": 183, "y": 42, "flags": 4},
+ {"matrix": [2, 10], "x": 203, "y": 42, "flags": 4},
+ {"matrix": [2, 11], "x": 224, "y": 42, "flags": 1},
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+ {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [3, 2], "x": 40, "y": 64, "flags": 1},
+ {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
+ {"matrix": [3, 4], "x": 81, "y": 64, "flags": 1},
+ {"matrix": [3, 5], "x": 111, "y": 64, "flags": 1},
+ {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
+ {"matrix": [3, 8], "x": 162, "y": 64, "flags": 1},
+ {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1},
+ {"matrix": [3, 10], "x": 203, "y": 64, "flags": 1},
+ {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1}
+ ],
+ "max_brightness": 200
+ },
+ "usb": {
+ "device_version": "2.0.0"
+ }
+}
diff --git a/keyboards/kprepublic/cstc40/rev2/mcuconf.h b/keyboards/kprepublic/cstc40/rev2/mcuconf.h
new file mode 100644
index 0000000000..563b86d26d
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev2/mcuconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/kprepublic/cstc40/rev2/readme.md b/keyboards/kprepublic/cstc40/rev2/readme.md
new file mode 100644
index 0000000000..8f6b27ed8e
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev2/readme.md
@@ -0,0 +1,29 @@
+# Rev 2
+
+A 40% hotswap ortholinear RGB keyboard from KP Republic.
+
+* **Revision 2: "single pcb"**
+* Keyboard Maintainer: [Var](https://github.com/itsvar8)
+* Hardware Supported: CSTC40 rev2
+* STM32F402RCT6 MCU with IS31FL3733 LED driver and using `stm32-dfu` bootloader. Integrated USB connection.
+* Hardware Availability: kprepublic.com
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kprepublic/cstc40/rev2:default
+
+Flashing example for this keyboard:
+
+ make kprepublic/cstc40/rev2:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
+
+The rev 2 uses pin `A10` in the key matrix, which apparently is a design flaw that may prevent the bootloader from entering the proper mode for DFU flashing - <https://docs.qmk.fm/#/platformdev_blackpill_f4x1?id=pins-to-be-avoided>. There is a simple workaround that works most of the time - press the pin key (generally the letter R) during the boot.
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/rev2/rev2.c
index 38fac99155..db063d3eba 100644
--- a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
+++ b/keyboards/kprepublic/cstc40/rev2/rev2.c
@@ -68,4 +68,4 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW3_CS11, SW2_CS11, SW1_CS11 },
{ 0, SW3_CS12, SW2_CS12, SW1_CS12 }
};
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/kprepublic/cstc40/rev3/keyboard.json b/keyboards/kprepublic/cstc40/rev3/keyboard.json
new file mode 100644
index 0000000000..2748a6f1fc
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev3/keyboard.json
@@ -0,0 +1,67 @@
+{
+ "maintainer": "ClownFish",
+ "bootloader": "tinyuf2",
+ "matrix_pins": {
+ "cols": ["A4", "A5", "A6", "A7", "C4", "C5", "A8", "A15", "C10", "C11", "C12", "D2"],
+ "rows": ["B12", "B1", "B0", "C13"]
+ },
+ "rgb_matrix": {
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1},
+ {"matrix": [3, 1], "x": 20, "y": 64, "flags": 1},
+ {"matrix": [3, 2], "x": 41, "y": 64, "flags": 1},
+ {"matrix": [3, 3], "x": 61, "y": 64, "flags": 1},
+ {"matrix": [3, 4], "x": 82, "y": 64, "flags": 1},
+ {"matrix": [3, 5], "x": 112, "y": 64, "flags": 1},
+ {"matrix": [3, 7], "x": 142, "y": 64, "flags": 1},
+ {"matrix": [3, 8], "x": 163, "y": 64, "flags": 1},
+ {"matrix": [3, 9], "x": 183, "y": 64, "flags": 1},
+ {"matrix": [3, 10], "x": 204, "y": 64, "flags": 1},
+ {"matrix": [3, 11], "x": 224, "y": 64, "flags": 1},
+ {"matrix": [2, 11], "x": 224, "y": 43, "flags": 1},
+ {"matrix": [2, 10], "x": 204, "y": 43, "flags": 4},
+ {"matrix": [2, 9], "x": 183, "y": 43, "flags": 4},
+ {"matrix": [2, 8], "x": 163, "y": 43, "flags": 4},
+ {"matrix": [2, 7], "x": 142, "y": 43, "flags": 4},
+ {"matrix": [2, 6], "x": 122, "y": 43, "flags": 4},
+ {"matrix": [2, 5], "x": 102, "y": 43, "flags": 4},
+ {"matrix": [2, 4], "x": 82, "y": 43, "flags": 4},
+ {"matrix": [2, 3], "x": 61, "y": 43, "flags": 4},
+ {"matrix": [2, 2], "x": 41, "y": 43, "flags": 4},
+ {"matrix": [2, 1], "x": 20, "y": 43, "flags": 4},
+ {"matrix": [2, 0], "x": 0, "y": 43, "flags": 1},
+ {"matrix": [1, 0], "x": 0, "y": 21, "flags": 1},
+ {"matrix": [1, 1], "x": 20, "y": 21, "flags": 4},
+ {"matrix": [1, 2], "x": 41, "y": 21, "flags": 4},
+ {"matrix": [1, 3], "x": 61, "y": 21, "flags": 4},
+ {"matrix": [1, 4], "x": 82, "y": 21, "flags": 4},
+ {"matrix": [1, 5], "x": 102, "y": 21, "flags": 4},
+ {"matrix": [1, 6], "x": 122, "y": 21, "flags": 4},
+ {"matrix": [1, 7], "x": 142, "y": 21, "flags": 4},
+ {"matrix": [1, 8], "x": 163, "y": 21, "flags": 4},
+ {"matrix": [1, 9], "x": 183, "y": 21, "flags": 4},
+ {"matrix": [1, 10], "x": 204, "y": 21, "flags": 4},
+ {"matrix": [1, 11], "x": 224, "y": 21, "flags": 1},
+ {"matrix": [0, 11], "x": 224, "y": 0, "flags": 1},
+ {"matrix": [0, 10], "x": 204, "y": 0, "flags": 4},
+ {"matrix": [0, 9], "x": 183, "y": 0, "flags": 4},
+ {"matrix": [0, 8], "x": 163, "y": 0, "flags": 4},
+ {"matrix": [0, 7], "x": 142, "y": 0, "flags": 4},
+ {"matrix": [0, 6], "x": 122, "y": 0, "flags": 4},
+ {"matrix": [0, 5], "x": 102, "y": 0, "flags": 4},
+ {"matrix": [0, 4], "x": 82, "y": 0, "flags": 4},
+ {"matrix": [0, 3], "x": 61, "y": 0, "flags": 4},
+ {"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
+ {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4},
+ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 1}
+ ],
+ "max_brightness": 180
+ },
+ "usb": {
+ "device_version": "3.0.0"
+ },
+ "ws2812": {
+ "pin": "B13"
+ }
+}
diff --git a/keyboards/kprepublic/cstc40/rev3/readme.md b/keyboards/kprepublic/cstc40/rev3/readme.md
new file mode 100644
index 0000000000..b372c63579
--- /dev/null
+++ b/keyboards/kprepublic/cstc40/rev3/readme.md
@@ -0,0 +1,27 @@
+# Rev 3
+
+A 40% hotswap ortholinear RGB keyboard from KP Republic.
+
+* **Revision 3: "FXTwink single pcb"**
+* Keyboard Maintainer: [ClownFish](https://github.com/clownfish-og)
+* Hardware Supported: CSTC40 rev3
+* STM32F402RCT6 MCU without separate LED driver and using `tinyuf2` bootloader. Integrated USB connection.
+* Hardware Availability: kprepublic.com
+
+Make example for this keyboard (after setting up your build environment):
+
+ make kprepublic/cstc40/rev3:default
+
+Flashing example for this keyboard:
+
+ make kprepublic/cstc40/rev3:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/kprepublic/cstc40/single_pcb/keyboard.json b/keyboards/kprepublic/cstc40/single_pcb/keyboard.json
deleted file mode 100644
index 330ada7bac..0000000000
--- a/keyboards/kprepublic/cstc40/single_pcb/keyboard.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["C7", "C8", "C9", "A8", "A10", "B10", "A15", "C13", "B6", "B5", "B4", "B3"],
- "rows": ["C12", "C10", "C11", "B0"]
- }
-} \ No newline at end of file
diff --git a/keyboards/kradoindustries/kousa/keymaps/default/keymap.c b/keyboards/kradoindustries/kousa/keymaps/default/keymap.c
index 68cbcea1e2..0262113397 100644
--- a/keyboards/kradoindustries/kousa/keymaps/default/keymap.c
+++ b/keyboards/kradoindustries/kousa/keymaps/default/keymap.c
@@ -103,7 +103,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[3] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }
diff --git a/keyboards/kradoindustries/krado66/keymaps/default/keymap.c b/keyboards/kradoindustries/krado66/keymaps/default/keymap.c
index 51306a2111..4048c6743c 100644
--- a/keyboards/kradoindustries/krado66/keymaps/default/keymap.c
+++ b/keyboards/kradoindustries/krado66/keymaps/default/keymap.c
@@ -148,10 +148,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_QWERTYX] = { ENCODER_CCW_CW(C(KC_TAB), C(S(KC_TAB))), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(UG_SATD, UG_SATU) },
+ [_QWERTY] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_QWERTYX] = { ENCODER_CCW_CW(C(KC_TAB), C(S(KC_TAB))), ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(UG_SATD, UG_SATU) },
[_FUNCTION] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT), ENCODER_CCW_CW(UG_SPDD, UG_SPDU) },
- [_EXTRA] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
+ [_EXTRA] = { ENCODER_CCW_CW(UG_PREV, UG_NEXT), ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_RIGHT, KC_LEFT) },
};
#endif
diff --git a/keyboards/kradoindustries/promenade_rp24s/keymaps/default/keymap.c b/keyboards/kradoindustries/promenade_rp24s/keymaps/default/keymap.c
index ed36cc85fb..f08f27216a 100644
--- a/keyboards/kradoindustries/promenade_rp24s/keymaps/default/keymap.c
+++ b/keyboards/kradoindustries/promenade_rp24s/keymaps/default/keymap.c
@@ -93,7 +93,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(UG_NEXT, UG_PREV),
ENCODER_CCW_CW(KC_LBRC, KC_RBRC), ENCODER_CCW_CW(C(KC_MINS), C(KC_EQL)),
ENCODER_CCW_CW(C(KC_Z), C(S(KC_Z))), ENCODER_CCW_CW(KC_PGUP, KC_PGDN),
- ENCODER_CCW_CW(KC_WH_U, KC_WH_D), ENCODER_CCW_CW(KC_UP, KC_DOWN)},
+ ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_UP, KC_DOWN)},
[1 ... 3] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(_______, _______),
diff --git a/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c b/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
index e9e7e0dd90..0f57f316bd 100644
--- a/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
+++ b/keyboards/kraken_jones/pteron56/keymaps/default/keymap.c
@@ -21,8 +21,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
KC_GRV, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
- KC_VOLU, KC_HOME, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, KC_PGUP, KC_UP, KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS,
- KC_VOLD, KC_END, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS,
+ KC_VOLU, KC_HOME, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, KC_PGUP, KC_UP, KC_PGDN, KC_MENU, KC_RBRC, KC_TRNS,
+ KC_VOLD, KC_END, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, KC_LEFT, KC_DOWN, KC_RGHT, KC_LBRC, KC_BSLS, KC_TRNS,
KC_TRNS, KC_LCTL, KC_LSFT, KC_LALT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
diff --git a/keyboards/ktec/ergodone/keyboard.json b/keyboards/ktec/ergodone/keyboard.json
index 3c9b0208bb..d88d0f2090 100644
--- a/keyboards/ktec/ergodone/keyboard.json
+++ b/keyboards/ktec/ergodone/keyboard.json
@@ -2,8 +2,7 @@
"keyboard_name": "Ergodone",
"manufacturer": "K.T.E.C.",
"maintainer": "Yu He",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"usb": {
"vid": "0x1209",
"pid": "0x2328",
diff --git a/keyboards/ktec/ergodone/keymaps/default/keymap.c b/keyboards/ktec/ergodone/keymaps/default/keymap.c
index 41d5da8dee..1ee2041501 100644
--- a/keyboards/ktec/ergodone/keymaps/default/keymap.c
+++ b/keyboards/ktec/ergodone/keymaps/default/keymap.c
@@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_EQL, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LEFT,
KC_DEL, KC_Q, KC_W, KC_E, KC_R, KC_T, TG(SYMB),
KC_BSPC, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, ALL_T(KC_NO),
+ KC_LSFT, CTL_T(KC_Z), KC_X, KC_C, KC_V, KC_B, HYPR_T(KC_NO),
LT(SYMB,KC_GRV),KC_QUOT, LALT(KC_LSFT), KC_LEFT,KC_RGHT,
ALT_T(KC_APP), KC_LGUI,
KC_HOME,
@@ -119,10 +119,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// MEDIA AND MOUSE
[MDIA] = LAYOUT_ergodox(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_BTN1, MS_BTN2,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/keyboards/ktec/staryu/keymaps/default/keymap.c b/keyboards/ktec/staryu/keymaps/default/keymap.c
index 68c1b85b19..3fa481e86d 100755
--- a/keyboards/ktec/staryu/keymaps/default/keymap.c
+++ b/keyboards/ktec/staryu/keymaps/default/keymap.c
@@ -52,9 +52,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER3] = LAYOUT(
/* ┌─────────┬─────────┬─────────┐ */
- KC_MS_U, TO(_LAYER4),
+ MS_UP, TO(_LAYER4),
/* ├─────────┼─────────┼─────────┤ */
- KC_MS_L, KC_MS_D, KC_MS_R
+ MS_LEFT, MS_DOWN, MS_RGHT
/* └─────────┴─────────┴─────────┘ */
),
diff --git a/keyboards/kumaokobo/kudox/columner/keyboard.json b/keyboards/kumaokobo/kudox/columner/keyboard.json
index 4345866382..ac3125abc7 100644
--- a/keyboards/kumaokobo/kudox/columner/keyboard.json
+++ b/keyboards/kumaokobo/kudox/columner/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kumaokobo/kudox/rev1/keyboard.json b/keyboards/kumaokobo/kudox/rev1/keyboard.json
index 65c01a798e..f056514c52 100644
--- a/keyboards/kumaokobo/kudox/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev1/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kumaokobo/kudox/rev2/keyboard.json b/keyboards/kumaokobo/kudox/rev2/keyboard.json
index 9df232c641..64940bfcdd 100644
--- a/keyboards/kumaokobo/kudox/rev2/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev2/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kumaokobo/kudox/rev3/keyboard.json b/keyboards/kumaokobo/kudox/rev3/keyboard.json
index cfd1511123..8c935a80da 100644
--- a/keyboards/kumaokobo/kudox/rev3/keyboard.json
+++ b/keyboards/kumaokobo/kudox/rev3/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
index b79deec7dc..81a3d5c4dd 100644
--- a/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
+++ b/keyboards/kumaokobo/kudox_full/rev1/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"mousekey": true,
diff --git a/keyboards/kumaokobo/kudox_game/info.json b/keyboards/kumaokobo/kudox_game/info.json
index 8750facede..498f2c581d 100644
--- a/keyboards/kumaokobo/kudox_game/info.json
+++ b/keyboards/kumaokobo/kudox_game/info.json
@@ -6,6 +6,5 @@
"vid": "0xABBA",
"pid": "0x9696"
},
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/kumaokobo/pico/65keys/keyboard.json b/keyboards/kumaokobo/pico/65keys/keyboard.json
index db2ca9fdca..2e8db34b38 100644
--- a/keyboards/kumaokobo/pico/65keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/65keys/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kumaokobo/pico/70keys/keyboard.json b/keyboards/kumaokobo/pico/70keys/keyboard.json
index 00add13874..3a8e41ecba 100644
--- a/keyboards/kumaokobo/pico/70keys/keyboard.json
+++ b/keyboards/kumaokobo/pico/70keys/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/kv/revt/keymaps/default/keymap.c b/keyboards/kv/revt/keymaps/default/keymap.c
index 2b4867add5..56921c9821 100644
--- a/keyboards/kv/revt/keymaps/default/keymap.c
+++ b/keyboards/kv/revt/keymaps/default/keymap.c
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_default(
_______, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY, KC_MNXT, KC_VOLU,
-_______, _______, _______, _______, _______, KC_MS_BTN1, KC_MS_U, KC_MS_BTN2, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_VOLD,
-_______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, _______, QK_BOOT, _______, _______, _______, _______,
+_______, _______, _______, _______, _______, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPRV, KC_VOLD,
+_______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, _______, _______, _______, QK_BOOT, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
diff --git a/keyboards/latincompass/latinpad/keyboard.json b/keyboards/latincompass/latinpad/keyboard.json
index 2efc370ad3..3b4563b1ca 100644
--- a/keyboards/latincompass/latinpad/keyboard.json
+++ b/keyboards/latincompass/latinpad/keyboard.json
@@ -65,8 +65,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/lendunistus/rpneko65/rev1/keyboard.json b/keyboards/lendunistus/rpneko65/rev1/keyboard.json
index d0bb593996..20fed0a14b 100644
--- a/keyboards/lendunistus/rpneko65/rev1/keyboard.json
+++ b/keyboards/lendunistus/rpneko65/rev1/keyboard.json
@@ -22,10 +22,14 @@
"url": "https://github.com/lendunistus/rpneko65",
"usb": {
"device_version": "1.0.0",
- "force_nkro": true,
"pid": "0x0001",
"vid": "0x6C75"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"driver": "vendor",
"pin": "GP18"
diff --git a/keyboards/lets_split/info.json b/keyboards/lets_split/info.json
index 9152226cab..dc46a7eb66 100644
--- a/keyboards/lets_split/info.json
+++ b/keyboards/lets_split/info.json
@@ -1,6 +1,5 @@
{
"maintainer": "qmk",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x12"]
}
diff --git a/keyboards/lily58/glow_enc/keyboard.json b/keyboards/lily58/glow_enc/keyboard.json
index 9f7a2760aa..63ee5b6a99 100644
--- a/keyboards/lily58/glow_enc/keyboard.json
+++ b/keyboards/lily58/glow_enc/keyboard.json
@@ -44,8 +44,7 @@
"max_brightness": 120,
"split_count": [36, 36]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"build": {
"lto": true
},
diff --git a/keyboards/lily58/light/keyboard.json b/keyboards/lily58/light/keyboard.json
index 0eadf11eb6..738a9418a6 100644
--- a/keyboards/lily58/light/keyboard.json
+++ b/keyboards/lily58/light/keyboard.json
@@ -45,8 +45,7 @@
"max_brightness": 120,
"split_count": [35, 35]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"build": {
"lto": true
},
diff --git a/keyboards/lily58/rev1/keyboard.json b/keyboards/lily58/rev1/keyboard.json
index 3488b0e2b5..f23d4dbaa1 100644
--- a/keyboards/lily58/rev1/keyboard.json
+++ b/keyboards/lily58/rev1/keyboard.json
@@ -27,8 +27,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/lime/rev1/keyboard.json b/keyboards/lime/rev1/keyboard.json
index 50fc82ae19..b61a91a0da 100644
--- a/keyboards/lime/rev1/keyboard.json
+++ b/keyboards/lime/rev1/keyboard.json
@@ -42,8 +42,7 @@
"qmk": {
"tap_keycode_delay": 10
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/linworks/dolice/keyboard.json b/keyboards/linworks/dolice/keyboard.json
index bcdfda561f..ade3b37d0a 100644
--- a/keyboards/linworks/dolice/keyboard.json
+++ b/keyboards/linworks/dolice/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4C58",
"pid": "0x0005",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/linworks/fave87/keyboard.json b/keyboards/linworks/fave87/keyboard.json
index 6dce6f39fe..132d3b5cbf 100644
--- a/keyboards/linworks/fave87/keyboard.json
+++ b/keyboards/linworks/fave87/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4C58",
"pid": "0x0002",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/linworks/whale75/keyboard.json b/keyboards/linworks/whale75/keyboard.json
index 4298382471..19a6ce320d 100644
--- a/keyboards/linworks/whale75/keyboard.json
+++ b/keyboards/linworks/whale75/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4C58",
"pid": "0x0001",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 18,
diff --git a/keyboards/littlealby/mute/keymaps/default/keymap.c b/keyboards/littlealby/mute/keymaps/default/keymap.c
index c6cf9836e3..729a6179a2 100644
--- a/keyboards/littlealby/mute/keymaps/default/keymap.c
+++ b/keyboards/littlealby/mute/keymaps/default/keymap.c
@@ -18,6 +18,6 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- SGUI(KC_A)
+ LSG(KC_A)
)
};
diff --git a/keyboards/littlealby/mute/keymaps/ms_teams/keymap.c b/keyboards/littlealby/mute/keymaps/ms_teams/keymap.c
index bb2cf1147c..223ccacaf0 100644
--- a/keyboards/littlealby/mute/keymaps/ms_teams/keymap.c
+++ b/keyboards/littlealby/mute/keymaps/ms_teams/keymap.c
@@ -18,6 +18,6 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- SGUI(KC_M)
+ LSG(KC_M)
)
};
diff --git a/keyboards/machkeyboards/mach3/keyboard.json b/keyboards/machkeyboards/mach3/keyboard.json
index 126845a37d..383f4a738e 100644
--- a/keyboards/machkeyboards/mach3/keyboard.json
+++ b/keyboards/machkeyboards/mach3/keyboard.json
@@ -26,8 +26,7 @@
"levels": 5,
"breathing": true
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_3x3": {
"layout": [
diff --git a/keyboards/macroflow_original/keymaps/default/keymap.c b/keyboards/macroflow_original/keymaps/default/keymap.c
index 76ef39bf5a..22ea8c0ce9 100644
--- a/keyboards/macroflow_original/keymaps/default/keymap.c
+++ b/keyboards/macroflow_original/keymaps/default/keymap.c
@@ -89,7 +89,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[1] = { ENCODER_CCW_CW(_______, _______) },
[2] = { ENCODER_CCW_CW(_______, _______) },
[3] = { ENCODER_CCW_CW(_______, _______) },
diff --git a/keyboards/magic_force/mf17/keyboard.json b/keyboards/magic_force/mf17/keyboard.json
index 10469f63c6..c0f0e6bd57 100644
--- a/keyboards/magic_force/mf17/keyboard.json
+++ b/keyboards/magic_force/mf17/keyboard.json
@@ -12,10 +12,14 @@
},
"usb": {
"device_version": "1.0.0",
- "force_nkro": true,
"vid": "0x3A54",
"pid": "0x4F5D"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"extrakey": true,
diff --git a/keyboards/magic_force/mf34/keyboard.json b/keyboards/magic_force/mf34/keyboard.json
index 44d1a4ec92..9acae04b27 100644
--- a/keyboards/magic_force/mf34/keyboard.json
+++ b/keyboards/magic_force/mf34/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x1A53",
"pid": "0x4F51",
- "device_version": "1.0.2",
- "force_nkro": true
+ "device_version": "1.0.2"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"indicators": {
"num_lock": "B15"
diff --git a/keyboards/makeymakey/keymaps/default/keymap.c b/keyboards/makeymakey/keymaps/default/keymap.c
index 1c3e6399fb..0216e2cd14 100644
--- a/keyboards/makeymakey/keymaps/default/keymap.c
+++ b/keyboards/makeymakey/keymaps/default/keymap.c
@@ -33,9 +33,9 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(
- KC_UP, KC_DOWN, KC_LEFT, KC_RGHT, KC_SPC, KC_BTN1,
+ KC_UP, KC_DOWN, KC_LEFT, KC_RGHT, KC_SPC, MS_BTN1,
KC_W, KC_A, KC_S, KC_D, KC_F, KC_G,
- KC_MS_U, KC_MS_D, KC_MS_L, KC_MS_R, KC_BTN1, KC_BTN2
+ MS_UP, MS_DOWN, MS_LEFT, MS_RGHT, MS_BTN1, MS_BTN2
)
};
diff --git a/keyboards/makrosu/keyboard.json b/keyboards/makrosu/keyboard.json
index e79a03f475..1e83c20aa7 100644
--- a/keyboards/makrosu/keyboard.json
+++ b/keyboards/makrosu/keyboard.json
@@ -34,8 +34,7 @@
"bootmagic": {
"matrix": [0, 5]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/manta60/keyboard.json b/keyboards/manta60/keyboard.json
index 007f015379..84af2a2752 100644
--- a/keyboards/manta60/keyboard.json
+++ b/keyboards/manta60/keyboard.json
@@ -53,8 +53,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/maple_computing/6ball/keyboard.json b/keyboards/maple_computing/6ball/keyboard.json
index 335294e51e..f68f2ec8ba 100644
--- a/keyboards/maple_computing/6ball/keyboard.json
+++ b/keyboards/maple_computing/6ball/keyboard.json
@@ -38,8 +38,7 @@
"rows": ["F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json
index d2ebc781d6..6682c574c9 100644
--- a/keyboards/maple_computing/christmas_tree/v2017/keyboard.json
+++ b/keyboards/maple_computing/christmas_tree/v2017/keyboard.json
@@ -8,8 +8,7 @@
"pid": "0x3070",
"device_version": "20.1.7"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"backlight": true,
"bootmagic": false,
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h b/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
deleted file mode 100644
index c50e010375..0000000000
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/config.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#pragma once
-
-/* Underlight Configuration */
-#define WS2812_DI_PIN F4
-#define RGBLIGHT_EFFECT_BREATHING
-#define RGBLIGHT_EFFECT_RAINBOW_MOOD
-#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-#define RGBLIGHT_EFFECT_SNAKE
-#define RGBLIGHT_EFFECT_KNIGHT
-#define RGBLIGHT_EFFECT_CHRISTMAS
-#define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#define RGBLIGHT_EFFECT_RGB_TEST
-#define RGBLIGHT_EFFECT_ALTERNATING
-#define RGBLIGHT_EFFECT_TWINKLE
-#define RGBLIGHT_LED_COUNT 2 // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c b/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
deleted file mode 100644
index 0b2335af98..0000000000
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/keymap.c
+++ /dev/null
@@ -1,76 +0,0 @@
-// Below layout is based upon /u/That-Canadian's planck layout
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_names {
- _QWERTY,
- _RGB,
- _FUNC
-};
-
-// Defines for task manager and such
-#define CALTDEL LCTL(LALT(KC_DEL))
-#define TSKMGR LCTL(LSFT(KC_ESC))
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
- /* Qwerty
- * ,-------------.
- * | 1 | 2 |
- * |------+------|
- * | 3 | 4 |
- * |------+------|
- * | 5 | 6 |
- * |------+------|
- * | FUNC | RGB |
- * `-------------'
- */
- [_QWERTY] = LAYOUT(
- KC_1, KC_2,
- KC_3, KC_4,
- KC_5, KC_6,
- MO(_FUNC), TG(_RGB)
- ),
-
- /* RGB
- * ,-------------.
- * | Mode-| Mode+|
- * |------+------|
- * | HUE- | HUE+ |
- * |------+------|
- * | SAT- | SAT+ |
- * |------+------|
- * |RGBTOG| |
- * `-------------'
- */
- [_RGB] = LAYOUT(
- UG_PREV, UG_NEXT,
- UG_HUED, UG_HUEU,
- UG_SATD, UG_SATU,
- UG_TOGG, KC_TRNS
- ),
-
- /* Function
- * ,-------------.
- * | Q |CALDEL|
- * |------+------|
- * | A |TSKMGR|
- * |------+------|
- * | Z | X |
- * |------+------|
- * | | C |
- * `-------------'
- */
- [_FUNC] = LAYOUT(
- KC_Q, CALTDEL,
- KC_A, TSKMGR,
- KC_Z, KC_X,
- _______, KC_C
- )
-
-};
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md b/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
deleted file mode 100644
index 3f15ff9bc3..0000000000
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/readme.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# Launch Pad
-
-![Launch Pad](https://i.imgur.com/WVTe0Ku.png)
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-A budget-minded, 4-8 key macro-pad with built in legs, plate & case.
-
-Supports MX & Alps switches. 2x 1u or 1x 2u supported for each row.
-
-Supports 2u PCB-Mount stabilizers.
-
-Runs off of 1x Pro Micro & 8x diodes (1n4148).
-
-Optional "Reset" switch can be used on the PCB.
-
-A fantastic project for beginners to learn to solder, veteran's of the hobby who want to add an easy macro-pad to their collection, and everyone in between.
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-Make example for this keyboard (after setting up your build environment):
-
- make launchpad/rev1:default
-
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
-
-# Under Glow
-
-![Underglow](https://i.imgur.com/3zFIOmu.jpg)
-
-SpaceCat now provides an underglow add-on kit. Please refer to the picture above for wiring.
-
-Make example for this keyboard (after setting up your build environment):
-
- make launchpad/rev1:default_rgb
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-Due to PCB tolerance issues outside of our control, the snap-apart legs included on the PCB may need extra padding to prevent a small amount of wobbling once placed properly. We have included small, clear, and semi-permanent "glue dots" in each order (PCB Only -and- Full Kit) to help with this. You may also use plastic wrap, tape, Elmer's glue, hot glue, rubber cement, etc. We advise against using anything more "permanent" in case you wish to make changes to your Launch Pad in the future. It is also best to attach legs after all of your soldering and building is finished, to get the most accurate feel for your Launch Pad.
-
--=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
diff --git a/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk b/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
deleted file mode 100644
index 1e3cebb145..0000000000
--- a/keyboards/maple_computing/launchpad/keymaps/default_rgb/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/maple_computing/launchpad/rev1/keyboard.json b/keyboards/maple_computing/launchpad/rev1/keyboard.json
index 272a2eef6d..9f7a23c7c8 100644
--- a/keyboards/maple_computing/launchpad/rev1/keyboard.json
+++ b/keyboards/maple_computing/launchpad/rev1/keyboard.json
@@ -30,8 +30,7 @@
"rows": ["C6", "B1", "B3", "D7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
index 699822ffc0..587cd02c35 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/keymap.c
@@ -52,8 +52,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* `------' `------'
*/
[_LOWER] = LAYOUT(
- ALGR(BP_B), BP_EACU, ALGR(BP_P), ALGR(BP_O), BP_EGRV, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_MS_WH_UP,
- ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E), BP_DLR, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, KC_MS_WH_DOWN,
+ ALGR(BP_B), BP_EACU, ALGR(BP_P), ALGR(BP_O), BP_EGRV, KC_PGUP, KC_HOME, KC_UP, KC_END, MS_WHLU,
+ ALGR(BP_A), ALGR(BP_U), ALGR(BP_I), ALGR(BP_E), BP_DLR, KC_PGDN, KC_LEFT, KC_DOWN, KC_RIGHT, MS_WHLD,
BP_AGRV, KC_LALT, KC_LCTL, KC_LSFT, BP_CCED, _______, KC_LSFT, KC_LCTL, KC_LALT, _______,
_______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/maple_computing/minidox/rev1/keyboard.json b/keyboards/maple_computing/minidox/rev1/keyboard.json
index 340a8bd39e..a11c2d94e6 100644
--- a/keyboards/maple_computing/minidox/rev1/keyboard.json
+++ b/keyboards/maple_computing/minidox/rev1/keyboard.json
@@ -18,8 +18,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": true,
diff --git a/keyboards/marcopad/keymaps/backlit/keymap.c b/keyboards/marcopad/keymaps/backlit/keymap.c
index d70df8e6f7..8166cf67b6 100644
--- a/keyboards/marcopad/keymaps/backlit/keymap.c
+++ b/keyboards/marcopad/keymaps/backlit/keymap.c
@@ -31,14 +31,14 @@ const uint16_t PROGMEM value_down[] = {KC_P7, KC_P3, COMBO_END};
const uint16_t PROGMEM speed_up[] = {KC_P8, KC_P4, COMBO_END};
const uint16_t PROGMEM speed_down[] = {KC_P8, KC_P1, COMBO_END};
combo_t key_combos[] = {
- COMBO(backlight_next, RGB_MODE_FORWARD),
- COMBO(backlight_toggle, RGB_TOG),
- COMBO(hue_up, RGB_HUI),
- COMBO(hue_down, RGB_HUD),
- COMBO(sat_up, RGB_SAI),
- COMBO(sat_down, RGB_SAD),
- COMBO(value_up, RGB_VAI),
- COMBO(value_down, RGB_VAD),
- COMBO(speed_up, RGB_SPI),
- COMBO(speed_down, RGB_SPD)
+ COMBO(backlight_next, RM_NEXT),
+ COMBO(backlight_toggle, RM_TOGG),
+ COMBO(hue_up, RM_HUEU),
+ COMBO(hue_down, RM_HUED),
+ COMBO(sat_up, RM_SATU),
+ COMBO(sat_down, RM_SATD),
+ COMBO(value_up, RM_VALU),
+ COMBO(value_down, RM_VALD),
+ COMBO(speed_up, RM_SPDU),
+ COMBO(speed_down, RM_SPDD)
};
diff --git a/keyboards/marksard/leftover30/keyboard.json b/keyboards/marksard/leftover30/keyboard.json
index 1b1131d6fc..9983935f66 100644
--- a/keyboards/marksard/leftover30/keyboard.json
+++ b/keyboards/marksard/leftover30/keyboard.json
@@ -56,8 +56,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/marksard/leftover30/keymaps/default/keymap.c b/keyboards/marksard/leftover30/keymaps/default/keymap.c
index dcad144ebb..08ee136e81 100644
--- a/keyboards/marksard/leftover30/keymaps/default/keymap.c
+++ b/keyboards/marksard/leftover30/keymaps/default/keymap.c
@@ -90,9 +90,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
- UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM,
+ UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_NUM,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, KC_CAPS,
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, XXXXXXX, KC_CAPS,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, KC_CAPS
//`-----------------------------------------------------------------------------------------------------------'
@@ -148,7 +148,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else if (IS_LAYER_ON(_RAISE)) {
tap_code16((clockwise == true) ? S(KC_DOWN) : S(KC_UP));
} else {
- tap_code((clockwise == true) ? KC_WH_D : KC_WH_U);
+ tap_code((clockwise == true) ? MS_WHLD : MS_WHLU);
}
}
return true;
diff --git a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c
index e340ba5e3e..2c15b3664f 100644
--- a/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c
+++ b/keyboards/marksard/leftover30/keymaps/default_isoenter/keymap.c
@@ -90,9 +90,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_INS, KC_PSCR,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
- UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM,
+ UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_NUM,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX,
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------|
_______, _______, _______, _______, KC_CAPS
//`-----------------------------------------------------------------------------------------------------------'
@@ -148,7 +148,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else if (IS_LAYER_ON(_RAISE)) {
tap_code16((clockwise == true) ? S(KC_DOWN) : S(KC_UP));
} else {
- tap_code((clockwise == true) ? KC_WH_D : KC_WH_U);
+ tap_code((clockwise == true) ? MS_WHLD : MS_WHLU);
}
}
return true;
diff --git a/keyboards/marksard/rhymestone/keymaps/default/keymap.c b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
index f566ab99eb..fb78a5049d 100644
--- a/keyboards/marksard/rhymestone/keymaps/default/keymap.c
+++ b/keyboards/marksard/rhymestone/keymaps/default/keymap.c
@@ -80,9 +80,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,---------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM,
+ UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_NUM,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
//,---------------------------------------------------------------------------------------------------.
diff --git a/keyboards/marksard/rhymestone/rev1/keyboard.json b/keyboards/marksard/rhymestone/rev1/keyboard.json
index 3fe23d6d94..aaff1515e0 100644
--- a/keyboards/marksard/rhymestone/rev1/keyboard.json
+++ b/keyboards/marksard/rhymestone/rev1/keyboard.json
@@ -44,8 +44,7 @@
"static_gradient": true
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"mousekey": false,
diff --git a/keyboards/marksard/treadstone32/keymaps/default/keymap.c b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
index 1373e819f8..93f2eaa91d 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone32/keymaps/default/keymap.c
@@ -101,9 +101,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,---------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_INS, KC_PSCR,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NUM,
+ UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, KC_NUM,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, XXXXXXX, XXXXXXX,
//`---------+---------+---------+---------+---------+---------+---------+---------+---------+---------'
_______, _______
// `---------|---------'
diff --git a/keyboards/marksard/treadstone48/keymaps/default/keymap.c b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
index 276c8446cb..625894203e 100644
--- a/keyboards/marksard/treadstone48/keymaps/default/keymap.c
+++ b/keyboards/marksard/treadstone48/keymaps/default/keymap.c
@@ -84,13 +84,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_base(
//,--------------------------------------------------------------------------------------------------------------------.
- XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX,
+ XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, MS_WHLL, MS_WHLU, KC_HOME, KC_PGUP, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------|
- XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX,
+ XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, XXXXXXX, MS_WHLR, MS_WHLD, KC_END, KC_PGDN, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
- _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, KC_MS_U,
+ _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, MS_UP,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------|
- _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R,
+ _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT,
//`-------------------------------------------------------------------------------------------------------------------'
_______
// ExtraKey: This key is an extra key. REV1 is a split back space. REV2 is to the right of the arrow-up key.
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
index f7e5a068b5..469cb94ee9 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/keymap.c
@@ -132,13 +132,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_rs(
// Treadstone48 Rhymestone
//,--------------------------------------------------------------------------------------------------------------------. --------------------------------------------.
- XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, XXXXXXX, MS_WHLL, MS_WHLU, KC_HOME, KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+-----------------| --------+--------+--------+--------+--------|
- XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ XXXXXXX, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, XXXXXXX, MS_WHLR, MS_WHLD, KC_END, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------| --------+--------+--------+--------+--------|
- _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_BTN2, XXXXXXX, KC_MS_U, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_BTN2, XXXXXXX, MS_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|--------+--------+--------+--------+--------+--------|--------+--------+--------+--------+--------+--------+--------| --------+--------+--------+--------+--------|
- _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, _______, _______, _______, XXXXXXX, XXXXXXX, _______, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//`--------------------------------------------------------------------------------------------------------------------' --------------------------------------------'
_______
// ExtraKey: This key is an extra key. REV1 is a split back space. REV2 is to the right of the arrow-up key.
diff --git a/keyboards/maxipad/promicro/keyboard.json b/keyboards/maxipad/promicro/keyboard.json
index 1499162155..d48a1c9d11 100644
--- a/keyboards/maxipad/promicro/keyboard.json
+++ b/keyboards/maxipad/promicro/keyboard.json
@@ -4,6 +4,5 @@
"rows": ["B6", "B2", "B3", "B1", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
index de5fe3a67c..3346f02ecd 100644
--- a/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
+++ b/keyboards/maxr1998/phoebe/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_GRV, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, DE_PLUS, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, SC_RSPC,
- KC_LCTL, KC_LGUI, KC_LALT, KC_BTN1, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT
+ KC_LCTL, KC_LGUI, KC_LALT, MS_BTN1, KC_SC, KC_SPC, KC_ALGR, KC_FN, KC_LEFT, KC_DOWN, KC_RGHT
),
/* Special characters
@@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______, DE_UDIA, KC_F9, DE_ODIA, KC_PSCR, KC_DEL,
QK_LOCK, DE_ADIA, DE_SS, _______, _______, G_1, _______, RGB_M_P, RGB_M_SW,RGB_M_SN,_______, _______,
_______, _______, _______, _______, _______, _______, _______, UG_HUED, UG_TOGG, UG_HUEU, KC_PGUP, _______,
- XXXXXXX, _______, XXXXXXX, KC_BTN2, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
+ XXXXXXX, _______, XXXXXXX, MS_BTN2, XXXXXXX, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
),
/* Gaming
diff --git a/keyboards/mechanickeys/undead60m/undead60m.c b/keyboards/mechanickeys/undead60m/undead60m.c
index 995b56e544..8aad8342d3 100644
--- a/keyboards/mechanickeys/undead60m/undead60m.c
+++ b/keyboards/mechanickeys/undead60m/undead60m.c
@@ -28,9 +28,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
case 1: /* Layer 2: Scroll */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
case 2: /* Layer 3: Change Track */
diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json
index fab11db131..8c6489409e 100644
--- a/keyboards/mechllama/g35/info.json
+++ b/keyboards/mechllama/g35/info.json
@@ -13,8 +13,12 @@
},
"usb": {
"vid": "0xCEEB",
- "pid": "0x0035",
- "force_nkro": true
+ "pid": "0x0035"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"ws2812": {
"pin": "F7"
diff --git a/keyboards/mechstudio/chapter1/keymaps/default/keymap.c b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
index 38508b2b03..79fb45f3db 100644
--- a/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
+++ b/keyboards/mechstudio/chapter1/keymaps/default/keymap.c
@@ -27,6 +27,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = {ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)}
+ [0] = {ENCODER_CCW_CW(MS_WHLU, MS_WHLD)}
};
#endif
diff --git a/keyboards/mechwild/bbs/keyboard.json b/keyboards/mechwild/bbs/keyboard.json
index 8985c4526a..c8a57c8bc5 100644
--- a/keyboards/mechwild/bbs/keyboard.json
+++ b/keyboards/mechwild/bbs/keyboard.json
@@ -44,13 +44,17 @@
"url": "https://mechwild.com/product/bb-steno/",
"usb": {
"device_version": "1.1.0",
- "force_nkro": true,
"pid": "0x170E",
"shared_endpoint": {
"keyboard": true
},
"vid": "0x6D77"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"driver": "pwm",
"pin": "B9"
diff --git a/keyboards/mechwild/mercutio/keyboard.json b/keyboards/mechwild/mercutio/keyboard.json
index d0b7d51029..58ff0b216e 100644
--- a/keyboards/mechwild/mercutio/keyboard.json
+++ b/keyboards/mechwild/mercutio/keyboard.json
@@ -1,12 +1,14 @@
{
- "keyboard_name": "Mercutio",
"manufacturer": "MechWild",
- "url": "mechwild.com",
+ "keyboard_name": "Mercutio",
"maintainer": "kylemccreery",
- "usb": {
- "vid": "0x6D77",
- "pid": "0x1703",
- "device_version": "1.0.0"
+ "bootloader": "usbasploader",
+ "bootloader_instructions": "Hold down the BOOT button, then tap the RESET button.",
+ "diode_direction": "COL2ROW",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "B4", "pin_b": "B5"}
+ ]
},
"features": {
"bootmagic": true,
@@ -20,26 +22,72 @@
"cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"],
"rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"]
},
- "diode_direction": "COL2ROW",
- "encoder": {
- "rotary": [
- {"pin_a": "B4", "pin_b": "B5"}
- ]
- },
+ "processor": "atmega328p",
"qmk": {
- "tap_keycode_delay": 10,
"locking": {
"enabled": true,
"resync": true
- }
+ },
+ "tap_keycode_delay": 10
+ },
+ "url": "https://mechwild.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x1703",
+ "vid": "0x6D77"
},
- "processor": "atmega328p",
- "bootloader": "usbasploader",
"layouts": {
+ "LAYOUT_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
"LAYOUT_all": {
"layout": [
- {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0},
-
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
@@ -52,7 +100,6 @@
{"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
{"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
{"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
-
{"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
@@ -65,7 +112,6 @@
{"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
{"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
{"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
-
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
{"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
@@ -78,7 +124,6 @@
{"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
{"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
-
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
{"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
@@ -90,10 +135,9 @@
{"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
]
},
- "LAYOUT_625u_space": {
+ "LAYOUT_full_enter": {
"layout": [
- {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0},
-
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
{"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
{"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
{"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
@@ -106,7 +150,6 @@
{"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
{"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
{"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
-
{"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
{"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
{"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
@@ -117,9 +160,7 @@
{"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
{"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
{"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
- {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
- {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
-
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
{"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
{"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
{"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
@@ -132,7 +173,197 @@
{"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
{"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
{"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
-
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_enter_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25},
+ {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_enter_full_lshift_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_lshift": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
+ },
+ "LAYOUT_full_lshift_625u_space": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
{"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
{"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
{"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4},
@@ -141,6 +372,54 @@
{"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
{"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
]
+ },
+ "LAYOUT_full_lshift_full_enter": {
+ "layout": [
+ {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0, "encoder": 0},
+ {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5},
+ {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1},
+ {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1},
+ {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1},
+ {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1},
+ {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1},
+ {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1},
+ {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1},
+ {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1},
+ {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1},
+ {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1},
+ {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5},
+ {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75},
+ {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2},
+ {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2},
+ {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2},
+ {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2},
+ {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2},
+ {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2},
+ {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2},
+ {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2},
+ {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2},
+ {"label": "Enter", "matrix": [5, 3], "x": 10.75, "y": 2, "w": 2.25},
+ {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 2.25},
+ {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3},
+ {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3},
+ {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3},
+ {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3},
+ {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3},
+ {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3},
+ {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3},
+ {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3},
+ {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3},
+ {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75},
+ {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25},
+ {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4},
+ {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25},
+ {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25},
+ {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4},
+ {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75},
+ {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25},
+ {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4},
+ {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25}
+ ]
}
}
}
diff --git a/keyboards/mechwild/mercutio/keymaps/default/keymap.c b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
index 9d5d174c60..bf6b96b8be 100644
--- a/keyboards/mechwild/mercutio/keymaps/default/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default/keymap.c
@@ -26,24 +26,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_all(
KC_TRNS,
- KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
- KC_TRNS, KC_TRNS, KC_GRV, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_TRNS, KC_QUOT,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_SLSH, KC_UP,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT ),
+ KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
+ KC_TRNS, KC_TRNS, KC_GRV, KC_BSLS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_TRNS, KC_QUOT,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MINS, KC_EQL, KC_SLSH, KC_UP,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_END, KC_LEFT, KC_DOWN, KC_RIGHT ),
[2] = LAYOUT_all(
KC_TRNS,
- KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
- KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ),
-
- [3] = LAYOUT_all(
- KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
+ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS )
};
#ifdef ENCODER_MAP_ENABLE
@@ -51,6 +44,5 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
[2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
- [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif
diff --git a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
index a4cd13134c..b76479a5b9 100644
--- a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
+++ b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c
@@ -36,13 +36,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______ ),
-
- [3] = LAYOUT_625u_space(
- _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______ )
};
@@ -50,7 +43,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(_______, _______) },
- [2] = { ENCODER_CCW_CW(_______, _______) },
- [3] = { ENCODER_CCW_CW(_______, _______) },
+ [2] = { ENCODER_CCW_CW(_______, _______) }
};
#endif
diff --git a/keyboards/mechwild/mokulua/mirrored/keyboard.json b/keyboards/mechwild/mokulua/mirrored/keyboard.json
index dc66c0c53a..e76314f869 100644
--- a/keyboards/mechwild/mokulua/mirrored/keyboard.json
+++ b/keyboards/mechwild/mokulua/mirrored/keyboard.json
@@ -61,8 +61,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_mirrored": "LAYOUT"
},
diff --git a/keyboards/mechwild/mokulua/standard/keyboard.json b/keyboards/mechwild/mokulua/standard/keyboard.json
index f3eccd921f..e9c81c7e6d 100644
--- a/keyboards/mechwild/mokulua/standard/keyboard.json
+++ b/keyboards/mechwild/mokulua/standard/keyboard.json
@@ -61,8 +61,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_standard": "LAYOUT"
},
diff --git a/keyboards/mechwild/murphpad/keyboard.json b/keyboards/mechwild/murphpad/keyboard.json
index 8ab90bd937..a79810afd7 100644
--- a/keyboards/mechwild/murphpad/keyboard.json
+++ b/keyboards/mechwild/murphpad/keyboard.json
@@ -59,8 +59,7 @@
"ws2812": {
"pin": "F4"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c b/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
index 2ef70b652a..0ad534e256 100644
--- a/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
+++ b/keyboards/mechwild/puckbuddy/keymaps/default/keymap.c
@@ -37,8 +37,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MUTE, MO(_FN3), MO(_FN2), MO(_FN1), LGUI(KC_D),
MO(_FN2), KC_HOME,
MO(_FN3), KC_END,
- KC_BTN3, DPI_FINE,
- KC_BTN1, KC_BTN2, KC_BTN2, KC_BTN1
+ MS_BTN3, DPI_FINE,
+ MS_BTN1, MS_BTN2, MS_BTN2, MS_BTN1
),
[_FN1] = LAYOUT(
UG_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, TAP_TOG,
diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json
index 0b796f7c21..514c90b6ce 100644
--- a/keyboards/mechwild/sugarglider/info.json
+++ b/keyboards/mechwild/sugarglider/info.json
@@ -7,11 +7,15 @@
"vid": "0x6D77",
"pid": "0x1710",
"device_version": "0.2.0",
- "force_nkro": true,
"shared_endpoint": {
"keyboard": true
}
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"diode_direction": "COL2ROW",
"dynamic_keymap": {
"layer_count": 5
diff --git a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c
index d723ba10a6..46818cf209 100644
--- a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c
+++ b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c
@@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, TAP_UP, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_MUTE, TAP_DN, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT,
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, TG(_STENO), KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_MUTE, KC_LGUI, KC_LALT, TL_LOWR, KC_MS_BTN1, TAP_TOG, KC_MS_BTN2, TL_UPPR, KC_SPC, KC_RSFT, KC_MUTE
+ KC_MUTE, KC_LGUI, KC_LALT, TL_LOWR, MS_BTN1, TAP_TOG, MS_BTN2, TL_UPPR, KC_SPC, KC_RSFT, KC_MUTE
),
[_LOWER] = LAYOUT(
KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, DPI_UP, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL,
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(DPI_UP, DPI_DN) },
[_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END) },
[_ADJUST] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_BRID, KC_BRIU), ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_BRID, KC_BRIU) },
diff --git a/keyboards/mechwild/sugarglider/rules.mk b/keyboards/mechwild/sugarglider/rules.mk
index a01a95a868..73a141ac91 100644
--- a/keyboards/mechwild/sugarglider/rules.mk
+++ b/keyboards/mechwild/sugarglider/rules.mk
@@ -7,5 +7,3 @@ CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += mcp23018.c matrix.c
I2C_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled
diff --git a/keyboards/mechwild/sugarglider/sugarglider.c b/keyboards/mechwild/sugarglider/sugarglider.c
index 086294470e..d2a199bb7c 100644
--- a/keyboards/mechwild/sugarglider/sugarglider.c
+++ b/keyboards/mechwild/sugarglider/sugarglider.c
@@ -97,9 +97,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
case 3:
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
}
diff --git a/keyboards/mechwild/sugarglider/wide_oled/rules.mk b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
index 23e6cab873..a77f1a8af2 100644
--- a/keyboards/mechwild/sugarglider/wide_oled/rules.mk
+++ b/keyboards/mechwild/sugarglider/wide_oled/rules.mk
@@ -2,5 +2,3 @@
# change yes to no to disable
#
WIDE_OLED_ENABLE = yes
-
-DEFAULT_FOLDER = mechwild/sugarglider/wide_oled/f401
diff --git a/keyboards/meow48/keyboard.json b/keyboards/meow48/keyboard.json
index 7861555648..f3b1453547 100644
--- a/keyboards/meow48/keyboard.json
+++ b/keyboards/meow48/keyboard.json
@@ -43,8 +43,7 @@
"rows": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/merge/uc1/keyboard.json b/keyboards/merge/uc1/keyboard.json
index 496b9a6b5f..4d0393399f 100644
--- a/keyboards/merge/uc1/keyboard.json
+++ b/keyboards/merge/uc1/keyboard.json
@@ -48,8 +48,7 @@
{"pin_a": "F5", "pin_b": "F6"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/miiiw/blackio83/rev_0100/keyboard.json b/keyboards/miiiw/blackio83/rev_0100/keyboard.json
index e5cf747537..bc94408419 100644
--- a/keyboards/miiiw/blackio83/rev_0100/keyboard.json
+++ b/keyboards/miiiw/blackio83/rev_0100/keyboard.json
@@ -166,10 +166,14 @@
"url": "https://github.com/ArthurCyy",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x83A1",
"vid": "0x3044"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"pin": "B15"
},
diff --git a/keyboards/millipad/keyboard.json b/keyboards/millipad/keyboard.json
index d2761b8b1b..e4e107c5a6 100644
--- a/keyboards/millipad/keyboard.json
+++ b/keyboards/millipad/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x1A1B",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/minimacro5/keyboard.json b/keyboards/minimacro5/keyboard.json
index 033bc1e85a..b868a3b058 100644
--- a/keyboards/minimacro5/keyboard.json
+++ b/keyboards/minimacro5/keyboard.json
@@ -34,8 +34,7 @@
{"pin_a": "C6", "pin_b": "E6", "resolution": 2}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"encoder": true,
diff --git a/keyboards/mint60/keyboard.json b/keyboards/mint60/keyboard.json
index 1bb54aebd9..9e581ce7b8 100644
--- a/keyboards/mint60/keyboard.json
+++ b/keyboards/mint60/keyboard.json
@@ -51,8 +51,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/misonoworks/chocolatebar/keyboard.json b/keyboards/misonoworks/chocolatebar/keyboard.json
index 75b10ae561..13bc64f16f 100644
--- a/keyboards/misonoworks/chocolatebar/keyboard.json
+++ b/keyboards/misonoworks/chocolatebar/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x6D77",
"pid": "0xC456",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 12,
diff --git a/keyboards/misonoworks/karina/keyboard.json b/keyboards/misonoworks/karina/keyboard.json
index 1266c07cea..ef2b7f7e6e 100644
--- a/keyboards/misonoworks/karina/keyboard.json
+++ b/keyboards/misonoworks/karina/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0xC456",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"led_count": 19,
diff --git a/keyboards/mixi/keyboard.json b/keyboards/mixi/keyboard.json
index a08d54b883..bde1eb6390 100644
--- a/keyboards/mixi/keyboard.json
+++ b/keyboards/mixi/keyboard.json
@@ -35,8 +35,7 @@
{"pin_a": "B1", "pin_b": "B3"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"command": true,
diff --git a/keyboards/ml/gas75/keyboard.json b/keyboards/ml/gas75/keyboard.json
index b7736884fc..280735eb14 100644
--- a/keyboards/ml/gas75/keyboard.json
+++ b/keyboards/ml/gas75/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xC0B0",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/mlego/m65/keymaps/default/keymap.c b/keyboards/mlego/m65/keymaps/default/keymap.c
index 6ff4b5dc70..52ead0ab36 100644
--- a/keyboards/mlego/m65/keymaps/default/keymap.c
+++ b/keyboards/mlego/m65/keymaps/default/keymap.c
@@ -15,17 +15,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LWR] = LAYOUT_ortho_5x13(
KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL ,
- KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
- _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+ MS_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ _______, MS_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_UP , _______ ,
+ _______, MS_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT),
[_RSE] = LAYOUT_ortho_5x13(
KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLU, _______ ,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR),
[_ADJ] = LAYOUT_ortho_5x13(
UG_NEXT, UG_PREV , A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index f708346239..06d5dd5bf2 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -185,10 +185,10 @@ MS - mouse directions
*/
[_LWR] = LAYOUT_ortho_5x13(
KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL, UK_EQL,
- KC_BTN3,UP(lq,lQ),UP(lw,lW),UP(le,lE),UP(lr,lR),UP(lt,lT),UP(ly,lY),UP(lu,lU),UP(li,lI), UP(lo,lO), UP(lp,lP), _______, _______,
- KC_BTN2,UP(la,lA),UP(ls,lS),UP(ld,lD),UP(lf,lF),UP(lg,lG),UP(lh,lH),UP(lj,lJ),UP(lk,lK), UP(ll,lL),UP(ll1,lL1), UP(lk1,lK1), _______,
- _______, KC_BTN1,UP(lz,lZ),UP(lx,lX),UP(lc,lC),UP(lv,lV),UP(lb,lB),UP(ln,lN),UP(lm,lM),UP(lc1,lC1),UP(lp1,lP1), KC_MS_U, UP(lq1,lQ1),
- _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R),
+ MS_BTN3,UP(lq,lQ),UP(lw,lW),UP(le,lE),UP(lr,lR),UP(lt,lT),UP(ly,lY),UP(lu,lU),UP(li,lI), UP(lo,lO), UP(lp,lP), _______, _______,
+ MS_BTN2,UP(la,lA),UP(ls,lS),UP(ld,lD),UP(lf,lF),UP(lg,lG),UP(lh,lH),UP(lj,lJ),UP(lk,lK), UP(ll,lL),UP(ll1,lL1), UP(lk1,lK1), _______,
+ _______, MS_BTN1,UP(lz,lZ),UP(lx,lX),UP(lc,lC),UP(lv,lV),UP(lb,lB),UP(ln,lN),UP(lm,lM),UP(lc1,lC1),UP(lp1,lP1), MS_UP, UP(lq1,lQ1),
+ _______, MS_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT),
/*
lower layer
@@ -221,8 +221,8 @@ raise layer shifted
KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 ,
_______,UP(ra1,rA1), _______, _______, _______,UP(rt,rT), _______, _______,UP(ri,rI), _______, _______, _______, _______ ,
KC_CAPS, UP(ra,rA), UP(rs,rS), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, KC_F20 , _______, _______,UP(rc,rC), _______, _______, _______, _______, _______, _______, KC_WH_U, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
+ _______, KC_F20 , _______, _______,UP(rc,rC), _______, _______, _______, _______, _______, _______, MS_WHLU, _______ ,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR),
/*
adj layer
* ┌───┬────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬────┬────┐
diff --git a/keyboards/mmkeyboard/class60/soldered/keyboard.json b/keyboards/mmkeyboard/class60/soldered/keyboard.json
index cb28da366c..8615129e83 100644
--- a/keyboards/mmkeyboard/class60/soldered/keyboard.json
+++ b/keyboards/mmkeyboard/class60/soldered/keyboard.json
@@ -36,10 +36,14 @@
"url": "https://www.mmkeyboard.com/products/mm-class60-retro-custom-mechanical-keyboard",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x3876",
"vid": "0x4F66"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"community_layouts": [
"60_ansi",
"60_ansi_split_bs_rshift",
diff --git a/keyboards/mmkzoo65/keyboard.json b/keyboards/mmkzoo65/keyboard.json
index fdd5f50b60..3d752d6d5d 100644
--- a/keyboards/mmkzoo65/keyboard.json
+++ b/keyboards/mmkzoo65/keyboard.json
@@ -6,9 +6,13 @@
"vid": "0x7BA1",
"pid": "0x6505",
"device_version": "0.0.1",
- "force_nkro": true,
"polling_interval": 2
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"extrakey": true,
diff --git a/keyboards/molecule/keymaps/default/keymap.c b/keyboards/molecule/keymaps/default/keymap.c
index 9030ba98d1..4b4fbd4eca 100755
--- a/keyboards/molecule/keymaps/default/keymap.c
+++ b/keyboards/molecule/keymaps/default/keymap.c
@@ -41,8 +41,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LOWER] = LAYOUT(
KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- KC_F2, KC_F3, KC_WH_U, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F8, KC_F9,
- KC_F1, KC_BTN2, KC_WH_D, KC_BTN1, KC_F11, KC_F12, KC_LEFT, KC_DOWN, KC_RGHT, KC_F10,
+ KC_F2, KC_F3, MS_WHLU, KC_F4, KC_F5, KC_F6, KC_F7, KC_UP, KC_F8, KC_F9,
+ KC_F1, MS_BTN2, MS_WHLD, MS_BTN1, KC_F11, KC_F12, KC_LEFT, KC_DOWN, KC_RGHT, KC_F10,
KC_LCTL, KC_LSFT, KC_LALT, KC_SPC, KC_ENT, KC_RGUI, KC_RSFT, KC_RCTL,
KC_TRNS, MO(4)
),
diff --git a/keyboards/monsgeek/m1/keyboard.json b/keyboards/monsgeek/m1/keyboard.json
index 4cca5c8686..7a7d1308ce 100644
--- a/keyboards/monsgeek/m1/keyboard.json
+++ b/keyboards/monsgeek/m1/keyboard.json
@@ -3,12 +3,16 @@
"manufacturer": "MonsGeek",
"maintainer": "jonylee@hfd",
"usb": {
- "force_nkro": true,
"vid": "0xFFFE",
"pid": "0x0005",
"device_version": "1.1.0",
"suspend_wakeup_delay": 400
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"features": {
diff --git a/keyboards/monsgeek/m3/keyboard.json b/keyboards/monsgeek/m3/keyboard.json
index 9d2ea18c9d..f3d318176b 100644
--- a/keyboards/monsgeek/m3/keyboard.json
+++ b/keyboards/monsgeek/m3/keyboard.json
@@ -6,8 +6,12 @@
"vid": "0xFFFE",
"pid": "0x0009",
"device_version": "1.0.5",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/monsgeek/m5/keyboard.json b/keyboards/monsgeek/m5/keyboard.json
index 92d6add3fe..f439830f8a 100644
--- a/keyboards/monsgeek/m5/keyboard.json
+++ b/keyboards/monsgeek/m5/keyboard.json
@@ -6,8 +6,12 @@
"vid": "0xFFFE",
"pid": "0x000A",
"device_version": "1.0.4",
- "suspend_wakeup_delay": 400,
- "force_nkro": true
+ "suspend_wakeup_delay": 400
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
diff --git a/keyboards/monsgeek/m6/keyboard.json b/keyboards/monsgeek/m6/keyboard.json
index afe38eb0da..bcc14da2e4 100644
--- a/keyboards/monsgeek/m6/keyboard.json
+++ b/keyboards/monsgeek/m6/keyboard.json
@@ -3,12 +3,16 @@
"manufacturer": "MonsGeek",
"maintainer": "jonylee@hfd",
"usb": {
- "force_nkro": true,
"vid": "0xFFFE",
"pid": "0x0011",
"device_version": "1.0.0",
"suspend_wakeup_delay": 400
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"features": {
diff --git a/keyboards/montsinger/rewind/keyboard.json b/keyboards/montsinger/rewind/keyboard.json
index ddb6ab6496..46468d4c67 100644
--- a/keyboards/montsinger/rewind/keyboard.json
+++ b/keyboards/montsinger/rewind/keyboard.json
@@ -27,8 +27,7 @@
"rows": ["B5", "B4", "D2", "D3", "B2"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_5x10": {
"layout": [
diff --git a/keyboards/moon/config.h b/keyboards/moon/config.h
index ca4c770a3b..1e95dc2b8f 100644
--- a/keyboards/moon/config.h
+++ b/keyboards/moon/config.h
@@ -1,23 +1,7 @@
-/*
-Copyright 2019 Mathias Andersson <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-
-/* key matrix size */
+// key matrix size
#define MATRIX_ROWS 8
#define MATRIX_COLS 11
diff --git a/keyboards/moon/keyboard.json b/keyboards/moon/keyboard.json
index 76d2c08f7e..ea3d34b650 100644
--- a/keyboards/moon/keyboard.json
+++ b/keyboards/moon/keyboard.json
@@ -9,13 +9,11 @@
"device_version": "0.0.1"
},
"features": {
- "bootmagic": false,
- "mousekey": true,
+ "backlight": true,
+ "bootmagic": true,
"extrakey": true,
- "console": true,
- "command": true,
- "nkro": true,
- "backlight": true
+ "mousekey": true,
+ "nkro": true
},
"qmk": {
"locking": {
diff --git a/keyboards/moon/keymaps/default/keymap.c b/keyboards/moon/keymaps/default/keymap.c
index fd1956a4dc..73dc65dc9a 100644
--- a/keyboards/moon/keymaps/default/keymap.c
+++ b/keyboards/moon/keymaps/default/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
// clang-format off
diff --git a/keyboards/moon/keymaps/default_tkl_ansi/keymap.c b/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
index b0244eccee..ee22951fcd 100644
--- a/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_ansi/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
// clang-format off
diff --git a/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c b/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
index 7fd641a93f..1b41519cc9 100644
--- a/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_ansi_wkl/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
// clang-format off
diff --git a/keyboards/moon/keymaps/default_tkl_iso/keymap.c b/keyboards/moon/keymaps/default_tkl_iso/keymap.c
index b4d9a9b60c..316ed8d5ba 100644
--- a/keyboards/moon/keymaps/default_tkl_iso/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_iso/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
// clang-format off
diff --git a/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c b/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
index 1224d9f02e..6637515e3e 100644
--- a/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
+++ b/keyboards/moon/keymaps/default_tkl_iso_wkl/keymap.c
@@ -1,3 +1,5 @@
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
// clang-format off
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index 1cb9590e9f..0f72cf3740 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -1,26 +1,8 @@
-/*
-Copyright 2012-2019 Jun Wako, Jack Humbert, Yiancar, Mathias Andersson <[email protected]>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
+// Copyright 2019 Mathias Andersson <[email protected]>
+// SPDX-License-Identifier: GPL-2.0-or-later
#include "matrix.h"
-#include "debounce.h"
#include "pca9555.h"
+#include "wait.h"
/*
* IC1 (PCA9555) IC2 (PCA9555)
@@ -70,56 +52,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PORT1_COLS_MASK 0b00111111
#define COLS_MASK 0b0000011111111111
-#if (MATRIX_COLS <= 8)
-# define print_matrix_header() print("\nr/c 01234567\n")
-# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
-# define ROW_SHIFTER ((uint8_t)1)
-#elif (MATRIX_COLS <= 16)
-# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
-# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
-# define ROW_SHIFTER ((uint16_t)1)
-#elif (MATRIX_COLS <= 32)
-# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
-# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
-# define ROW_SHIFTER ((uint32_t)1)
-#endif
-
-/* matrix state(1:on, 0:off) */
-static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
-static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
-
-__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
-
-__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
-
-__attribute__((weak)) void matrix_init_user(void) {}
-
-__attribute__((weak)) void matrix_scan_user(void) {}
-
-inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
-
-inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
-
-inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
-
-inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
-
-void matrix_print(void) {
- print_matrix_header();
-
- for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- print_hex8(row);
- print(": ");
- print_matrix_row(row);
- print("\n");
- }
-}
-
-static void init_i2c(void) {
- pca9555_init(IC1);
- pca9555_init(IC2);
-}
-
static void init_pins(void) {
// init cols - IC2 port0 & IC2 port1 input
pca9555_set_config(IC2, PCA9555_PORT0, ALL_INPUT);
@@ -158,45 +90,28 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Clear data in matrix row
current_matrix[current_row] = 0;
- // Select row and wait for row selecton to stabilize
+ // Select row and wait for row selection to stabilize
select_row(current_row);
wait_us(30);
- current_matrix[current_row] |= read_cols();
+ current_matrix[current_row] = read_cols();
// No need to unselect as `select_row` sets all the pins.
return (last_row_value != current_matrix[current_row]);
}
-void matrix_init(void) {
- // initialize i2c
- init_i2c();
+void matrix_init_custom(void) {
+ pca9555_init(IC1);
+ pca9555_init(IC2);
- // initialize key pins
init_pins();
-
- // initialize matrix state: all keys off
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- raw_matrix[i] = 0;
- matrix[i] = 0;
- }
-
- debounce_init(MATRIX_ROWS);
-
- matrix_init_kb();
}
-uint8_t matrix_scan(void) {
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
bool changed = false;
-
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
- changed |= read_cols_on_row(raw_matrix, current_row);
+ changed |= read_cols_on_row(current_matrix, current_row);
}
-
- debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-
- matrix_scan_kb();
-
- return (uint8_t)changed;
+ return changed;
}
diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk
index aee52dfee1..e11c65db02 100644
--- a/keyboards/moon/rules.mk
+++ b/keyboards/moon/rules.mk
@@ -1,5 +1,5 @@
# custom matrix setup
-CUSTOM_MATRIX = yes
+CUSTOM_MATRIX = lite
VPATH += drivers/gpio
SRC += pca9555.c matrix.c
diff --git a/keyboards/morizon/keyboard.json b/keyboards/morizon/keyboard.json
index 13999e5753..1b3dba08d4 100644
--- a/keyboards/morizon/keyboard.json
+++ b/keyboards/morizon/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/mountainblocks/mb17/keyboard.json b/keyboards/mountainblocks/mb17/keyboard.json
index 9103f7775f..d8ef466def 100644
--- a/keyboards/mountainblocks/mb17/keyboard.json
+++ b/keyboards/mountainblocks/mb17/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["F4", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
diff --git a/keyboards/mss_studio/m63_rgb/keyboard.json b/keyboards/mss_studio/m63_rgb/keyboard.json
index 16a4c5295f..b798df21dd 100644
--- a/keyboards/mss_studio/m63_rgb/keyboard.json
+++ b/keyboards/mss_studio/m63_rgb/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4D4B",
"pid": "0x6063",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"ws2812": {
"pin": "B15"
diff --git a/keyboards/mss_studio/m64_rgb/keyboard.json b/keyboards/mss_studio/m64_rgb/keyboard.json
index 5b53cd58c7..083afec8c7 100644
--- a/keyboards/mss_studio/m64_rgb/keyboard.json
+++ b/keyboards/mss_studio/m64_rgb/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4D4B",
"pid": "0x6064",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"ws2812": {
"pin": "B15"
diff --git a/keyboards/mt/mt40/keymaps/default/keymap.c b/keyboards/mt/mt40/keymaps/default/keymap.c
index 22e13e662a..0880037a9b 100644
--- a/keyboards/mt/mt40/keymaps/default/keymap.c
+++ b/keyboards/mt/mt40/keymaps/default/keymap.c
@@ -64,9 +64,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, OOOOOOO, _______, _______, _______, _______, _______, _______, _______),
[4] = LAYOUT_planck_mit(
- _______, _______, _______, _______, _______, _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______,
- KC_PSCR, KC_INS, KC_MUTE, KC_VOLD, KC_VOLU, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______,
- KC_CAPS, _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______,
+ KC_PSCR, KC_INS, KC_MUTE, KC_VOLD, KC_VOLU, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, _______, _______,
+ KC_CAPS, _______, KC_MPLY, KC_MRWD, KC_MFFD, _______, _______, _______, MS_BTN1, MS_BTN2, _______, _______,
_______, _______, _______, _______, _______, _______, _______, OOOOOOO, _______, _______, _______),
diff --git a/keyboards/mwstudio/alicekk/keyboard.json b/keyboards/mwstudio/alicekk/keyboard.json
index 355437f953..fe76ec123d 100644
--- a/keyboards/mwstudio/alicekk/keyboard.json
+++ b/keyboards/mwstudio/alicekk/keyboard.json
@@ -4,8 +4,12 @@
"usb": {
"vid": "0x7BA1",
"pid": "0x3201",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/mwstudio/mw660/keyboard.json b/keyboards/mwstudio/mw660/keyboard.json
index bf0cd6781c..385abb1828 100644
--- a/keyboards/mwstudio/mw660/keyboard.json
+++ b/keyboards/mwstudio/mw660/keyboard.json
@@ -25,8 +25,12 @@
"usb": {
"device_version": "1.0.0",
"pid": "0x6601",
- "vid": "0x7BA1",
- "force_nkro": true
+ "vid": "0x7BA1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/nacly/sodium42/keyboard.json b/keyboards/nacly/sodium42/keyboard.json
index a1d7b65ab3..97b6a837c5 100644
--- a/keyboards/nacly/sodium42/keyboard.json
+++ b/keyboards/nacly/sodium42/keyboard.json
@@ -35,8 +35,7 @@
"pin": "D3"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/nacly/sodium50/keyboard.json b/keyboards/nacly/sodium50/keyboard.json
index e41495755f..dd1604c480 100644
--- a/keyboards/nacly/sodium50/keyboard.json
+++ b/keyboards/nacly/sodium50/keyboard.json
@@ -35,8 +35,7 @@
"pin": "D3"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/nacly/sodium62/keyboard.json b/keyboards/nacly/sodium62/keyboard.json
index ab16bf45fa..64cb488159 100644
--- a/keyboards/nacly/sodium62/keyboard.json
+++ b/keyboards/nacly/sodium62/keyboard.json
@@ -36,8 +36,7 @@
"pin": "D3"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/nacly/splitreus62/keyboard.json b/keyboards/nacly/splitreus62/keyboard.json
index d356578690..567cb6d6db 100644
--- a/keyboards/nacly/splitreus62/keyboard.json
+++ b/keyboards/nacly/splitreus62/keyboard.json
@@ -42,8 +42,7 @@
"ws2812": {
"pin": "B1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/nacly/ua62/keyboard.json b/keyboards/nacly/ua62/keyboard.json
index 0bf01308f5..85fbbd431c 100644
--- a/keyboards/nacly/ua62/keyboard.json
+++ b/keyboards/nacly/ua62/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/newgame40/keyboard.json b/keyboards/newgame40/keyboard.json
index ad59f2bcd0..62c567cb40 100644
--- a/keyboards/newgame40/keyboard.json
+++ b/keyboards/newgame40/keyboard.json
@@ -39,8 +39,7 @@
"ws2812": {
"pin": "F6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x10"],
"layouts": {
"LAYOUT_ortho_4x10": {
diff --git a/keyboards/nightly_boards/n9/keyboard.json b/keyboards/nightly_boards/n9/keyboard.json
index e3d8a3be84..f99ff31258 100644
--- a/keyboards/nightly_boards/n9/keyboard.json
+++ b/keyboards/nightly_boards/n9/keyboard.json
@@ -46,8 +46,7 @@
"ws2812": {
"pin": "F5"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/nightly_boards/ph_arisu/keyboard.json b/keyboards/nightly_boards/ph_arisu/keyboard.json
index afcbdd905a..7d64536c1a 100644
--- a/keyboards/nightly_boards/ph_arisu/keyboard.json
+++ b/keyboards/nightly_boards/ph_arisu/keyboard.json
@@ -25,8 +25,7 @@
"rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/novelkeys/nk65/config.h b/keyboards/novelkeys/nk65/config.h
index 97350e34b4..75c5c8638c 100755
--- a/keyboards/novelkeys/nk65/config.h
+++ b/keyboards/novelkeys/nk65/config.h
@@ -1,89 +1,6 @@
-/*
-Copyright 2019 Yiancar
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
+// Copyright 2019 Yiancar
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-/* Backlight options */
-
-#define RGB_BACKLIGHT_ENABLED 1
-
-#define RGB_BACKLIGHT_NK65
-
-// they aren't really used if RGB_BACKLIGHT_HS60 defined
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
-#define RGB_BACKLIGHT_USE_ISO_ENTER 0
-#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
-
-// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
-#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
-
-// disable backlight after timeout in minutes, 0 = no timeout
-#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
-
-// the default brightness
-#define RGB_BACKLIGHT_BRIGHTNESS 255
-
-// the default effect (RGB test)
-#define RGB_BACKLIGHT_EFFECT 6
-
-// the default effect speed (0-3)
-#define RGB_BACKLIGHT_EFFECT_SPEED 0
-
-// the default color1 and color2
-#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
-#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
-
#define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND
#define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_GND_SDA
-#define IS31FL3733_LED_COUNT 128
-
-// These define which keys in the matrix are alphas/mods
-// Used for backlight effects so colors are different for
-// alphas vs. mods
-// Each value is for a row, bit 0 is column 0
-// Alpha=0 Mod=1
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0110000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0100000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0110000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0111000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0111111000000111
-
-#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-
-// Backlight config starts after VIA's EEPROM usage,
-// dynamic keymaps start after this.
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
-
-/* Custom EEPROM start addressing. This is to support
- * both 128kb and 256kb versions of F303.
- * Register 0x1FFFF7CC holds the size of the flash memory.
- */
-#ifndef FLASHSIZE_BASE
-# define FLASHSIZE_BASE ((uint32_t)0x1FFFF7CCU) /*!< FLASH Size register base address */
-#endif
-#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK
-#define FEE_MCU_FLASH_SIZE \
-({ \
- uint16_t (*flash_size) = (uint16_t*)FLASHSIZE_BASE; \
- *flash_size; \
-})
diff --git a/keyboards/novelkeys/nk65/halconf.h b/keyboards/novelkeys/nk65/halconf.h
index e6d7e3c2ed..481d19c467 100644
--- a/keyboards/novelkeys/nk65/halconf.h
+++ b/keyboards/novelkeys/nk65/halconf.h
@@ -1,33 +1,7 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/nk65/halconf.h -r platforms/chibios/QMK_PROTON_C/configs/halconf.h`
- */
-
+// Copyright 2019 Yiancar
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
-#define HAL_USE_PWM FALSE
-
-#define HAL_USE_SPI FALSE
-
-#define PAL_USE_CALLBACKS FALSE
-
-#define PAL_USE_WAIT FALSE
+#define HAL_USE_I2C TRUE
#include_next <halconf.h>
-
diff --git a/keyboards/novelkeys/nk65/info.json b/keyboards/novelkeys/nk65/info.json
index ae02d3ac05..63c8af9faf 100755
--- a/keyboards/novelkeys/nk65/info.json
+++ b/keyboards/novelkeys/nk65/info.json
@@ -11,11 +11,133 @@
"bootmagic": true,
"extrakey": true,
"mousekey": true,
+ "rgb_matrix": true,
"nkro": true
},
"processor": "STM32F303",
"bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "rgb_matrix": {
+ "driver": "is31fl3733",
+ "sleep": true,
+ "animations": {
+ "alphas_mods": true,
+ "gradient_up_down": true,
+ "gradient_left_right": true,
+ "breathing": true,
+ "band_sat": true,
+ "band_val": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "rainbow_moving_chevron": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "jellybean_raindrops": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "pixel_fractal": true,
+ "pixel_flow": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive": true,
+ "solid_reactive_wide": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "multisplash": true,
+ "solid_splash": true,
+ "solid_multisplash": true
+ },
+ "layout": [
+ { "flags": 4, "matrix": [0, 0], "x": 8, "y": 7 },
+ { "flags": 4, "matrix": [0, 1], "x": 22, "y": 7 },
+ { "flags": 4, "matrix": [0, 2], "x": 35, "y": 7 },
+ { "flags": 4, "matrix": [0, 3], "x": 49, "y": 7 },
+ { "flags": 4, "matrix": [0, 4], "x": 63, "y": 7 },
+ { "flags": 4, "matrix": [0, 5], "x": 77, "y": 7 },
+ { "flags": 4, "matrix": [0, 6], "x": 91, "y": 7 },
+ { "flags": 4, "matrix": [0, 7], "x": 105, "y": 7 },
+ { "flags": 4, "matrix": [0, 8], "x": 118, "y": 7 },
+ { "flags": 4, "matrix": [0, 9], "x": 132, "y": 7 },
+ { "flags": 4, "matrix": [0, 10], "x": 146, "y": 7 },
+ { "flags": 4, "matrix": [0, 11], "x": 160, "y": 7 },
+ { "flags": 4, "matrix": [0, 12], "x": 174, "y": 7 },
+ { "flags": 4, "matrix": [0, 13], "x": 195, "y": 7 },
+ { "flags": 4, "matrix": [0, 14], "x": 215, "y": 7 },
+ { "flags": 4, "matrix": [1, 0], "x": 11, "y": 19 },
+ { "flags": 4, "matrix": [1, 1], "x": 28, "y": 19 },
+ { "flags": 4, "matrix": [1, 2], "x": 42, "y": 19 },
+ { "flags": 4, "matrix": [1, 3], "x": 56, "y": 19 },
+ { "flags": 4, "matrix": [1, 4], "x": 70, "y": 19 },
+ { "flags": 4, "matrix": [1, 5], "x": 84, "y": 19 },
+ { "flags": 4, "matrix": [1, 6], "x": 98, "y": 19 },
+ { "flags": 4, "matrix": [1, 7], "x": 112, "y": 19 },
+ { "flags": 4, "matrix": [1, 8], "x": 125, "y": 19 },
+ { "flags": 4, "matrix": [1, 9], "x": 139, "y": 19 },
+ { "flags": 4, "matrix": [1, 10], "x": 153, "y": 19 },
+ { "flags": 4, "matrix": [1, 11], "x": 167, "y": 19 },
+ { "flags": 4, "matrix": [1, 12], "x": 181, "y": 19 },
+ { "flags": 4, "matrix": [2, 12], "x": 198, "y": 19 },
+ { "flags": 4, "matrix": [1, 14], "x": 215, "y": 19 },
+ { "flags": 4, "matrix": [2, 0], "x": 13, "y": 32 },
+ { "flags": 4, "matrix": [2, 1], "x": 32, "y": 32 },
+ { "flags": 4, "matrix": [2, 2], "x": 46, "y": 32 },
+ { "flags": 4, "matrix": [2, 3], "x": 60, "y": 32 },
+ { "flags": 4, "matrix": [2, 4], "x": 73, "y": 32 },
+ { "flags": 4, "matrix": [2, 5], "x": 87, "y": 32 },
+ { "flags": 4, "matrix": [2, 6], "x": 101, "y": 32 },
+ { "flags": 4, "matrix": [2, 7], "x": 115, "y": 32 },
+ { "flags": 4, "matrix": [2, 8], "x": 129, "y": 32 },
+ { "flags": 4, "matrix": [2, 9], "x": 143, "y": 32 },
+ { "flags": 4, "matrix": [2, 10], "x": 156, "y": 32 },
+ { "flags": 4, "matrix": [2, 11], "x": 170, "y": 32 },
+ { "flags": 4, "matrix": [2, 13], "x": 193, "y": 32 },
+ { "flags": 4, "matrix": [2, 14], "x": 215, "y": 32 },
+ { "flags": 4, "matrix": [3, 0], "x": 16, "y": 44 },
+ { "flags": 4, "matrix": [3, 2], "x": 39, "y": 44 },
+ { "flags": 4, "matrix": [3, 3], "x": 53, "y": 44 },
+ { "flags": 4, "matrix": [3, 4], "x": 67, "y": 44 },
+ { "flags": 4, "matrix": [3, 5], "x": 80, "y": 44 },
+ { "flags": 4, "matrix": [3, 6], "x": 94, "y": 44 },
+ { "flags": 4, "matrix": [3, 7], "x": 108, "y": 44 },
+ { "flags": 4, "matrix": [3, 8], "x": 122, "y": 44 },
+ { "flags": 4, "matrix": [3, 9], "x": 136, "y": 44 },
+ { "flags": 4, "matrix": [3, 10], "x": 150, "y": 44 },
+ { "flags": 4, "matrix": [3, 11], "x": 163, "y": 44 },
+ { "flags": 4, "matrix": [3, 12], "x": 182, "y": 44 },
+ { "flags": 4, "matrix": [3, 13], "x": 201, "y": 44 },
+ { "flags": 4, "matrix": [3, 14], "x": 215, "y": 44 },
+ { "flags": 4, "matrix": [4, 0], "x": 9, "y": 56 },
+ { "flags": 4, "matrix": [4, 1], "x": 27, "y": 56 },
+ { "flags": 4, "matrix": [4, 2], "x": 44, "y": 56 },
+ { "flags": 4, "matrix": [4, 6], "x": 96, "y": 56 },
+ { "flags": 4, "matrix": [4, 9], "x": 146, "y": 56 },
+ { "flags": 4, "matrix": [4, 10], "x": 160, "y": 56 },
+ { "flags": 4, "matrix": [4, 11], "x": 174, "y": 56 },
+ { "flags": 4, "matrix": [4, 12], "x": 188, "y": 56 },
+ { "flags": 4, "matrix": [4, 13], "x": 201, "y": 56 },
+ { "flags": 4, "matrix": [4, 14], "x": 215, "y": 56 },
+ { "flags": 1, "x": 224, "y": 0 },
+ { "flags": 1, "x": 224, "y": 5 },
+ { "flags": 1, "x": 224, "y": 10 }
+ ]
+ },
"community_layouts": ["65_ansi"],
"layouts": {
"LAYOUT_65_ansi": {
diff --git a/keyboards/novelkeys/nk65/keymaps/default/keymap.c b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
index 3a043cbfe7..95a1d7f367 100755
--- a/keyboards/novelkeys/nk65/keymaps/default/keymap.c
+++ b/keyboards/novelkeys/nk65/keymaps/default/keymap.c
@@ -1,46 +1,21 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
+// Copyright 2019 Yiancar
+// SPDX-License-Identifier: GPL-2.0-or-later
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_65_ansi( /* Base */
- QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
- KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
- KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ [0] = LAYOUT_65_ansi( /* Base */
+ QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_HOME,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
-[1] = LAYOUT_65_ansi( /* FN */
- KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[2] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
-
-[3] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ [1] = LAYOUT_65_ansi( /* FN */
+ KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______,
+ _______, RM_TOGG, _______, _______, RM_SATD, RM_SATU, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RM_PREV, RM_NEXT, RM_HUED, RM_HUEU, _______, _______, RM_VALD, RM_VALU, RM_SPDD, RM_SPDU, _______, _______, _______,
+ KC_VOLU, KC_VOLD, KC_MUTE, _______, _______, _______, _______, _______, _______, _______
+ )
};
diff --git a/keyboards/novelkeys/nk65/keymaps/default/readme.md b/keyboards/novelkeys/nk65/keymaps/default/readme.md
deleted file mode 100755
index 27bcd0501d..0000000000
--- a/keyboards/novelkeys/nk65/keymaps/default/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-The default keymap for NK65. VIA support disabled.
-=========================================================
-
-![Layout image](https://i.imgur.com/DL0CjJO.png)
-
-Default layer is normal ANSI 65% \ No newline at end of file
diff --git a/keyboards/novelkeys/nk65/mcuconf.h b/keyboards/novelkeys/nk65/mcuconf.h
index f37f37c179..9024dd88ab 100644
--- a/keyboards/novelkeys/nk65/mcuconf.h
+++ b/keyboards/novelkeys/nk65/mcuconf.h
@@ -1,43 +1,8 @@
-/* Copyright 2020 QMK
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/*
- * This file was auto-generated by:
- * `qmk chibios-confmigrate -i keyboards/nk65/mcuconf.h -r platforms/chibios/QMK_PROTON_C/configs/mcuconf.h`
- */
-
+// Copyright 2019 Yiancar
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include_next <mcuconf.h>
-#undef STM32_GPT_USE_TIM4
-#define STM32_GPT_USE_TIM4 TRUE
-
-#undef STM32_GPT_USE_TIM15
-#define STM32_GPT_USE_TIM15 FALSE
-
-#undef STM32_PWM_USE_TIM3
-#define STM32_PWM_USE_TIM3 FALSE
-
-#undef STM32_PWM_USE_TIM4
-#define STM32_PWM_USE_TIM4 FALSE
-
-#undef STM32_SERIAL_USE_USART2
-#define STM32_SERIAL_USE_USART2 FALSE
-
-#undef STM32_SPI_USE_SPI2
-#define STM32_SPI_USE_SPI2 FALSE
-
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index dd0a94a8e6..16750481cb 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -1,26 +1,8 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef RGB_BACKLIGHT_NK65
-#error RGB_BACKLIGHT_NK65 not defined, recheck config.h
-#endif
-
-#include "nk65.h"
-#include "drivers/led/issi/is31fl3733.h"
+// Copyright 2019 Yiancar
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
-#if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_NK65)
+#if defined(RGB_MATRIX_ENABLE)
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
/* Refer to IS31 manual for these locations
* driver
@@ -28,135 +10,79 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
- {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
- {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
- {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
- {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
- {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
- {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
- {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
- {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
- {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
- {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
- {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
- {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
- {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
- {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
- {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
- {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
- {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
- {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
- {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
- {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
- {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
- {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
- {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
- {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
- {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
- {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
- {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
- {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
- {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
- {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
- {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
- {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
- {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
- {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
- {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
- {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
- {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
- {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
- {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
- {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
- {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
- {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
- {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
- {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
- {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
- {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
- {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
- {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
- {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
- {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
- {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
- {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
- {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
- {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
- {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
- {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
- {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
- {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
- {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
- {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
- {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
- {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
- {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1 - esc
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5 - 1
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9 - 2
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13 - 3
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17 - 4
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21 - 5
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25 - 6
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29 - 7
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33 - 8
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37 - 9
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41 - 0
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45 - -
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49 - =
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53 - bspace
+ {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1 - home
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2 - tab
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6 - q
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10 - w
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14 - e
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18 - r
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22 - t
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26 - y
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30 - u
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34 - i
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38 - o
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42 - p
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46 - [
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50 - ]
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54 - |
+ {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2 - pgup
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3 - caps
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7 - a
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11 - s
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15 - d
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19 - f
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23 - g
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27 - h
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31 - j
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35 - k
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39 - l
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43 - ;
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47 - '
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55 - ent
+ {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5 - pgdn
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4 - lshft
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8 - z
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12 - x
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16 - c
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20 - v
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24 - b
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28 - n
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32 - m
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36 - <
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40 - >
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44 - ?
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51 - rshift
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52 - up
+ {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3 - end
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57 - lctrl
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58 - lgui
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59 - lalt
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60 space
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48 - ralt
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62 - fn
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63 - rctrl
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64 - left
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56 - down
+ {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4 - right
- {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1
- {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2
- {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3
- {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4
- {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
- {1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
- {1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
- {1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
- {1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
- {1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
- {1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
- {1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
- {1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
- {1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
- {1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
- {1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
- {1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
- {1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
- {1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
- {1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
- {1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
- {1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
- {1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
- {1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
- {1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
- {1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
- {1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
- {1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
- {1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
- {1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
- {1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
- {1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
- {1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
- {1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
- {1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
- {1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
- {1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
- {1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
- {1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
- {1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
- {1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
- {1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
- {1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
- {1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
- {1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
- {1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
- {1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
- {1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
- {1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
- {1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
- {1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
- {1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
- {1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
- {1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
- {1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
- {1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
- {1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
- {1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
- {1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
- {1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
- {1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
- {1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
- {1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
- {1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
+ // Mapped with "dead" locations so each indicator is logically separate
+ {1, SW2_CS3, SW7_CS2, SW3_CS3}, //LB7 - top indi
+ {1, SW5_CS2, SW10_CS2, SW6_CS2}, //LB6 - mid indi
+ {1, SW11_CS2, SW4_CS2, SW12_CS2}, //LB6 - bot indi
};
#endif
@@ -165,26 +91,29 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
* Bottom LED is red only LED driver 2 RGB 6 Green channel.
*/
-void led_update_ports(led_t led_state) {
- if (led_state.caps_lock) {
- is31fl3733_set_color( 7+64-1, 0, 255, 0 );
+bool rgb_matrix_indicators_kb(void) {
+ if (!rgb_matrix_indicators_user()) {
+ return false;
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ rgb_matrix_set_color(68, RGB_WHITE); //0, 0xFF, 0);
} else {
- is31fl3733_set_color( 7+64-1, 0, 0, 0 );
+ rgb_matrix_set_color(68, RGB_OFF);
}
-}
-__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
- uint8_t R = 0;
- uint8_t G = 0;
- uint8_t B = 0;
+ layer_state_t state = layer_state|default_layer_state;
if (state & (1UL << 1)) {
- R = 255;
- B = 255;
+ rgb_matrix_set_color(69, RGB_WHITE); // 0xFF, 0, 0xFF);
+ } else {
+ rgb_matrix_set_color(69, RGB_OFF);
}
+
if (state & (1UL << 2)) {
- G = 255;
+ rgb_matrix_set_color(70, RGB_WHITE); //0, 0xFF, 0);
+ } else {
+ rgb_matrix_set_color(70, RGB_OFF);
}
- is31fl3733_set_color( 6+64-1, R, G, B );
- return state;
+ return true;
}
diff --git a/keyboards/novelkeys/nk65/nk65.h b/keyboards/novelkeys/nk65/nk65.h
deleted file mode 100755
index c75541be93..0000000000
--- a/keyboards/novelkeys/nk65/nk65.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2019 Yiancar
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-#include "../wilba_tech/wt_rgb_backlight_keycodes.h"
-#include "via.h"
diff --git a/keyboards/novelkeys/nk65/readme.md b/keyboards/novelkeys/nk65/readme.md
index 38f66500b9..5e30f54b31 100755
--- a/keyboards/novelkeys/nk65/readme.md
+++ b/keyboards/novelkeys/nk65/readme.md
@@ -1,39 +1,29 @@
-NK65
-=========
+# NK65
![NK65](https://i.imgur.com/EXNbVpL.jpg)
-This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
-
-Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-Hardware Supported: A 65% keyboard with STM32F303CC
-Hardware Availability: https://novelkeys.xyz/
+> NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make command.
-Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
+This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
-NOTE: For PCBs with revision v1.4 or later please use nk65/v1_4 in the make command.
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 65% keyboard with STM32F303CC
+* Hardware Availability: https://novelkeys.xyz/
-## Instructions
+Make example for this keyboard (after setting up your build environment):
-### Build
+ make novelkeys/nk65/v1:default
-Make example for this keyboard (after setting up your build environment):
+Flashing example for this keyboard:
- make novelkeys/nk65:via
+ make novelkeys/nk65/v1:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-### Reset
-
-- Unplug
-- Hold Escape
-- Plug In
-- Unplug
-- Release Escape
+## Bootloader
-### Flash
+Enter the bootloader in 3 ways:
-- Unplug
-- Hold Escape
-- Plug In
-- Flash using QMK Toolbox or dfu-util (`make nk65:<keymap>:dfu-util`)
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/novelkeys/nk65/rules.mk b/keyboards/novelkeys/nk65/rules.mk
deleted file mode 100755
index c0d789a5a6..0000000000
--- a/keyboards/novelkeys/nk65/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Do not put the microcontroller into power saving mode
-# when we get USB suspend event. We want it to keep updating
-# backlight effects.
-NO_SUSPEND_POWER_DOWN = yes
-
-CIE1931_CURVE = yes
-I2C_DRIVER_REQUIRED = yes
-
-# project specific files
-SRC = keyboards/wilba_tech/wt_main.c \
- keyboards/wilba_tech/wt_rgb_backlight.c \
- drivers/led/issi/is31fl3733.c \
- quantum/color.c
-
-DEFAULT_FOLDER = novelkeys/nk65/base
diff --git a/keyboards/novelkeys/nk65/base/keyboard.json b/keyboards/novelkeys/nk65/v1/keyboard.json
index fc547dc134..fc547dc134 100644
--- a/keyboards/novelkeys/nk65/base/keyboard.json
+++ b/keyboards/novelkeys/nk65/v1/keyboard.json
diff --git a/keyboards/novelkeys/nk65/v1_4/readme.md b/keyboards/novelkeys/nk65/v1_4/readme.md
index 399919a8be..11f581ff31 100755
--- a/keyboards/novelkeys/nk65/v1_4/readme.md
+++ b/keyboards/novelkeys/nk65/v1_4/readme.md
@@ -1,39 +1,29 @@
-NK65 V1.4
-=========
+# NK65 V1.4
![NK65](https://i.imgur.com/EXNbVpL.jpg)
-NOTE: Please use this directory only if you have revision 1.4 PCB or later.
+> NOTE: Please use this directory only if you have revision 1.4 PCB or later.
This is a standard fixed layout 65% PCB. It supports VIA and full per-key RGB.
-Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
-Hardware Supported: A 65% keyboard with STM32F303CC
-Hardware Availability: https://novelkeys.xyz/
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar)
+* Hardware Supported: A 65% keyboard with STM32F303CC
+* Hardware Availability: https://novelkeys.xyz/
-Due to the RGB implementation, the NK65 is currently not compatible with community layouts.
-
-## Instructions
+Make example for this keyboard (after setting up your build environment):
-### Build
+ make novelkeys/nk65/v1_4:default
-Make example for this keyboard (after setting up your build environment):
+Flashing example for this keyboard:
- make nk65/v1_4:via
+ make novelkeys/nk65/v1_4:default:flash
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
-### Reset
-
-- Unplug
-- Hold Escape
-- Plug In
-- Unplug
-- Release Escape
+## Bootloader
-### Flash
+Enter the bootloader in 3 ways:
-- Unplug
-- Hold Escape
-- Plug In
-- Flash using QMK Toolbox or dfu-util (`make nk65/v1_4:<keymap>:dfu-util`)
+* **Bootmagic reset**: Hold down the top left key and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/np12/keyboard.json b/keyboards/np12/keyboard.json
index 435f2db3b7..d12307f117 100644
--- a/keyboards/np12/keyboard.json
+++ b/keyboards/np12/keyboard.json
@@ -25,8 +25,7 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/numatreus/keyboard.json b/keyboards/numatreus/keyboard.json
index 3441a769e1..5a9df0f429 100644
--- a/keyboards/numatreus/keyboard.json
+++ b/keyboards/numatreus/keyboard.json
@@ -33,8 +33,7 @@
"led_count": 6,
"max_brightness": 200
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/numatreus/keymaps/like_jis/keymap.c b/keyboards/numatreus/keymaps/like_jis/keymap.c
index 6fc526610a..1b3838bf6b 100644
--- a/keyboards/numatreus/keymaps/like_jis/keymap.c
+++ b/keyboards/numatreus/keymaps/like_jis/keymap.c
@@ -112,13 +112,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT(
//,----------------------------------. ,----------------------------------.
- QK_BOOT, RGBRST, AG_NORM, AG_SWAP, KC_CAPS, XXXXXXX, KC_WH_L, KC_WH_U, KC_HOME, KC_PGUP,
+ QK_BOOT, RGBRST, AG_NORM, AG_SWAP, KC_CAPS, XXXXXXX, MS_WHLL, MS_WHLU, KC_HOME, KC_PGUP,
//|------+------+------+------+------| |------+------+------+------+------|
- UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, KC_SCRL, XXXXXXX, KC_WH_R, KC_WH_D, KC_END, KC_PGDN,
+ UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, KC_SCRL, XXXXXXX, MS_WHLR, MS_WHLD, KC_END, KC_PGDN,
//|------+------+------+------+------| |------+------+------+------+------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, KC_NUM, XXXXXXX, KC_BTN1, KC_BTN2, KC_MS_U, XXXXXXX,
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, KC_NUM, XXXXXXX, MS_BTN1, MS_BTN2, MS_UP, XXXXXXX,
//|------+------+------+------+------|------+------+------+------+------+------+------|
- KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R
+ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT
//|------+------+------+------+-------------+------+------+------+------+------+------|
)
};
diff --git a/keyboards/obosob/arch_36/keyboard.json b/keyboards/obosob/arch_36/keyboard.json
index 791c08d3f1..661d335daa 100644
--- a/keyboards/obosob/arch_36/keyboard.json
+++ b/keyboards/obosob/arch_36/keyboard.json
@@ -34,8 +34,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/obosob/steal_this_keyboard/keyboard.json b/keyboards/obosob/steal_this_keyboard/keyboard.json
index 4865f54283..60abd1ecf9 100644
--- a/keyboards/obosob/steal_this_keyboard/keyboard.json
+++ b/keyboards/obosob/steal_this_keyboard/keyboard.json
@@ -8,8 +8,7 @@
"pid": "0x50AD",
"device_version": "0.0.1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"extrakey": true,
diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c b/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
index 2d20fafe30..2a8f615201 100644
--- a/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
+++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/keymap.c
@@ -43,9 +43,9 @@ KC_Z, MT_X, MT_C, KC_V, KC_B, KC_N, KC_M, MT_COMM, MT_DOT,
KC_P0, KC_BSPC, MT_SPC, KC_P1
),
[1] = LAYOUT_split_3x5_2(
-_______, _______, _______, _______, _______, _______, KC_BTN1, KC_WH_U, KC_BTN2, _______,
-_______, KC_BTN2, XXXXXXX, KC_BTN1, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R,
-_______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______,
+_______, _______, _______, _______, _______, _______, MS_BTN1, MS_WHLU, MS_BTN2, _______,
+_______, MS_BTN2, XXXXXXX, MS_BTN1, _______, _______, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT,
+_______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR, _______,
_______, _______, _______, _______
),
[2] = LAYOUT_split_3x5_2(
diff --git a/keyboards/ocean/addon/keyboard.json b/keyboards/ocean/addon/keyboard.json
index 0793a7082a..671c04cba0 100644
--- a/keyboards/ocean/addon/keyboard.json
+++ b/keyboards/ocean/addon/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ocean/gin_v2/keyboard.json b/keyboards/ocean/gin_v2/keyboard.json
index d20aa5916f..08a7f29b8c 100644
--- a/keyboards/ocean/gin_v2/keyboard.json
+++ b/keyboards/ocean/gin_v2/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ocean/slamz/keyboard.json b/keyboards/ocean/slamz/keyboard.json
index cf3ed54426..65bc91eebe 100644
--- a/keyboards/ocean/slamz/keyboard.json
+++ b/keyboards/ocean/slamz/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["D2", "D1", "D0", "D4"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ocean/stealth/keyboard.json b/keyboards/ocean/stealth/keyboard.json
index a15d2fffac..0f0070de63 100644
--- a/keyboards/ocean/stealth/keyboard.json
+++ b/keyboards/ocean/stealth/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["D1"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ocean/sus/keyboard.json b/keyboards/ocean/sus/keyboard.json
index 3ac426f6aa..ebbb247035 100644
--- a/keyboards/ocean/sus/keyboard.json
+++ b/keyboards/ocean/sus/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["B5", "B4", "E6", "D7"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_4x3": {
"layout": [
diff --git a/keyboards/ocean/wang_ergo/keyboard.json b/keyboards/ocean/wang_ergo/keyboard.json
index d552028bc6..e32f21d802 100644
--- a/keyboards/ocean/wang_ergo/keyboard.json
+++ b/keyboards/ocean/wang_ergo/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_all"
},
diff --git a/keyboards/ocean/wang_v2/keyboard.json b/keyboards/ocean/wang_v2/keyboard.json
index 79ef6b3697..e64345db2f 100644
--- a/keyboards/ocean/wang_v2/keyboard.json
+++ b/keyboards/ocean/wang_v2/keyboard.json
@@ -18,8 +18,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ocean/yuri/keyboard.json b/keyboards/ocean/yuri/keyboard.json
index aeb4cd895d..fee89b9de7 100644
--- a/keyboards/ocean/yuri/keyboard.json
+++ b/keyboards/ocean/yuri/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/oddball/keymaps/default/keymap.c b/keyboards/oddball/keymaps/default/keymap.c
index 2d1c7ee049..7df7f9c152 100644
--- a/keyboards/oddball/keymaps/default/keymap.c
+++ b/keyboards/oddball/keymaps/default/keymap.c
@@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LOWER] = LAYOUT(
- KC_DEL, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_BTN3, KC_DQUO, KC_7, KC_8, KC_9, KC_ASTR, KC_UNDS,
- KC_SCROLL, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_QUOT, KC_4, KC_5, KC_6, KC_PLUS, KC_ENT,
- _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_0, KC_1, KC_2, KC_3, KC_MINS, _______,
+ KC_DEL, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, MS_BTN3, KC_DQUO, KC_7, KC_8, KC_9, KC_ASTR, KC_UNDS,
+ KC_SCROLL, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, MS_BTN2, KC_QUOT, KC_4, KC_5, KC_6, KC_PLUS, KC_ENT,
+ _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, MS_BTN1, KC_0, KC_1, KC_2, KC_3, KC_MINS, _______,
_______, _______, _______, _______
),
diff --git a/keyboards/oddball/keymaps/pmw3360/keymap.c b/keyboards/oddball/keymaps/pmw3360/keymap.c
index 2d1c7ee049..7df7f9c152 100644
--- a/keyboards/oddball/keymaps/pmw3360/keymap.c
+++ b/keyboards/oddball/keymaps/pmw3360/keymap.c
@@ -32,9 +32,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LOWER] = LAYOUT(
- KC_DEL, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, KC_BTN3, KC_DQUO, KC_7, KC_8, KC_9, KC_ASTR, KC_UNDS,
- KC_SCROLL, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, KC_BTN2, KC_QUOT, KC_4, KC_5, KC_6, KC_PLUS, KC_ENT,
- _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, KC_BTN1, KC_0, KC_1, KC_2, KC_3, KC_MINS, _______,
+ KC_DEL, KC_EXLM, KC_AT, KC_LCBR, KC_RCBR, MS_BTN3, KC_DQUO, KC_7, KC_8, KC_9, KC_ASTR, KC_UNDS,
+ KC_SCROLL, KC_HASH, KC_DLR, KC_LPRN, KC_RPRN, MS_BTN2, KC_QUOT, KC_4, KC_5, KC_6, KC_PLUS, KC_ENT,
+ _______, KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC, MS_BTN1, KC_0, KC_1, KC_2, KC_3, KC_MINS, _______,
_______, _______, _______, _______
),
diff --git a/keyboards/oddball/oddball.c b/keyboards/oddball/oddball.c
index bbc3b3f2e4..aa74b07475 100644
--- a/keyboards/oddball/oddball.c
+++ b/keyboards/oddball/oddball.c
@@ -107,23 +107,23 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
// handle mouse drag and scroll
switch (keycode) {
- case KC_BTN1:
+ case MS_BTN1:
on_mouse_button(MOUSE_BTN1, record);
return false;
- case KC_BTN2:
+ case MS_BTN2:
on_mouse_button(MOUSE_BTN2, record);
return false;
- case KC_BTN3:
+ case MS_BTN3:
on_mouse_button(MOUSE_BTN3, record);
return false;
- case KC_BTN4:
+ case MS_BTN4:
on_mouse_button(MOUSE_BTN4, record);
return false;
- case KC_BTN5:
+ case MS_BTN5:
on_mouse_button(MOUSE_BTN5, record);
return false;
diff --git a/keyboards/om60/keyboard.json b/keyboards/om60/keyboard.json
index 08eb898b01..d91f28f8af 100644
--- a/keyboards/om60/keyboard.json
+++ b/keyboards/om60/keyboard.json
@@ -49,8 +49,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/omkbd/ergodash/info.json b/keyboards/omkbd/ergodash/info.json
index 306a3970bb..18138dd692 100644
--- a/keyboards/omkbd/ergodash/info.json
+++ b/keyboards/omkbd/ergodash/info.json
@@ -1,6 +1,5 @@
{
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"split": {
"enabled": true
}
diff --git a/keyboards/omkbd/runner3680/info.json b/keyboards/omkbd/runner3680/info.json
index c626b2e3b4..e06cb1243c 100644
--- a/keyboards/omkbd/runner3680/info.json
+++ b/keyboards/omkbd/runner3680/info.json
@@ -1,6 +1,5 @@
{
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": false,
"extrakey": false,
diff --git a/keyboards/omnikeyish/keyboard.json b/keyboards/omnikeyish/keyboard.json
index 82363b10bf..2a607dc852 100644
--- a/keyboards/omnikeyish/keyboard.json
+++ b/keyboards/omnikeyish/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x0666",
- "device_version": "13.3.7",
- "force_nkro": true
+ "device_version": "13.3.7"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/opendeck/32/info.json b/keyboards/opendeck/32/info.json
index 4d340985d3..3a75fd163b 100644
--- a/keyboards/opendeck/32/info.json
+++ b/keyboards/opendeck/32/info.json
@@ -4,7 +4,11 @@
"usb": {
"vid": "0x4345",
"pid": "0x2EC0",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
}
}
diff --git a/keyboards/org60/keymaps/default/keymap.c b/keyboards/org60/keymaps/default/keymap.c
index 666f61ca83..0cd34ec9d5 100644
--- a/keyboards/org60/keymaps/default/keymap.c
+++ b/keyboards/org60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1: Function Layer
LAYOUT(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO,
- KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
+ KC_NO, MS_WHLU, KC_UP, MS_WHLD, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_RSFT, KC_NO ,KC_PGUP, KC_INS,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_HOME, KC_PGDN,KC_END),
diff --git a/keyboards/orthodox/rev1/keyboard.json b/keyboards/orthodox/rev1/keyboard.json
index 0444009f2b..bd08fc19d2 100644
--- a/keyboards/orthodox/rev1/keyboard.json
+++ b/keyboards/orthodox/rev1/keyboard.json
@@ -17,8 +17,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/orthodox/rev3/keyboard.json b/keyboards/orthodox/rev3/keyboard.json
index 61d8281f55..411df12f98 100644
--- a/keyboards/orthodox/rev3/keyboard.json
+++ b/keyboards/orthodox/rev3/keyboard.json
@@ -17,8 +17,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keyboard.json b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json
index 8fcea8034d..b6a519f686 100644
--- a/keyboards/owlab/jelly_epoch/hotswap/keyboard.json
+++ b/keyboards/owlab/jelly_epoch/hotswap/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x4A4C",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/owlab/jelly_epoch/soldered/keyboard.json b/keyboards/owlab/jelly_epoch/soldered/keyboard.json
index 2d807c58a9..b8c83b8c41 100644
--- a/keyboards/owlab/jelly_epoch/soldered/keyboard.json
+++ b/keyboards/owlab/jelly_epoch/soldered/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x4A53",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/owlab/spring/keyboard.json b/keyboards/owlab/spring/keyboard.json
index 1789f4ebb1..2a8d1e2d9b 100644
--- a/keyboards/owlab/spring/keyboard.json
+++ b/keyboards/owlab/spring/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x5350",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/owlab/suit80/ansi/keyboard.json b/keyboards/owlab/suit80/ansi/keyboard.json
index fe0f1b6e4b..b01ec347d3 100644
--- a/keyboards/owlab/suit80/ansi/keyboard.json
+++ b/keyboards/owlab/suit80/ansi/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x5355",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/owlab/suit80/iso/keyboard.json b/keyboards/owlab/suit80/iso/keyboard.json
index 2d9fcde472..a2814b0942 100644
--- a/keyboards/owlab/suit80/iso/keyboard.json
+++ b/keyboards/owlab/suit80/iso/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x5349",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/owlab/voice65/hotswap/keyboard.json b/keyboards/owlab/voice65/hotswap/keyboard.json
index f153efbde2..79ca2a57ed 100644
--- a/keyboards/owlab/voice65/hotswap/keyboard.json
+++ b/keyboards/owlab/voice65/hotswap/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x564F",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
index d189bc66f6..de2738e648 100644
--- a/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
+++ b/keyboards/owlab/voice65/hotswap/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[3] = LAYOUT_65_ansi_blocker(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_WH_U, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_WHLU, MS_WHLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
- [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [2] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[3] = { ENCODER_CCW_CW(_______, _______) },
};
#endif
diff --git a/keyboards/owlab/voice65/soldered/keyboard.json b/keyboards/owlab/voice65/soldered/keyboard.json
index 932c32d2fd..edd79a064f 100644
--- a/keyboards/owlab/voice65/soldered/keyboard.json
+++ b/keyboards/owlab/voice65/soldered/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x5657",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
index fc92357cf5..70d22ceba9 100644
--- a/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
+++ b/keyboards/owlab/voice65/soldered/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[3] = LAYOUT_65_ansi_blocker(
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_WH_U, KC_WH_D, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, MS_WHLU, MS_WHLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
@@ -53,7 +53,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
[1] = { ENCODER_CCW_CW(KC_PGUP, KC_PGDN) },
- [2] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) },
+ [2] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[3] = { ENCODER_CCW_CW(_______, _______) },
};
#endif
diff --git a/keyboards/p3d/spacey/keymaps/default/keymap.c b/keyboards/p3d/spacey/keymaps/default/keymap.c
index 19bc5323b8..031728b37d 100644
--- a/keyboards/p3d/spacey/keymaps/default/keymap.c
+++ b/keyboards/p3d/spacey/keymaps/default/keymap.c
@@ -33,8 +33,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_FN] = LAYOUT_all(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_ESC,
KC_TAB, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL,
- KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, KC_MS_U,
- KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_MS_L, KC_MS_D, KC_MS_R,
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT, MS_UP,
+ KC_LSFT, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MS_LEFT, MS_DOWN, MS_RGHT,
KC_LCTL, KC_LGUI, KC_NO, KC_LALT, KC_SPC, KC_BSPC, KC_RALT, KC_APP, KC_RGUI, KC_RCTL
)
};
diff --git a/keyboards/p3d/synapse/synapse.c b/keyboards/p3d/synapse/synapse.c
index 0b532eaab6..c851e47f6b 100644
--- a/keyboards/p3d/synapse/synapse.c
+++ b/keyboards/p3d/synapse/synapse.c
@@ -20,9 +20,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 1) { /* left encoder*/
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 0) { /* right encoder */
if (clockwise){
diff --git a/keyboards/pabile/p18/keyboard.json b/keyboards/pabile/p18/keyboard.json
index bf3380038a..12b7006680 100644
--- a/keyboards/pabile/p18/keyboard.json
+++ b/keyboards/pabile/p18/keyboard.json
@@ -27,8 +27,7 @@
{"pin_a": "F6", "pin_b": "F5"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pabile/p18/keymaps/default/keymap.c b/keyboards/pabile/p18/keymaps/default/keymap.c
index 0223a450cd..8d93db1097 100644
--- a/keyboards/pabile/p18/keymaps/default/keymap.c
+++ b/keyboards/pabile/p18/keymaps/default/keymap.c
@@ -19,9 +19,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_WH_U); /*mouse wheel up*/
+ tap_code(MS_WHLU); /*mouse wheel up*/
} else {
- tap_code(KC_WH_D); /*mouse wheel down*/
+ tap_code(MS_WHLD); /*mouse wheel down*/
}
}
return true;
diff --git a/keyboards/pabile/p20/ver1/keyboard.json b/keyboards/pabile/p20/ver1/keyboard.json
index 3e3a16a6d9..2cc5fed1ee 100644
--- a/keyboards/pabile/p20/ver1/keyboard.json
+++ b/keyboards/pabile/p20/ver1/keyboard.json
@@ -22,8 +22,7 @@
{"pin_a": "F7", "pin_b": "B1"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
diff --git a/keyboards/pabile/p20/ver1/keymaps/default/keymap.c b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
index a844e2c8a1..03b32323a4 100644
--- a/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
+++ b/keyboards/pabile/p20/ver1/keymaps/default/keymap.c
@@ -15,18 +15,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_RPRN, KC_NO, KC_PSLS, KC_NO),
[2] = LAYOUT_ortho_5x4(
KC_NUM, KC_NO, KC_NO, KC_NO,
- KC_BTN1, KC_MS_U, KC_BTN2, KC_NO,
- KC_MS_L, KC_MS_D, KC_MS_R, KC_TAB,
- KC_WH_U, KC_NO, KC_WH_D, KC_NO,
+ MS_BTN1, MS_UP, MS_BTN2, KC_NO,
+ MS_LEFT, MS_DOWN, MS_RGHT, KC_TAB,
+ MS_WHLU, KC_NO, MS_WHLD, KC_NO,
KC_NO, KC_NO, KC_DEL, KC_ESC)
};
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* First encoder */
if (clockwise) {
- tap_code(KC_WH_U); /*mouse wheel up*/
+ tap_code(MS_WHLU); /*mouse wheel up*/
} else {
- tap_code(KC_WH_D); /*mouse wheel down */
+ tap_code(MS_WHLD); /*mouse wheel down */
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
diff --git a/keyboards/pabile/p20/ver2/keyboard.json b/keyboards/pabile/p20/ver2/keyboard.json
index cdacbf3aec..b82959af7a 100644
--- a/keyboards/pabile/p20/ver2/keyboard.json
+++ b/keyboards/pabile/p20/ver2/keyboard.json
@@ -15,8 +15,7 @@
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_numpad_5x4": {
"layout": [
diff --git a/keyboards/pabile/p40/keyboard.json b/keyboards/pabile/p40/keyboard.json
index fbe4896687..de4eca82ac 100644
--- a/keyboards/pabile/p40/keyboard.json
+++ b/keyboards/pabile/p40/keyboard.json
@@ -20,8 +20,7 @@
"rows": ["F6", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x10"],
"layouts": {
"LAYOUT_ortho_4x10": {
diff --git a/keyboards/pabile/p40/keymaps/default/keymap.c b/keyboards/pabile/p40/keymaps/default/keymap.c
index d607deb73c..f0f25eef0c 100644
--- a/keyboards/pabile/p40/keymaps/default/keymap.c
+++ b/keyboards/pabile/p40/keymaps/default/keymap.c
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
[4] = LAYOUT_ortho_4x10(
- KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL,
- KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_BTN1, MS_UP, MS_BTN2, KC_DEL,
+ KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLU, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLD, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
};
diff --git a/keyboards/pabile/p40_ortho/keyboard.json b/keyboards/pabile/p40_ortho/keyboard.json
index 3e5d9ea504..838c58235c 100644
--- a/keyboards/pabile/p40_ortho/keyboard.json
+++ b/keyboards/pabile/p40_ortho/keyboard.json
@@ -19,8 +19,7 @@
"rows": ["D1", "D0", "F4", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_ortho_4x10": {
"layout": [
diff --git a/keyboards/pabile/p40_ortho/keymaps/default/keymap.c b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
index 891d2b5735..74614bbb34 100644
--- a/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
+++ b/keyboards/pabile/p40_ortho/keymaps/default/keymap.c
@@ -39,8 +39,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
[4] = LAYOUT_ortho_4x10(
- KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL,
- KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_BTN1, MS_UP, MS_BTN2, KC_DEL,
+ KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLU, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLD, KC_NO, KC_NO, KC_NO, KC_NO,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO)
};
diff --git a/keyboards/pabile/p42/keyboard.json b/keyboards/pabile/p42/keyboard.json
index 42c8964332..8311becdfc 100644
--- a/keyboards/pabile/p42/keyboard.json
+++ b/keyboards/pabile/p42/keyboard.json
@@ -20,8 +20,7 @@
"rows": ["D1", "D0", "D4", "C6"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pabile/p42/keymaps/default/keymap.c b/keyboards/pabile/p42/keymaps/default/keymap.c
index ef4bad015b..b69f8719b4 100644
--- a/keyboards/pabile/p42/keymaps/default/keymap.c
+++ b/keyboards/pabile/p42/keymaps/default/keymap.c
@@ -22,8 +22,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_END, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS),
[4] = LAYOUT(
- KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_MS_U, KC_BTN2, KC_DEL,
- KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,
- KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
+ KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_BTN1, MS_UP, MS_BTN2, KC_DEL,
+ KC_TAB, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLU, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLD, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS)
};
diff --git a/keyboards/palette1202/keymaps/default/keymap.c b/keyboards/palette1202/keymaps/default/keymap.c
index 0f49e46661..905b800cd6 100644
--- a/keyboards/palette1202/keymaps/default/keymap.c
+++ b/keyboards/palette1202/keymaps/default/keymap.c
@@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_CS_2] = LAYOUT(
MO(SETTING), KC_ESC, KC_G, KC_R, LGUI(KC_GRV),
_______, LGUI(KC_D), KC_K, KC_F, LGUI(KC_S),
- KC_LALT, KC_I, SGUI(KC_Z), KC_H
+ KC_LALT, KC_I, LSG(KC_Z), KC_H
),
// Photoshop
[MAC_PS_1] = LAYOUT(
@@ -61,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_PS_2] = LAYOUT(
MO(SETTING), KC_ESC, KC_G, KC_R, KC_ESC,
_______, LGUI(KC_D), KC_V, LGUI(KC_T), LGUI(KC_S),
- KC_LALT, KC_I, SGUI(KC_Z), KC_H
+ KC_LALT, KC_I, LSG(KC_Z), KC_H
),
// Windows
@@ -97,7 +97,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[IOS_CS_2] = LAYOUT(
MO(SETTING), KC_ESC, KC_G, KC_R, LGUI(KC_EQL),
_______, LGUI(KC_D), KC_K, KC_F, LGUI(KC_S),
- KC_LALT, KC_I, SGUI(KC_Z), KC_H
+ KC_LALT, KC_I, LSG(KC_Z), KC_H
),
[SETTING] = LAYOUT(
_______, IOS_CS, Win_CS, Mac_CS, KC_NO,
diff --git a/keyboards/peej/tripel/info.json b/keyboards/peej/tripel/info.json
index 7a5c12461a..e716e20cfe 100644
--- a/keyboards/peej/tripel/info.json
+++ b/keyboards/peej/tripel/info.json
@@ -20,6 +20,5 @@
"rows": ["C6", "D4", "D0", "B4", "E6", "D7", "D1", "D2", "D3"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/peranekofactory/tone/rev1/keyboard.json b/keyboards/peranekofactory/tone/rev1/keyboard.json
index fb7b41b27a..9e9f7013c2 100644
--- a/keyboards/peranekofactory/tone/rev1/keyboard.json
+++ b/keyboards/peranekofactory/tone/rev1/keyboard.json
@@ -27,8 +27,7 @@
},
"tap_keycode_delay": 100
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"matrix_pins": {
"direct": [
["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
diff --git a/keyboards/peranekofactory/tone/rev2/keyboard.json b/keyboards/peranekofactory/tone/rev2/keyboard.json
index fb7b41b27a..9e9f7013c2 100644
--- a/keyboards/peranekofactory/tone/rev2/keyboard.json
+++ b/keyboards/peranekofactory/tone/rev2/keyboard.json
@@ -27,8 +27,7 @@
},
"tap_keycode_delay": 100
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"matrix_pins": {
"direct": [
["D4", "C6", "D7", "E6", "F6", "F7", "B1", "B3"]
diff --git a/keyboards/phentech/rpk_001/keyboard.json b/keyboards/phentech/rpk_001/keyboard.json
index ce822295b2..df92139874 100644
--- a/keyboards/phentech/rpk_001/keyboard.json
+++ b/keyboards/phentech/rpk_001/keyboard.json
@@ -8,9 +8,13 @@
"device_version": "1.0.0",
"vid": "0xAC12",
"pid": "0x2236",
- "force_nkro": true,
"suspend_wakeup_delay": 1000
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"diode_direction": "ROW2COL",
"eeprom": {
"driver": "wear_leveling",
diff --git a/keyboards/phoenix/keymaps/default/keymap.c b/keyboards/phoenix/keymaps/default/keymap.c
index 909e1dbb60..8191c0af26 100644
--- a/keyboards/phoenix/keymaps/default/keymap.c
+++ b/keyboards/phoenix/keymaps/default/keymap.c
@@ -116,13 +116,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
- KC_BTN1, KC_TRNS, KC_TRNS,
+ MS_BTN1, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, MS_UP, KC_TRNS, KC_TRNS, KC_TRNS,
+ MS_LEFT, MS_DOWN, MS_RGHT, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS,
KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS),
diff --git a/keyboards/pica40/rev1/keyboard.json b/keyboards/pica40/rev1/keyboard.json
index 85c2221a13..a616a2e497 100644
--- a/keyboards/pica40/rev1/keyboard.json
+++ b/keyboards/pica40/rev1/keyboard.json
@@ -1,6 +1,5 @@
{
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"matrix_pins": {
"cols": ["D2", "B5", "B4", "E6", "D7"],
diff --git a/keyboards/pimentoso/paddino02/rev1/keyboard.json b/keyboards/pimentoso/paddino02/rev1/keyboard.json
index b0fddff9d3..30ac2a9a06 100644
--- a/keyboards/pimentoso/paddino02/rev1/keyboard.json
+++ b/keyboards/pimentoso/paddino02/rev1/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "ROW2COL",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pimentoso/paddino02/rev1/keymaps/default/keymap.c b/keyboards/pimentoso/paddino02/rev1/keymaps/default/keymap.c
index 343ae043b4..364224b77b 100755
--- a/keyboards/pimentoso/paddino02/rev1/keymaps/default/keymap.c
+++ b/keyboards/pimentoso/paddino02/rev1/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- KC_ESC, KC_BTN1, KC_UP, KC_BTN2,
+ KC_ESC, MS_BTN1, KC_UP, MS_BTN2,
KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT,
MO(1), KC_SPC),
diff --git a/keyboards/pimentoso/paddino02/rev2/left/keyboard.json b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json
index f89552220d..ff9687b2b1 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/keyboard.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["D0", "D4", "D1"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pimentoso/paddino02/rev2/left/keymaps/default/keymap.c b/keyboards/pimentoso/paddino02/rev2/left/keymaps/default/keymap.c
index 343ae043b4..364224b77b 100755
--- a/keyboards/pimentoso/paddino02/rev2/left/keymaps/default/keymap.c
+++ b/keyboards/pimentoso/paddino02/rev2/left/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- KC_ESC, KC_BTN1, KC_UP, KC_BTN2,
+ KC_ESC, MS_BTN1, KC_UP, MS_BTN2,
KC_LSFT, KC_LEFT, KC_DOWN, KC_RGHT,
MO(1), KC_SPC),
diff --git a/keyboards/pimentoso/paddino02/rev2/right/keyboard.json b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json
index 1148564a05..006eca8794 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/keyboard.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/keyboard.json
@@ -24,8 +24,7 @@
"rows": ["F4", "F6", "F5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pimentoso/paddino02/rev2/right/keymaps/default/keymap.c b/keyboards/pimentoso/paddino02/rev2/right/keymaps/default/keymap.c
index 0cc38837d3..7e624fcf66 100755
--- a/keyboards/pimentoso/paddino02/rev2/right/keymaps/default/keymap.c
+++ b/keyboards/pimentoso/paddino02/rev2/right/keymaps/default/keymap.c
@@ -3,7 +3,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- KC_ESC, KC_BTN2, KC_UP, KC_BTN1,
+ KC_ESC, MS_BTN2, KC_UP, MS_BTN1,
KC_LSFT, KC_RGHT, KC_DOWN, KC_LEFT,
MO(1), KC_SPC),
diff --git a/keyboards/pimentoso/touhoupad/keyboard.json b/keyboards/pimentoso/touhoupad/keyboard.json
index fed01eb5a6..5407d49e59 100644
--- a/keyboards/pimentoso/touhoupad/keyboard.json
+++ b/keyboards/pimentoso/touhoupad/keyboard.json
@@ -35,8 +35,7 @@
"rows": ["D4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pinky/3/keyboard.json b/keyboards/pinky/3/keyboard.json
index f02b6c72d0..9ca44c26f3 100644
--- a/keyboards/pinky/3/keyboard.json
+++ b/keyboards/pinky/3/keyboard.json
@@ -17,8 +17,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x7_4"
},
diff --git a/keyboards/pinky/4/keyboard.json b/keyboards/pinky/4/keyboard.json
index 68b1dcb14c..bc651638ac 100644
--- a/keyboards/pinky/4/keyboard.json
+++ b/keyboards/pinky/4/keyboard.json
@@ -17,8 +17,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT": "LAYOUT_split_4x7_4"
},
diff --git a/keyboards/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c
index c08e58653a..a56cee0549 100644
--- a/keyboards/planck/keymaps/default/keymap.c
+++ b/keyboards/planck/keymaps/default/keymap.c
@@ -258,13 +258,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
} else {
if (clockwise) {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
#else
tap_code(KC_PGDN);
#endif
} else {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
#else
tap_code(KC_PGUP);
#endif
diff --git a/keyboards/ploopyco/madromys/keymaps/default/keymap.c b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
index bc8265b39d..a4e46efc87 100644
--- a/keyboards/ploopyco/madromys/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/madromys/keymaps/default/keymap.c
@@ -18,5 +18,5 @@
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [0] = LAYOUT( KC_BTN4, KC_BTN5, DRAG_SCROLL, KC_BTN2, KC_BTN1, KC_BTN3 )
+ [0] = LAYOUT( MS_BTN4, MS_BTN5, DRAG_SCROLL, MS_BTN2, MS_BTN1, MS_BTN3 )
};
diff --git a/keyboards/ploopyco/mouse/keymaps/default/keymap.c b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
index 29d81b8061..d2ed79a774 100644
--- a/keyboards/ploopyco/mouse/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/mouse/keymaps/default/keymap.c
@@ -19,5 +19,5 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT(/* Base */
- C(KC_C), KC_BTN1, KC_BTN3, KC_BTN2, C(KC_V), KC_BTN4, KC_BTN5, DPI_CONFIG)
+ C(KC_C), MS_BTN1, MS_BTN3, MS_BTN2, C(KC_V), MS_BTN4, MS_BTN5, DPI_CONFIG)
};
diff --git a/keyboards/ploopyco/ploopyco.c b/keyboards/ploopyco/ploopyco.c
index 57f2a26b8c..642696be0f 100644
--- a/keyboards/ploopyco/ploopyco.c
+++ b/keyboards/ploopyco/ploopyco.c
@@ -80,7 +80,7 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
return false;
}
# ifdef MOUSEKEY_ENABLE
- tap_code(clockwise ? KC_WH_U : KC_WH_D);
+ tap_code(clockwise ? MS_WHLU : MS_WHLD);
# else
report_mouse_t mouse_report = pointing_device_get_report();
mouse_report.v = clockwise ? 1 : -1;
@@ -139,6 +139,7 @@ void cycle_dpi(void) {
}
report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
+ mouse_report = pointing_device_task_user(mouse_report);
if (is_drag_scroll) {
scroll_accumulated_h += (float)mouse_report.x / PLOOPY_DRAGSCROLL_DIVISOR_H;
scroll_accumulated_v += (float)mouse_report.y / PLOOPY_DRAGSCROLL_DIVISOR_V;
@@ -163,7 +164,7 @@ report_mouse_t pointing_device_task_kb(report_mouse_t mouse_report) {
mouse_report.y = 0;
}
- return pointing_device_task_user(mouse_report);
+ return mouse_report;
}
bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/ploopyco/trackball/keymaps/default/keymap.c b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
index 83a4a16847..e330a2efff 100644
--- a/keyboards/ploopyco/trackball/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN1, KC_BTN3, KC_BTN2,
- KC_BTN4, KC_BTN5
+ MS_BTN1, MS_BTN3, MS_BTN2,
+ MS_BTN4, MS_BTN5
),
};
diff --git a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
index 3659076bec..ac51e8b89a 100644
--- a/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_mini/keymaps/default/keymap.c
@@ -20,7 +20,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN1, KC_BTN3, KC_BTN2,
- KC_BTN4, KC_BTN5
+ MS_BTN1, MS_BTN3, MS_BTN2,
+ MS_BTN4, MS_BTN5
),
};
diff --git a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
index 8729deabc1..eb50542ce4 100644
--- a/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
+++ b/keyboards/ploopyco/trackball_thumb/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( /* Base */
- KC_BTN4, KC_BTN1, KC_BTN3, KC_BTN2, KC_BTN5,
+ MS_BTN4, MS_BTN1, MS_BTN3, MS_BTN2, MS_BTN5,
DPI_CONFIG
),
};
diff --git a/keyboards/pluckey/keymaps/default/keymap.c b/keyboards/pluckey/keymaps/default/keymap.c
index 787bb192b2..604215b3c6 100644
--- a/keyboards/pluckey/keymaps/default/keymap.c
+++ b/keyboards/pluckey/keymaps/default/keymap.c
@@ -51,15 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_RAISE] = LAYOUT_all(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______,
- _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, KC_BTN4, KC_UP, KC_BTN5, _______, _______,
+ _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, MS_BTN4, KC_UP, MS_BTN5, _______, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_LPRN, KC_RPRN, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______,
_______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______,
_______, _______, MO_ADJU, _______, KC_DEL, _______, _______, MO_CURR, _______, _______
),
[_ADJUST] = LAYOUT_all(
KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLU, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_CLR, _______, _______, _______, _______, _______
)
diff --git a/keyboards/pluckey/keymaps/default_ergo/keymap.c b/keyboards/pluckey/keymaps/default_ergo/keymap.c
index 313b118b8a..5fe90e9fbb 100644
--- a/keyboards/pluckey/keymaps/default_ergo/keymap.c
+++ b/keyboards/pluckey/keymaps/default_ergo/keymap.c
@@ -51,15 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_RAISE] = LAYOUT_ergo(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______, _______,
- _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, KC_BTN4, KC_UP, KC_BTN5, _______, _______,
+ _______, _______, _______, KC_VOLU, _______, _______, KC_LPRN, KC_RPRN, _______, MS_BTN4, KC_UP, MS_BTN5, _______, _______,
_______, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, _______,
_______, _______, _______, KC_VOLD, _______, _______, M_ARROW, KC_PGUP, KC_PGDN, _______, _______, _______, KC_PGDN, _______, _______, _______,
_______, _______, MO_ADJU, _______, KC_DEL, _______, _______, MO_CURR, _______, _______
),
[_ADJUST] = LAYOUT_ergo(
KC_SLEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_U, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLU, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, _______, _______, _______, KC_CLR, _______, _______, _______, _______, _______
)
diff --git a/keyboards/pluckey/pluckey.c b/keyboards/pluckey/pluckey.c
index d9215b9339..db801c8b81 100644
--- a/keyboards/pluckey/pluckey.c
+++ b/keyboards/pluckey/pluckey.c
@@ -28,9 +28,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
else if (index == 1) {
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/plum47/keyboard.json b/keyboards/plum47/keyboard.json
index 2c6e009300..00efab2c28 100644
--- a/keyboards/plum47/keyboard.json
+++ b/keyboards/plum47/keyboard.json
@@ -2,7 +2,7 @@
"manufacturer": "Masayuki Takagi",
"keyboard_name": "plum47",
"maintainer": "awh-tokyo",
- "bootloader": "caterina",
+ "development_board": "promicro",
"diode_direction": "COL2ROW",
"features": {
"bootmagic": true,
@@ -14,7 +14,6 @@
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7"],
"rows": ["D1", "D0", "D4", "C6"]
},
- "processor": "atmega32u4",
"url": "ihttps://github.com/takagi/plum47_buildguide",
"usb": {
"device_version": "1.0.0",
diff --git a/keyboards/polycarbdiet/s20/keyboard.json b/keyboards/polycarbdiet/s20/keyboard.json
index e8b180b860..327debdb7d 100644
--- a/keyboards/polycarbdiet/s20/keyboard.json
+++ b/keyboards/polycarbdiet/s20/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5040",
"pid": "0x7320",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"backlight": true,
diff --git a/keyboards/proteus67/keymaps/default/keymap.c b/keyboards/proteus67/keymaps/default/keymap.c
index 225476b40c..710ae56a90 100644
--- a/keyboards/proteus67/keymaps/default/keymap.c
+++ b/keyboards/proteus67/keymaps/default/keymap.c
@@ -18,8 +18,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[_LAYERB] = LAYOUT_ortho_5x14(
UG_TOGG , UG_HUEU ,UG_HUED ,UG_SATU , UG_SATD , UG_VALU , UG_VALD , RGB_M_P , RGB_M_B , RGB_M_R , RGB_M_SW , RGB_M_K , RGB_M_X , RGB_M_G ,
- KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_TRNS ,KC_TRNS,
- KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_MS_L , KC_MS_D , KC_MS_R , KC_SCLN,KC_QUOT ,
+ KC_TRNS , KC_TRNS, KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , MS_BTN1 , MS_UP , MS_BTN2 , KC_TRNS ,KC_TRNS,
+ KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , MS_LEFT , MS_DOWN , MS_RGHT , KC_SCLN,KC_QUOT ,
KC_TRNS, KC_TRNS ,KC_TRNS ,KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_NUBS, KC_TRNS,
KC_TRNS , KC_TRNS ,KC_TRNS,KC_TRNS, KC_TRNS , UG_PREV, KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS , KC_TRNS
),
diff --git a/keyboards/prototypist/oceanographer/keymaps/default/keymap.c b/keyboards/prototypist/oceanographer/keymaps/default/keymap.c
index 83b907f9a4..ceeb224927 100644
--- a/keyboards/prototypist/oceanographer/keymaps/default/keymap.c
+++ b/keyboards/prototypist/oceanographer/keymaps/default/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_FN1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU)},
- [_FN2] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP)},
+ [_FN2] = { ENCODER_CCW_CW(MS_WHLD, MS_WHLU)},
[_FN3] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT)}
};
#endif
diff --git a/keyboards/prototypist/oceanographer/keymaps/default_625/keymap.c b/keyboards/prototypist/oceanographer/keymaps/default_625/keymap.c
index 94e8e936f8..185ce52c9b 100644
--- a/keyboards/prototypist/oceanographer/keymaps/default_625/keymap.c
+++ b/keyboards/prototypist/oceanographer/keymaps/default_625/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_FN1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU)},
- [_FN2] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP)},
+ [_FN2] = { ENCODER_CCW_CW(MS_WHLD, MS_WHLU)},
[_FN3] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT)}
};
#endif
diff --git a/keyboards/prototypist/oceanographer/keymaps/split_225_2/keymap.c b/keyboards/prototypist/oceanographer/keymaps/split_225_2/keymap.c
index cc7c155752..0a1d1558dd 100644
--- a/keyboards/prototypist/oceanographer/keymaps/split_225_2/keymap.c
+++ b/keyboards/prototypist/oceanographer/keymaps/split_225_2/keymap.c
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
[_FN1] = { ENCODER_CCW_CW(UG_VALD, UG_VALU)},
- [_FN2] = { ENCODER_CCW_CW(KC_MS_WH_DOWN, KC_MS_WH_UP)},
+ [_FN2] = { ENCODER_CCW_CW(MS_WHLD, MS_WHLU)},
[_FN3] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT)}
};
#endif
diff --git a/keyboards/psuieee/pluto12/keyboard.json b/keyboards/psuieee/pluto12/keyboard.json
index 02db5bc0a1..815c3b5949 100644
--- a/keyboards/psuieee/pluto12/keyboard.json
+++ b/keyboards/psuieee/pluto12/keyboard.json
@@ -31,8 +31,7 @@
{"pin_a": "B6", "pin_b": "B2"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json
index 783e1e8db0..5daca888e9 100644
--- a/keyboards/pteron36/keyboard.json
+++ b/keyboards/pteron36/keyboard.json
@@ -54,8 +54,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT_split_3x5_3": {
diff --git a/keyboards/qck75/v1/v1.c b/keyboards/qck75/v1/v1.c
index 5e512b292c..d7756fe06d 100644
--- a/keyboards/qck75/v1/v1.c
+++ b/keyboards/qck75/v1/v1.c
@@ -26,16 +26,16 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
break;
case THIRD:
if (clockwise) {
- tap_code(KC_MS_R);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_L);
+ tap_code(MS_LEFT);
}
break;
case FOURTH:
if (clockwise) {
- tap_code(KC_MS_U);
+ tap_code(MS_UP);
} else {
- tap_code(KC_MS_D);
+ tap_code(MS_DOWN);
}
break;
}
diff --git a/keyboards/qpockets/eggman/keymaps/default/keymap.c b/keyboards/qpockets/eggman/keymaps/default/keymap.c
index 079272d918..60b70837fb 100644
--- a/keyboards/qpockets/eggman/keymaps/default/keymap.c
+++ b/keyboards/qpockets/eggman/keymaps/default/keymap.c
@@ -63,9 +63,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) { /* left encoder */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 1) { /* right encoder */
if (clockwise) {
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
index 1bbdd632e8..1b88459606 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/keymap.c
@@ -85,9 +85,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
default:
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else{
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
}
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
index 19390f665c..f872606d07 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
+++ b/keyboards/qpockets/space_space/rev1/keymaps/default/keymap.c
@@ -87,9 +87,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
default:
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else{
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
break;
}
diff --git a/keyboards/qpockets/space_space/rev2/rev2.c b/keyboards/qpockets/space_space/rev2/rev2.c
index e6053afb75..04581833ff 100644
--- a/keyboards/qpockets/space_space/rev2/rev2.c
+++ b/keyboards/qpockets/space_space/rev2/rev2.c
@@ -20,9 +20,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (index == 1) { /* left encoder*/
if (clockwise){
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
} else if (index == 0) { /* right encoder */
if (clockwise){
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
index 3322fc8923..de67171c2e 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/keymap.c
@@ -78,9 +78,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* center encoder */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
index 1bd1be2f66..fc5dab3b77 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/keymap.c
@@ -78,9 +78,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* center encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
return true;
diff --git a/keyboards/qpockets/wanten/keymaps/default/keymap.c b/keyboards/qpockets/wanten/keymaps/default/keymap.c
index 248974a7eb..386a8d982d 100644
--- a/keyboards/qpockets/wanten/keymaps/default/keymap.c
+++ b/keyboards/qpockets/wanten/keymaps/default/keymap.c
@@ -78,9 +78,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* center encoder */
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
return true;
diff --git a/keyboards/qvex/lynepad/keymaps/default/keymap.c b/keyboards/qvex/lynepad/keymaps/default/keymap.c
index 142f295de6..a4c3030f22 100644
--- a/keyboards/qvex/lynepad/keymaps/default/keymap.c
+++ b/keyboards/qvex/lynepad/keymaps/default/keymap.c
@@ -24,9 +24,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* |----------------------------|
*/
[0] = LAYOUT(
- KC_MS_BTN4, KC_MS_BTN2, KC_MS_UP, KC_MS_BTN1,
- KC_MS_BTN5, KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT,
- KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2
+ MS_BTN4, MS_BTN2, MS_UP, MS_BTN1,
+ MS_BTN5, MS_LEFT, MS_DOWN, MS_RGHT,
+ MS_ACL0, MS_ACL1, MS_ACL2
)
};
@@ -41,9 +41,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
}
return true;
@@ -76,10 +76,10 @@ void matrix_scan_user(void) {
}
if (enc2Center != enc2CenterPrev) {
if (enc2Center < ENC_TILT_THRESHOLD) {
- register_code16(KC_MS_BTN3);
+ register_code16(MS_BTN3);
}
else {
- unregister_code16(KC_MS_BTN3);
+ unregister_code16(MS_BTN3);
}
/*
* Encoder sets ALL values when center is pressed so bail out at this point
diff --git a/keyboards/qwertykeys/qk65/hotswap/keyboard.json b/keyboards/qwertykeys/qk65/hotswap/keyboard.json
index 3aa8597626..2cdfe33ba3 100644
--- a/keyboards/qwertykeys/qk65/hotswap/keyboard.json
+++ b/keyboards/qwertykeys/qk65/hotswap/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x514B",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/qwertykeys/qk65/solder/keyboard.json b/keyboards/qwertykeys/qk65/solder/keyboard.json
index 0d02ba7a91..63afc40994 100644
--- a/keyboards/qwertykeys/qk65/solder/keyboard.json
+++ b/keyboards/qwertykeys/qk65/solder/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x4F53",
"pid": "0x5153",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/qwertyydox/keymaps/default/keymap.c b/keyboards/qwertyydox/keymaps/default/keymap.c
index 49d45b9c5f..69e1d5c31c 100644
--- a/keyboards/qwertyydox/keymaps/default/keymap.c
+++ b/keyboards/qwertyydox/keymaps/default/keymap.c
@@ -42,11 +42,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_NAV] = LAYOUT(
//,--------+--------+--------+--------+--------+--------+--------. ,--------+--------+--------+--------+--------+--------+--------.
- KC_ESC, KC_NO, KC_ACL0, KC_ACL1, KC_ACL2, KC_WH_L, KC_WH_R, KC_ESC, KC_NO, KC_UP, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS,
+ KC_ESC, KC_NO, MS_ACL0, MS_ACL1, MS_ACL2, MS_WHLL, MS_WHLR, KC_ESC, KC_NO, KC_UP, KC_PSLS, KC_PAST, KC_PMNS, KC_PPLS,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_WH_U, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO,
+ KC_NO, KC_Z, KC_X, KC_C, KC_V, MS_WHLU, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO, KC_NO, KC_NO,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
- KC_INS, KC_HOME, KC_PGUP, KC_BTN1, KC_BTN2, KC_WH_D, KC_MS_L, KC_MS_U, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
+ KC_INS, KC_HOME, KC_PGUP, MS_BTN1, MS_BTN2, MS_WHLD, MS_LEFT, MS_UP, MS_DOWN, MS_RGHT, KC_NO, KC_NO,
//|--------+--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------+--------|
KC_DEL, KC_END, KC_PGDN, nav, KC_LCTL, KC_SPC, TO(0), TO(1), KC_LSFT, KC_BSPC, KC_NO, KC_NO, KC_NO, QK_BOOT
//`--------+--------+--------+--------+--------+--------+--------/ \--------+--------+--------+--------+--------+--------+--------'
diff --git a/keyboards/rainkeebs/rainkeeb/keyboard.json b/keyboards/rainkeebs/rainkeeb/keyboard.json
index 2d4a2ac5b9..b14ea45dde 100644
--- a/keyboards/rainkeebs/rainkeeb/keyboard.json
+++ b/keyboards/rainkeebs/rainkeeb/keyboard.json
@@ -32,8 +32,7 @@
{"pin_a": "B2", "pin_b": "B6"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c b/keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c
index 914d1113b1..bcc7ea0f88 100644
--- a/keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c
+++ b/keyboards/rainkeebs/rainkeeb/keymaps/default/keymap.c
@@ -62,16 +62,16 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
break;
case _RAISE:
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
break;
case _ADJUST:
if (clockwise) {
- tap_code(KC_MS_WH_RIGHT);
+ tap_code(MS_WHLR);
} else {
- tap_code(KC_MS_WH_LEFT);
+ tap_code(MS_WHLL);
}
break;
case _GAME:
diff --git a/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c b/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c
index 77418f9cd6..7c3fcb3ce0 100644
--- a/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c
+++ b/keyboards/rainkeebs/trailmix/keymaps/default/keymap.c
@@ -58,9 +58,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)},
+ [_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(MS_WHLU, MS_WHLD)},
[_LOWER] = {ENCODER_CCW_CW(KC_PGDN, KC_PGUP), ENCODER_CCW_CW(KC_HOME, KC_END)},
- [_RAISE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R)},
- [_ADJUST] = {ENCODER_CCW_CW(KC_MS_LEFT, KC_MS_RIGHT), ENCODER_CCW_CW(KC_MS_UP, KC_MS_DOWN)},
+ [_RAISE] = {ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(MS_WHLL, MS_WHLR)},
+ [_ADJUST] = {ENCODER_CCW_CW(MS_LEFT, MS_RGHT), ENCODER_CCW_CW(MS_UP, MS_DOWN)},
};
#endif
diff --git a/keyboards/rainkeebs/trailmix/trailmix.c b/keyboards/rainkeebs/trailmix/trailmix.c
index 105d988dad..954c72f2c8 100644
--- a/keyboards/rainkeebs/trailmix/trailmix.c
+++ b/keyboards/rainkeebs/trailmix/trailmix.c
@@ -34,9 +34,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
} else if (index == 1) {
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
}
break;
@@ -49,9 +49,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
} else if (index == 1) {
if (clockwise) {
- tap_code(KC_WH_R);
+ tap_code(MS_WHLR);
} else {
- tap_code(KC_WH_L);
+ tap_code(MS_WHLL);
}
}
break;
@@ -73,15 +73,15 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
case _ADJUST:
if (index == 0) {
if (clockwise) {
- tap_code(KC_MS_RIGHT);
+ tap_code(MS_RGHT);
} else {
- tap_code(KC_MS_LEFT);
+ tap_code(MS_LEFT);
}
} else if (index == 1) {
if (clockwise) {
- tap_code(KC_MS_DOWN);
+ tap_code(MS_DOWN);
} else {
- tap_code(KC_MS_UP);
+ tap_code(MS_UP);
}
}
break;
diff --git a/keyboards/rart/rart4x4/keyboard.json b/keyboards/rart/rart4x4/keyboard.json
index a18e4a4606..13d7ca3345 100644
--- a/keyboards/rart/rart4x4/keyboard.json
+++ b/keyboards/rart/rart4x4/keyboard.json
@@ -54,8 +54,7 @@
{"pin_a": "D7", "pin_b": "E6"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_4x4"],
"layouts": {
"LAYOUT_ortho_4x4": {
diff --git a/keyboards/rart/rart4x4/keymaps/default/keymap.c b/keyboards/rart/rart4x4/keymaps/default/keymap.c
index e57b87a35f..9f16aff6ed 100644
--- a/keyboards/rart/rart4x4/keymaps/default/keymap.c
+++ b/keyboards/rart/rart4x4/keymaps/default/keymap.c
@@ -43,9 +43,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
return true;
diff --git a/keyboards/rart/rart67m/keyboard.json b/keyboards/rart/rart67m/keyboard.json
index bade7834fd..a9ab73ce57 100644
--- a/keyboards/rart/rart67m/keyboard.json
+++ b/keyboards/rart/rart67m/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["D3", "D2", "D4", "F6", "B3", "B4", "B2", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_all": "LAYOUT"
},
diff --git a/keyboards/rart/rartlite/keyboard.json b/keyboards/rart/rartlite/keyboard.json
index df9180d622..48325bf391 100644
--- a/keyboards/rart/rartlite/keyboard.json
+++ b/keyboards/rart/rartlite/keyboard.json
@@ -29,8 +29,7 @@
"num_lock": "F6",
"on_state": 0
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_right_numpad": {
"layout": [
diff --git a/keyboards/rart/rartpad/keyboard.json b/keyboards/rart/rartpad/keyboard.json
index cc3f7120d2..70195fc4bf 100644
--- a/keyboards/rart/rartpad/keyboard.json
+++ b/keyboards/rart/rartpad/keyboard.json
@@ -57,8 +57,7 @@
"twinkle": true
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": ["ortho_5x4", "numpad_5x4"],
"layouts": {
"LAYOUT_ortho_5x4": {
diff --git a/keyboards/rart/rartpad/keymaps/default/keymap.c b/keyboards/rart/rartpad/keymaps/default/keymap.c
index 342b280c57..8b177bba5c 100644
--- a/keyboards/rart/rartpad/keymaps/default/keymap.c
+++ b/keyboards/rart/rartpad/keymaps/default/keymap.c
@@ -45,9 +45,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
return true;
diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json
index 7136860260..0e65b68f98 100644
--- a/keyboards/rate/pistachio/info.json
+++ b/keyboards/rate/pistachio/info.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5255",
"pid": "0xD0C2",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"processor": "atmega32u4",
"bootloader": "caterina"
diff --git a/keyboards/rate/pistachio/keymaps/default/keymap.c b/keyboards/rate/pistachio/keymaps/default/keymap.c
index a8cd297ce8..3d7d8fb636 100644
--- a/keyboards/rate/pistachio/keymaps/default/keymap.c
+++ b/keyboards/rate/pistachio/keymaps/default/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_MPLY, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, JP_AT, JP_LBRC, KC_HOME,
KC_MUTE, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, JP_SCLN, JP_COLN, JP_RBRC, KC_ENT, KC_END,
KC_VOLU, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, JP_COMM, JP_DOT, JP_SLSH, JP_BSLS, KC_RSFT, KC_PGUP,
- KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, KC_ENT, JP_MHEN, LT(_FN,KC_SPC), LT(_FN,KC_SPC), JP_HENK, KC_BTN1, KC_INS, KC_RALT, KC_APP, KC_RCTL, KC_PGDN
+ KC_VOLD, KC_LCTL, KC_LGUI, KC_LALT, KC_ENT, JP_MHEN, LT(_FN,KC_SPC), LT(_FN,KC_SPC), JP_HENK, MS_BTN1, KC_INS, KC_RALT, KC_APP, KC_RCTL, KC_PGDN
),
[_FN] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/rate/pistachio_mp/keyboard.json b/keyboards/rate/pistachio_mp/keyboard.json
index 71e3244523..299dc5c3a8 100644
--- a/keyboards/rate/pistachio_mp/keyboard.json
+++ b/keyboards/rate/pistachio_mp/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5255",
"pid": "0xE212",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"hue_steps": 10,
@@ -39,8 +43,7 @@
{"pin_a": "F4", "pin_b": "F5"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/recompile_keys/choco60/rev1/keyboard.json b/keyboards/recompile_keys/choco60/rev1/keyboard.json
index 4e5a8903bd..6c0b363011 100644
--- a/keyboards/recompile_keys/choco60/rev1/keyboard.json
+++ b/keyboards/recompile_keys/choco60/rev1/keyboard.json
@@ -19,6 +19,5 @@
"pin": "D3"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/recompile_keys/cocoa40/keyboard.json b/keyboards/recompile_keys/cocoa40/keyboard.json
index 9fad026ea7..a576e54551 100644
--- a/keyboards/recompile_keys/cocoa40/keyboard.json
+++ b/keyboards/recompile_keys/cocoa40/keyboard.json
@@ -28,8 +28,7 @@
"pin": "D2"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
index 16d320f045..98167fa2d3 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/keymap.c
@@ -93,9 +93,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-------------------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
+ _______, UG_TOGG, UG_HUEU, UG_SATU, UG_VALU, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, _______, KC_BTN1, KC_BTN2, XXXXXXX
+ UG_NEXT, UG_HUED, UG_SATD, UG_VALD, XXXXXXX, _______, MS_BTN1, MS_BTN2, XXXXXXX
//`---------+---------+---------+---------+---------+---------+---------+---------+---------'
)
};
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
index 34a3ec1fbe..bc468beb37 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/readme.md
@@ -59,9 +59,9 @@ At first, Move to Lower layer with long push. After that Adjust key with long pu
//,-------------------------------------------------------------------------------------------------------------.
QK_BOOT, RGBRST, AG_NORM, AG_SWAP, XXXXXXX, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, XXXXXXX,
+ _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, MS_LEFT, MS_DOWN, MS_UP, MS_RGHT, XXXXXXX,
//|---------+---------+---------+---------+---------+---------+---------+---------+---------+---------+---------|
- RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, _______, KC_BTN1, KC_BTN2, XXXXXXX
+ RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, _______, MS_BTN1, MS_BTN2, XXXXXXX
//`---------+---------+---------+---------+---------+---------+---------+---------+---------'
)
diff --git a/keyboards/recompile_keys/nomu30/rev1/keyboard.json b/keyboards/recompile_keys/nomu30/rev1/keyboard.json
index 01afb9fe7d..8865eb0535 100644
--- a/keyboards/recompile_keys/nomu30/rev1/keyboard.json
+++ b/keyboards/recompile_keys/nomu30/rev1/keyboard.json
@@ -10,6 +10,5 @@
"rows": ["D1", "D0", "D4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina"
+ "development_board": "promicro"
}
diff --git a/keyboards/rect44/keyboard.json b/keyboards/rect44/keyboard.json
index c863bec9a3..7e0202cde7 100644
--- a/keyboards/rect44/keyboard.json
+++ b/keyboards/rect44/keyboard.json
@@ -37,8 +37,7 @@
"rows": ["D3", "D2", "F5", "F4"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT_all": {
"layout": [
diff --git a/keyboards/redox/keymaps/default/keymap.c b/keyboards/redox/keymaps/default/keymap.c
index d69a5d5cdd..2636144025 100644
--- a/keyboards/redox/keymaps/default/keymap.c
+++ b/keyboards/redox/keymaps/default/keymap.c
@@ -70,13 +70,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐
_______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤
- XXXXXXX ,XXXXXXX ,KC_MS_U ,XXXXXXX ,KC_WH_U ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
+ XXXXXXX ,XXXXXXX ,MS_UP ,XXXXXXX ,MS_WHLU ,XXXXXXX ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤
- XXXXXXX ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_WH_D ,XXXXXXX ,_______ , _______ ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
+ XXXXXXX ,MS_LEFT ,MS_DOWN ,MS_RGHT ,MS_WHLD ,XXXXXXX ,_______ , _______ ,KC_LEFT ,KC_DOWN ,KC_UP ,KC_RIGHT,XXXXXXX ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,
//├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤
- XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
+ XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , MS_BTN1 , MS_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX
//└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘
),
diff --git a/keyboards/redox/rules.mk b/keyboards/redox/rules.mk
index a2f52752e0..4df55cd220 100644
--- a/keyboards/redox/rules.mk
+++ b/keyboards/redox/rules.mk
@@ -1,5 +1,3 @@
-DEFAULT_FOLDER = redox/rev1/base
-
# Disable unsupported hardware
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/redox_media/keyboard.json b/keyboards/redox_media/keyboard.json
index dba5657ea2..145d9116ca 100644
--- a/keyboards/redox_media/keyboard.json
+++ b/keyboards/redox_media/keyboard.json
@@ -36,8 +36,7 @@
"pin": "D0"
}
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/redox_media/redox_media.c b/keyboards/redox_media/redox_media.c
index e3a83c6c2d..ffc2f11a6c 100644
--- a/keyboards/redox_media/redox_media.c
+++ b/keyboards/redox_media/redox_media.c
@@ -29,9 +29,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
} else if (index == 1) { /* Second encoder */
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
}
return true;
diff --git a/keyboards/reviung/reviung34/keyboard.json b/keyboards/reviung/reviung34/keyboard.json
index 7495b7cc9d..d7e6fe422a 100755
--- a/keyboards/reviung/reviung34/keyboard.json
+++ b/keyboards/reviung/reviung34/keyboard.json
@@ -26,8 +26,7 @@
"rows": ["F4", "F5", "F6", "F7"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"community_layouts": [
"split_3x5_2"
],
diff --git a/keyboards/reviung/reviung39/keyboard.json b/keyboards/reviung/reviung39/keyboard.json
index e18c1c163e..b57100d1eb 100644
--- a/keyboards/reviung/reviung39/keyboard.json
+++ b/keyboards/reviung/reviung39/keyboard.json
@@ -49,8 +49,7 @@
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_reviung39": "LAYOUT"
},
diff --git a/keyboards/reviung/reviung41/keyboard.json b/keyboards/reviung/reviung41/keyboard.json
index b44827c3d2..f0ad524da2 100644
--- a/keyboards/reviung/reviung41/keyboard.json
+++ b/keyboards/reviung/reviung41/keyboard.json
@@ -49,8 +49,7 @@
"rows": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_reviung41": "LAYOUT"
},
diff --git a/keyboards/reviung/reviung5/keyboard.json b/keyboards/reviung/reviung5/keyboard.json
index 7e7101c0ab..014cbb288a 100644
--- a/keyboards/reviung/reviung5/keyboard.json
+++ b/keyboards/reviung/reviung5/keyboard.json
@@ -53,8 +53,7 @@
{"pin_a": "D0", "pin_b": "D1"}
]
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_reviung5": "LAYOUT"
},
diff --git a/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c
index 4a73d57a6a..e53eccf645 100644
--- a/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c
+++ b/keyboards/reviung/reviung5/keymaps/default_lre/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (IS_LAYER_ON(_LOWER)) {
- tap_code16((clockwise == true) ? KC_WH_D : KC_WH_U);
+ tap_code16((clockwise == true) ? MS_WHLD : MS_WHLU);
} else {
tap_code((clockwise == true) ? KC_VOLD : KC_VOLU);
}
diff --git a/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c b/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c
index ec684c6a2f..4d7f666952 100644
--- a/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c
+++ b/keyboards/reviung/reviung5/keymaps/default_rre/keymap.c
@@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (IS_LAYER_ON(_LOWER)) {
- tap_code16((clockwise == true) ? KC_WH_D : KC_WH_U);
+ tap_code16((clockwise == true) ? MS_WHLD : MS_WHLU);
} else {
tap_code((clockwise == true) ? KC_VOLD : KC_VOLU);
}
diff --git a/keyboards/reviung/reviung53/keyboard.json b/keyboards/reviung/reviung53/keyboard.json
index 15f896e7d4..0468912f82 100644
--- a/keyboards/reviung/reviung53/keyboard.json
+++ b/keyboards/reviung/reviung53/keyboard.json
@@ -47,8 +47,7 @@
"rows": ["D0", "D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layout_aliases": {
"LAYOUT_reviung53": "LAYOUT"
},
diff --git a/keyboards/rgbkb/zen/rev1/keyboard.json b/keyboards/rgbkb/zen/rev1/keyboard.json
index b35381f607..94164016bb 100644
--- a/keyboards/rgbkb/zen/rev1/keyboard.json
+++ b/keyboards/rgbkb/zen/rev1/keyboard.json
@@ -38,8 +38,7 @@
"ws2812": {
"pin": "D1"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/rgbkb/zen/rev2/keyboard.json b/keyboards/rgbkb/zen/rev2/keyboard.json
index 917274f186..d34fd7afb1 100644
--- a/keyboards/rgbkb/zen/rev2/keyboard.json
+++ b/keyboards/rgbkb/zen/rev2/keyboard.json
@@ -56,8 +56,7 @@
"ws2812": {
"pin": "B6"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index a29808d04d..a765968bc3 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -254,22 +254,22 @@ lookup_table_t lookup_table[333] =
{"KC_RSFT", KC_RSFT},
{"KC_RALT", KC_RALT},
{"KC_RGUI", KC_RGUI},
- {"KC_MS_UP", KC_MS_UP},
- {"KC_MS_DOWN", KC_MS_DOWN},
- {"KC_MS_LEFT", KC_MS_LEFT},
- {"KC_MS_RIGHT", KC_MS_RIGHT},
- {"KC_MS_BTN1", KC_MS_BTN1},
- {"KC_MS_BTN2", KC_MS_BTN2},
- {"KC_MS_BTN3", KC_MS_BTN3},
- {"KC_MS_BTN4", KC_MS_BTN4},
- {"KC_MS_BTN5", KC_MS_BTN5},
- {"KC_MS_WH_UP", KC_MS_WH_UP},
- {"KC_MS_WH_DOWN", KC_MS_WH_DOWN},
- {"KC_MS_WH_LEFT", KC_MS_WH_LEFT},
- {"KC_MS_WH_RIGHT", KC_MS_WH_RIGHT},
- {"KC_MS_ACCEL0", KC_MS_ACCEL0},
- {"KC_MS_ACCEL1", KC_MS_ACCEL1},
- {"KC_MS_ACCEL2", KC_MS_ACCEL2},
+ {"MS_UP", MS_UP},
+ {"MS_DOWN", MS_DOWN},
+ {"MS_LEFT", MS_LEFT},
+ {"MS_RGHT", MS_RGHT},
+ {"MS_BTN1", MS_BTN1},
+ {"MS_BTN2", MS_BTN2},
+ {"MS_BTN3", MS_BTN3},
+ {"MS_BTN4", MS_BTN4},
+ {"MS_BTN5", MS_BTN5},
+ {"MS_WHLU", MS_WHLU},
+ {"MS_WHLD", MS_WHLD},
+ {"MS_WHLL", MS_WHLL},
+ {"MS_WHLR", MS_WHLR},
+ {"MS_ACL0", MS_ACL0},
+ {"MS_ACL1", MS_ACL1},
+ {"MS_ACL2", MS_ACL2},
{"KC_EXLM", KC_EXLM},
{"KC_AT", KC_AT},
{"KC_HASH", KC_HASH},
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
index 29e9ddf825..34607fd5ed 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/colemak/keymap.c
@@ -42,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NUMB] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, DF(0), KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______,
- _______, _______, _______, KC_MS_U, _______, _______, _______, KC_7, KC_8, KC_9, KC_PPLS, _______, _______, _______,
- _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_4, KC_5, KC_6, KC_PPLS, _______, _______, _______,
- _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_1, KC_2, KC_3, KC_PENT, _______, _______, _______,
- _______, _______, _______, _______, KC_BTN1, _______, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______
+ _______, _______, _______, MS_UP, _______, _______, _______, KC_7, KC_8, KC_9, KC_PPLS, _______, _______, _______,
+ _______, MS_BTN2, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, KC_4, KC_5, KC_6, KC_PPLS, _______, _______, _______,
+ _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, KC_1, KC_2, KC_3, KC_PENT, _______, _______, _______,
+ _______, _______, _______, _______, MS_BTN1, _______, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______
),
[SYMB] = LAYOUT(
QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[CURS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP, K_NXTWD, _______, _______,
- _______, KC_LCTL, KC_WH_D, KC_LSFT, _______, _______, _______, _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, _______,
+ _______, _______, MS_WHLU, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP, K_NXTWD, _______, _______,
+ _______, KC_LCTL, MS_WHLD, KC_LSFT, _______, _______, _______, _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, _______,
_______, UNDO, CUT, COPY, PASTE, _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
diff --git a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
index 20ed993ade..1da40aa611 100644
--- a/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
+++ b/keyboards/rominronin/katana60/rev1/keymaps/default/keymap.c
@@ -42,10 +42,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NUMB] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, DF(0), KC_PSLS, KC_PAST, KC_PMNS, _______, _______, _______, _______,
- _______, _______, _______, KC_MS_U, _______, _______, _______, KC_7, KC_8, KC_9, KC_PPLS, _______, _______, _______,
- _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, KC_4, KC_5, KC_6, KC_PPLS, _______, _______, _______,
- _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, KC_1, KC_2, KC_3, KC_PENT, _______, _______, _______,
- _______, _______, _______, _______, KC_BTN1, _______, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______
+ _______, _______, _______, MS_UP, _______, _______, _______, KC_7, KC_8, KC_9, KC_PPLS, _______, _______, _______,
+ _______, MS_BTN2, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, KC_4, KC_5, KC_6, KC_PPLS, _______, _______, _______,
+ _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, KC_1, KC_2, KC_3, KC_PENT, _______, _______, _______,
+ _______, _______, _______, _______, MS_BTN1, _______, KC_P0, KC_PDOT, KC_PENT, _______, _______, _______
),
[SYMB] = LAYOUT(
QK_BOOT, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
@@ -56,8 +56,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[CURS] = LAYOUT(
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_WH_U, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP, K_NXTWD, _______, _______,
- _______, KC_LCTL, KC_WH_D, KC_LSFT, _______, _______, _______, _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, _______,
+ _______, _______, MS_WHLU, _______, _______, _______, _______, _______, _______, K_PRVWD, KC_UP, K_NXTWD, _______, _______,
+ _______, KC_LCTL, MS_WHLD, KC_LSFT, _______, _______, _______, _______, KC_BSPC, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, _______,
_______, UNDO, CUT, COPY, PASTE, _______, _______, _______, _______, _______, K_LSTRT, _______, K_LEND, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
diff --git a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c
index ee057c5c11..0964f0ebab 100644
--- a/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c
+++ b/keyboards/rominronin/katana60/rev2/keymaps/default/keymap.c
@@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[NUMB] = LAYOUT_1_a(
_______, _______, _______, _______, _______, _______, _______, DF(0), _______, _______, KC_PEQL, KC_PSLS, KC_PAST, _______, _______,
- _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
- _______, KC_BTN2, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
- _______, _______, KC_ACL0, KC_ACL1, KC_ACL2, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
+ _______, _______, _______, MS_UP, _______, _______, _______, _______, _______, KC_P7, KC_P8, KC_P9, KC_PMNS, _______,
+ _______, MS_BTN2, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, KC_P4, KC_P5, KC_P6, KC_PPLS, _______,
+ _______, _______, MS_ACL0, MS_ACL1, MS_ACL2, _______, _______, _______, _______, _______, KC_P1, KC_P2, KC_P3, KC_PENT, _______,
_______, _______, _______, _______, _______, KC_P0, _______, _______, KC_PDOT, KC_PENT, _______, _______
),
[SYMB] = LAYOUT_1_a(
diff --git a/keyboards/rose75/keyboard.json b/keyboards/rose75/keyboard.json
index 1c756d3fdd..09d0b7af19 100644
--- a/keyboards/rose75/keyboard.json
+++ b/keyboards/rose75/keyboard.json
@@ -28,10 +28,14 @@
"url": "https://github.com/Smollchungus",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x7503",
"vid": "0x5363"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"driver": "vendor",
"pin": "GP29"
diff --git a/keyboards/rpiguy9907/southpaw66/keyboard.json b/keyboards/rpiguy9907/southpaw66/keyboard.json
index c751ee6d8e..980d217806 100644
--- a/keyboards/rpiguy9907/southpaw66/keyboard.json
+++ b/keyboards/rpiguy9907/southpaw66/keyboard.json
@@ -35,8 +35,7 @@
"tapping": {
"term": 400
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/runes/skjoldr/keyboard.json b/keyboards/runes/skjoldr/keyboard.json
index ff3476697e..b48cb2a1d9 100644
--- a/keyboards/runes/skjoldr/keyboard.json
+++ b/keyboards/runes/skjoldr/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x726E",
"pid": "0x736B",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/runes/vaengr/keyboard.json b/keyboards/runes/vaengr/keyboard.json
index dce2c7a228..1910f37f0d 100644
--- a/keyboards/runes/vaengr/keyboard.json
+++ b/keyboards/runes/vaengr/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x726E",
"pid": "0x7661",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgblight": {
"hue_steps": 10,
diff --git a/keyboards/rura66/rev1/keyboard.json b/keyboards/rura66/rev1/keyboard.json
index cb9ad6f29a..3dc41aabd4 100644
--- a/keyboards/rura66/rev1/keyboard.json
+++ b/keyboards/rura66/rev1/keyboard.json
@@ -55,8 +55,7 @@
"ws2812": {
"pin": "D3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/ryanbaekr/rb1/keyboard.json b/keyboards/ryanbaekr/rb1/keyboard.json
index a7222869e0..8b1b1a5a82 100644
--- a/keyboards/ryanbaekr/rb1/keyboard.json
+++ b/keyboards/ryanbaekr/rb1/keyboard.json
@@ -7,8 +7,7 @@
"pid": "0x0001",
"device_version": "0.0.3"
},
- "processor": "atmega32u4",
- "bootloader": "caterina",
+ "development_board": "promicro",
"features": {
"bootmagic": true,
"extrakey": true,
diff --git a/keyboards/ryanskidmore/rskeys100/keyboard.json b/keyboards/ryanskidmore/rskeys100/keyboard.json
index 27eae84a6e..b62d870aba 100644
--- a/keyboards/ryanskidmore/rskeys100/keyboard.json
+++ b/keyboards/ryanskidmore/rskeys100/keyboard.json
@@ -4,8 +4,12 @@
"usb": {
"vid": "0x7273",
"pid": "0x0064",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c b/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
index 21889f2fe6..9c2917fac1 100644
--- a/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/nafuda/keymaps/default/keymap.c
@@ -33,9 +33,9 @@ LT(_ADJUST, KC_BSPC), KC_UP,TG(_BROWSER),
//|-------------------------------------------|
TG(_MOUSE),
//|---------------+---------------+-----------|
- KC_BTN1, KC_MS_U, KC_BTN2,
+ MS_BTN1, MS_UP, MS_BTN2,
//|---------------+---------------+-----------|
- KC_MS_L, KC_MS_D, KC_MS_R
+ MS_LEFT, MS_DOWN, MS_RGHT
//|-------------------------------------------|
),
@@ -43,9 +43,9 @@ LT(_ADJUST, KC_BSPC), KC_UP,TG(_BROWSER),
//|-------------------------------------------|
LCTL(KC_W),
//|---------------+---------------+-----------|
- LCTL(LSFT(KC_T)), KC_WH_U,TG(_BROWSER),
+ LCTL(LSFT(KC_T)), MS_WHLU,TG(_BROWSER),
//|---------------+---------------+-----------|
- LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB)
+ LCTL(LSFT(KC_TAB)), MS_WHLD,LCTL(KC_TAB)
//|-------------------------------------------|
),
diff --git a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
index 6dd300f9db..4c5b7656d1 100644
--- a/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked48/keymaps/default_with_nafuda/keymap.c
@@ -43,9 +43,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, TG(_MOUSE),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BTN1, KC_MS_U, KC_BTN2,
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, MS_BTN1, MS_UP, MS_BTN2,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, KC_MS_L, KC_MS_D, KC_MS_R,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, MS_LEFT, MS_DOWN, MS_RGHT,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
MO(_ADJUST),KC_LCTL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT
//`------------------------------------------------------------------------------------------------------------'
@@ -55,9 +55,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, LCTL(KC_W),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
+ KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT,LCTL(LSFT(KC_T)),MS_WHLU,TG(_BROWSER),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT,LCTL(LSFT(KC_TAB)), MS_WHLD,LCTL(KC_TAB),
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |--------------------------|
MO(_ADJUST),KC_LCTL, KC_LALT, KC_LGUI,MO(_LOWER),KC_SPC,KC_SPC,MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP,KC_RIGHT
//`------------------------------------------------------------------------------------------------------------'
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
index ffc5a0ad62..7c0f96a076 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default/keymap.c
@@ -80,9 +80,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------.
TG(_FLOCK), KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR),
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, XXXXXXX,LALT(KC_PSCR),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, KC_PSCR,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
index 89c44f87a6..0db21f9bdc 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_nafuda/keymap.c
@@ -55,9 +55,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, TG(_MOUSE),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_BTN2,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_BTN1, MS_UP, MS_BTN2,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------------------------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -69,9 +69,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, LCTL(KC_W),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_T)),KC_WH_U,TG(_BROWSER),
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_T)),MS_WHLU,TG(_BROWSER),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_TAB)), KC_WH_D,LCTL(KC_TAB),
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,LCTL(LSFT(KC_TAB)), MS_WHLD,LCTL(KC_TAB),
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------------------------|
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
@@ -111,9 +111,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |--------------------------|
TG(_FLOCK), KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, UG_VALD,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR), _ADJUST, UG_SATD, UG_VALU,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, XXXXXXX,LALT(KC_PSCR), _ADJUST, UG_SATD, UG_VALU,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------+--------+--------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR, UG_NEXT, UG_TOGG, UG_SATU,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, KC_PSCR, UG_NEXT, UG_TOGG, UG_SATU,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |--------------------------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL),
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
index 81c1c63541..07d2111b88 100644
--- a/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
+++ b/keyboards/salicylic_acid3/naked60/keymaps/default_with_setta21/keymap.c
@@ -86,9 +86,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,-----------------------------------------------------| |-----------------------------------------------------. |-----------------------------------------------|
TG(_FLOCK), KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,UG_VALD,UG_HUED,UG_SATD,XXXXXXX,_______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX,LALT(KC_PSCR), UG_VALU,UG_HUEU,UG_SATU,XXXXXXX,_______,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, XXXXXXX,LALT(KC_PSCR), UG_VALU,UG_HUEU,UG_SATU,XXXXXXX,_______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |-------+-------+-------+-------+-------+-------|
- _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PSCR, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, KC_PSCR, _______,XXXXXXX,XXXXXXX,XXXXXXX,XXXXXXX,_______,
//|--------+--------+--------+--------+--------+--------| |--------+--------+--------+--------+--------+--------| |---------------+---------------+-------+-------|
_______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,LCA(KC_DEL), UG_NEXT, UG_TOGG,_______,_______,
//|--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------| |-----------------------------------------------|
diff --git a/keyboards/sawnsprojects/bunnygirl65/keyboard.json b/keyboards/sawnsprojects/bunnygirl65/keyboard.json
index 3fab84c557..b23f41e7d7 100644
--- a/keyboards/sawnsprojects/bunnygirl65/keyboard.json
+++ b/keyboards/sawnsprojects/bunnygirl65/keyboard.json
@@ -17,10 +17,14 @@
"processor": "STM32F072",
"usb": {
"device_version": "1.0.0",
- "force_nkro": true,
"pid": "0x00A2",
"vid": "0x5350"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"community_layouts": ["65_ansi_blocker_tsangan", "65_ansi_blocker_tsangan_split_bs"],
"layouts": {
"LAYOUT_65_ansi_blocker_tsangan": {
diff --git a/keyboards/sawnsprojects/okayu/info.json b/keyboards/sawnsprojects/okayu/info.json
index 14c8f20c35..21c5e899ce 100644
--- a/keyboards/sawnsprojects/okayu/info.json
+++ b/keyboards/sawnsprojects/okayu/info.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5350",
"pid": "0x00A1",
- "device_version": "1.0.0",
- "force_nkro": true
+ "device_version": "1.0.0"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/sekigon/grs_70ec/matrix.c b/keyboards/sekigon/grs_70ec/matrix.c
index 926ed6f813..718423e57b 100644
--- a/keyboards/sekigon/grs_70ec/matrix.c
+++ b/keyboards/sekigon/grs_70ec/matrix.c
@@ -40,7 +40,7 @@ extern matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
// row offsets for each hand
-uint8_t thisHand, thatHand;
+static uint8_t thisHand, thatHand;
// user-defined overridable functions
__attribute__((weak)) void matrix_slave_scan_user(void) {}
diff --git a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c
index d29621929b..11ee5a85d7 100644
--- a/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c
+++ b/keyboards/sergiopoverony/creator_pro/keymaps/default/keymap.c
@@ -39,9 +39,9 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
case _RED:
if (clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
break;
diff --git a/keyboards/shuguet/shu89/keymaps/default/keymap.json b/keyboards/shuguet/shu89/keymaps/default/keymap.json
index 1725f3438e..12cdccf3db 100644
--- a/keyboards/shuguet/shu89/keymaps/default/keymap.json
+++ b/keyboards/shuguet/shu89/keymaps/default/keymap.json
@@ -13,8 +13,8 @@
],
[
"QK_BOOT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "RGB_VAI", "RGB_VAD", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
- "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RGB_TOG" , "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+ "KC_TRNS", "RM_VALU", "RM_VALD", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+ "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_TOGG" , "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS" , "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_VOLU",
"KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MPLY", "KC_MPLY", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_MPRV", "KC_VOLD", "KC_MNXT"
diff --git a/keyboards/signum/3_0/keymaps/default/keymap.c b/keyboards/signum/3_0/keymaps/default/keymap.c
index 27f79e7692..76a349f713 100644
--- a/keyboards/signum/3_0/keymaps/default/keymap.c
+++ b/keyboards/signum/3_0/keymaps/default/keymap.c
@@ -750,9 +750,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
* -------------------------------------------------
*/
LAYOUT_ortho_4x12(
- KC_TRNS, KC_ACL1, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_U, KC_WH_L, KC_MS_U, KC_WH_R, KC_NO, KC_NO,
- KC_TRNS, KC_ACL2, KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_MS_L, KC_MS_L, KC_MS_D, KC_MS_R, KC_NO, KC_NO,
- KC_TRNS, KC_ACL0, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_D, KC_NO, KC_MS_D, KC_NO, KC_NO, KC_TRNS,
+ KC_TRNS, MS_ACL1, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLU, MS_WHLL, MS_UP, MS_WHLR, KC_NO, KC_NO,
+ KC_TRNS, MS_ACL2, MS_BTN2, MS_BTN3, MS_BTN1, MS_BTN1, MS_LEFT, MS_LEFT, MS_DOWN, MS_RGHT, KC_NO, KC_NO,
+ KC_TRNS, MS_ACL0, KC_NO, KC_NO, KC_NO, KC_NO, MS_WHLD, KC_NO, MS_DOWN, KC_NO, KC_NO, KC_TRNS,
TG(6), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
};
diff --git a/keyboards/signum/3_0/keymaps/default/layout.py b/keyboards/signum/3_0/keymaps/default/layout.py
index 4691985d29..b7c07eb6a4 100644
--- a/keyboards/signum/3_0/keymaps/default/layout.py
+++ b/keyboards/signum/3_0/keymaps/default/layout.py
@@ -380,12 +380,12 @@ qmk_dict = {
# Layer Switching missing, Lx -> MO(x), Tx -> TG(x)
"qwertz": "DF(0)", "neo": "DF(2)",
# Mouse Keys
- "^ Mouse": "KC_MS_U", "v Mouse": "KC_MS_D", "< Mouse": "KC_MS_L",
- "> Mouse": "KC_MS_R", "Mouse 1": "KC_BTN1", "Mouse 2": "KC_BTN2",
- "Mouse 3": "KC_BTN3", "Mouse 4": "KC_BTN4", "Mouse 5": "KC_BTN5",
- "^ Wheel": "KC_WH_U", "v Wheel": "KC_WH_D", "< Wheel": "KC_WH_L",
- "> Wheel": "KC_WH_R", "acc0": "KC_ACL0", "acc1": "KC_ACL1",
- "acc2": "KC_ACL2",
+ "^ Mouse": "MS_UP", "v Mouse": "MS_DOWN", "< Mouse": "MS_LEFT",
+ "> Mouse": "MS_RGHT", "Mouse 1": "MS_BTN1", "Mouse 2": "MS_BTN2",
+ "Mouse 3": "MS_BTN3", "Mouse 4": "MS_BTN4", "Mouse 5": "MS_BTN5",
+ "^ Wheel": "MS_WHLU", "v Wheel": "MS_WHLD", "< Wheel": "MS_WHLL",
+ "> Wheel": "MS_WHLR", "acc0": "MS_ACL0", "acc1": "MS_ACL1",
+ "acc2": "MS_ACL2",
# Modifiers missinng, add entry for each specific application
# Mod-Tap Keys missing, add entry for each specific application
"_Sh_swp": "LSFT_T(SH_TOGG)",
diff --git a/keyboards/sirius/uni660/rev2/rules.mk b/keyboards/sirius/uni660/rev2/rules.mk
index c03b052c56..18d234d62a 100644
--- a/keyboards/sirius/uni660/rev2/rules.mk
+++ b/keyboards/sirius/uni660/rev2/rules.mk
@@ -3,5 +3,3 @@ CUSTOM_MATRIX = lite
# project specific files
SRC += matrix.c
UART_DRIVER_REQUIRED = yes
-
-DEFAULT_FOLDER = sirius/uni660/rev2/ansi
diff --git a/keyboards/sixkeyboard/keyboard.json b/keyboards/sixkeyboard/keyboard.json
index 5c29dee16f..ca846affb3 100644
--- a/keyboards/sixkeyboard/keyboard.json
+++ b/keyboards/sixkeyboard/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x746B",
"pid": "0x736B",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": false,
diff --git a/keyboards/skmt/15k/keyboard.json b/keyboards/skmt/15k/keyboard.json
index d09f3fb989..2cfb05bae6 100644
--- a/keyboards/skmt/15k/keyboard.json
+++ b/keyboards/skmt/15k/keyboard.json
@@ -23,8 +23,12 @@
"usb": {
"device_version": "1.1.0",
"pid": "0x3488",
- "vid": "0xFEFE",
- "force_nkro": true
+ "vid": "0xFEFE"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"layouts": {
"LAYOUT_default": {
diff --git a/keyboards/skyloong/gk61/v1/keyboard.json b/keyboards/skyloong/gk61/v1/keyboard.json
index 68fda1220f..e6ce09ae7f 100644
--- a/keyboards/skyloong/gk61/v1/keyboard.json
+++ b/keyboards/skyloong/gk61/v1/keyboard.json
@@ -119,8 +119,12 @@
"vid": "0x1EA7",
"device_version": "1.0.0",
"pid": "0x6061",
- "max_power": 380,
- "force_nkro": true
+ "max_power": 380
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"community_layouts": ["60_ansi"],
"layouts": {
diff --git a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
index 885faaf858..12ec8170fc 100644
--- a/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
+++ b/keyboards/splitkb/aurora/sweep/keymaps/default/keymap.json
@@ -11,9 +11,9 @@
"KC_P0" , "KC_BSPC" , "LT(7,KC_SPC)" , "KC_P1"
],
[
- "RM_TOGG" , "RM_NEXT" , "RM_HUEU" , "RM_SATU" , "RM_VALU" , "RM_SPDU" , "KC_BTN1" , "KC_WH_U" , "KC_BTN2" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN2" , "KC_NO" , "KC_BTN1" , "KC_TRNS" , "KC_TRNS" , "KC_MS_L" , "KC_MS_D" , "KC_MS_U" , "KC_MS_R",
- "KC_TRNS" , "RM_PREV" , "RM_HUED" , "RM_SATD" , "RM_VALD" , "RM_SPDD" , "KC_WH_L" , "KC_WH_D" , "KC_WH_R" , "KC_TRNS",
+ "RM_TOGG" , "RM_NEXT" , "RM_HUEU" , "RM_SATU" , "RM_VALU" , "RM_SPDU" , "MS_BTN1" , "MS_WHLU" , "MS_BTN2" , "KC_TRNS",
+ "KC_TRNS" , "MS_BTN2" , "KC_NO" , "MS_BTN1" , "KC_TRNS" , "KC_TRNS" , "MS_LEFT" , "MS_DOWN" , "MS_UP" , "MS_RGHT",
+ "KC_TRNS" , "RM_PREV" , "RM_HUED" , "RM_SATD" , "RM_VALD" , "RM_SPDD" , "MS_WHLL" , "MS_WHLD" , "MS_WHLR" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS"
],
[
diff --git a/keyboards/splitkb/elora/rev1/myriad.c b/keyboards/splitkb/elora/rev1/myriad.c
index 8bb6054df9..0263821b81 100644
--- a/keyboards/splitkb/elora/rev1/myriad.c
+++ b/keyboards/splitkb/elora/rev1/myriad.c
@@ -9,10 +9,10 @@
#include "analog.h"
typedef struct __attribute__((__packed__)) {
- char magic_numbers[3];
- uint8_t version_major;
- uint8_t version_minor;
- uint8_t version_patch;
+ char magic_numbers[3];
+ uint8_t version_major;
+ uint8_t version_minor;
+ uint8_t version_patch;
uint32_t checksum;
uint16_t payload_length;
} myriad_header_t;
@@ -20,34 +20,36 @@ typedef struct __attribute__((__packed__)) {
typedef struct __attribute__((__packed__)) {
uint16_t vendor_id;
uint16_t product_id;
- uint8_t revision;
+ uint8_t revision;
} identity_record_t;
static bool myriad_reader(uint8_t *data, uint16_t length) {
- const uint8_t eeprom_address = 0x50; // 1010 000 - NOT shifted for R/W bit
- const uint16_t i2c_timeout = 100; // in milliseconds
+ const uint8_t eeprom_address = 0x50; // 1010 000 - NOT shifted for R/W bit
+ const uint16_t i2c_timeout = 100; // in milliseconds
- uint8_t num_pages = (length / 256) + 1;
+ uint8_t num_pages = (length / 256) + 1;
uint8_t last_page_size = length % 256;
for (int i = 0; i < num_pages; i++) {
- uint8_t reg = 0; // We always start on a page boundary, so this is always zero
+ uint8_t reg = 0; // We always start on a page boundary, so this is always zero
uint16_t read_length;
if (i == num_pages - 1) {
read_length = last_page_size;
} else {
read_length = 256;
}
- i2c_status_t s = i2c_read_register((eeprom_address + i) << 1, reg, &(data[i*256]), read_length, i2c_timeout);
- if (s != I2C_STATUS_SUCCESS) { return false; }
+ i2c_status_t s = i2c_read_register((eeprom_address + i) << 1, reg, &(data[i * 256]), read_length, i2c_timeout);
+ if (s != I2C_STATUS_SUCCESS) {
+ return false;
+ }
}
return true;
}
static bool verify_header(myriad_header_t *header) {
- char magic_numbers[] = {'M', 'Y', 'R'};
- uint8_t version_major = 1;
- uint16_t version_minor = 0;
+ char magic_numbers[] = {'M', 'Y', 'R'};
+ uint8_t version_major = 1;
+ uint16_t version_minor = 0;
for (int i = 0; i < sizeof(magic_numbers); i++) {
// Check that the header starts with 'MYR', indicating that this is indeed a Myriad card.
@@ -82,16 +84,15 @@ static bool verify_checksum(uint8_t *data, uint16_t length, uint32_t checksum) {
const uint32_t MOD_ADLER = 65521;
uint32_t a = 1, b = 0;
- size_t index;
-
+ size_t index;
+
// Process each byte of the data in order
- for (index = 0; index < length; ++index)
- {
+ for (index = 0; index < length; ++index) {
a = (a + data[index]) % MOD_ADLER;
b = (b + a) % MOD_ADLER;
}
uint32_t calculated = ((b << 16) | a);
-
+
return calculated == checksum;
}
@@ -108,9 +109,9 @@ static int16_t locate_entry(uint8_t entry_type, uint8_t entry_data_length, uint8
while (offset < maximum) {
if (data[offset] == entry_type) {
// Type matches!
- if (data[offset+1] == entry_data_length) {
+ if (data[offset + 1] == entry_data_length) {
// We found what we are looking for, so return payload reference.
- return offset+2;
+ return offset + 2;
} else {
// The entry is the wrong length?
return -2;
@@ -118,7 +119,7 @@ static int16_t locate_entry(uint8_t entry_type, uint8_t entry_data_length, uint8
} else {
// No type match, so skip this one
// We skip the type byte, the length byte, and any potential data (with length stored in the length byte)
- offset += 2 + data[offset+1];
+ offset += 2 + data[offset + 1];
}
}
@@ -127,13 +128,15 @@ static int16_t locate_entry(uint8_t entry_type, uint8_t entry_data_length, uint8
}
static bool read_card_identity(uint8_t *data, uint16_t length, identity_record_t *record) {
- const uint8_t identity_type = 0x01;
+ const uint8_t identity_type = 0x01;
const uint8_t entry_data_length = sizeof(identity_record_t);
- int16_t result = locate_entry(identity_type, entry_data_length, data, 0, length);
- if (result < 0) { return false; }
+ int16_t result = locate_entry(identity_type, entry_data_length, data, 0, length);
+ if (result < 0) {
+ return false;
+ }
for (int i = 0; i < sizeof(identity_record_t); i++) {
- ((uint8_t*)record)[i] = data[result + i];
+ ((uint8_t *)record)[i] = data[result + i];
}
return true;
}
@@ -141,27 +144,37 @@ static bool read_card_identity(uint8_t *data, uint16_t length, identity_record_t
static myriad_card_t _detect_myriad(void) {
gpio_set_pin_input(MYRIAD_PRESENT);
wait_ms(100);
- // The pin has an external pull-up, and a Myriad card shorts it to ground.
- #ifndef MYRIAD_OVERRIDE_PRESENCE
+// The pin has an external pull-up, and a Myriad card shorts it to ground.
+#ifndef MYRIAD_OVERRIDE_PRESENCE
if (gpio_read_pin(MYRIAD_PRESENT)) {
return NONE;
}
- #endif
+#endif
// Attempt to read header
myriad_header_t header;
- if (!myriad_reader((uint8_t*)&header, sizeof(header))) { return INVALID; }
- if (!verify_header(&header)) { return INVALID; }
+ if (!myriad_reader((uint8_t *)&header, sizeof(header))) {
+ return INVALID;
+ }
+ if (!verify_header(&header)) {
+ return INVALID;
+ }
// Now that we have determined that the header is valid
// and we know the payload length, read the entire thing
- uint8_t data[2048]; // Guaranteed to be large enough.
- uint16_t data_size = sizeof(header)+header.payload_length;
- if (!myriad_reader(data, data_size)) { return INVALID; }
- if (!verify_checksum(data, data_size, header.checksum)) { return INVALID; }
+ uint8_t data[2048]; // Guaranteed to be large enough.
+ uint16_t data_size = sizeof(header) + header.payload_length;
+ if (!myriad_reader(data, data_size)) {
+ return INVALID;
+ }
+ if (!verify_checksum(data, data_size, header.checksum)) {
+ return INVALID;
+ }
identity_record_t identity;
- if (!read_card_identity(data, data_size, &identity)) { return INVALID; }
+ if (!read_card_identity(data, data_size, &identity)) {
+ return INVALID;
+ }
if (identity.vendor_id == 0x0001 && identity.product_id == 0x0001) {
return SKB_ENCODER;
@@ -201,7 +214,7 @@ static void myr_encoder_init(void) {
}
static uint16_t myr_joystick_timer;
-static void myr_joystick_init(void) {
+static void myr_joystick_init(void) {
gpio_set_pin_input_high(MYRIAD_GPIO1); // Press
myr_joystick_timer = timer_read();
@@ -235,7 +248,7 @@ static myriad_card_t myriad_card_init(void) {
bool myriad_hook_matrix(matrix_row_t current_matrix[]) {
myriad_card_t card = myriad_card_init();
- uint8_t word = 0;
+ uint8_t word = 0;
if (card == SKB_SWITCHES) {
word |= ((!gpio_read_pin(MYRIAD_GPIO3)) & 1) << 0;
@@ -252,7 +265,7 @@ bool myriad_hook_matrix(matrix_row_t current_matrix[]) {
// 5 bytes of on-board keys, so we are the 6th
bool matrix_has_changed = current_matrix[5] ^ word;
- current_matrix[5] = word;
+ current_matrix[5] = word;
return matrix_has_changed;
}
@@ -261,16 +274,20 @@ static pin_t encoders_pad_a[NUM_ENCODERS_MAX_PER_SIDE];
static pin_t encoders_pad_b[NUM_ENCODERS_MAX_PER_SIDE];
uint8_t myriad_hook_encoder(uint8_t index, bool pad_b) {
- if (myriad_card_init() != SKB_ENCODER) { return 0; }
+ if (myriad_card_init() != SKB_ENCODER) {
+ return 0;
+ }
// 3 onboard encoders, so we are number 4
- pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
+ pin_t pin = pad_b ? encoders_pad_b[index] : encoders_pad_a[index];
encoders_pad_a[3] = MYRIAD_GPIO2;
encoders_pad_b[3] = MYRIAD_GPIO3;
return gpio_read_pin(pin) ? 1 : 0;
}
report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
- if (myriad_card_init() != SKB_JOYSTICK) { return mouse_report; }
+ if (myriad_card_init() != SKB_JOYSTICK) {
+ return mouse_report;
+ }
if (timer_elapsed(myr_joystick_timer) < 10) {
wait_ms(2);
@@ -286,10 +303,10 @@ report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
// Create a dead zone in the middle where the mouse doesn't move
const int16_t dead_zone = 10;
- if ((y < 0 && y > -1*dead_zone) || (y > 0 && y < dead_zone)) {
+ if ((y < 0 && y > -1 * dead_zone) || (y > 0 && y < dead_zone)) {
y = 0;
}
- if ((x < 0 && x > -1*dead_zone) || (x > 0 && x < dead_zone)) {
+ if ((x < 0 && x > -1 * dead_zone) || (x > 0 && x < dead_zone)) {
x = 0;
}
@@ -298,10 +315,18 @@ report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
y = abs(y) * y / 5000;
// Clamp final value to make sure we don't under/overflow
- if (y < -127) { y = -127; }
- if (y > 127) { y = 127; }
- if (x < -127) { x = -127; }
- if (x > 127) { x = 127; }
+ if (y < -127) {
+ y = -127;
+ }
+ if (y > 127) {
+ y = 127;
+ }
+ if (x < -127) {
+ x = -127;
+ }
+ if (x > 127) {
+ x = 127;
+ }
mouse_report.x = x;
mouse_report.y = y;
@@ -309,7 +334,8 @@ report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
return mouse_report;
}
-void pointing_device_driver_init(void) {
+bool pointing_device_driver_init(void) {
gpio_set_pin_input(MYRIAD_ADC1); // Y
gpio_set_pin_input(MYRIAD_ADC2); // X
+ return true;
} \ No newline at end of file
diff --git a/keyboards/splitkb/halcyon/ferris/keymaps/default/keymap.json b/keyboards/splitkb/halcyon/ferris/keymaps/default/keymap.json
index 95748c743f..df28d96b42 100644
--- a/keyboards/splitkb/halcyon/ferris/keymaps/default/keymap.json
+++ b/keyboards/splitkb/halcyon/ferris/keymaps/default/keymap.json
@@ -11,9 +11,9 @@
"KC_P0" , "KC_BSPC" , "LT(7,KC_SPC)" , "KC_P1"
],
[
- "RM_TOGG" , "RM_NEXT" , "RM_HUEU" , "RM_SATU" , "RM_VALU" , "RM_SPDU" , "KC_BTN1" , "KC_WH_U" , "KC_BTN2" , "KC_TRNS",
- "KC_TRNS" , "KC_BTN2" , "KC_NO" , "KC_BTN1" , "KC_TRNS" , "KC_TRNS" , "KC_MS_L" , "KC_MS_D" , "KC_MS_U" , "KC_MS_R",
- "KC_TRNS" , "RM_PREV" , "RM_HUED" , "RM_SATD" , "RM_VALD" , "RM_SPDD" , "KC_WH_L" , "KC_WH_D" , "KC_WH_R" , "KC_TRNS",
+ "RM_TOGG" , "RM_NEXT" , "RM_HUEU" , "RM_SATU" , "RM_VALU" , "RM_SPDU" , "MS_BTN1" , "MS_WHLU" , "MS_BTN2" , "KC_TRNS",
+ "KC_TRNS" , "MS_BTN2" , "KC_NO" , "MS_BTN1" , "KC_TRNS" , "KC_TRNS" , "MS_LEFT" , "MS_DOWN" , "MS_UP" , "MS_RGHT",
+ "KC_TRNS" , "RM_PREV" , "RM_HUED" , "RM_SATD" , "RM_VALD" , "RM_SPDD" , "MS_WHLL" , "MS_WHLD" , "MS_WHLR" , "KC_TRNS",
"KC_TRNS" , "KC_TRNS" , "KC_TRNS" , "KC_TRNS"
],
[
diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json
index 9cbed0feb9..770fbbb0e9 100644
--- a/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json
+++ b/keyboards/stenokeyboards/the_uni/pro_micro/keyboard.json
@@ -1,7 +1,11 @@
{
"usb": {
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json b/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json
index e1753f2b84..6ec92ce422 100644
--- a/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json
+++ b/keyboards/stenokeyboards/the_uni/rp_2040/keyboard.json
@@ -1,7 +1,11 @@
{
"usb": {
- "device_version": "0.0.4",
- "force_nkro": true
+ "device_version": "0.0.4"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json
index 81639fe32b..2cf1e4e324 100644
--- a/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json
+++ b/keyboards/stenokeyboards/the_uni/usb_c/keyboard.json
@@ -1,7 +1,11 @@
{
"usb": {
- "device_version": "0.0.3",
- "force_nkro": true
+ "device_version": "0.0.3"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/synthlabs/060/keyboard.json b/keyboards/synthlabs/060/keyboard.json
index e251201a51..4183232dd1 100644
--- a/keyboards/synthlabs/060/keyboard.json
+++ b/keyboards/synthlabs/060/keyboard.json
@@ -23,8 +23,12 @@
"usb": {
"vid": "0x534E",
"pid": "0x3630",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/synthlabs/065/keyboard.json b/keyboards/synthlabs/065/keyboard.json
index ea862c6f01..1cd9e03a6a 100644
--- a/keyboards/synthlabs/065/keyboard.json
+++ b/keyboards/synthlabs/065/keyboard.json
@@ -152,10 +152,14 @@
"url": "http://065.synthlabs.io",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x3635",
"vid": "0x534E"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"ws2812": {
"driver": "vendor",
"pin": "GP18"
diff --git a/keyboards/synthlabs/solo/keyboard.json b/keyboards/synthlabs/solo/keyboard.json
index 6640202474..09c83cec76 100644
--- a/keyboards/synthlabs/solo/keyboard.json
+++ b/keyboards/synthlabs/solo/keyboard.json
@@ -22,8 +22,12 @@
"usb": {
"vid": "0x534E",
"pid": "0x3031",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"encoder": {
"rotary": [
diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c
index c01fb7b01d..2cff70076e 100644
--- a/keyboards/system76/launch_1/launch_1.c
+++ b/keyboards/system76/launch_1/launch_1.c
@@ -124,7 +124,7 @@ void system76_ec_rgb_layer(layer_state_t layer_state);
void system76_ec_unlock(void);
bool system76_ec_is_unlocked(void);
-rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT];
+extern rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT];
void matrix_init_kb(void) {
usb_mux_init();
diff --git a/keyboards/system76/launch_1/rgb_matrix_kb.inc b/keyboards/system76/launch_1/rgb_matrix_kb.inc
index abde7aae19..6ac7970ccd 100644
--- a/keyboards/system76/launch_1/rgb_matrix_kb.inc
+++ b/keyboards/system76/launch_1/rgb_matrix_kb.inc
@@ -69,7 +69,7 @@ static bool active_keys(effect_params_t* params) {
return led_max < RGB_MATRIX_LED_COUNT;
}
-rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
+extern rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT];
static uint8_t normalize_component(uint8_t component) {
uint16_t x = (uint16_t)component;
diff --git a/keyboards/system76/system76_ec.c b/keyboards/system76/system76_ec.c
index cce60a5dea..db0401a7d4 100644
--- a/keyboards/system76/system76_ec.c
+++ b/keyboards/system76/system76_ec.c
@@ -135,7 +135,7 @@ static enum rgb_matrix_effects mode_map[] = {
_Static_assert(sizeof(mode_map) == MODE_LAST, "mode_map_length");
-rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT];
+rgb_t raw_rgb_data[RGB_MATRIX_LED_COUNT] = {0};
// clang-format off
rgb_config_t layer_rgb[DYNAMIC_KEYMAP_LAYER_COUNT] = {
diff --git a/keyboards/tacworks/tac_k1/keyboard.json b/keyboards/tacworks/tac_k1/keyboard.json
index f1875ec180..63cde4777f 100644
--- a/keyboards/tacworks/tac_k1/keyboard.json
+++ b/keyboards/tacworks/tac_k1/keyboard.json
@@ -29,11 +29,15 @@
"url": "https://tacworks.store",
"usb": {
"device_version": "1.0.0",
- "force_nkro": true,
"pid": "0xE431",
"suspend_wakeup_delay": 1000,
"vid": "0x342D"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"community_layouts": [
"65_ansi_blocker",
"65_ansi_blocker_split_bs",
diff --git a/keyboards/tada68/keymaps/default/keymap.c b/keyboards/tada68/keymaps/default/keymap.c
index fcc37aff6c..f4fa3a95d3 100755
--- a/keyboards/tada68/keymaps/default/keymap.c
+++ b/keyboards/tada68/keymaps/default/keymap.c
@@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS,
_______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME,
_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, KC_BTN1, KC_MS_U, KC_BTN2,
- _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ _______, _______, _______, BL_DOWN, BL_TOGG, BL_UP, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, MS_BTN1, MS_UP, MS_BTN2,
+ _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
};
diff --git a/keyboards/tada68/keymaps/rgb/keymap.c b/keyboards/tada68/keymaps/rgb/keymap.c
index 0f2186b0b3..7f57c9ddfb 100755
--- a/keyboards/tada68/keymaps/rgb/keymap.c
+++ b/keyboards/tada68/keymaps/rgb/keymap.c
@@ -45,6 +45,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, KC_F1 ,KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_INS ,
_______,_______,KC_UP,_______,_______, UG_TOGG,UG_NEXT,UG_HUEU,UG_HUED,UG_SATU,UG_SATD,UG_VALU,UG_VALD, _______,KC_HOME,
_______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______, _______,KC_END,
- _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,KC_BTN1, KC_MS_U, KC_BTN2,
- _______,_______,_______, _______, _______,_______,_______,KC_MS_L,KC_MS_D, KC_MS_R),
+ _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP, _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,MS_BTN1, MS_UP, MS_BTN2,
+ _______,_______,_______, _______, _______,_______,_______,MS_LEFT,MS_DOWN, MS_RGHT),
};
diff --git a/keyboards/takashicompany/baumkuchen/baumkuchen.c b/keyboards/takashicompany/baumkuchen/baumkuchen.c
index 7d4f26b73e..e7cc85f091 100644
--- a/keyboards/takashicompany/baumkuchen/baumkuchen.c
+++ b/keyboards/takashicompany/baumkuchen/baumkuchen.c
@@ -10,9 +10,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
if (clockwise) {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
}
return true;
diff --git a/keyboards/takashicompany/center_enter/keymaps/default/keymap.c b/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
index 82fafc41c7..a6d9ab43a6 100644
--- a/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/center_enter/keymaps/default/keymap.c
@@ -88,9 +88,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
return true;
diff --git a/keyboards/takashicompany/compacx/compacx.c b/keyboards/takashicompany/compacx/compacx.c
index 5a63210c5b..5f4a262273 100644
--- a/keyboards/takashicompany/compacx/compacx.c
+++ b/keyboards/takashicompany/compacx/compacx.c
@@ -19,9 +19,9 @@
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) { return false; }
if (!clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
return true;
diff --git a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
index c109ee4093..9c966137e7 100644
--- a/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/dogtag/keymaps/default/keymap.c
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) },
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(MS_WHLU, MS_WHLD) },
[1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
};
#endif
diff --git a/keyboards/takashicompany/goat51/keymaps/default/keymap.c b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
index 39267f596c..71d623c91f 100644
--- a/keyboards/takashicompany/goat51/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/goat51/keymaps/default/keymap.c
@@ -114,9 +114,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
return true;
diff --git a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c
index fa642bc6e2..62650eb777 100644
--- a/keyboards/takashicompany/jourkey/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/jourkey/keymaps/default/keymap.c
@@ -13,6 +13,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/takashicompany/qoolee/keymaps/default/keymap.c b/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
index 04595e49c1..7c6f68ee5e 100644
--- a/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/qoolee/keymaps/default/keymap.c
@@ -69,9 +69,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
}
return true;
diff --git a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
index 83572b124b..5858e9d8b1 100644
--- a/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
+++ b/keyboards/takashicompany/spreadwriter/keymaps/default/keymap.c
@@ -81,9 +81,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
return false;
}
diff --git a/keyboards/teleport/native/info.json b/keyboards/teleport/native/info.json
index 08432fbf14..b1cb06c942 100644
--- a/keyboards/teleport/native/info.json
+++ b/keyboards/teleport/native/info.json
@@ -7,8 +7,12 @@
"processor": "STM32F411",
"usb": {
"vid": "0x7470",
- "device_version": "1.0.0",
- "force_nkro": true
+ "device_version": "1.0.0"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/thumbsup/keymaps/default/keymap.c b/keyboards/thumbsup/keymaps/default/keymap.c
index 04a16a5081..e9fb913248 100644
--- a/keyboards/thumbsup/keymaps/default/keymap.c
+++ b/keyboards/thumbsup/keymaps/default/keymap.c
@@ -98,9 +98,9 @@ without separate thumbcluster.
* `-------------------------------------------------------'
*/
[_CURSORRGHT] = LAYOUT(
- _______, KC_BRK, KC_WH_D, KC_MS_U, KC_WH_U, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL,
- KC_ENT, LCTL(KC_A), KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______,
- _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, KC_BTN1, KC_BTN3, KC_BTN2, XXXXXXX, _______,
+ _______, KC_BRK, MS_WHLD, MS_UP, MS_WHLU, KC_DEL, KC_PGUP, KC_HOME, KC_UP, KC_END, KC_GRV, KC_DEL,
+ KC_ENT, LCTL(KC_A), MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, _______,
+ _______, LCTL(KC_Z), LSFT(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, KC_INS, MS_BTN1, MS_BTN3, MS_BTN2, XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
@@ -118,9 +118,9 @@ without separate thumbcluster.
* `-------------------------------------------------------'
*/
[_CURSORLEFT] = LAYOUT(
- _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, KC_WH_U, KC_MS_U, KC_WH_D, KC_GRV, KC_DEL,
- KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, _______,
- _______, XXXXXXX, KC_BTN2, KC_BTN3, KC_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______,
+ _______, KC_BRK, KC_HOME, KC_UP, KC_END, KC_PGUP, KC_DEL, MS_WHLU, MS_UP, MS_WHLD, KC_GRV, KC_DEL,
+ KC_ENT, LCTL(KC_A), KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, MS_LEFT, MS_DOWN, MS_RGHT, XXXXXXX, _______,
+ _______, XXXXXXX, MS_BTN2, MS_BTN3, MS_BTN1, KC_INS, XXXXXXX, LCTL(KC_DEL), LCTL(KC_INS), LSFT(KC_INS), XXXXXXX, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
),
diff --git a/keyboards/toffee_studio/blueberry/keymaps/default/keymap.c b/keyboards/toffee_studio/blueberry/keymaps/default/keymap.c
index ee26853885..11bc271ea1 100644
--- a/keyboards/toffee_studio/blueberry/keymaps/default/keymap.c
+++ b/keyboards/toffee_studio/blueberry/keymaps/default/keymap.c
@@ -28,9 +28,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_BSPC, KC_DEL,
- _______, KC_BTN1, KC_MS_U, KC_BTN2, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, UG_SPDU,
- KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, UG_SPDD,
- KC_WH_D, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, UG_VALU, UG_TOGG,
+ _______, MS_BTN1, MS_UP, MS_BTN2, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, UG_SPDU,
+ MS_WHLU, MS_LEFT, MS_DOWN, MS_RGHT, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER, UG_SPDD,
+ MS_WHLD, KC_BSLS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT, UG_VALU, UG_TOGG,
_______, _______, _______, KC_SPC, MO(2), _______, UG_PREV, UG_VALD, UG_NEXT
),
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
index 291f98a60e..756eb06506 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/keymap.c
@@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
[_BASE] = {ENCODER_CCW_CW(KC_MNXT, KC_MPRV) },
- [_NUM_SYM] = { ENCODER_CCW_CW(KC_WH_D, KC_WH_U) },
+ [_NUM_SYM] = { ENCODER_CCW_CW(MS_WHLD, MS_WHLU) },
[_NAV] = { ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }
};
#endif
diff --git a/keyboards/trnthsn/e8ghtyneo/e8ghtyneo.c b/keyboards/trnthsn/e8ghtyneo/e8ghtyneo.c
new file mode 100644
index 0000000000..b1af2c63a8
--- /dev/null
+++ b/keyboards/trnthsn/e8ghtyneo/e8ghtyneo.c
@@ -0,0 +1,24 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "quantum.h"
+
+#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0,4, HSV_GREEN}
+);
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_capslock_layer
+);
+
+void keyboard_post_init_kb(void) {
+ rgblight_layers = my_rgb_layers;
+ keyboard_post_init_user();
+}
+bool led_update_kb(led_t led_state) {
+ bool res = led_update_user(led_state);
+ if (res) {
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ }
+ return res;
+}
+#endif
diff --git a/keyboards/trnthsn/e8ghtyneo/info.json b/keyboards/trnthsn/e8ghtyneo/info.json
index e81c5fbb22..6bd6d5ca66 100644
--- a/keyboards/trnthsn/e8ghtyneo/info.json
+++ b/keyboards/trnthsn/e8ghtyneo/info.json
@@ -10,8 +10,8 @@
"nkro": true
},
"matrix_pins": {
- "cols": ["A9", "A8", "B14", "B12", "B11", "B10", "B0", "A7", "A6", "A4", "A3", "A2", "A1", "A0", "C13", "B9", "B7"],
- "rows": ["B8", "A10", "B1", "A5", "C15", "C14"]
+ "cols": ["A9", "A8", "B14", "B12", "B11", "B10", "B0", "A7", "A6", "A5", "A3", "A2", "A1", "A0", "C13", "B9", "B7"],
+ "rows": ["B8", "A10", "B1", "A4", "C15", "C14"]
},
"rgblight": {
"animations": {
@@ -28,6 +28,9 @@
"default": {
"animation": "rainbow_mood"
},
+ "layers": {
+ "enabled": true,
+ },
"led_count": 4,
"sleep": true
},
diff --git a/keyboards/trnthsn/s6xtyfs/info.json b/keyboards/trnthsn/s6xtyfs/info.json
index 132c1a4e97..2599ff2504 100644
--- a/keyboards/trnthsn/s6xtyfs/info.json
+++ b/keyboards/trnthsn/s6xtyfs/info.json
@@ -39,7 +39,6 @@
"led_count": 28,
"sleep": true
},
- "url": "",
"usb": {
"device_version": "1.0.0",
"pid": "0x3666",
diff --git a/keyboards/tunks/ergo33/keymaps/default/keymap.c b/keyboards/tunks/ergo33/keymaps/default/keymap.c
index 8f646f08ca..58e7b8ec27 100644
--- a/keyboards/tunks/ergo33/keymaps/default/keymap.c
+++ b/keyboards/tunks/ergo33/keymaps/default/keymap.c
@@ -49,9 +49,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
}
return true;
diff --git a/keyboards/tweetydabird/lotus58/info.json b/keyboards/tweetydabird/lotus58/info.json
index 7becd3ae26..3c47e3fdc2 100644
--- a/keyboards/tweetydabird/lotus58/info.json
+++ b/keyboards/tweetydabird/lotus58/info.json
@@ -45,10 +45,14 @@
"url": "https://lectronz.com/stores/tweetys-wild-thinking",
"usb": {
"device_version": "1.2.3",
- "force_nkro": true,
"pid": "0x23B0",
"vid": "0xFEED"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/tzarc/djinn/config.h b/keyboards/tzarc/djinn/config.h
index 24357b6a35..717ce4ee50 100644
--- a/keyboards/tzarc/djinn/config.h
+++ b/keyboards/tzarc/djinn/config.h
@@ -50,3 +50,5 @@
#ifndef STARTUP_SONG
# define STARTUP_SONG SONG(STARTUP_SOUND)
#endif // STARTUP_SONG
+
+#define RGB_MATRIX_MODE_NAME_ENABLE
diff --git a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
index 739a0817b0..03535587c4 100644
--- a/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
+++ b/keyboards/tzarc/djinn/graphics/theme_djinn_default.c
@@ -31,55 +31,6 @@ static painter_image_handle_t lock_scrl_off;
static painter_font_handle_t thintel;
//----------------------------------------------------------
-// RGB Matrix naming
-#if defined(RGB_MATRIX_ENABLE)
-# include <rgb_matrix.h>
-
-# if defined(RGB_MATRIX_EFFECT)
-# undef RGB_MATRIX_EFFECT
-# endif // defined(RGB_MATRIX_EFFECT)
-
-# define RGB_MATRIX_EFFECT(x) RGB_MATRIX_EFFECT_##x,
-enum {
- RGB_MATRIX_EFFECT_NONE,
-# include "rgb_matrix_effects.inc"
-# ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-# endif
-# ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-# endif
-# if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
-# include "rgb_matrix_community_modules.inc"
-# endif
-# undef RGB_MATRIX_EFFECT
-};
-
-# define RGB_MATRIX_EFFECT(x) \
- case RGB_MATRIX_EFFECT_##x: \
- return #x;
-const char *rgb_matrix_name(uint8_t effect) {
- switch (effect) {
- case RGB_MATRIX_EFFECT_NONE:
- return "NONE";
-# include "rgb_matrix_effects.inc"
-# ifdef RGB_MATRIX_CUSTOM_KB
-# include "rgb_matrix_kb.inc"
-# endif
-# ifdef RGB_MATRIX_CUSTOM_USER
-# include "rgb_matrix_user.inc"
-# endif
-# if defined(COMMUNITY_MODULES_ENABLE) && __has_include("rgb_matrix_community_modules.inc")
-# include "rgb_matrix_community_modules.inc"
-# endif
-# undef RGB_MATRIX_EFFECT
- default:
- return "UNKNOWN";
- }
-}
-#endif // defined(RGB_MATRIX_ENABLE)
-
-//----------------------------------------------------------
// UI Initialisation
void keyboard_post_init_display(void) {
djinn_logo = qp_load_image_mem(gfx_djinn);
@@ -163,7 +114,7 @@ void draw_ui_user(bool force_redraw) {
if (hue_redraw || rgb_effect_redraw) {
static int max_rgb_xpos = 0;
xpos = 16;
- snprintf(buf, sizeof(buf), "rgb: %s", rgb_matrix_name(curr_effect));
+ snprintf(buf, sizeof(buf), "rgb: %s", rgb_matrix_get_mode_name(curr_effect));
for (int i = 5; i < sizeof(buf); ++i) {
if (buf[i] == 0)
diff --git a/keyboards/tzarc/djinn/keymaps/default/keymap.c b/keyboards/tzarc/djinn/keymaps/default/keymap.c
index b63e1624c7..2c6fb9e1db 100644
--- a/keyboards/tzarc/djinn/keymaps/default/keymap.c
+++ b/keyboards/tzarc/djinn/keymaps/default/keymap.c
@@ -63,10 +63,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// clang-format off
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_QWERTY] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LOWER] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU), ENCODER_CCW_CW(RM_SATD, RM_SATU) },
- [_RAISE] = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_SPDD, RM_SPDU) },
- [_ADJUST] = { ENCODER_CCW_CW(RM_PREV, RM_NEXT), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
+ [_QWERTY] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_LOWER] = { ENCODER_CCW_CW(RM_HUED, RM_HUEU), ENCODER_CCW_CW(RM_SATD, RM_SATU) },
+ [_RAISE] = { ENCODER_CCW_CW(RM_VALD, RM_VALU), ENCODER_CCW_CW(RM_SPDD, RM_SPDU) },
+ [_ADJUST] = { ENCODER_CCW_CW(RM_PREV, RM_NEXT), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) },
};
// clang-format on
diff --git a/keyboards/tzarc/djinn/rules.mk b/keyboards/tzarc/djinn/rules.mk
index d5060d9814..91dc4fe478 100644
--- a/keyboards/tzarc/djinn/rules.mk
+++ b/keyboards/tzarc/djinn/rules.mk
@@ -8,5 +8,3 @@ SRC += \
djinn_portscan_matrix.c \
djinn_split_sync.c \
djinn_usbpd.c
-
-DEFAULT_FOLDER = tzarc/djinn/rev2
diff --git a/keyboards/tzarc/ghoul/rules.mk b/keyboards/tzarc/ghoul/rules.mk
index 4bf96d9824..a9abdfe116 100644
--- a/keyboards/tzarc/ghoul/rules.mk
+++ b/keyboards/tzarc/ghoul/rules.mk
@@ -1,6 +1,4 @@
CUSTOM_MATRIX = lite
QUANTUM_PAINTER_DRIVERS = ssd1351_spi
-DEFAULT_FOLDER = tzarc/ghoul/rev1/stm32
-
ANALOG_DRIVER_REQUIRED = yes
diff --git a/keyboards/varanidae/keymaps/ansi/keymap.c b/keyboards/varanidae/keymaps/ansi/keymap.c
index c020bd6718..94ebf62048 100644
--- a/keyboards/varanidae/keymaps/ansi/keymap.c
+++ b/keyboards/varanidae/keymaps/ansi/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ansi(
- KC_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
+ MS_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_PSLS, KC_P7, KC_P8, KC_P9, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_PAST, KC_P4, KC_P5, KC_P6, KC_END, KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/varanidae/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/varanidae/keymaps/ansi_split_bs_rshift/keymap.c
index becb812071..fdc0d4c526 100644
--- a/keyboards/varanidae/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/varanidae/keymaps/ansi_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_ansi_split_bs_rshift(
- KC_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
+ MS_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
KC_PSLS, KC_P7, KC_P8, KC_P9, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS,
KC_PAST, KC_P4, KC_P5, KC_P6, KC_END, KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/varanidae/keymaps/default/keymap.c b/keyboards/varanidae/keymaps/default/keymap.c
index 4c43532108..fff5411754 100644
--- a/keyboards/varanidae/keymaps/default/keymap.c
+++ b/keyboards/varanidae/keymaps/default/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_all(
- KC_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
+ MS_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
KC_PSLS, KC_P7, KC_P8, KC_P9, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
KC_PAST, KC_P4, KC_P5, KC_P6, KC_END, KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/varanidae/keymaps/iso/keymap.c b/keyboards/varanidae/keymaps/iso/keymap.c
index b1f1b0c9a4..0de8eb6c23 100644
--- a/keyboards/varanidae/keymaps/iso/keymap.c
+++ b/keyboards/varanidae/keymaps/iso/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_iso(
- KC_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
+ MS_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
KC_PSLS, KC_P7, KC_P8, KC_P9, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
KC_PAST, KC_P4, KC_P5, KC_P6, KC_END, KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/varanidae/keymaps/iso_split_bs_rshift/keymap.c b/keyboards/varanidae/keymaps/iso_split_bs_rshift/keymap.c
index 7324f62877..5d53eccab9 100644
--- a/keyboards/varanidae/keymaps/iso_split_bs_rshift/keymap.c
+++ b/keyboards/varanidae/keymaps/iso_split_bs_rshift/keymap.c
@@ -19,7 +19,7 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_iso_split_bs_rshift(
- KC_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
+ MS_BTN3, KC_F16, KC_F17, KC_F18, KC_F19, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15,
KC_F20, KC_F21, KC_F22, KC_F23, KC_F24, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_DEL, KC_BSPC,
KC_PSLS, KC_P7, KC_P8, KC_P9, KC_HOME, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,
KC_PAST, KC_P4, KC_P5, KC_P6, KC_END, KC_LALT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,
@@ -30,6 +30,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#ifdef ENCODER_MAP_ENABLE
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [0] = { ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }
+ [0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD) }
};
#endif
diff --git a/keyboards/vertex/angle65/keyboard.json b/keyboards/vertex/angle65/keyboard.json
index 3047d82dfa..6e0a6525ba 100644
--- a/keyboards/vertex/angle65/keyboard.json
+++ b/keyboards/vertex/angle65/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x9954",
"pid": "0x9970",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": false,
diff --git a/keyboards/vertex/arc60/keyboard.json b/keyboards/vertex/arc60/keyboard.json
index 7bca331f44..b370e699ec 100644
--- a/keyboards/vertex/arc60/keyboard.json
+++ b/keyboards/vertex/arc60/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x8354",
"pid": "0x8370",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": false,
diff --git a/keyboards/vertex/arc60h/keyboard.json b/keyboards/vertex/arc60h/keyboard.json
index 684bbb9538..0fc6f642a3 100644
--- a/keyboards/vertex/arc60h/keyboard.json
+++ b/keyboards/vertex/arc60h/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x7374",
"pid": "0x9770",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"indicators": {
"caps_lock": "C13",
diff --git a/keyboards/vertex/cycle8/keyboard.json b/keyboards/vertex/cycle8/keyboard.json
index d00ef3eb49..d1a341df20 100644
--- a/keyboards/vertex/cycle8/keyboard.json
+++ b/keyboards/vertex/cycle8/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x8A94",
"pid": "0x8F70",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/vertex/t75/keyboard.json b/keyboards/vertex/t75/keyboard.json
index 32e85cf8b4..f67326afb8 100644
--- a/keyboards/vertex/t75/keyboard.json
+++ b/keyboards/vertex/t75/keyboard.json
@@ -20,10 +20,14 @@
"processor": "STM32F103",
"usb": {
"device_version": "0.0.1",
- "force_nkro": true,
"pid": "0x3006",
"vid": "0x28E9"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/viktus/at101_bh/keyboard.json b/keyboards/viktus/at101_bh/keyboard.json
index de7498964e..ca37ecedeb 100644
--- a/keyboards/viktus/at101_bh/keyboard.json
+++ b/keyboards/viktus/at101_bh/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/viktus/omnikey_bh/keyboard.json b/keyboards/viktus/omnikey_bh/keyboard.json
index 8128a30b25..6bceb1e0db 100644
--- a/keyboards/viktus/omnikey_bh/keyboard.json
+++ b/keyboards/viktus/omnikey_bh/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/viktus/z150_bh/keyboard.json b/keyboards/viktus/z150_bh/keyboard.json
index 29bba7b8ab..912ee03bab 100644
--- a/keyboards/viktus/z150_bh/keyboard.json
+++ b/keyboards/viktus/z150_bh/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/waterfowl/waterfowl.c b/keyboards/waterfowl/waterfowl.c
index fb30fd0078..9d9b0bf467 100644
--- a/keyboards/waterfowl/waterfowl.c
+++ b/keyboards/waterfowl/waterfowl.c
@@ -23,9 +23,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
if (index == 0) { // Left roller
if (clockwise) {
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
} else {
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
}
} else if (index == 1) { // Left encoder
if (clockwise) {
@@ -35,9 +35,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
} else if (index == 2) { // Right roller
if (clockwise) {
- tap_code16(S(KC_MS_WH_DOWN));
+ tap_code16(S(MS_WHLD));
} else {
- tap_code16(S(KC_MS_WH_UP));
+ tap_code16(S(MS_WHLU));
}
} else if (index == 3) { // Right encoder
if (clockwise) {
diff --git a/keyboards/willoucom/keypad/keyboard.json b/keyboards/willoucom/keypad/keyboard.json
index 1d070ea4e2..9b4717e63f 100644
--- a/keyboards/willoucom/keypad/keyboard.json
+++ b/keyboards/willoucom/keypad/keyboard.json
@@ -22,10 +22,14 @@
},
"usb": {
"device_version": "1.0.0",
- "force_nkro": true,
"pid": "0x4B50",
"vid": "0x574A"
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/winry/winry25tc/keyboard.json b/keyboards/winry/winry25tc/keyboard.json
index c2682daa9a..ebe3d0cc77 100644
--- a/keyboards/winry/winry25tc/keyboard.json
+++ b/keyboards/winry/winry25tc/keyboard.json
@@ -3,8 +3,8 @@
"manufacturer": "SpiderIsland",
"maintainer": "qmk",
"usb": {
- "vid": "0xFEED",
- "pid": "0x0000",
+ "vid": "0xF1F1",
+ "pid": "0x0025",
"device_version": "0.0.1"
},
"ws2812": {
diff --git a/keyboards/wolf/frogpad/keymaps/default/keymap.c b/keyboards/wolf/frogpad/keymaps/default/keymap.c
index adc4cf77e8..236afeab06 100644
--- a/keyboards/wolf/frogpad/keymaps/default/keymap.c
+++ b/keyboards/wolf/frogpad/keymaps/default/keymap.c
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
#if defined(ENCODER_MAP_ENABLE)
const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
- [_LAYER0] = { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
- [_LAYER1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+ [_LAYER0] = { ENCODER_CCW_CW(MS_WHLU, MS_WHLD), ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [_LAYER1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
};
#endif \ No newline at end of file
diff --git a/keyboards/work_louder/micro/micro.c b/keyboards/work_louder/micro/micro.c
index 07ab92f7a7..f88ac8bb45 100644
--- a/keyboards/work_louder/micro/micro.c
+++ b/keyboards/work_louder/micro/micro.c
@@ -39,9 +39,9 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
}
} else if (index == 1) {
if (clockwise) {
- tap_code_delay(KC_WH_U, 10);
+ tap_code_delay(MS_WHLU, 10);
} else {
- tap_code_delay(KC_WH_D, 10);
+ tap_code_delay(MS_WHLD, 10);
}
}
return true;
diff --git a/keyboards/work_louder/rgb_functions.c b/keyboards/work_louder/rgb_functions.c
index b0d89d8511..1ea9afc42a 100644
--- a/keyboards/work_louder/rgb_functions.c
+++ b/keyboards/work_louder/rgb_functions.c
@@ -25,6 +25,7 @@
#define ws2812_set_color ws2812_rgb_set_color
#define ws2812_set_color_all ws2812_rgb_set_color_all
#define ws2812_flush ws2812_rgb_flush
+#define ws2812_leds ws2812_rgb_leds
#include "ws2812_bitbang.c"
diff --git a/keyboards/wuque/tata80/wk/keyboard.json b/keyboards/wuque/tata80/wk/keyboard.json
index 5b5b1fe50e..a5ae56720b 100644
--- a/keyboards/wuque/tata80/wk/keyboard.json
+++ b/keyboards/wuque/tata80/wk/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x2365",
"pid": "0x0168",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/wuque/tata80/wkl/keyboard.json b/keyboards/wuque/tata80/wkl/keyboard.json
index d8633e99f9..3eee37ef19 100644
--- a/keyboards/wuque/tata80/wkl/keyboard.json
+++ b/keyboards/wuque/tata80/wkl/keyboard.json
@@ -6,8 +6,12 @@
"usb": {
"vid": "0x2365",
"pid": "0x0169",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/xdboards/recon/recon.c b/keyboards/xdboards/recon/recon.c
index 708c9d894c..823f3df7bf 100644
--- a/keyboards/xdboards/recon/recon.c
+++ b/keyboards/xdboards/recon/recon.c
@@ -101,13 +101,13 @@ bool encoder_update_kb(uint8_t index, bool clockwise) {
// Page up/Page down
if (clockwise) {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
#else
tap_code(KC_PGUP);
#endif
} else {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
#else
tap_code(KC_PGDN);
#endif
diff --git a/keyboards/xelus/dharma/keyboard.json b/keyboards/xelus/dharma/keyboard.json
index adedaedba4..373db3f84e 100644
--- a/keyboards/xelus/dharma/keyboard.json
+++ b/keyboards/xelus/dharma/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5845",
"pid": "0xDAAA",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/xelus/pachi/rgb/rev1/keyboard.json b/keyboards/xelus/pachi/rgb/rev1/keyboard.json
index a27bcae0fc..59d335d6e7 100644
--- a/keyboards/xelus/pachi/rgb/rev1/keyboard.json
+++ b/keyboards/xelus/pachi/rgb/rev1/keyboard.json
@@ -5,8 +5,12 @@
"usb": {
"vid": "0x5845",
"pid": "0x5052",
- "device_version": "0.0.1",
- "force_nkro": true
+ "device_version": "0.0.1"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"rgb_matrix": {
"animations": {
diff --git a/keyboards/xelus/rs108/keyboard.json b/keyboards/xelus/rs108/keyboard.json
index c524ae09ed..b1964e0577 100644
--- a/keyboards/xelus/rs108/keyboard.json
+++ b/keyboards/xelus/rs108/keyboard.json
@@ -6,11 +6,15 @@
"vid": "0x5845",
"pid": "0x5208",
"device_version": "0.0.2",
- "force_nkro": true,
"shared_endpoint": {
"keyboard": true
}
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"console": true,
diff --git a/keyboards/xelus/rs60/rev1/keyboard.json b/keyboards/xelus/rs60/rev1/keyboard.json
index 4f894056f6..c8a1afa790 100644
--- a/keyboards/xelus/rs60/rev1/keyboard.json
+++ b/keyboards/xelus/rs60/rev1/keyboard.json
@@ -1,7 +1,11 @@
{
"usb": {
- "device_version": "0.1.0",
- "force_nkro": true
+ "device_version": "0.1.0"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/xelus/rs60/rev2_0/keyboard.json b/keyboards/xelus/rs60/rev2_0/keyboard.json
index e5506e0040..1ec1e71d42 100644
--- a/keyboards/xelus/rs60/rev2_0/keyboard.json
+++ b/keyboards/xelus/rs60/rev2_0/keyboard.json
@@ -1,11 +1,15 @@
{
"usb": {
"device_version": "0.2.0",
- "force_nkro": true,
"shared_endpoint": {
"keyboard": true
}
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"console": true,
diff --git a/keyboards/xelus/rs60/rev2_1/keyboard.json b/keyboards/xelus/rs60/rev2_1/keyboard.json
index c116abc30b..86f3c2fa3d 100644
--- a/keyboards/xelus/rs60/rev2_1/keyboard.json
+++ b/keyboards/xelus/rs60/rev2_1/keyboard.json
@@ -1,11 +1,15 @@
{
"usb": {
"device_version": "0.2.1",
- "force_nkro": true,
"shared_endpoint": {
"keyboard": true
}
},
+ "host": {
+ "default": {
+ "nkro": true
+ }
+ },
"features": {
"bootmagic": true,
"console": true,
diff --git a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
index ad54ef0c86..e3a54e714e 100644
--- a/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/ansi_split_bs_rshift_space/keymap.c
@@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_60_ansi_split_bs_rshift_space(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
- KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
+ KC_NO, MS_WHLU, KC_UP, MS_WHLD, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS,
KC_LCTL, KC_LGUI, KC_LALT, KC_LSFT, KC_SPC, KC_ESC, KC_RGUI, MO(1), KC_HOME, KC_PGDN, KC_END
diff --git a/keyboards/xiudi/xd60/keymaps/default/keymap.c b/keyboards/xiudi/xd60/keymaps/default/keymap.c
index af133d9b3a..f6dce2c5c7 100644
--- a/keyboards/xiudi/xd60/keymaps/default/keymap.c
+++ b/keyboards/xiudi/xd60/keymaps/default/keymap.c
@@ -13,7 +13,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// 1: Function Layer
LAYOUT_all(
QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14,
- KC_NO, KC_WH_U, KC_UP, KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
+ KC_NO, MS_WHLU, KC_UP, MS_WHLD, KC_BSPC,KC_HOME,KC_CALC,KC_NO, KC_INS, KC_NO, KC_PSCR, KC_SCRL, KC_PAUS, KC_DEL,
KC_NO, KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO, KC_NO, KC_NO, KC_HOME, KC_PGUP, KC_NO, KC_ENT,
KC_LSFT, KC_NO, KC_NO, KC_APP, BL_STEP,KC_NO, KC_NO, KC_VOLD,KC_VOLU,KC_MUTE, KC_END, KC_PGDN, KC_RSFT, KC_PGUP, KC_INS,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RGUI, MO(1), KC_HOME, KC_PGDN, KC_END),
diff --git a/keyboards/yandrstudio/zhou65/keyboard.json b/keyboards/yandrstudio/zhou65/keyboard.json
index 6e65bacea2..0766bd3eca 100644
--- a/keyboards/yandrstudio/zhou65/keyboard.json
+++ b/keyboards/yandrstudio/zhou65/keyboard.json
@@ -2,8 +2,12 @@
"keyboard_name": "zhou65",
"usb": {
"pid": "0xAAAD",
- "device_version": "1.0.0",
- "force_nkro": true
+ "device_version": "1.0.0"
+ },
+ "host": {
+ "default": {
+ "nkro": true
+ }
},
"features": {
"bootmagic": true,
diff --git a/keyboards/yanghu/unicorne/keymaps/default/keymap.c b/keyboards/yanghu/unicorne/keymaps/default/keymap.c
index 48e3b9a343..590f4a16ba 100644
--- a/keyboards/yanghu/unicorne/keymaps/default/keymap.c
+++ b/keyboards/yanghu/unicorne/keymaps/default/keymap.c
@@ -59,13 +59,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (index == 0) {
if (clockwise) {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_DOWN);
+ tap_code(MS_WHLD);
#else
tap_code(KC_PGDN);
#endif
} else {
#ifdef MOUSEKEY_ENABLE
- tap_code(KC_MS_WH_UP);
+ tap_code(MS_WHLU);
#else
tap_code(KC_PGUP);
#endif
diff --git a/keyboards/ydkb/grape/keymaps/default/keymap.c b/keyboards/ydkb/grape/keymaps/default/keymap.c
index 62a9e55433..d468c44028 100644
--- a/keyboards/ydkb/grape/keymaps/default/keymap.c
+++ b/keyboards/ydkb/grape/keymaps/default/keymap.c
@@ -24,6 +24,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P0, KC_P0, KC_PDOT, KC_PENT,
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_F13, KC_F14, KC_F15,
KC_LSFT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, KC_UP, KC_F16, KC_F17, KC_F18,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_BTN1, KC_BTN2
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, MS_BTN1, MS_BTN2
)
};
diff --git a/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c b/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
index 9c437680df..310549c07d 100644
--- a/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
+++ b/keyboards/ymdk/yd60mq/keymaps/iso/keymap.c
@@ -19,8 +19,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
//,: Function Layer
[1] = LAYOUT_60_iso(
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
- XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_HOME, KC_PSCR,
- KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, UG_HUEU, UG_SATU, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, XXXXXXX, KC_MNXT,
+ XXXXXXX, MS_BTN1, MS_UP, MS_BTN2, MS_WHLU, XXXXXXX, XXXXXXX, XXXXXXX, KC_UP, XXXXXXX, KC_PGUP, KC_HOME, KC_PSCR,
+ KC_TRNS, MS_LEFT, MS_DOWN, MS_RGHT, MS_WHLD, UG_HUEU, UG_SATU, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_END, XXXXXXX, KC_MNXT,
KC_TRNS, UG_NEXT, UG_PREV, UG_VALU, UG_VALD, UG_HUED, UG_SATD, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MPRV,
KC_TRNS, KC_TRNS, KC_TRNS, UG_TOGG, UG_SPDU, UG_SPDD, XXXXXXX, KC_TRNS
)
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
index a0c62cc4ce..c0e194aeda 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/keymap.c
@@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_BOOT, EE_CLR, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NUM, KC_QUOT, KC_PEQL, KC_NO,
KC_CAPS, KC_NUM, KC_SCRL, S(KC_9), KC_UP, S(KC_0), S(KC_SPC),
- KC_LEFT, KC_BTN3, KC_RGHT, S(KC_SPC),
+ KC_LEFT, MS_BTN3, KC_RGHT, S(KC_SPC),
KC_TRNS, S(KC_ENT), KC_TRNS, KC_BSPC, KC_DOWN, KC_DEL, KC_TRNS,
- KC_BTN1, KC_ENT, S(KC_SPC),LT(2,KC_SPC),KC_SPC, KC_COMM, KC_TRNS
+ MS_BTN1, KC_ENT, S(KC_SPC),LT(2,KC_SPC),KC_SPC, KC_COMM, KC_TRNS
),
[_FN2] =LAYOUT (
diff --git a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
index b9cf727e24..42e3df9506 100644
--- a/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10/keymaps/default/readme.md
@@ -25,11 +25,11 @@
|----------+----------+----------+----------+-----------+----------+---------------|
| KC_CAPS | KC_NUM | KC_SCRL | S(KC_9) | KC_UP | S(KC_0) | S(KC_SPC) |
`--------------------------------+----------+-----------+----------+---------------|
- | KC_LEFT | KC_BTN3 | KC_RGHT | S(KC_SPC) |
+ | KC_LEFT | MS_BTN3 | KC_RGHT | S(KC_SPC) |
,--------------------------------+----------+-----------+----------+---------------|
| KC_TRNS | S(KC_ENT)| KC_TRNS | KC_BSPC | KC_DOWN | KC_DEL | KC_TRNS |
|----------+----------+----------+----------+-----------+----------+---------------|
- | KC_BTN1 | KC_ENT |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC | KC_COMM | KC_TRNS |
+ | MS_BTN1 | KC_ENT |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC | KC_COMM | KC_TRNS |
'----------------------------------------------------------------------------------`
```
### FN2 layer
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
index 5c5d1110a1..18c34677d0 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c
@@ -31,9 +31,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
QK_BOOT, EE_CLR, KC_NO, KC_NO,
KC_NO, KC_NO, KC_NO, KC_NUM, KC_QUOT, KC_PEQL, KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, KC_DEL,
KC_CAPS, KC_NUM, KC_SCRL, S(KC_9), KC_UP, S(KC_0), S(KC_SPC), KC_Q, KC_W, KC_E, KC_R, KC_T, KC_BSPC,
- KC_LEFT, KC_BTN3, KC_RGHT, S(KC_SPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_QUOT,
+ KC_LEFT, MS_BTN3, KC_RGHT, S(KC_SPC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_QUOT,
KC_TRNS, S(KC_ENT), KC_TRNS, KC_BSPC, KC_DOWN, KC_DEL, KC_TRNS, KC_RBRC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_ENT,
- KC_BTN1, KC_ENT, S(KC_SPC),LT(2,KC_SPC),KC_SPC, KC_COMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
+ MS_BTN1, KC_ENT, S(KC_SPC),LT(2,KC_SPC),KC_SPC, KC_COMM, KC_TRNS, KC_TRNS, KC_TRNS, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT
),
[_FN2] =LAYOUT (
diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
index 48eeee421f..f18c01d8ef 100644
--- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
+++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/readme.md
@@ -25,11 +25,11 @@
`--------------------------------+----------+-----------+----------+---------------| |------------+----------+-----------+-----------+-----------+-----------|
| KC_CAPS | KC_NUM | KC_SCRL | S(KC_9) | KC_UP | S(KC_0) | S(KC_SPC) | | KC_Q | KC_W | KC_E | KC_R | KC_T | KC_BSPC |
`--------------------------------+----------+-----------+----------+---------------| |------------+----------+-----------+-----------+-----------+-----------|
- | KC_LEFT | KC_BTN3 | KC_RGHT | S(KC_SPC) | | KC_A | KC_S | KC_D | KC_F | KC_G | KC_QUOT |
+ | KC_LEFT | MS_BTN3 | KC_RGHT | S(KC_SPC) | | KC_A | KC_S | KC_D | KC_F | KC_G | KC_QUOT |
,--------------------------------+----------+-----------+----------+---------------| ,-------------+------------+----------+-----------+-----------+-----------+-----------|
| KC_TRNS | S(KC_ENT)| KC_TRNS | KC_BSPC | KC_DOWN | KC_DEL | KC_TRNS | | KC_RBRC | KC_Z | KC_X | KC_C | KC_V | KC_B | KC_ENT |
|----------+----------+----------+----------+-----------+----------+---------------| |-------------+------------+----------+-----------+-----------+-----------+-----------|
- | KC_BTN1 | KC_ENT |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC | KC_COMM | KC_TRNS | | KC_TRNS | KC_TRNS | KC_NO | KC_LEFT | KC_DOWN | KC_UP | KC_RGHT |
+ | MS_BTN1 | KC_ENT |S(KC_SPC)|LT(2,KC_SPC)|KC_SPC | KC_COMM | KC_TRNS | | KC_TRNS | KC_TRNS | KC_NO | KC_LEFT | KC_DOWN | KC_UP | KC_RGHT |
'----------------------------------------------------------------------------------` '-------------------------------------------------------------------------------------`
```
### FN2 layer
diff --git a/keyboards/yushakobo/quick17/keymaps/default/keymap.c b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
index 80e1b04ca5..8b3cd6fff1 100644
--- a/keyboards/yushakobo/quick17/keymaps/default/keymap.c
+++ b/keyboards/yushakobo/quick17/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LSFT,KC_X, KC_V, KC_B, LT(2,KC_SPC),LCTL(KC_S)
),
[_EDIT2] = LAYOUT(
- KC_ESC, KC_Q, KC_BTN3,KC_INS, KC_ENT, KC_DEL,
+ KC_ESC, KC_Q, MS_BTN3,KC_INS, KC_ENT, KC_DEL,
KC_LCTL,KC_LBRC,KC_RBRC,KC_PGDN,KC_PGUP,LCTL(KC_Y),
KC_LSFT,TO(3), RM_TOGG,TO(0), _______,KC_NO
),
@@ -92,9 +92,9 @@ bool encoder_update_user(uint8_t index, bool clockwise){
}
} else { // IS_LAYER_ON(_CONTROL)
if (clockwise) {
- tap_code(KC_WH_U);
+ tap_code(MS_WHLU);
} else {
- tap_code(KC_WH_D);
+ tap_code(MS_WHLD);
}
}
}
diff --git a/keyboards/zsa/moonlander/keymaps/default/keymap.c b/keyboards/zsa/moonlander/keymaps/default/keymap.c
index 338e8e4f97..899b2d559b 100644
--- a/keyboards/zsa/moonlander/keymaps/default/keymap.c
+++ b/keyboards/zsa/moonlander/keymaps/default/keymap.c
@@ -53,10 +53,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MDIA] = LAYOUT(
LED_LEVEL,_______,_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT,
- _______, _______, _______, KC_MS_U, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
+ _______, _______, _______, MS_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, MS_LEFT, MS_DOWN, MS_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, KC_MPLY,
_______, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, _______, _______,
- _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
+ _______, _______, _______, MS_BTN1, MS_BTN2, _______, _______, KC_VOLU, KC_VOLD, KC_MUTE, _______, _______,
_______, _______, _______, _______, _______, _______
),
};
diff --git a/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c b/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c
index 11958f3700..1ab20cdc25 100644
--- a/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c
+++ b/layouts/default/ortho_5x13/default_ortho_5x13/keymap.c
@@ -26,16 +26,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
),
[1] = LAYOUT_ortho_5x13(
KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, KC_DEL , KC_EQL ,
- KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
- _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ MS_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ _______, MS_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_UP, _______ ,
+ _______, MS_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
[2] = LAYOUT_ortho_5x13(
KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 ,
_______, _______, _______, _______, QK_RBT, _______, _______, _______, _______, _______, _______, _______, _______ ,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_WH_U, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R
+ _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, MS_WHLU, _______ ,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR
),
};
diff --git a/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c b/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c
index 2fa8f2acce..013b3ba987 100644
--- a/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c
+++ b/layouts/default/ortho_6x13/default_ortho_6x13/keymap.c
@@ -30,17 +30,17 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = LAYOUT_ortho_6x13(
KC_GRV , KC_MUTE, KC_VOLU, KC_VOLD, KC_MPRV, KC_MPLY, KC_MNXT, G(KC_P), KC_SLEP, KC_WAKE, KC_PSCR, _______, _______ ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- KC_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- KC_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, KC_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_U, _______ ,
- _______, KC_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ MS_BTN3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ MS_BTN2, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
+ _______, MS_BTN1, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_UP, _______ ,
+ _______, MS_BTN4, _______, _______, _______, _______, _______, _______, _______, _______, MS_LEFT, MS_DOWN, MS_RGHT
),
[2] = LAYOUT_ortho_6x13(
KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 ,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
_______, _______, _______, _______, QK_RBT, _______, _______, _______, _______, _______, _______, _______, _______ ,
KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ,
- _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, KC_WH_U, _______ ,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_WH_L, KC_WH_D, KC_WH_R
+ _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, MS_WHLU, _______ ,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MS_WHLL, MS_WHLD, MS_WHLR
),
};
diff --git a/lib/python/qmk/cli/ci/validate_aliases.py b/lib/python/qmk/cli/ci/validate_aliases.py
index 7f781d4397..8b062dbe56 100644
--- a/lib/python/qmk/cli/ci/validate_aliases.py
+++ b/lib/python/qmk/cli/ci/validate_aliases.py
@@ -2,7 +2,7 @@
"""
from milc import cli
-from qmk.keyboard import resolve_keyboard, keyboard_folder, keyboard_alias_definitions
+from qmk.keyboard import keyboard_folder, keyboard_alias_definitions
def _safe_keyboard_folder(target):
@@ -17,10 +17,6 @@ def _target_keyboard_exists(target):
if not target:
return False
- # If the target directory existed but there was no rules.mk or rules.mk was incorrectly parsed, then we can't build it.
- if not resolve_keyboard(target):
- return False
-
# If the target directory exists but it itself has an invalid alias or invalid rules.mk, then we can't build it either.
if not _safe_keyboard_folder(target):
return False
diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py
index d613f7b92c..d6d0299291 100755
--- a/lib/python/qmk/cli/generate/config_h.py
+++ b/lib/python/qmk/cli/generate/config_h.py
@@ -72,19 +72,6 @@ def generate_matrix_size(kb_info_json, config_h_lines):
config_h_lines.append(generate_define('MATRIX_ROWS', kb_info_json['matrix_size']['rows']))
-def generate_matrix_masked(kb_info_json, config_h_lines):
- """"Enable matrix mask if required"""
- mask_required = False
-
- if 'matrix_grid' in kb_info_json.get('dip_switch', {}):
- mask_required = True
- if 'matrix_grid' in kb_info_json.get('split', {}).get('handedness', {}):
- mask_required = True
-
- if mask_required:
- config_h_lines.append(generate_define('MATRIX_MASKED'))
-
-
def generate_config_items(kb_info_json, config_h_lines):
"""Iterate through the info_config map to generate basic config values.
"""
@@ -202,8 +189,6 @@ def generate_config_h(cli):
generate_matrix_size(kb_info_json, config_h_lines)
- generate_matrix_masked(kb_info_json, config_h_lines)
-
if 'matrix_pins' in kb_info_json:
config_h_lines.append(matrix_pins(kb_info_json['matrix_pins']))
diff --git a/lib/python/qmk/cli/list/keyboards.py b/lib/python/qmk/cli/list/keyboards.py
index 405b9210e4..8b6c451673 100644
--- a/lib/python/qmk/cli/list/keyboards.py
+++ b/lib/python/qmk/cli/list/keyboards.py
@@ -5,10 +5,9 @@ from milc import cli
import qmk.keyboard
[email protected]('--no-resolve-defaults', arg_only=True, action='store_false', help='Ignore any "DEFAULT_FOLDER" within keyboards rules.mk')
@cli.subcommand("List the keyboards currently defined within QMK")
def list_keyboards(cli):
"""List the keyboards currently defined within QMK
"""
- for keyboard_name in qmk.keyboard.list_keyboards(cli.args.no_resolve_defaults):
+ for keyboard_name in qmk.keyboard.list_keyboards():
print(keyboard_name)
diff --git a/lib/python/qmk/cli/migrate.py b/lib/python/qmk/cli/migrate.py
index 0bab5c1949..d0f195d737 100644
--- a/lib/python/qmk/cli/migrate.py
+++ b/lib/python/qmk/cli/migrate.py
@@ -6,14 +6,14 @@ from dotty_dict import dotty
from milc import cli
-from qmk.keyboard import keyboard_completer, keyboard_folder, resolve_keyboard
+from qmk.keyboard import keyboard_completer, keyboard_folder
from qmk.info import info_json, find_info_json
from qmk.json_encoders import InfoJSONEncoder
from qmk.json_schema import json_load
def _candidate_files(keyboard):
- kb_dir = Path(resolve_keyboard(keyboard))
+ kb_dir = Path(keyboard)
cur_dir = Path('keyboards')
files = []
diff --git a/lib/python/qmk/cli/resolve_alias.py b/lib/python/qmk/cli/resolve_alias.py
index b9ffb46618..dff2242b28 100644
--- a/lib/python/qmk/cli/resolve_alias.py
+++ b/lib/python/qmk/cli/resolve_alias.py
@@ -5,7 +5,7 @@ from milc import cli
@cli.argument('--allow-unknown', arg_only=True, action='store_true', help="Return original if rule is not a valid keyboard.")
@cli.argument('keyboard', arg_only=True, help='The keyboard\'s name')
[email protected]('Resolve DEFAULT_FOLDER and any keyboard_aliases for provided rule')
[email protected]('Resolve any keyboard_aliases for provided rule')
def resolve_alias(cli):
try:
print(keyboard_folder(cli.args.keyboard))
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index d95fd3d799..b4fa481b1b 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -223,12 +223,6 @@ def _validate(keyboard, info_data):
def info_json(keyboard, force_layout=None):
"""Generate the info.json data for a specific keyboard.
"""
- cur_dir = Path('keyboards')
- root_rules_mk = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
-
- if 'DEFAULT_FOLDER' in root_rules_mk:
- keyboard = root_rules_mk['DEFAULT_FOLDER']
-
info_data = {
'keyboard_name': str(keyboard),
'keyboard_folder': str(keyboard),
@@ -260,6 +254,7 @@ def info_json(keyboard, force_layout=None):
# Ensure that we have various calculated values
info_data = _matrix_size(info_data)
info_data = _joystick_axis_count(info_data)
+ info_data = _matrix_masked(info_data)
# Merge in data from <keyboard.c>
info_data = _extract_led_config(info_data, str(keyboard))
@@ -836,6 +831,25 @@ def _joystick_axis_count(info_data):
return info_data
+def _matrix_masked(info_data):
+ """"Add info_data['matrix_pins.masked'] if required"""
+ mask_required = False
+
+ if 'matrix_grid' in info_data.get('dip_switch', {}):
+ mask_required = True
+ if 'matrix_grid' in info_data.get('split', {}).get('handedness', {}):
+ mask_required = True
+
+ if mask_required:
+ if 'masked' not in info_data.get('matrix_pins', {}):
+ if 'matrix_pins' not in info_data:
+ info_data['matrix_pins'] = {}
+
+ info_data['matrix_pins']['masked'] = True
+
+ return info_data
+
+
def _check_matrix(info_data):
"""Check the matrix to ensure that row/column count is consistent.
"""
@@ -1005,11 +1019,6 @@ def find_info_json(keyboard):
keyboard_parent = keyboard_path.parent
info_jsons = [keyboard_path / 'info.json', keyboard_path / 'keyboard.json']
- # Add DEFAULT_FOLDER before parents, if present
- rules = rules_mk(keyboard)
- if 'DEFAULT_FOLDER' in rules:
- info_jsons.append(Path(rules['DEFAULT_FOLDER']) / 'info.json')
-
# Add in parent folders for least specific
for _ in range(5):
if keyboard_parent == base_path:
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py
index fcf5b5b158..254dc62309 100644
--- a/lib/python/qmk/keyboard.py
+++ b/lib/python/qmk/keyboard.py
@@ -99,8 +99,6 @@ def find_keyboard_from_dir():
keymap_index = len(current_path.parts) - current_path.parts.index('keymaps') - 1
current_path = current_path.parents[keymap_index]
- current_path = resolve_keyboard(current_path)
-
if qmk.path.is_keyboard(current_path):
return str(current_path)
@@ -121,7 +119,7 @@ def find_readme(keyboard):
def keyboard_folder(keyboard):
"""Returns the actual keyboard folder.
- This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
+ This checks aliases to resolve the actual path for a keyboard.
"""
aliases = keyboard_alias_definitions()
@@ -131,8 +129,6 @@ def keyboard_folder(keyboard):
if keyboard == last_keyboard:
break
- keyboard = resolve_keyboard(keyboard)
-
if not qmk.path.is_keyboard(keyboard):
raise ValueError(f'Invalid keyboard: {keyboard}')
@@ -158,7 +154,7 @@ def keyboard_aliases(keyboard):
def keyboard_folder_or_all(keyboard):
"""Returns the actual keyboard folder.
- This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard.
+ This checks aliases to resolve the actual path for a keyboard.
If the supplied argument is "all", it returns an AllKeyboards object.
"""
if keyboard == 'all':
@@ -179,32 +175,18 @@ def keyboard_completer(prefix, action, parser, parsed_args):
return list_keyboards()
-def list_keyboards(resolve_defaults=True):
- """Returns a list of all keyboards - optionally processing any DEFAULT_FOLDER.
+def list_keyboards():
+ """Returns a list of all keyboards
"""
# We avoid pathlib here because this is performance critical code.
- paths = []
- for marker in ['rules.mk', 'keyboard.json']:
- kb_wildcard = os.path.join(base_path, "**", marker)
- paths += [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path]
+ kb_wildcard = os.path.join(base_path, "**", 'keyboard.json')
+ paths = [path for path in glob(kb_wildcard, recursive=True) if os.path.sep + 'keymaps' + os.path.sep not in path]
found = map(_find_name, paths)
- if resolve_defaults:
- found = map(resolve_keyboard, found)
return sorted(set(found))
-@lru_cache(maxsize=None)
-def resolve_keyboard(keyboard):
- cur_dir = Path('keyboards')
- rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
- while 'DEFAULT_FOLDER' in rules and keyboard != rules['DEFAULT_FOLDER']:
- keyboard = rules['DEFAULT_FOLDER']
- rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
- return keyboard
-
-
def config_h(keyboard):
"""Parses all the config.h files for a keyboard.
@@ -216,7 +198,7 @@ def config_h(keyboard):
"""
config = {}
cur_dir = Path('keyboards')
- keyboard = Path(resolve_keyboard(keyboard))
+ keyboard = Path(keyboard)
for dir in keyboard.parts:
cur_dir = cur_dir / dir
@@ -235,7 +217,7 @@ def rules_mk(keyboard):
a dictionary representing the content of the entire rules.mk tree for a keyboard
"""
cur_dir = Path('keyboards')
- keyboard = Path(resolve_keyboard(keyboard))
+ keyboard = Path(keyboard)
rules = parse_rules_mk_file(cur_dir / keyboard / 'rules.mk')
for i, dir in enumerate(keyboard.parts):
diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index c47ed18362..1739689adf 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -21,11 +21,9 @@ def is_keyboard(keyboard_name):
if Path(keyboard_name).is_absolute():
return False
- keyboard_path = QMK_FIRMWARE / 'keyboards' / keyboard_name
- rules_mk = keyboard_path / 'rules.mk'
- keyboard_json = keyboard_path / 'keyboard.json'
+ keyboard_json = QMK_FIRMWARE / 'keyboards' / keyboard_name / 'keyboard.json'
- return rules_mk.exists() or keyboard_json.exists()
+ return keyboard_json.exists()
def under_qmk_firmware(path=Path(os.environ['ORIG_CWD'])):
diff --git a/quantum/audio/audio.c b/quantum/audio/audio.c
index 4e223f0c9a..247b737331 100644
--- a/quantum/audio/audio.c
+++ b/quantum/audio/audio.c
@@ -371,8 +371,9 @@ void audio_play_melody(float (*np)[][2], uint16_t n_count, bool n_repeat) {
melody_current_note_duration = audio_duration_to_ms((*notes_pointer)[current_note][1]);
}
-float click[2][2];
-void audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
+void audio_play_click(uint16_t delay, float pitch, uint16_t duration) {
+ static float click[2][2];
+
uint16_t duration_tone = audio_ms_to_duration(duration);
uint16_t duration_delay = audio_ms_to_duration(delay);
diff --git a/quantum/command.c b/quantum/command.c
index 998d9b9aa1..ea2fd68e2b 100644
--- a/quantum/command.c
+++ b/quantum/command.c
@@ -28,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "action_layer.h"
#include "action_util.h"
#include "eeconfig.h"
-#include "sleep_led.h"
#include "led.h"
#include "command.h"
#include "quantum.h"
@@ -39,6 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# include "backlight.h"
#endif
+#ifdef SLEEP_LED_ENABLE
+# include "sleep_led.h"
+#endif
+
#if defined(MOUSEKEY_ENABLE)
# include "mousekey.h"
#endif
diff --git a/quantum/led_matrix/led_matrix.c b/quantum/led_matrix/led_matrix.c
index 7a0e8a5ebb..9c8004cc17 100644
--- a/quantum/led_matrix/led_matrix.c
+++ b/quantum/led_matrix/led_matrix.c
@@ -107,7 +107,11 @@ void eeconfig_update_led_matrix_default(void) {
void eeconfig_debug_led_matrix(void) {
dprintf("led_matrix_eeconfig EEPROM\n");
dprintf("led_matrix_eeconfig.enable = %d\n", led_matrix_eeconfig.enable);
+#ifdef LED_MATRIX_MODE_NAME_ENABLE
+ dprintf("led_matrix_eeconfig.mode = %d (%s)\n", led_matrix_eeconfig.mode, led_matrix_get_mode_name(led_matrix_eeconfig.mode));
+#else
dprintf("led_matrix_eeconfig.mode = %d\n", led_matrix_eeconfig.mode);
+#endif // LED_MATRIX_MODE_NAME_ENABLE
dprintf("led_matrix_eeconfig.val = %d\n", led_matrix_eeconfig.val);
dprintf("led_matrix_eeconfig.speed = %d\n", led_matrix_eeconfig.speed);
dprintf("led_matrix_eeconfig.flags = %d\n", led_matrix_eeconfig.flags);
@@ -525,7 +529,11 @@ void led_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
}
led_task_state = STARTING;
eeconfig_flag_led_matrix(write_to_eeprom);
- dprintf("led matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", led_matrix_eeconfig.mode);
+#ifdef LED_MATRIX_MODE_NAME_ENABLE
+ dprintf("led matrix mode [%s]: %u (%s)\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", (unsigned)led_matrix_eeconfig.mode, led_matrix_get_mode_name(led_matrix_eeconfig.mode));
+#else
+ dprintf("led matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", (unsigned)led_matrix_eeconfig.mode);
+#endif // LED_MATRIX_MODE_NAME_ENABLE
}
void led_matrix_mode_noeeprom(uint8_t mode) {
led_matrix_mode_eeprom_helper(mode, false);
@@ -652,3 +660,48 @@ void led_matrix_set_flags(led_flags_t flags) {
void led_matrix_set_flags_noeeprom(led_flags_t flags) {
led_matrix_set_flags_eeprom_helper(flags, false);
}
+
+// LED Matrix naming
+#undef LED_MATRIX_EFFECT
+#ifdef LED_MATRIX_MODE_NAME_ENABLE
+const char *led_matrix_get_mode_name(uint8_t mode) {
+ switch (mode) {
+ case LED_MATRIX_NONE:
+ return "NONE";
+
+# define LED_MATRIX_EFFECT(name, ...) \
+ case LED_MATRIX_##name: \
+ return #name;
+# include "led_matrix_effects.inc"
+# undef LED_MATRIX_EFFECT
+
+# ifdef COMMUNITY_MODULES_ENABLE
+# define LED_MATRIX_EFFECT(name, ...) \
+ case LED_MATRIX_COMMUNITY_MODULE_##name: \
+ return #name;
+# include "led_matrix_community_modules.inc"
+# undef LED_MATRIX_EFFECT
+# endif // COMMUNITY_MODULES_ENABLE
+
+# if defined(LED_MATRIX_CUSTOM_KB) || defined(LED_MATRIX_CUSTOM_USER)
+# define LED_MATRIX_EFFECT(name, ...) \
+ case LED_MATRIX_CUSTOM_##name: \
+ return #name;
+
+# ifdef LED_MATRIX_CUSTOM_KB
+# include "led_matrix_kb.inc"
+# endif // LED_MATRIX_CUSTOM_KB
+
+# ifdef LED_MATRIX_CUSTOM_USER
+# include "led_matrix_user.inc"
+# endif // LED_MATRIX_CUSTOM_USER
+
+# undef LED_MATRIX_EFFECT
+# endif // LED_MATRIX_CUSTOM_KB || LED_MATRIX_CUSTOM_USER
+
+ default:
+ return "UNKNOWN";
+ }
+}
+# undef LED_MATRIX_EFFECT
+#endif // LED_MATRIX_MODE_NAME_ENABLE
diff --git a/quantum/led_matrix/led_matrix.h b/quantum/led_matrix/led_matrix.h
index 0dfe33ffab..9a49515ab2 100644
--- a/quantum/led_matrix/led_matrix.h
+++ b/quantum/led_matrix/led_matrix.h
@@ -184,6 +184,10 @@ led_flags_t led_matrix_get_flags(void);
void led_matrix_set_flags(led_flags_t flags);
void led_matrix_set_flags_noeeprom(led_flags_t flags);
+#ifdef LED_MATRIX_MODE_NAME_ENABLE
+const char *led_matrix_get_mode_name(uint8_t mode);
+#endif // LED_MATRIX_MODE_NAME_ENABLE
+
static inline bool led_matrix_check_finished_leds(uint8_t led_idx) {
#if defined(LED_MATRIX_SPLIT)
if (is_keyboard_left()) {
diff --git a/quantum/pointing_device/pointing_device.c b/quantum/pointing_device/pointing_device.c
index 564c2d294c..fe88d5a1af 100644
--- a/quantum/pointing_device/pointing_device.c
+++ b/quantum/pointing_device/pointing_device.c
@@ -80,8 +80,10 @@ uint16_t pointing_device_get_shared_cpi(void) {
#endif // defined(SPLIT_POINTING_ENABLE)
-static report_mouse_t local_mouse_report = {};
-static bool pointing_device_force_send = false;
+static report_mouse_t local_mouse_report = {};
+static bool pointing_device_force_send = false;
+static pointing_device_status_t pointing_device_status = POINTING_DEVICE_STATUS_UNKNOWN;
+
#ifdef POINTING_DEVICE_HIRES_SCROLL_ENABLE
static uint16_t hires_scroll_resolution;
#endif
@@ -90,7 +92,9 @@ static uint16_t hires_scroll_resolution;
#define POINTING_DEVICE_DRIVER(name) POINTING_DEVICE_DRIVER_CONCAT(name)
#ifdef POINTING_DEVICE_DRIVER_custom
-__attribute__((weak)) void pointing_device_driver_init(void) {}
+__attribute__((weak)) bool pointing_device_driver_init(void) {
+ return false;
+}
__attribute__((weak)) report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
return mouse_report;
}
@@ -179,7 +183,11 @@ __attribute__((weak)) void pointing_device_init(void) {
if ((POINTING_DEVICE_THIS_SIDE))
#endif
{
- pointing_device_driver->init();
+ if (pointing_device_driver->init()) {
+ pointing_device_status = POINTING_DEVICE_STATUS_SUCCESS;
+ } else {
+ pointing_device_status = POINTING_DEVICE_STATUS_INIT_FAILED;
+ }
#ifdef POINTING_DEVICE_MOTION_PIN
# ifdef POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
gpio_set_pin_input_high(POINTING_DEVICE_MOTION_PIN);
@@ -201,6 +209,28 @@ __attribute__((weak)) void pointing_device_init(void) {
}
/**
+ * @brief Gets status of pointing device
+ *
+ * Returns current pointing device status
+ * @return pointing_device_status_t
+ */
+__attribute__((weak)) pointing_device_status_t pointing_device_get_status(void) {
+#ifdef SPLIT_POINTING_ENABLE
+ // Assume target side is always good, split transaction checksum should stop additional reports being generated.
+ return POINTING_DEVICE_THIS_SIDE ? pointing_device_status : POINTING_DEVICE_STATUS_SUCCESS;
+#else
+ return pointing_device_status;
+#endif
+}
+
+/**
+ * @brief Sets status of pointing device
+ */
+void pointing_device_set_status(pointing_device_status_t status) {
+ pointing_device_status = status;
+}
+
+/**
* @brief Sends processed mouse report to host
*
* This sends the mouse report generated by pointing_device_task if changed since the last report. Once send zeros mouse report except buttons.
@@ -281,6 +311,10 @@ __attribute__((weak)) bool pointing_device_task(void) {
last_exec = timer_read32();
#endif
+ if (pointing_device_get_status() != POINTING_DEVICE_STATUS_SUCCESS) {
+ return false;
+ }
+
// Gather report info
#ifdef POINTING_DEVICE_MOTION_PIN
# if defined(SPLIT_POINTING_ENABLE)
diff --git a/quantum/pointing_device/pointing_device.h b/quantum/pointing_device/pointing_device.h
index e7a0819ed9..5dfb9ce196 100644
--- a/quantum/pointing_device/pointing_device.h
+++ b/quantum/pointing_device/pointing_device.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "report.h"
typedef struct {
- void (*init)(void);
+ bool (*init)(void);
report_mouse_t (*get_report)(report_mouse_t mouse_report);
void (*set_cpi)(uint16_t);
uint16_t (*get_cpi)(void);
@@ -75,7 +75,7 @@ typedef struct {
# include "drivers/sensors/pmw33xx_common.h"
# define POINTING_DEVICE_MOTION_PIN_ACTIVE_LOW
#else
-void pointing_device_driver_init(void);
+bool pointing_device_driver_init(void);
report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report);
uint16_t pointing_device_driver_get_cpi(void);
void pointing_device_driver_set_cpi(uint16_t cpi);
@@ -92,6 +92,13 @@ typedef enum {
POINTING_DEVICE_BUTTON8,
} pointing_device_buttons_t;
+typedef enum {
+ POINTING_DEVICE_STATUS_UNKNOWN,
+ POINTING_DEVICE_STATUS_INIT_FAILED,
+ POINTING_DEVICE_STATUS_FAILED,
+ POINTING_DEVICE_STATUS_SUCCESS,
+} pointing_device_status_t;
+
#ifdef MOUSE_EXTENDED_REPORT
typedef int32_t xy_clamp_range_t;
#else
@@ -107,13 +114,15 @@ typedef int16_t hv_clamp_range_t;
#define CONSTRAIN_HID(amt) ((amt) < INT8_MIN ? INT8_MIN : ((amt) > INT8_MAX ? INT8_MAX : (amt)))
#define CONSTRAIN_HID_XY(amt) ((amt) < MOUSE_REPORT_XY_MIN ? MOUSE_REPORT_XY_MIN : ((amt) > MOUSE_REPORT_XY_MAX ? MOUSE_REPORT_XY_MAX : (amt)))
-void pointing_device_init(void);
-bool pointing_device_task(void);
-bool pointing_device_send(void);
-report_mouse_t pointing_device_get_report(void);
-void pointing_device_set_report(report_mouse_t mouse_report);
-uint16_t pointing_device_get_cpi(void);
-void pointing_device_set_cpi(uint16_t cpi);
+void pointing_device_init(void);
+bool pointing_device_task(void);
+bool pointing_device_send(void);
+report_mouse_t pointing_device_get_report(void);
+void pointing_device_set_report(report_mouse_t mouse_report);
+uint16_t pointing_device_get_cpi(void);
+void pointing_device_set_cpi(uint16_t cpi);
+pointing_device_status_t pointing_device_get_status(void);
+void pointing_device_set_status(pointing_device_status_t status);
void pointing_device_init_kb(void);
void pointing_device_init_user(void);
diff --git a/quantum/process_keycode/process_oneshot.c b/quantum/process_keycode/process_oneshot.c
new file mode 100644
index 0000000000..6c43da1011
--- /dev/null
+++ b/quantum/process_keycode/process_oneshot.c
@@ -0,0 +1,25 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "process_oneshot.h"
+#include "action_util.h"
+
+bool process_oneshot(uint16_t keycode, keyrecord_t *record) {
+#ifndef NO_ACTION_ONESHOT
+ if (record->event.pressed) {
+ switch (keycode) {
+ case QK_ONE_SHOT_TOGGLE:
+ oneshot_toggle();
+ return false;
+ case QK_ONE_SHOT_ON:
+ oneshot_enable();
+ return false;
+ case QK_ONE_SHOT_OFF:
+ oneshot_disable();
+ return false;
+ }
+ }
+#endif
+
+ return true;
+}
diff --git a/quantum/process_keycode/process_oneshot.h b/quantum/process_keycode/process_oneshot.h
new file mode 100644
index 0000000000..11445b9b38
--- /dev/null
+++ b/quantum/process_keycode/process_oneshot.h
@@ -0,0 +1,10 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
+bool process_oneshot(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_quantum.c b/quantum/process_keycode/process_quantum.c
new file mode 100644
index 0000000000..703e00755b
--- /dev/null
+++ b/quantum/process_keycode/process_quantum.c
@@ -0,0 +1,76 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "process_quantum.h"
+#include "quantum.h"
+
+#ifdef ENABLE_COMPILE_KEYCODE
+/** \brief Compiles the firmware, and adds the flash command based on keyboard bootloader
+ */
+static void send_make_command(void) {
+# ifdef NO_ACTION_ONESHOT
+ const uint8_t temp_mod = mod_config(get_mods());
+# else
+ const uint8_t temp_mod = mod_config(get_mods() | get_oneshot_mods());
+ clear_oneshot_mods();
+# endif
+ clear_mods();
+
+ SEND_STRING_DELAY("qmk", TAP_CODE_DELAY);
+ if (temp_mod & MOD_MASK_SHIFT) { // if shift is held, flash rather than compile
+ SEND_STRING_DELAY(" flash ", TAP_CODE_DELAY);
+ } else {
+ SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
+ }
+# if defined(CONVERTER_ENABLED)
+ SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP " -e CONVERT_TO=" CONVERTER_TARGET SS_TAP(X_ENTER), TAP_CODE_DELAY);
+# else
+ SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
+# endif
+ if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
+ reset_keyboard();
+ }
+}
+#endif
+
+bool process_quantum(uint16_t keycode, keyrecord_t *record) {
+ if (record->event.pressed) {
+ switch (keycode) {
+#ifndef NO_RESET
+ case QK_BOOTLOADER:
+ reset_keyboard();
+ return false;
+ case QK_REBOOT:
+ soft_reset_keyboard();
+ return false;
+#endif
+#ifndef NO_DEBUG
+ case QK_DEBUG_TOGGLE:
+ debug_enable ^= 1;
+ if (debug_enable) {
+ print("DEBUG: enabled.\n");
+ } else {
+ print("DEBUG: disabled.\n");
+ }
+ return false;
+#endif
+ case QK_CLEAR_EEPROM:
+#ifdef NO_RESET
+ eeconfig_init();
+#else
+ eeconfig_disable();
+ soft_reset_keyboard();
+#endif
+ return false;
+#ifdef ENABLE_COMPILE_KEYCODE
+ case QK_MAKE:
+ send_make_command();
+ return false;
+#endif
+ default:
+ break;
+ }
+ }
+
+ return true;
+}
diff --git a/quantum/process_keycode/process_quantum.h b/quantum/process_keycode/process_quantum.h
new file mode 100644
index 0000000000..5c2462be01
--- /dev/null
+++ b/quantum/process_keycode/process_quantum.h
@@ -0,0 +1,10 @@
+// Copyright 2025 QMK
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
+
+bool process_quantum(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/process_keycode/process_underglow.c b/quantum/process_keycode/process_underglow.c
index b8d8989ef3..78006ee099 100644
--- a/quantum/process_keycode/process_underglow.c
+++ b/quantum/process_keycode/process_underglow.c
@@ -200,6 +200,11 @@ bool process_underglow(uint16_t keycode, keyrecord_t *record) {
}
#endif
return false;
+#ifdef VELOCIKEY_ENABLE
+ case QK_VELOCIKEY_TOGGLE:
+ velocikey_toggle();
+ return false;
+#endif
}
}
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 0bb6ee0a91..09e5fe1dac 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -15,6 +15,11 @@
*/
#include "quantum.h"
+#include "process_quantum.h"
+
+#ifdef SLEEP_LED_ENABLE
+# include "sleep_led.h"
+#endif
#ifdef BACKLIGHT_ENABLE
# include "process_backlight.h"
@@ -84,6 +89,10 @@
# include "process_layer_lock.h"
#endif
+#ifndef NO_ACTION_ONESHOT
+# include "process_oneshot.h"
+#endif
+
#ifdef AUDIO_ENABLE
# ifndef GOODBYE_SONG
# define GOODBYE_SONG SONG(GOODBYE_SOUND)
@@ -174,10 +183,6 @@ __attribute__((weak)) bool pre_process_record_user(uint16_t keycode, keyrecord_t
return true;
}
-__attribute__((weak)) bool process_action_kb(keyrecord_t *record) {
- return true;
-}
-
__attribute__((weak)) bool process_record_modules(uint16_t keycode, keyrecord_t *record) {
return true;
}
@@ -292,9 +297,10 @@ void post_process_record_quantum(keyrecord_t *record) {
post_process_record_kb(keycode, record);
}
-/* Core keycode function, hands off handling to other functions,
- then processes internal quantum keycodes, and then processes
- ACTIONs. */
+/** \brief Core keycode function
+ *
+ * Hands off handling to other quantum/process_keycode/ functions
+ */
bool process_record_quantum(keyrecord_t *record) {
uint16_t keycode = get_record_keycode(record, true);
@@ -439,85 +445,14 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef CONNECTION_ENABLE
process_connection(keycode, record) &&
#endif
- true)) {
- return false;
- }
-
- if (record->event.pressed) {
- switch (keycode) {
-#ifndef NO_RESET
- case QK_BOOTLOADER:
- reset_keyboard();
- return false;
- case QK_REBOOT:
- soft_reset_keyboard();
- return false;
-#endif
-#ifndef NO_DEBUG
- case QK_DEBUG_TOGGLE:
- debug_enable ^= 1;
- if (debug_enable) {
- print("DEBUG: enabled.\n");
- } else {
- print("DEBUG: disabled.\n");
- }
-#endif
- return false;
- case QK_CLEAR_EEPROM:
-#ifdef NO_RESET
- eeconfig_init();
-#else
- eeconfig_disable();
- soft_reset_keyboard();
-#endif
- return false;
-#ifdef VELOCIKEY_ENABLE
- case QK_VELOCIKEY_TOGGLE:
- velocikey_toggle();
- return false;
-#endif
#ifndef NO_ACTION_ONESHOT
- case QK_ONE_SHOT_TOGGLE:
- oneshot_toggle();
- break;
- case QK_ONE_SHOT_ON:
- oneshot_enable();
- break;
- case QK_ONE_SHOT_OFF:
- oneshot_disable();
- break;
-#endif
-#ifdef ENABLE_COMPILE_KEYCODE
- case QK_MAKE: // Compiles the firmware, and adds the flash command based on keyboard bootloader
- {
-# ifdef NO_ACTION_ONESHOT
- const uint8_t temp_mod = mod_config(get_mods());
-# else
- const uint8_t temp_mod = mod_config(get_mods() | get_oneshot_mods());
- clear_oneshot_mods();
-# endif
- clear_mods();
-
- SEND_STRING_DELAY("qmk", TAP_CODE_DELAY);
- if (temp_mod & MOD_MASK_SHIFT) { // if shift is held, flash rather than compile
- SEND_STRING_DELAY(" flash ", TAP_CODE_DELAY);
- } else {
- SEND_STRING_DELAY(" compile ", TAP_CODE_DELAY);
- }
-# if defined(CONVERTER_ENABLED)
- SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP " -e CONVERT_TO=" CONVERTER_TARGET SS_TAP(X_ENTER), TAP_CODE_DELAY);
-# else
- SEND_STRING_DELAY("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP SS_TAP(X_ENTER), TAP_CODE_DELAY);
-# endif
- if (temp_mod & MOD_MASK_SHIFT && temp_mod & MOD_MASK_CTRL) {
- reset_keyboard();
- }
- }
+ process_oneshot(keycode, record) &&
#endif
- }
+ process_quantum(keycode, record))) {
+ return false;
}
- return process_action_kb(record);
+ return true;
}
void set_single_default_layer(uint8_t default_layer) {
@@ -556,6 +491,10 @@ void suspend_power_down_quantum(void) {
backlight_level_noeeprom(0);
# endif
+# ifdef SLEEP_LED_ENABLE
+ sleep_led_enable();
+# endif
+
# ifdef LED_MATRIX_ENABLE
led_matrix_task();
# endif
@@ -602,6 +541,10 @@ __attribute__((weak)) void suspend_wakeup_init_quantum(void) {
backlight_init();
#endif
+#ifdef SLEEP_LED_ENABLE
+ sleep_led_disable();
+#endif
+
// Restore LED indicators
led_wakeup();
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 3a994e9a03..0036cd784b 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -263,7 +263,6 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
bool pre_process_record_quantum(keyrecord_t *record);
bool pre_process_record_kb(uint16_t keycode, keyrecord_t *record);
bool pre_process_record_user(uint16_t keycode, keyrecord_t *record);
-bool process_action_kb(keyrecord_t *record);
bool process_record_kb(uint16_t keycode, keyrecord_t *record);
bool process_record_user(uint16_t keycode, keyrecord_t *record);
void post_process_record_kb(uint16_t keycode, keyrecord_t *record);
diff --git a/quantum/quantum_keycodes.h b/quantum/quantum_keycodes.h
index 515386756d..a1ae7ed0be 100644
--- a/quantum/quantum_keycodes.h
+++ b/quantum/quantum_keycodes.h
@@ -66,10 +66,6 @@
#define LCAG(kc) (QK_LCTL | QK_LALT | QK_LGUI | (kc))
#define LSAG(kc) (QK_LSFT | QK_LALT | QK_LGUI | (kc))
-#define SGUI(kc) LSG(kc)
-#define SCMD(kc) LSG(kc)
-#define SWIN(kc) LSG(kc)
-
#define RCTL(kc) (QK_RCTL | (kc))
#define RSFT(kc) (QK_RSFT | (kc))
#define RALT(kc) (QK_RALT | (kc))
@@ -90,8 +86,6 @@
#define RCAG(kc) (QK_RCTL | QK_RALT | QK_RGUI | (kc))
#define RSAG(kc) (QK_RSFT | QK_RALT | QK_RGUI | (kc))
-#define SAGR(kc) RSA(kc)
-
#define HYPR(kc) (QK_LCTL | QK_LSFT | QK_LALT | QK_LGUI | (kc))
#define MEH(kc) (QK_LCTL | QK_LSFT | QK_LALT | (kc))
@@ -206,10 +200,6 @@
#define LCAG_T(kc) MT(MOD_LCTL | MOD_LALT | MOD_LGUI, kc)
#define LSAG_T(kc) MT(MOD_LSFT | MOD_LALT | MOD_LGUI, kc)
-#define SGUI_T(kc) LSG_T(kc)
-#define SCMD_T(kc) LSG_T(kc)
-#define SWIN_T(kc) LSG_T(kc)
-
#define RCTL_T(kc) MT(MOD_RCTL, kc)
#define RSFT_T(kc) MT(MOD_RSFT, kc)
#define RALT_T(kc) MT(MOD_RALT, kc)
@@ -230,11 +220,8 @@
#define RCAG_T(kc) MT(MOD_RCTL | MOD_RALT | MOD_RGUI, kc)
#define RSAG_T(kc) MT(MOD_RSFT | MOD_RALT | MOD_RGUI, kc)
-#define SAGR_T(kc) RSA_T(kc)
-
#define MEH_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT, kc)
#define HYPR_T(kc) MT(MOD_LCTL | MOD_LSFT | MOD_LALT | MOD_LGUI, kc)
-#define ALL_T(kc) HYPR_T(kc)
// Dedicated keycode versions for Hyper and Meh, if you want to use them as standalone keys rather than mod-tap
#define KC_HYPR HYPR(KC_NO)
diff --git a/quantum/quantum_keycodes_legacy.h b/quantum/quantum_keycodes_legacy.h
index 55b0fc3596..e417591fe2 100644
--- a/quantum/quantum_keycodes_legacy.h
+++ b/quantum/quantum_keycodes_legacy.h
@@ -3,59 +3,17 @@
// clang-format off
// Deprecated Quantum keycodes
-#define RGB_TOG QK_UNDERGLOW_TOGGLE
-#define RGB_MOD QK_UNDERGLOW_MODE_NEXT
-#define RGB_MODE_FORWARD QK_UNDERGLOW_MODE_NEXT
-#define RGB_RMOD QK_UNDERGLOW_MODE_PREVIOUS
-#define RGB_MODE_REVERSE QK_UNDERGLOW_MODE_PREVIOUS
-#define RGB_HUI QK_UNDERGLOW_HUE_UP
-#define RGB_HUD QK_UNDERGLOW_HUE_DOWN
-#define RGB_SAI QK_UNDERGLOW_SATURATION_UP
-#define RGB_SAD QK_UNDERGLOW_SATURATION_DOWN
-#define RGB_VAI QK_UNDERGLOW_VALUE_UP
-#define RGB_VAD QK_UNDERGLOW_VALUE_DOWN
-#define RGB_SPI QK_UNDERGLOW_SPEED_UP
-#define RGB_SPD QK_UNDERGLOW_SPEED_DOWN
-
-#define KC_MS_UP QK_MOUSE_CURSOR_UP
-#define KC_MS_U QK_MOUSE_CURSOR_UP
-#define KC_MS_DOWN QK_MOUSE_CURSOR_DOWN
-#define KC_MS_D QK_MOUSE_CURSOR_DOWN
-#define KC_MS_LEFT QK_MOUSE_CURSOR_LEFT
-#define KC_MS_L QK_MOUSE_CURSOR_LEFT
-#define KC_MS_RIGHT QK_MOUSE_CURSOR_RIGHT
-#define KC_MS_R QK_MOUSE_CURSOR_RIGHT
-#define KC_MS_BTN1 QK_MOUSE_BUTTON_1
-#define KC_BTN1 QK_MOUSE_BUTTON_1
-#define KC_MS_BTN2 QK_MOUSE_BUTTON_2
-#define KC_BTN2 QK_MOUSE_BUTTON_2
-#define KC_MS_BTN3 QK_MOUSE_BUTTON_3
-#define KC_BTN3 QK_MOUSE_BUTTON_3
-#define KC_MS_BTN4 QK_MOUSE_BUTTON_4
-#define KC_BTN4 QK_MOUSE_BUTTON_4
-#define KC_MS_BTN5 QK_MOUSE_BUTTON_5
-#define KC_BTN5 QK_MOUSE_BUTTON_5
-#define KC_MS_BTN6 QK_MOUSE_BUTTON_6
-#define KC_BTN6 QK_MOUSE_BUTTON_6
-#define KC_MS_BTN7 QK_MOUSE_BUTTON_7
-#define KC_BTN7 QK_MOUSE_BUTTON_7
-#define KC_MS_BTN8 QK_MOUSE_BUTTON_8
-#define KC_BTN8 QK_MOUSE_BUTTON_8
-#define KC_MS_WH_UP QK_MOUSE_WHEEL_UP
-#define KC_WH_U QK_MOUSE_WHEEL_UP
-#define KC_MS_WH_DOWN QK_MOUSE_WHEEL_DOWN
-#define KC_WH_D QK_MOUSE_WHEEL_DOWN
-#define KC_MS_WH_LEFT QK_MOUSE_WHEEL_LEFT
-#define KC_WH_L QK_MOUSE_WHEEL_LEFT
-#define KC_MS_WH_RIGHT QK_MOUSE_WHEEL_RIGHT
-#define KC_WH_R QK_MOUSE_WHEEL_RIGHT
-#define KC_MS_ACCEL0 QK_MOUSE_ACCELERATION_0
-#define KC_ACL0 QK_MOUSE_ACCELERATION_0
-#define KC_MS_ACCEL1 QK_MOUSE_ACCELERATION_1
-#define KC_ACL1 QK_MOUSE_ACCELERATION_1
-#define KC_MS_ACCEL2 QK_MOUSE_ACCELERATION_2
-#define KC_ACL2 QK_MOUSE_ACCELERATION_2
-
#define QK_OUTPUT_AUTO OU_AUTO
#define C_S_T(kc) LCS_T(kc)
+#define ALL_T(kc) HYPR_T(kc)
+
+#define SGUI(kc) LSG(kc)
+#define SCMD(kc) LSG(kc)
+#define SWIN(kc) LSG(kc)
+#define SGUI_T(kc) LSG_T(kc)
+#define SCMD_T(kc) LSG_T(kc)
+#define SWIN_T(kc) LSG_T(kc)
+
+#define SAGR(kc) RSA(kc)
+#define SAGR_T(kc) RSA_T(kc)
diff --git a/quantum/rgb_matrix/animations/starlight_smooth_anim.h b/quantum/rgb_matrix/animations/starlight_smooth_anim.h
index a87c06f9df..5467ea0a59 100644
--- a/quantum/rgb_matrix/animations/starlight_smooth_anim.h
+++ b/quantum/rgb_matrix/animations/starlight_smooth_anim.h
@@ -9,7 +9,7 @@ static uint8_t phase_offsets[RGB_MATRIX_LED_COUNT];
hsv_t STARLIGHT_SMOOTH_math(hsv_t hsv, uint8_t i, uint8_t time) {
if (phase_offsets[i] == 0) {
- phase_offsets[i] = rand() % 255;
+ phase_offsets[i] = random8();
}
hsv.v = scale8(abs8(sin8((time + phase_offsets[i]) / 2) - 128) * 2, hsv.v);
return hsv;
diff --git a/quantum/rgb_matrix/rgb_matrix.c b/quantum/rgb_matrix/rgb_matrix.c
index 2679c48342..ab0aa17512 100644
--- a/quantum/rgb_matrix/rgb_matrix.c
+++ b/quantum/rgb_matrix/rgb_matrix.c
@@ -109,7 +109,11 @@ void eeconfig_update_rgb_matrix_default(void) {
void eeconfig_debug_rgb_matrix(void) {
dprintf("rgb_matrix_config EEPROM\n");
dprintf("rgb_matrix_config.enable = %d\n", rgb_matrix_config.enable);
+#ifdef RGB_MATRIX_MODE_NAME_ENABLE
+ dprintf("rgb_matrix_config.mode = %d (%s)\n", rgb_matrix_config.mode, rgb_matrix_get_mode_name(rgb_matrix_config.mode));
+#else
dprintf("rgb_matrix_config.mode = %d\n", rgb_matrix_config.mode);
+#endif // RGB_MATRIX_MODE_NAME_ENABLE
dprintf("rgb_matrix_config.hsv.h = %d\n", rgb_matrix_config.hsv.h);
dprintf("rgb_matrix_config.hsv.s = %d\n", rgb_matrix_config.hsv.s);
dprintf("rgb_matrix_config.hsv.v = %d\n", rgb_matrix_config.hsv.v);
@@ -560,7 +564,11 @@ void rgb_matrix_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom) {
}
rgb_task_state = STARTING;
eeconfig_flag_rgb_matrix(write_to_eeprom);
- dprintf("rgb matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", rgb_matrix_config.mode);
+#ifdef RGB_MATRIX_MODE_NAME_ENABLE
+ dprintf("rgb matrix mode [%s]: %u (%s)\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", (unsigned)rgb_matrix_config.mode, rgb_matrix_get_mode_name(rgb_matrix_config.mode));
+#else
+ dprintf("rgb matrix mode [%s]: %u\n", (write_to_eeprom) ? "EEPROM" : "NOEEPROM", (unsigned)rgb_matrix_config.mode);
+#endif // RGB_MATRIX_MODE_NAME_ENABLE
}
void rgb_matrix_mode_noeeprom(uint8_t mode) {
rgb_matrix_mode_eeprom_helper(mode, false);
@@ -738,3 +746,49 @@ void rgb_matrix_set_flags(led_flags_t flags) {
void rgb_matrix_set_flags_noeeprom(led_flags_t flags) {
rgb_matrix_set_flags_eeprom_helper(flags, false);
}
+
+//----------------------------------------------------------
+// RGB Matrix naming
+#undef RGB_MATRIX_EFFECT
+#ifdef RGB_MATRIX_MODE_NAME_ENABLE
+const char *rgb_matrix_get_mode_name(uint8_t mode) {
+ switch (mode) {
+ case RGB_MATRIX_NONE:
+ return "NONE";
+
+# define RGB_MATRIX_EFFECT(name, ...) \
+ case RGB_MATRIX_##name: \
+ return #name;
+# include "rgb_matrix_effects.inc"
+# undef RGB_MATRIX_EFFECT
+
+# ifdef COMMUNITY_MODULES_ENABLE
+# define RGB_MATRIX_EFFECT(name, ...) \
+ case RGB_MATRIX_COMMUNITY_MODULE_##name: \
+ return #name;
+# include "rgb_matrix_community_modules.inc"
+# undef RGB_MATRIX_EFFECT
+# endif // COMMUNITY_MODULES_ENABLE
+
+# if defined(RGB_MATRIX_CUSTOM_KB) || defined(RGB_MATRIX_CUSTOM_USER)
+# define RGB_MATRIX_EFFECT(name, ...) \
+ case RGB_MATRIX_CUSTOM_##name: \
+ return #name;
+
+# ifdef RGB_MATRIX_CUSTOM_KB
+# include "rgb_matrix_kb.inc"
+# endif // RGB_MATRIX_CUSTOM_KB
+
+# ifdef RGB_MATRIX_CUSTOM_USER
+# include "rgb_matrix_user.inc"
+# endif // RGB_MATRIX_CUSTOM_USER
+
+# undef RGB_MATRIX_EFFECT
+# endif // RGB_MATRIX_CUSTOM_KB || RGB_MATRIX_CUSTOM_USER
+
+ default:
+ return "UNKNOWN";
+ }
+}
+# undef RGB_MATRIX_EFFECT
+#endif // RGB_MATRIX_MODE_NAME_ENABLE
diff --git a/quantum/rgb_matrix/rgb_matrix.h b/quantum/rgb_matrix/rgb_matrix.h
index c6b302631e..a91dded4a8 100644
--- a/quantum/rgb_matrix/rgb_matrix.h
+++ b/quantum/rgb_matrix/rgb_matrix.h
@@ -220,6 +220,10 @@ void rgb_matrix_set_flags(led_flags_t flags);
void rgb_matrix_set_flags_noeeprom(led_flags_t flags);
void rgb_matrix_update_pwm_buffers(void);
+#ifdef RGB_MATRIX_MODE_NAME_ENABLE
+const char *rgb_matrix_get_mode_name(uint8_t mode);
+#endif // RGB_MATRIX_MODE_NAME_ENABLE
+
#ifndef RGBLIGHT_ENABLE
# define eeconfig_update_rgblight_current eeconfig_force_flush_rgb_matrix
# define rgblight_reload_from_eeprom rgb_matrix_reload_from_eeprom
diff --git a/quantum/via.c b/quantum/via.c
index 3682b4ab2b..9446811af6 100644
--- a/quantum/via.c
+++ b/quantum/via.c
@@ -22,6 +22,10 @@
# error "DYNAMIC_KEYMAP_ENABLE is not enabled"
#endif
+#ifdef VIA_INSECURE
+# pragma message "VIA_INSECURE is enabled - firmware is susceptible to keyloggers"
+#endif
+
#include "via.h"
#include "raw_hid.h"
@@ -318,7 +322,11 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
uint8_t rows = 28 / ((MATRIX_COLS + 7) / 8);
uint8_t i = 2;
for (uint8_t row = 0; row < rows && row + offset < MATRIX_ROWS; row++) {
+#ifdef VIA_INSECURE
matrix_row_t value = matrix_get_row(row + offset);
+#else
+ matrix_row_t value = 0;
+#endif
#if (MATRIX_COLS > 24)
command_data[i++] = (value >> 24) & 0xFF;
#endif
diff --git a/readme.md b/readme.md
index 62aed12066..e5c0d41b7b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,7 @@
+# THIS IS THE DEVELOP BRANCH
+
+Warning- This is the `develop` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
+
# Quantum Mechanical Keyboard Firmware
[![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
diff --git a/tests/pointing/test_pointing.cpp b/tests/pointing/test_pointing.cpp
index d59d014925..6de6ad30f0 100644
--- a/tests/pointing/test_pointing.cpp
+++ b/tests/pointing/test_pointing.cpp
@@ -12,6 +12,26 @@ using testing::_;
class Pointing : public TestFixture {};
class PointingButtonsViaMousekeysParametrized : public ::testing::WithParamInterface<std::pair<KeymapKey, uint8_t>>, public Pointing {};
+TEST_F(Pointing, NoMovementOnInitFailure) {
+ TestDriver driver;
+
+ pointing_device_set_status(POINTING_DEVICE_STATUS_INIT_FAILED);
+ pd_set_x(-50);
+ pd_set_y(100);
+ EXPECT_NO_MOUSE_REPORT(driver);
+ run_one_scan_loop();
+
+ pointing_device_set_status(POINTING_DEVICE_STATUS_SUCCESS);
+ EXPECT_MOUSE_REPORT(driver, (-50, 100, 0, 0, 0));
+ run_one_scan_loop();
+
+ pd_clear_movement();
+ // EXPECT_EMPTY_MOUSE_REPORT(driver);
+ run_one_scan_loop();
+
+ VERIFY_AND_CLEAR(driver);
+}
+
TEST_F(Pointing, SendMouseIsNotCalledWithNoInput) {
TestDriver driver;
EXPECT_NO_MOUSE_REPORT(driver);
@@ -111,7 +131,7 @@ TEST_F(Pointing, CorrectButtonIsReportedWhenPressed) {
TEST_F(Pointing, CorrectButtonIsReportedWhenKeyPressed) {
TestDriver driver;
- auto key = KeymapKey(0, 0, 0, KC_MS_BTN1);
+ auto key = KeymapKey(0, 0, 0, QK_MOUSE_BUTTON_1);
set_keymap({key});
EXPECT_MOUSE_REPORT(driver, (0, 0, 0, 0, 1));
diff --git a/tests/test_common/pointing_device_driver.c b/tests/test_common/pointing_device_driver.c
index b64dbad506..42c7a814a4 100644
--- a/tests/test_common/pointing_device_driver.c
+++ b/tests/test_common/pointing_device_driver.c
@@ -22,8 +22,9 @@ typedef struct {
static pd_config_t pd_config = {0};
-void pointing_device_driver_init(void) {
+bool pointing_device_driver_init(void) {
pd_set_init(true);
+ return pd_config.initiated;
}
report_mouse_t pointing_device_driver_get_report(report_mouse_t mouse_report) {
diff --git a/tmk_core/protocol/chibios/chibios.c b/tmk_core/protocol/chibios/chibios.c
index 19d8121e34..5720bc3c4c 100644
--- a/tmk_core/protocol/chibios/chibios.c
+++ b/tmk_core/protocol/chibios/chibios.c
@@ -40,9 +40,6 @@
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP FALSE
#endif
-#ifdef SLEEP_LED_ENABLE
-# include "sleep_led.h"
-#endif
#ifdef MIDI_ENABLE
# include "qmk_midi.h"
#endif
diff --git a/tmk_core/protocol/chibios/usb_main.c b/tmk_core/protocol/chibios/usb_main.c
index f9d7f5c4d6..b798a8d1cb 100644
--- a/tmk_core/protocol/chibios/usb_main.c
+++ b/tmk_core/protocol/chibios/usb_main.c
@@ -21,10 +21,6 @@
#include "host.h"
#include "suspend.h"
#include "timer.h"
-#ifdef SLEEP_LED_ENABLE
-# include "sleep_led.h"
-# include "led.h"
-#endif
#include "wait.h"
#include "usb_endpoints.h"
#include "usb_device_state.h"
@@ -131,19 +127,11 @@ static inline bool usb_event_queue_dequeue(usbevent_t *event) {
static inline void usb_event_suspend_handler(void) {
usb_device_state_set_suspend(USB_DRIVER.configuration != 0, USB_DRIVER.configuration);
-#ifdef SLEEP_LED_ENABLE
- sleep_led_enable();
-#endif /* SLEEP_LED_ENABLE */
}
static inline void usb_event_wakeup_handler(void) {
suspend_wakeup_init();
usb_device_state_set_resume(USB_DRIVER.configuration != 0, USB_DRIVER.configuration);
-#ifdef SLEEP_LED_ENABLE
- sleep_led_disable();
- // NOTE: converters may not accept this
- led_set(host_keyboard_leds());
-#endif /* SLEEP_LED_ENABLE */
}
bool last_suspend_state = false;
diff --git a/tmk_core/protocol/lufa/lufa.c b/tmk_core/protocol/lufa/lufa.c
index d59468133c..e13f4b548e 100644
--- a/tmk_core/protocol/lufa/lufa.c
+++ b/tmk_core/protocol/lufa/lufa.c
@@ -44,9 +44,6 @@
#include "led.h"
#include "sendchar.h"
#include "debug.h"
-#ifdef SLEEP_LED_ENABLE
-# include "sleep_led.h"
-#endif
#include "suspend.h"
#include "wait.h"
@@ -278,10 +275,6 @@ void EVENT_USB_Device_Reset(void) {
void EVENT_USB_Device_Suspend(void) {
print("[S]");
usb_device_state_set_suspend(USB_Device_ConfigurationNumber != 0, USB_Device_ConfigurationNumber);
-
-#ifdef SLEEP_LED_ENABLE
- sleep_led_enable();
-#endif
}
/** \brief Event USB Device Connect
@@ -295,12 +288,6 @@ void EVENT_USB_Device_WakeUp(void) {
#endif
usb_device_state_set_resume(USB_DeviceState == DEVICE_STATE_Configured, USB_Device_ConfigurationNumber);
-
-#ifdef SLEEP_LED_ENABLE
- sleep_led_disable();
- // NOTE: converters may not accept this
- led_set(host_keyboard_leds());
-#endif
}
#ifdef CONSOLE_ENABLE
diff --git a/tmk_core/protocol/vusb/protocol.c b/tmk_core/protocol/vusb/protocol.c
index 41ccf451fd..e2d0c4112e 100644
--- a/tmk_core/protocol/vusb/protocol.c
+++ b/tmk_core/protocol/vusb/protocol.c
@@ -27,10 +27,6 @@
#include "wait.h"
#include "sendchar.h"
-#ifdef SLEEP_LED_ENABLE
-# include "sleep_led.h"
-#endif
-
/* This is from main.c of USBaspLoader */
static void initForUsbConnectivity(void) {
uint8_t i = 0;
@@ -64,22 +60,6 @@ static inline void vusb_send_remote_wakeup(void) {
bool vusb_suspended = false;
-static inline void vusb_suspend(void) {
-#ifdef SLEEP_LED_ENABLE
- sleep_led_enable();
-#endif
-
- suspend_power_down();
-}
-
-static inline void vusb_wakeup(void) {
- suspend_wakeup_init();
-
-#ifdef SLEEP_LED_ENABLE
- sleep_led_disable();
-#endif
-}
-
/** \brief Setup USB
*
* FIXME: Needs doc
@@ -133,7 +113,7 @@ void protocol_pre_task(void) {
if (should_do_suspend()) {
dprintln("suspending keyboard");
while (should_do_suspend()) {
- vusb_suspend();
+ suspend_power_down();
if (suspend_wakeup_condition()) {
vusb_send_remote_wakeup();
@@ -148,7 +128,7 @@ void protocol_pre_task(void) {
# endif
}
}
- vusb_wakeup();
+ suspend_wakeup_init();
}
#endif
}