aboutsummaryrefslogtreecommitdiff
path: root/keyboards/handwired
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/handwired')
-rw-r--r--keyboards/handwired/108key_trackpoint/keyboard.json (renamed from keyboards/handwired/108key_trackpoint/info.json)10
-rw-r--r--keyboards/handwired/108key_trackpoint/rules.mk14
-rw-r--r--keyboards/handwired/10k/keyboard.json (renamed from keyboards/handwired/10k/info.json)11
-rw-r--r--keyboards/handwired/10k/rules.mk2
-rw-r--r--keyboards/handwired/2x5keypad/2x5keypad.c14
-rw-r--r--keyboards/handwired/2x5keypad/keyboard.json (renamed from keyboards/handwired/2x5keypad/info.json)8
-rw-r--r--keyboards/handwired/2x5keypad/rules.mk13
-rw-r--r--keyboards/handwired/3dfoxc/keyboard.json (renamed from keyboards/handwired/3dfoxc/info.json)8
-rw-r--r--keyboards/handwired/3dfoxc/rules.mk12
-rw-r--r--keyboards/handwired/3dortho14u/rev1/keyboard.json (renamed from keyboards/handwired/3dortho14u/rev1/info.json)18
-rw-r--r--keyboards/handwired/3dortho14u/rev1/rules.mk1
-rw-r--r--keyboards/handwired/3dortho14u/rev2/keyboard.json (renamed from keyboards/handwired/3dortho14u/rev2/info.json)18
-rw-r--r--keyboards/handwired/3dortho14u/rev2/rules.mk1
-rw-r--r--keyboards/handwired/3dp660/keyboard.json (renamed from keyboards/handwired/3dp660/info.json)11
-rw-r--r--keyboards/handwired/3dp660/rules.mk13
-rw-r--r--keyboards/handwired/3dp660_oled/info.json251
-rw-r--r--keyboards/handwired/3dp660_oled/keyboard.json251
-rw-r--r--keyboards/handwired/3dp660_oled/rules.mk1
-rw-r--r--keyboards/handwired/412_64/keyboard.json (renamed from keyboards/handwired/412_64/info.json)8
-rw-r--r--keyboards/handwired/412_64/rules.mk11
-rw-r--r--keyboards/handwired/42/keyboard.json (renamed from keyboards/handwired/42/info.json)7
-rw-r--r--keyboards/handwired/42/rules.mk15
-rw-r--r--keyboards/handwired/6key/keyboard.json (renamed from keyboards/handwired/6key/info.json)9
-rw-r--r--keyboards/handwired/6key/rules.mk13
-rw-r--r--keyboards/handwired/6macro/keyboard.json (renamed from keyboards/handwired/6macro/info.json)10
-rw-r--r--keyboards/handwired/6macro/rules.mk14
-rw-r--r--keyboards/handwired/aball/keyboard.json (renamed from keyboards/handwired/aball/info.json)6
-rw-r--r--keyboards/handwired/aball/rules.mk15
-rw-r--r--keyboards/handwired/acacia/keyboard.json (renamed from keyboards/handwired/acacia/info.json)11
-rw-r--r--keyboards/handwired/acacia/rules.mk7
-rw-r--r--keyboards/handwired/aek64/aek64.c6
-rw-r--r--keyboards/handwired/aek64/keyboard.json (renamed from keyboards/handwired/aek64/info.json)10
-rw-r--r--keyboards/handwired/aek64/rules.mk11
-rw-r--r--keyboards/handwired/aim65/keyboard.json (renamed from keyboards/handwired/aim65/info.json)8
-rw-r--r--keyboards/handwired/aim65/rules.mk12
-rw-r--r--keyboards/handwired/alcor_dactyl/keyboard.json (renamed from keyboards/handwired/alcor_dactyl/info.json)0
-rw-r--r--keyboards/handwired/amigopunk/keyboard.json (renamed from keyboards/handwired/amigopunk/info.json)10
-rw-r--r--keyboards/handwired/amigopunk/rules.mk14
-rw-r--r--keyboards/handwired/angel/keyboard.json (renamed from keyboards/handwired/angel/info.json)8
-rw-r--r--keyboards/handwired/angel/rules.mk12
-rw-r--r--keyboards/handwired/aplx2/keyboard.json (renamed from keyboards/handwired/aplx2/info.json)8
-rw-r--r--keyboards/handwired/aplx2/rules.mk12
-rw-r--r--keyboards/handwired/aranck/keyboard.json (renamed from keyboards/handwired/aranck/info.json)9
-rw-r--r--keyboards/handwired/aranck/rules.mk12
-rw-r--r--keyboards/handwired/arrow_pad/keyboard.json (renamed from keyboards/handwired/arrow_pad/info.json)9
-rw-r--r--keyboards/handwired/arrow_pad/keymaps/default/keymap.c14
-rw-r--r--keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c16
-rw-r--r--keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c14
-rw-r--r--keyboards/handwired/arrow_pad/rules.mk11
-rw-r--r--keyboards/handwired/atreus50/atreus50.c4
-rw-r--r--keyboards/handwired/atreus50/keyboard.json (renamed from keyboards/handwired/atreus50/info.json)8
-rw-r--r--keyboards/handwired/atreus50/keymaps/default/keymap.c11
-rw-r--r--keyboards/handwired/atreus50/rules.mk12
-rw-r--r--keyboards/handwired/axon/keyboard.json (renamed from keyboards/handwired/axon/info.json)8
-rw-r--r--keyboards/handwired/axon/rules.mk12
-rw-r--r--keyboards/handwired/baredev/rev1/keyboard.json (renamed from keyboards/handwired/baredev/rev1/info.json)9
-rw-r--r--keyboards/handwired/baredev/rev1/rules.mk0
-rw-r--r--keyboards/handwired/battleship_gamepad/battleship_gamepad.c2
-rw-r--r--keyboards/handwired/battleship_gamepad/keyboard.json (renamed from keyboards/handwired/battleship_gamepad/info.json)7
-rw-r--r--keyboards/handwired/battleship_gamepad/rules.mk13
-rw-r--r--keyboards/handwired/bdn9_ble/keyboard.json (renamed from keyboards/handwired/bdn9_ble/info.json)9
-rw-r--r--keyboards/handwired/bdn9_ble/rules.mk15
-rw-r--r--keyboards/handwired/bento/rev1/keyboard.json (renamed from keyboards/handwired/bento/rev1/info.json)9
-rw-r--r--keyboards/handwired/bento/rev1/rules.mk13
-rw-r--r--keyboards/handwired/bigmac/keyboard.json (renamed from keyboards/handwired/bigmac/info.json)8
-rw-r--r--keyboards/handwired/bigmac/rules.mk12
-rw-r--r--keyboards/handwired/bolek/keyboard.json (renamed from keyboards/handwired/bolek/info.json)8
-rw-r--r--keyboards/handwired/bolek/rules.mk12
-rw-r--r--keyboards/handwired/boss566y/redragon_vara/keyboard.json (renamed from keyboards/handwired/boss566y/redragon_vara/info.json)8
-rw-r--r--keyboards/handwired/boss566y/redragon_vara/rules.mk12
-rw-r--r--keyboards/handwired/brain/keyboard.json (renamed from keyboards/handwired/brain/info.json)9
-rw-r--r--keyboards/handwired/brain/rules.mk14
-rw-r--r--keyboards/handwired/bstk100/keyboard.json (renamed from keyboards/handwired/bstk100/info.json)8
-rw-r--r--keyboards/handwired/bstk100/rules.mk12
-rw-r--r--keyboards/handwired/cans12er/keyboard.json (renamed from keyboards/handwired/cans12er/info.json)8
-rw-r--r--keyboards/handwired/cans12er/rules.mk12
-rw-r--r--keyboards/handwired/carpolly/keyboard.json (renamed from keyboards/handwired/carpolly/info.json)8
-rw-r--r--keyboards/handwired/carpolly/rules.mk15
-rw-r--r--keyboards/handwired/chiron/keyboard.json (renamed from keyboards/handwired/chiron/info.json)11
-rw-r--r--keyboards/handwired/chiron/rules.mk17
-rw-r--r--keyboards/handwired/ck4x4/keyboard.json (renamed from keyboards/handwired/ck4x4/info.json)8
-rw-r--r--keyboards/handwired/ck4x4/rules.mk13
-rw-r--r--keyboards/handwired/cmd60/keyboard.json (renamed from keyboards/handwired/cmd60/info.json)8
-rw-r--r--keyboards/handwired/cmd60/rules.mk11
-rw-r--r--keyboards/handwired/co60/rev1/keyboard.json (renamed from keyboards/handwired/co60/rev1/info.json)10
-rw-r--r--keyboards/handwired/co60/rev1/rules.mk12
-rw-r--r--keyboards/handwired/co60/rev6/keyboard.json (renamed from keyboards/handwired/co60/rev6/info.json)10
-rw-r--r--keyboards/handwired/co60/rev6/rules.mk13
-rw-r--r--keyboards/handwired/co60/rev7/keyboard.json (renamed from keyboards/handwired/co60/rev7/info.json)11
-rw-r--r--keyboards/handwired/co60/rev7/rules.mk13
-rw-r--r--keyboards/handwired/colorlice/colorlice.c8
-rw-r--r--keyboards/handwired/colorlice/keyboard.json (renamed from keyboards/handwired/colorlice/info.json)12
-rw-r--r--keyboards/handwired/colorlice/rules.mk14
-rw-r--r--keyboards/handwired/concertina/64key/keyboard.json (renamed from keyboards/handwired/concertina/64key/info.json)8
-rw-r--r--keyboards/handwired/concertina/64key/rules.mk12
-rw-r--r--keyboards/handwired/consolekeyboard/18key/keyboard.json (renamed from keyboards/handwired/consolekeyboard/18key/info.json)12
-rw-r--r--keyboards/handwired/consolekeyboard/18key/rules.mk13
-rw-r--r--keyboards/handwired/consolekeyboard/20key/keyboard.json (renamed from keyboards/handwired/consolekeyboard/20key/info.json)12
-rw-r--r--keyboards/handwired/consolekeyboard/20key/rules.mk13
-rw-r--r--keyboards/handwired/consolekeyboard/27key/keyboard.json (renamed from keyboards/handwired/consolekeyboard/27key/info.json)12
-rw-r--r--keyboards/handwired/consolekeyboard/27key/rules.mk13
-rw-r--r--keyboards/handwired/consolekeyboard/30key/keyboard.json (renamed from keyboards/handwired/consolekeyboard/30key/info.json)12
-rw-r--r--keyboards/handwired/consolekeyboard/30key/rules.mk13
-rw-r--r--keyboards/handwired/croxsplit44/keyboard.json (renamed from keyboards/handwired/croxsplit44/info.json)9
-rw-r--r--keyboards/handwired/croxsplit44/rules.mk12
-rw-r--r--keyboards/handwired/curiosity/keyboard.json (renamed from keyboards/handwired/curiosity/info.json)8
-rw-r--r--keyboards/handwired/curiosity/rules.mk13
-rw-r--r--keyboards/handwired/cyberstar/config.h4
-rw-r--r--keyboards/handwired/cyberstar/keyboard.json (renamed from keyboards/handwired/cyberstar/info.json)7
-rw-r--r--keyboards/handwired/cyberstar/rules.mk13
-rw-r--r--keyboards/handwired/d48/keyboard.json (renamed from keyboards/handwired/d48/info.json)16
-rw-r--r--keyboards/handwired/d48/rules.mk17
-rw-r--r--keyboards/handwired/d48/taphold.c3
-rw-r--r--keyboards/handwired/d48/taphold.h4
-rw-r--r--keyboards/handwired/dactyl/keyboard.json (renamed from keyboards/handwired/dactyl/info.json)8
-rw-r--r--keyboards/handwired/dactyl/rules.mk15
-rw-r--r--keyboards/handwired/dactyl_cc/keyboard.json (renamed from keyboards/handwired/dactyl_cc/info.json)0
-rw-r--r--keyboards/handwired/dactyl_cc/rules.mk0
-rw-r--r--keyboards/handwired/dactyl_kinesis/keyboard.json (renamed from keyboards/handwired/dactyl_kinesis/info.json)5
-rw-r--r--keyboards/handwired/dactyl_kinesis/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_left/keyboard.json (renamed from keyboards/handwired/dactyl_left/info.json)8
-rw-r--r--keyboards/handwired/dactyl_left/rules.mk12
-rw-r--r--keyboards/handwired/dactyl_lightcycle/keyboard.json (renamed from keyboards/handwired/dactyl_lightcycle/info.json)3
-rw-r--r--keyboards/handwired/dactyl_lightcycle/rules.mk0
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/4x5/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c5
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c6
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/4x5_5/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/4x5_5/rules.mk12
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/4x6/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c5
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/4x6_4_3/info.json)0
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/4x6_5/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/4x6_5/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x6/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x6_2_5/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x6_5/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_5/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x6_6/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_6/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x6_68/info.json)5
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/5x7/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/5x7/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json)12
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk18
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/6x6/promicro/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk0
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6/rules.mk14
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/6x6_4/info.json)9
-rw-r--r--keyboards/handwired/dactyl_manuform/6x6_4/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/keyboard.json (renamed from keyboards/handwired/dactyl_manuform/6x7/info.json)5
-rw-r--r--keyboards/handwired/dactyl_manuform/6x7/rules.mk0
-rw-r--r--keyboards/handwired/dactyl_maximus/keyboard.json (renamed from keyboards/handwired/dactyl_maximus/info.json)0
-rw-r--r--keyboards/handwired/dactyl_maximus/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_minidox/dactyl_minidox.c (renamed from keyboards/handwired/dactyl_minidox/3x5_3.c)0
-rw-r--r--keyboards/handwired/dactyl_minidox/keyboard.json (renamed from keyboards/handwired/dactyl_minidox/info.json)0
-rw-r--r--keyboards/handwired/dactyl_minidox/rules.mk1
-rw-r--r--keyboards/handwired/dactyl_promicro/keyboard.json (renamed from keyboards/handwired/dactyl_promicro/info.json)9
-rw-r--r--keyboards/handwired/dactyl_promicro/rules.mk14
-rw-r--r--keyboards/handwired/dactyl_rah/keyboard.json (renamed from keyboards/handwired/dactyl_rah/info.json)9
-rw-r--r--keyboards/handwired/dactyl_rah/rules.mk13
-rw-r--r--keyboards/handwired/dactyl_tracer/keyboard.json (renamed from keyboards/handwired/dactyl_tracer/info.json)0
-rw-r--r--keyboards/handwired/dactyl_tracer/rules.mk1
-rw-r--r--keyboards/handwired/dactylmacropad/keyboard.json (renamed from keyboards/handwired/dactylmacropad/info.json)0
-rw-r--r--keyboards/handwired/dactylmacropad/rules.mk1
-rw-r--r--keyboards/handwired/daishi/keyboard.json (renamed from keyboards/handwired/daishi/info.json)10
-rw-r--r--keyboards/handwired/daishi/rules.mk14
-rw-r--r--keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json (renamed from keyboards/handwired/daskeyboard/daskeyboard4/info.json)0
-rw-r--r--keyboards/handwired/daskeyboard/daskeyboard4/rules.mk1
-rw-r--r--keyboards/handwired/datahand/keyboard.json (renamed from keyboards/handwired/datahand/info.json)8
-rw-r--r--keyboards/handwired/datahand/matrix.c16
-rw-r--r--keyboards/handwired/datahand/rules.mk13
-rw-r--r--keyboards/handwired/dc/mc/001/keyboard.json (renamed from keyboards/handwired/dc/mc/001/info.json)9
-rw-r--r--keyboards/handwired/dc/mc/001/rules.mk13
-rw-r--r--keyboards/handwired/ddg_56/keyboard.json (renamed from keyboards/handwired/ddg_56/info.json)9
-rw-r--r--keyboards/handwired/ddg_56/rules.mk11
-rw-r--r--keyboards/handwired/dmote/keyboard.json (renamed from keyboards/handwired/dmote/info.json)0
-rw-r--r--keyboards/handwired/dmote/rules.mk1
-rw-r--r--keyboards/handwired/dqz11n1g/keyboard.json (renamed from keyboards/handwired/dqz11n1g/info.json)7
-rw-r--r--keyboards/handwired/dqz11n1g/matrix.c19
-rw-r--r--keyboards/handwired/dqz11n1g/rules.mk14
-rw-r--r--keyboards/handwired/dygma/raise/ansi/ansi.c2
-rw-r--r--keyboards/handwired/dygma/raise/ansi/keyboard.json (renamed from keyboards/handwired/dygma/raise/ansi/info.json)0
-rw-r--r--keyboards/handwired/dygma/raise/ansi/rules.mk0
-rw-r--r--keyboards/handwired/dygma/raise/info.json10
-rw-r--r--keyboards/handwired/dygma/raise/iso/iso.c2
-rw-r--r--keyboards/handwired/dygma/raise/iso/keyboard.json (renamed from keyboards/handwired/dygma/raise/iso/info.json)0
-rw-r--r--keyboards/handwired/dygma/raise/iso/rules.mk0
-rw-r--r--keyboards/handwired/dygma/raise/leds.c6
-rw-r--r--keyboards/handwired/dygma/raise/leds.h3
-rw-r--r--keyboards/handwired/dygma/raise/matrix.c3
-rw-r--r--keyboards/handwired/dygma/raise/rules.mk13
-rw-r--r--keyboards/handwired/eagleii/keyboard.json (renamed from keyboards/handwired/eagleii/info.json)8
-rw-r--r--keyboards/handwired/eagleii/rules.mk12
-rw-r--r--keyboards/handwired/elrgo_s/keyboard.json (renamed from keyboards/handwired/elrgo_s/info.json)9
-rw-r--r--keyboards/handwired/elrgo_s/rules.mk13
-rw-r--r--keyboards/handwired/ergocheap/keyboard.json (renamed from keyboards/handwired/ergocheap/info.json)12
-rw-r--r--keyboards/handwired/ergocheap/rules.mk14
-rw-r--r--keyboards/handwired/evk/v1_3/keyboard.json (renamed from keyboards/handwired/evk/v1_3/info.json)8
-rw-r--r--keyboards/handwired/evk/v1_3/rules.mk12
-rw-r--r--keyboards/handwired/evk/v1_3/v1_3.c8
-rw-r--r--keyboards/handwired/fc200rt_qmk/keyboard.json (renamed from keyboards/handwired/fc200rt_qmk/info.json)8
-rw-r--r--keyboards/handwired/fc200rt_qmk/rules.mk12
-rw-r--r--keyboards/handwired/fivethirteen/keyboard.json (renamed from keyboards/handwired/fivethirteen/info.json)8
-rw-r--r--keyboards/handwired/fivethirteen/rules.mk11
-rw-r--r--keyboards/handwired/floorboard/keyboard.json (renamed from keyboards/handwired/floorboard/info.json)12
-rw-r--r--keyboards/handwired/floorboard/rules.mk12
-rw-r--r--keyboards/handwired/frankie_macropad/keyboard.json (renamed from keyboards/handwired/frankie_macropad/info.json)15
-rw-r--r--keyboards/handwired/frankie_macropad/rules.mk17
-rw-r--r--keyboards/handwired/frenchdev/frenchdev.c15
-rw-r--r--keyboards/handwired/frenchdev/frenchdev.h42
-rw-r--r--keyboards/handwired/frenchdev/keyboard.json (renamed from keyboards/handwired/frenchdev/info.json)8
-rw-r--r--keyboards/handwired/frenchdev/matrix.c60
-rw-r--r--keyboards/handwired/frenchdev/rules.mk14
-rw-r--r--keyboards/handwired/freoduo/keyboard.json (renamed from keyboards/handwired/freoduo/info.json)11
-rw-r--r--keyboards/handwired/freoduo/rules.mk14
-rw-r--r--keyboards/handwired/fruity60/keyboard.json (renamed from keyboards/handwired/fruity60/info.json)7
-rw-r--r--keyboards/handwired/fruity60/rules.mk14
-rw-r--r--keyboards/handwired/gamenum/gamenum.c8
-rw-r--r--keyboards/handwired/gamenum/keyboard.json (renamed from keyboards/handwired/gamenum/info.json)8
-rw-r--r--keyboards/handwired/gamenum/keymaps/default/keymap.c8
-rw-r--r--keyboards/handwired/gamenum/rules.mk11
-rw-r--r--keyboards/handwired/hacked_motospeed/keyboard.json (renamed from keyboards/handwired/hacked_motospeed/info.json)12
-rw-r--r--keyboards/handwired/hacked_motospeed/rules.mk14
-rw-r--r--keyboards/handwired/heisenberg/keyboard.json (renamed from keyboards/handwired/heisenberg/info.json)10
-rw-r--r--keyboards/handwired/heisenberg/rules.mk12
-rw-r--r--keyboards/handwired/hexon38/keyboard.json (renamed from keyboards/handwired/hexon38/info.json)8
-rw-r--r--keyboards/handwired/hexon38/rules.mk12
-rw-r--r--keyboards/handwired/hnah108/keyboard.json (renamed from keyboards/handwired/hnah108/info.json)11
-rw-r--r--keyboards/handwired/hnah108/rules.mk14
-rw-r--r--keyboards/handwired/hnah40/keyboard.json (renamed from keyboards/handwired/hnah40/info.json)8
-rw-r--r--keyboards/handwired/hnah40/rules.mk12
-rw-r--r--keyboards/handwired/hnah40rgb/keyboard.json (renamed from keyboards/handwired/hnah40rgb/info.json)9
-rw-r--r--keyboards/handwired/hnah40rgb/rules.mk13
-rw-r--r--keyboards/handwired/hwpm87/keyboard.json (renamed from keyboards/handwired/hwpm87/info.json)8
-rw-r--r--keyboards/handwired/hwpm87/rules.mk14
-rw-r--r--keyboards/handwired/ibm_wheelwriter/keyboard.json (renamed from keyboards/handwired/ibm_wheelwriter/info.json)8
-rw-r--r--keyboards/handwired/ibm_wheelwriter/rules.mk12
-rw-r--r--keyboards/handwired/iso85k/keyboard.json (renamed from keyboards/handwired/iso85k/info.json)0
-rw-r--r--keyboards/handwired/iso85k/rules.mk1
-rw-r--r--keyboards/handwired/itstleo9/promicro/keyboard.json (renamed from keyboards/handwired/itstleo9/promicro/info.json)0
-rw-r--r--keyboards/handwired/itstleo9/promicro/rules.mk1
-rw-r--r--keyboards/handwired/itstleo9/rp2040/keyboard.json (renamed from keyboards/handwired/itstleo9/rp2040/info.json)0
-rw-r--r--keyboards/handwired/itstleo9/rp2040/rules.mk1
-rw-r--r--keyboards/handwired/jankrp2040dactyl/keyboard.json (renamed from keyboards/handwired/jankrp2040dactyl/info.json)0
-rw-r--r--keyboards/handwired/jn68m/keyboard.json (renamed from keyboards/handwired/jn68m/info.json)8
-rw-r--r--keyboards/handwired/jn68m/rules.mk12
-rw-r--r--keyboards/handwired/jopr/jopr.c6
-rw-r--r--keyboards/handwired/jopr/keyboard.json (renamed from keyboards/handwired/jopr/info.json)9
-rw-r--r--keyboards/handwired/jopr/rules.mk13
-rw-r--r--keyboards/handwired/jot50/keyboard.json (renamed from keyboards/handwired/jot50/info.json)9
-rw-r--r--keyboards/handwired/jot50/rules.mk12
-rw-r--r--keyboards/handwired/jotanck/jotanck.c4
-rw-r--r--keyboards/handwired/jotanck/keyboard.json (renamed from keyboards/handwired/jotanck/info.json)16
-rw-r--r--keyboards/handwired/jotanck/rules.mk12
-rw-r--r--keyboards/handwired/jotlily60/keyboard.json (renamed from keyboards/handwired/jotlily60/info.json)0
-rw-r--r--keyboards/handwired/jotlily60/rules.mk1
-rw-r--r--keyboards/handwired/jotpad16/jotpad16.c4
-rw-r--r--keyboards/handwired/jotpad16/keyboard.json (renamed from keyboards/handwired/jotpad16/info.json)8
-rw-r--r--keyboards/handwired/jotpad16/rules.mk12
-rw-r--r--keyboards/handwired/jtallbean/split_65/keyboard.json (renamed from keyboards/handwired/jtallbean/split_65/info.json)9
-rw-r--r--keyboards/handwired/jtallbean/split_65/rules.mk13
-rw-r--r--keyboards/handwired/jtallbean/split_65/split_65.c8
-rw-r--r--keyboards/handwired/juliet/keyboard.json (renamed from keyboards/handwired/juliet/info.json)8
-rw-r--r--keyboards/handwired/juliet/rules.mk12
-rw-r--r--keyboards/handwired/k8split/keyboard.json (renamed from keyboards/handwired/k8split/info.json)8
-rw-r--r--keyboards/handwired/k8split/rules.mk12
-rw-r--r--keyboards/handwired/k_numpad17/keyboard.json (renamed from keyboards/handwired/k_numpad17/info.json)8
-rw-r--r--keyboards/handwired/k_numpad17/rules.mk12
-rw-r--r--keyboards/handwired/kbod/keyboard.json (renamed from keyboards/handwired/kbod/info.json)8
-rw-r--r--keyboards/handwired/kbod/rules.mk11
-rw-r--r--keyboards/handwired/ks63/keyboard.json (renamed from keyboards/handwired/ks63/info.json)9
-rw-r--r--keyboards/handwired/ks63/rules.mk14
-rw-r--r--keyboards/handwired/lagrange/keyboard.json (renamed from keyboards/handwired/lagrange/info.json)11
-rw-r--r--keyboards/handwired/lagrange/lagrange.c4
-rw-r--r--keyboards/handwired/lagrange/rules.mk16
-rw-r--r--keyboards/handwired/lagrange/transport.c20
-rw-r--r--keyboards/handwired/leftynumpad/keyboard.json (renamed from keyboards/handwired/leftynumpad/info.json)8
-rw-r--r--keyboards/handwired/leftynumpad/rules.mk12
-rw-r--r--keyboards/handwired/lemonpad/keyboard.json (renamed from keyboards/handwired/lemonpad/info.json)11
-rw-r--r--keyboards/handwired/lemonpad/rules.mk14
-rw-r--r--keyboards/handwired/lovelive9/keyboard.json (renamed from keyboards/handwired/lovelive9/info.json)9
-rw-r--r--keyboards/handwired/lovelive9/keymaps/default/keymap.c24
-rw-r--r--keyboards/handwired/lovelive9/rules.mk12
-rw-r--r--keyboards/handwired/m40/5x5_macropad/keyboard.json (renamed from keyboards/handwired/m40/5x5_macropad/info.json)6
-rw-r--r--keyboards/handwired/m40/5x5_macropad/rules.mk15
-rw-r--r--keyboards/handwired/macro3/keyboard.json (renamed from keyboards/handwired/macro3/info.json)0
-rw-r--r--keyboards/handwired/macro3/rules.mk1
-rw-r--r--keyboards/handwired/macroboard/config.h4
-rw-r--r--keyboards/handwired/macroboard/f401/info.json13
-rw-r--r--keyboards/handwired/macroboard/f401/keyboard.json23
-rw-r--r--keyboards/handwired/macroboard/f401/rules.mk13
-rw-r--r--keyboards/handwired/macroboard/f411/info.json13
-rw-r--r--keyboards/handwired/macroboard/f411/keyboard.json27
-rw-r--r--keyboards/handwired/macroboard/f411/rules.mk14
-rw-r--r--keyboards/handwired/magicforce61/keyboard.json (renamed from keyboards/handwired/magicforce61/info.json)8
-rw-r--r--keyboards/handwired/magicforce61/rules.mk11
-rw-r--r--keyboards/handwired/magicforce68/keyboard.json (renamed from keyboards/handwired/magicforce68/info.json)8
-rw-r--r--keyboards/handwired/magicforce68/rules.mk11
-rw-r--r--keyboards/handwired/marauder/keyboard.json (renamed from keyboards/handwired/marauder/info.json)12
-rw-r--r--keyboards/handwired/marauder/rules.mk13
-rw-r--r--keyboards/handwired/marek128b/ergosplit44/keyboard.json (renamed from keyboards/handwired/marek128b/ergosplit44/info.json)0
-rw-r--r--keyboards/handwired/marek128b/ergosplit44/rules.mk1
-rw-r--r--keyboards/handwired/maverick0197/keydeck8/keyboard.json (renamed from keyboards/handwired/maverick0197/keydeck8/info.json)0
-rw-r--r--keyboards/handwired/maverick0197/keydeck8/rules.mk1
-rw-r--r--keyboards/handwired/mechboards_micropad/keyboard.json (renamed from keyboards/handwired/mechboards_micropad/info.json)8
-rw-r--r--keyboards/handwired/mechboards_micropad/rules.mk12
-rw-r--r--keyboards/handwired/meck_tkl/blackpill_f401/info.json14
-rw-r--r--keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json (renamed from keyboards/handwired/meck_tkl/info.json)30
-rw-r--r--keyboards/handwired/meck_tkl/blackpill_f401/rules.mk4
-rw-r--r--keyboards/handwired/meck_tkl/config.h9
-rw-r--r--keyboards/handwired/meck_tkl/rules.mk12
-rw-r--r--keyboards/handwired/minorca/keyboard.json (renamed from keyboards/handwired/minorca/info.json)8
-rw-r--r--keyboards/handwired/minorca/rules.mk12
-rw-r--r--keyboards/handwired/misterdeck/keyboard.json (renamed from keyboards/handwired/misterdeck/info.json)8
-rw-r--r--keyboards/handwired/misterdeck/rules.mk12
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json (renamed from keyboards/handwired/ms_sculpt_mobile/astar/info.json)0
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/astar/rules.mk0
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/info.json8
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/rules.mk13
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json (renamed from keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json)0
-rw-r--r--keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk0
-rw-r--r--keyboards/handwired/mutepad/keyboard.json (renamed from keyboards/handwired/mutepad/info.json)9
-rw-r--r--keyboards/handwired/mutepad/rules.mk13
-rw-r--r--keyboards/handwired/myskeeb/keyboard.json (renamed from keyboards/handwired/myskeeb/info.json)11
-rw-r--r--keyboards/handwired/myskeeb/rules.mk15
-rw-r--r--keyboards/handwired/nicekey/keyboard.json (renamed from keyboards/handwired/nicekey/info.json)8
-rw-r--r--keyboards/handwired/nicekey/rules.mk12
-rw-r--r--keyboards/handwired/nortontechpad/keyboard.json (renamed from keyboards/handwired/nortontechpad/info.json)0
-rw-r--r--keyboards/handwired/nortontechpad/rules.mk1
-rw-r--r--keyboards/handwired/not_so_minidox/keyboard.json (renamed from keyboards/handwired/not_so_minidox/info.json)9
-rw-r--r--keyboards/handwired/not_so_minidox/rules.mk14
-rw-r--r--keyboards/handwired/novem/keyboard.json (renamed from keyboards/handwired/novem/info.json)5
-rw-r--r--keyboards/handwired/novem/rules.mk12
-rw-r--r--keyboards/handwired/nozbe_macro/keyboard.json (renamed from keyboards/handwired/nozbe_macro/info.json)9
-rw-r--r--keyboards/handwired/nozbe_macro/rules.mk12
-rw-r--r--keyboards/handwired/numpad20/keyboard.json (renamed from keyboards/handwired/numpad20/info.json)8
-rw-r--r--keyboards/handwired/numpad20/rules.mk11
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/keyboard.json (renamed from keyboards/handwired/obuwunkunubi/spaget/info.json)11
-rw-r--r--keyboards/handwired/obuwunkunubi/spaget/rules.mk17
-rw-r--r--keyboards/handwired/oem_ansi_fullsize/keyboard.json (renamed from keyboards/handwired/oem_ansi_fullsize/info.json)8
-rw-r--r--keyboards/handwired/oem_ansi_fullsize/rules.mk12
-rw-r--r--keyboards/handwired/oem_iso_fullsize/keyboard.json (renamed from keyboards/handwired/oem_iso_fullsize/info.json)8
-rw-r--r--keyboards/handwired/oem_iso_fullsize/rules.mk12
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/keyboard.json (renamed from keyboards/handwired/onekey/blackpill_f401/info.json)5
-rw-r--r--keyboards/handwired/onekey/blackpill_f401/rules.mk1
-rw-r--r--keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json (renamed from keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json)5
-rwxr-xr-xkeyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk1
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/keyboard.json (renamed from keyboards/handwired/onekey/blackpill_f411/info.json)5
-rw-r--r--keyboards/handwired/onekey/blackpill_f411/rules.mk1
-rw-r--r--keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json (renamed from keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json)5
-rwxr-xr-xkeyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk1
-rw-r--r--keyboards/handwired/onekey/bluepill/keyboard.json (renamed from keyboards/handwired/onekey/bluepill/info.json)0
-rw-r--r--keyboards/handwired/onekey/bluepill/rules.mk1
-rw-r--r--keyboards/handwired/onekey/bluepill_f103c6/keyboard.json (renamed from keyboards/handwired/onekey/bluepill_f103c6/info.json)3
-rw-r--r--keyboards/handwired/onekey/bluepill_f103c6/rules.mk3
-rw-r--r--keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json (renamed from keyboards/handwired/onekey/bluepill_uf2boot/info.json)0
-rw-r--r--keyboards/handwired/onekey/bluepill_uf2boot/rules.mk1
-rw-r--r--keyboards/handwired/onekey/elite_c/keyboard.json (renamed from keyboards/handwired/onekey/elite_c/info.json)0
-rw-r--r--keyboards/handwired/onekey/elite_c/rules.mk0
-rw-r--r--keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json (renamed from keyboards/handwired/onekey/evb_wb32f3g71/info.json)0
-rw-r--r--keyboards/handwired/onekey/evb_wb32fq95/keyboard.json (renamed from keyboards/handwired/onekey/evb_wb32fq95/info.json)0
-rw-r--r--keyboards/handwired/onekey/info.json5
-rw-r--r--keyboards/handwired/onekey/kb2040/keyboard.json (renamed from keyboards/handwired/onekey/kb2040/info.json)3
-rw-r--r--keyboards/handwired/onekey/kb2040/rules.mk1
-rw-r--r--keyboards/handwired/onekey/nucleo_f446re/keyboard.json (renamed from keyboards/handwired/onekey/nucleo_f446re/info.json)0
-rw-r--r--keyboards/handwired/onekey/nucleo_f446re/rules.mk0
-rw-r--r--keyboards/handwired/onekey/nucleo_g431rb/keyboard.json (renamed from keyboards/handwired/onekey/nucleo_g431rb/info.json)0
-rw-r--r--keyboards/handwired/onekey/nucleo_g431rb/rules.mk0
-rw-r--r--keyboards/handwired/onekey/nucleo_g474re/keyboard.json (renamed from keyboards/handwired/onekey/nucleo_g474re/info.json)0
-rw-r--r--keyboards/handwired/onekey/nucleo_g474re/rules.mk0
-rw-r--r--keyboards/handwired/onekey/nucleo_h723zg/keyboard.json (renamed from keyboards/handwired/onekey/nucleo_h723zg/info.json)0
-rwxr-xr-xkeyboards/handwired/onekey/nucleo_h723zg/rules.mk0
-rw-r--r--keyboards/handwired/onekey/nucleo_l432kc/keyboard.json (renamed from keyboards/handwired/onekey/nucleo_l432kc/info.json)0
-rw-r--r--keyboards/handwired/onekey/nucleo_l432kc/rules.mk0
-rw-r--r--keyboards/handwired/onekey/promicro/keyboard.json (renamed from keyboards/handwired/onekey/promicro/info.json)0
-rw-r--r--keyboards/handwired/onekey/promicro/rules.mk0
-rw-r--r--keyboards/handwired/onekey/proton_c/keyboard.json (renamed from keyboards/handwired/onekey/proton_c/info.json)0
-rw-r--r--keyboards/handwired/onekey/proton_c/rules.mk0
-rw-r--r--keyboards/handwired/onekey/rp2040/keyboard.json (renamed from keyboards/handwired/onekey/rp2040/info.json)0
-rw-r--r--keyboards/handwired/onekey/rp2040/rules.mk0
-rw-r--r--keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json (renamed from keyboards/handwired/onekey/sipeed_longan_nano/info.json)0
-rw-r--r--keyboards/handwired/onekey/stm32f0_disco/keyboard.json (renamed from keyboards/handwired/onekey/stm32f0_disco/info.json)0
-rw-r--r--keyboards/handwired/onekey/stm32f0_disco/rules.mk1
-rw-r--r--keyboards/handwired/onekey/stm32f3_disco/keyboard.json (renamed from keyboards/handwired/onekey/stm32f3_disco/info.json)0
-rw-r--r--keyboards/handwired/onekey/stm32f3_disco/rules.mk0
-rw-r--r--keyboards/handwired/onekey/stm32f405_feather/keyboard.json (renamed from keyboards/handwired/onekey/stm32f405_feather/info.json)0
-rw-r--r--keyboards/handwired/onekey/stm32f405_feather/rules.mk1
-rw-r--r--keyboards/handwired/onekey/teensy_2/keyboard.json (renamed from keyboards/handwired/onekey/teensy_2/info.json)0
-rw-r--r--keyboards/handwired/onekey/teensy_2/rules.mk0
-rw-r--r--keyboards/handwired/onekey/teensy_2pp/keyboard.json (renamed from keyboards/handwired/onekey/teensy_2pp/info.json)0
-rw-r--r--keyboards/handwired/onekey/teensy_2pp/rules.mk0
-rw-r--r--keyboards/handwired/onekey/teensy_32/keyboard.json (renamed from keyboards/handwired/onekey/teensy_32/info.json)0
-rw-r--r--keyboards/handwired/onekey/teensy_32/rules.mk1
-rw-r--r--keyboards/handwired/onekey/teensy_35/keyboard.json (renamed from keyboards/handwired/onekey/teensy_35/info.json)0
-rw-r--r--keyboards/handwired/onekey/teensy_35/rules.mk1
-rw-r--r--keyboards/handwired/onekey/teensy_lc/keyboard.json (renamed from keyboards/handwired/onekey/teensy_lc/info.json)0
-rw-r--r--keyboards/handwired/orbweaver/keyboard.json (renamed from keyboards/handwired/orbweaver/info.json)3
-rw-r--r--keyboards/handwired/orbweaver/rules.mk2
-rw-r--r--keyboards/handwired/ortho5x13/keyboard.json (renamed from keyboards/handwired/ortho5x13/info.json)8
-rw-r--r--keyboards/handwired/ortho5x13/keymaps/default/keymap.c11
-rw-r--r--keyboards/handwired/ortho5x13/rules.mk11
-rw-r--r--keyboards/handwired/ortho5x14/keyboard.json (renamed from keyboards/handwired/ortho5x14/info.json)8
-rw-r--r--keyboards/handwired/ortho5x14/rules.mk11
-rw-r--r--keyboards/handwired/ortho_brass/keyboard.json (renamed from keyboards/handwired/ortho_brass/info.json)6
-rw-r--r--keyboards/handwired/ortho_brass/rules.mk10
-rw-r--r--keyboards/handwired/osborne1/keyboard.json (renamed from keyboards/handwired/osborne1/info.json)3
-rw-r--r--keyboards/handwired/osborne1/rules.mk1
-rw-r--r--keyboards/handwired/owlet60/keyboard.json (renamed from keyboards/handwired/owlet60/info.json)7
-rw-r--r--keyboards/handwired/owlet60/matrix.c36
-rw-r--r--keyboards/handwired/owlet60/rules.mk13
-rw-r--r--keyboards/handwired/p65rgb/keyboard.json (renamed from keyboards/handwired/p65rgb/info.json)12
-rw-r--r--keyboards/handwired/p65rgb/rules.mk14
-rw-r--r--keyboards/handwired/petruziamini/keyboard.json (renamed from keyboards/handwired/petruziamini/info.json)21
-rw-r--r--keyboards/handwired/petruziamini/keymaps/default/keymap.c66
-rw-r--r--keyboards/handwired/petruziamini/readme.md5
-rw-r--r--keyboards/handwired/petruziamini/rules.mk1
-rw-r--r--keyboards/handwired/phantagom/baragon/keyboard.json (renamed from keyboards/handwired/phantagom/baragon/info.json)0
-rw-r--r--keyboards/handwired/phantagom/baragon/rules.mk1
-rw-r--r--keyboards/handwired/phantagom/varan/keyboard.json (renamed from keyboards/handwired/phantagom/varan/info.json)0
-rw-r--r--keyboards/handwired/phantagom/varan/rules.mk1
-rw-r--r--keyboards/handwired/pilcrow/keyboard.json (renamed from keyboards/handwired/pilcrow/info.json)8
-rw-r--r--keyboards/handwired/pilcrow/rules.mk11
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/keyboard.json (renamed from keyboards/handwired/pill60/blackpill_f411/info.json)9
-rw-r--r--keyboards/handwired/pill60/blackpill_f401/rules.mk4
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/keyboard.json (renamed from keyboards/handwired/pill60/blackpill_f401/info.json)9
-rw-r--r--keyboards/handwired/pill60/blackpill_f411/rules.mk4
-rw-r--r--keyboards/handwired/pill60/bluepill/keyboard.json (renamed from keyboards/handwired/pill60/bluepill/info.json)3
-rw-r--r--keyboards/handwired/pill60/bluepill/rules.mk1
-rw-r--r--keyboards/handwired/pill60/info.json10
-rw-r--r--keyboards/handwired/pill60/rules.mk15
-rw-r--r--keyboards/handwired/polly40/keyboard.json (renamed from keyboards/handwired/polly40/info.json)6
-rw-r--r--keyboards/handwired/polly40/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/polly40/rules.mk1
-rw-r--r--keyboards/handwired/postageboard/mini/keyboard.json (renamed from keyboards/handwired/postageboard/mini/info.json)9
-rw-r--r--keyboards/handwired/postageboard/mini/rules.mk12
-rw-r--r--keyboards/handwired/postageboard/r1/keyboard.json (renamed from keyboards/handwired/postageboard/r1/info.json)9
-rw-r--r--keyboards/handwired/postageboard/r1/rules.mk12
-rw-r--r--keyboards/handwired/prime_exl/keyboard.json (renamed from keyboards/handwired/prime_exl/info.json)9
-rw-r--r--keyboards/handwired/prime_exl/rules.mk12
-rw-r--r--keyboards/handwired/prime_exl_plus/keyboard.json (renamed from keyboards/handwired/prime_exl_plus/info.json)9
-rw-r--r--keyboards/handwired/prime_exl_plus/prime_exl_plus.c22
-rw-r--r--keyboards/handwired/prime_exl_plus/rules.mk12
-rw-r--r--keyboards/handwired/prkl30/feather/keyboard.json (renamed from keyboards/handwired/prkl30/feather/info.json)10
-rw-r--r--keyboards/handwired/prkl30/feather/rules.mk16
-rw-r--r--keyboards/handwired/prkl30/promicro/keyboard.json (renamed from keyboards/handwired/prkl30/promicro/info.json)10
-rw-r--r--keyboards/handwired/prkl30/promicro/rules.mk13
-rw-r--r--keyboards/handwired/promethium/keyboard.json (renamed from keyboards/handwired/promethium/info.json)12
-rw-r--r--keyboards/handwired/promethium/keymaps/default/keymap.c16
-rw-r--r--keyboards/handwired/promethium/rgbsps.c7
-rw-r--r--keyboards/handwired/promethium/rules.mk17
-rw-r--r--keyboards/handwired/pterodactyl/keyboard.json (renamed from keyboards/handwired/pterodactyl/info.json)9
-rw-r--r--keyboards/handwired/pterodactyl/matrix.c10
-rw-r--r--keyboards/handwired/pterodactyl/rules.mk14
-rw-r--r--keyboards/handwired/pteron/keyboard.json (renamed from keyboards/handwired/pteron/info.json)8
-rw-r--r--keyboards/handwired/pteron/rules.mk11
-rw-r--r--keyboards/handwired/pteron38/keyboard.json (renamed from keyboards/handwired/pteron38/info.json)8
-rw-r--r--keyboards/handwired/pteron38/rules.mk12
-rw-r--r--keyboards/handwired/pteron44/keyboard.json (renamed from keyboards/handwired/pteron44/info.json)8
-rw-r--r--keyboards/handwired/pteron44/rules.mk12
-rw-r--r--keyboards/handwired/pytest/basic/keyboard.json (renamed from keyboards/handwired/pytest/basic/info.json)0
-rw-r--r--keyboards/handwired/pytest/basic/rules.mk0
-rw-r--r--keyboards/handwired/pytest/has_community/keyboard.json (renamed from keyboards/handwired/pytest/has_community/info.json)0
-rw-r--r--keyboards/handwired/pytest/has_community/rules.mk0
-rw-r--r--keyboards/handwired/pytest/macro/keyboard.json (renamed from keyboards/handwired/pytest/macro/info.json)0
-rw-r--r--keyboards/handwired/pytest/macro/rules.mk0
-rw-r--r--keyboards/handwired/qc60/proto/keyboard.json (renamed from keyboards/handwired/qc60/info.json)10
-rw-r--r--keyboards/handwired/qc60/proto/rules.mk1
-rw-r--r--keyboards/handwired/qc60/rules.mk15
-rw-r--r--keyboards/handwired/rabijl/rotary_numpad/keyboard.json (renamed from keyboards/handwired/rabijl/rotary_numpad/info.json)0
-rw-r--r--keyboards/handwired/rabijl/rotary_numpad/rules.mk1
-rw-r--r--keyboards/handwired/rd_61_qmk/keyboard.json (renamed from keyboards/handwired/rd_61_qmk/info.json)0
-rw-r--r--keyboards/handwired/rd_61_qmk/rules.mk1
-rw-r--r--keyboards/handwired/reclined/keyboard.json (renamed from keyboards/handwired/reclined/info.json)0
-rw-r--r--keyboards/handwired/reclined/rules.mk1
-rw-r--r--keyboards/handwired/retro_refit/keyboard.json (renamed from keyboards/handwired/retro_refit/info.json)8
-rw-r--r--keyboards/handwired/retro_refit/retro_refit.c10
-rw-r--r--keyboards/handwired/retro_refit/rules.mk10
-rw-r--r--keyboards/handwired/riblee_f401/keyboard.json (renamed from keyboards/handwired/riblee_f401/info.json)16
-rw-r--r--keyboards/handwired/riblee_f401/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/riblee_f401/rules.mk13
-rw-r--r--keyboards/handwired/riblee_f411/keyboard.json (renamed from keyboards/handwired/riblee_f411/info.json)15
-rw-r--r--keyboards/handwired/riblee_f411/keymaps/default/keymap.c2
-rw-r--r--keyboards/handwired/riblee_f411/rules.mk13
-rw-r--r--keyboards/handwired/riblee_split/keyboard.json (renamed from keyboards/handwired/riblee_split/info.json)0
-rw-r--r--keyboards/handwired/rs60/keyboard.json (renamed from keyboards/handwired/rs60/info.json)8
-rw-r--r--keyboards/handwired/rs60/rules.mk12
-rw-r--r--keyboards/handwired/scottokeebs/scotto108/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto108/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scotto108/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scotto34/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto34/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scotto34/rules.mk0
-rw-r--r--keyboards/handwired/scottokeebs/scotto36/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto36/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scotto36/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scotto40/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto40/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scotto40/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scotto61/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto61/info.json)3
-rw-r--r--keyboards/handwired/scottokeebs/scotto61/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scotto9/keyboard.json (renamed from keyboards/handwired/scottokeebs/scotto9/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scotto9/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/info.json76
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keyboard.json80
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c40
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/readme.md4
-rw-r--r--keyboards/handwired/scottokeebs/scottoalp/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottocmd/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottocmd/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottocmd/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottodeck/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottodeck/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottodeck/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottoergo/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottoergo/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottoergo/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottofly/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottofly/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottofly/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottofrog/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottofrog/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottofrog/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottogame/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottogame/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottogame/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottoinvader/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottoinvader/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottoinvader/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottokatana/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottokatana/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottokatana/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottolong/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottolong/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottolong/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottomacrodeck/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk0
-rw-r--r--keyboards/handwired/scottokeebs/scottomouse/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottomouse/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottomouse/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottonum/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottonum/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottonum/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottoslant/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottoslant/info.json)3
-rw-r--r--keyboards/handwired/scottokeebs/scottoslant/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottosplit/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottosplit/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottosplit/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottostarter/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottostarter/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottostarter/rules.mk1
-rw-r--r--keyboards/handwired/scottokeebs/scottowing/keyboard.json (renamed from keyboards/handwired/scottokeebs/scottowing/info.json)0
-rw-r--r--keyboards/handwired/scottokeebs/scottowing/rules.mk1
-rw-r--r--keyboards/handwired/sejin_eat1010r2/keyboard.json (renamed from keyboards/handwired/sejin_eat1010r2/info.json)0
-rw-r--r--keyboards/handwired/sejin_eat1010r2/rules.mk1
-rw-r--r--keyboards/handwired/selene/keyboard.json (renamed from keyboards/handwired/selene/info.json)13
-rw-r--r--keyboards/handwired/selene/rules.mk12
-rw-r--r--keyboards/handwired/selene/selene.c12
-rw-r--r--keyboards/handwired/sick68/keyboard.json (renamed from keyboards/handwired/sick68/info.json)8
-rw-r--r--keyboards/handwired/sick68/rules.mk12
-rw-r--r--keyboards/handwired/sick_pad/keyboard.json (renamed from keyboards/handwired/sick_pad/info.json)12
-rw-r--r--keyboards/handwired/sick_pad/rules.mk12
-rw-r--r--keyboards/handwired/skakunm_dactyl/keyboard.json (renamed from keyboards/handwired/skakunm_dactyl/info.json)9
-rw-r--r--keyboards/handwired/skakunm_dactyl/rules.mk14
-rw-r--r--keyboards/handwired/slash/keyboard.json (renamed from keyboards/handwired/slash/info.json)6
-rw-r--r--keyboards/handwired/slash/rules.mk14
-rw-r--r--keyboards/handwired/snatchpad/keyboard.json (renamed from keyboards/handwired/snatchpad/info.json)10
-rw-r--r--keyboards/handwired/snatchpad/rules.mk14
-rw-r--r--keyboards/handwired/sono1/info.json8
-rw-r--r--keyboards/handwired/sono1/rules.mk13
-rw-r--r--keyboards/handwired/sono1/sono1.c26
-rw-r--r--keyboards/handwired/sono1/stm32f103/keyboard.json (renamed from keyboards/handwired/sono1/stm32f103/info.json)3
-rw-r--r--keyboards/handwired/sono1/stm32f103/rules.mk1
-rw-r--r--keyboards/handwired/sono1/t2pp/keyboard.json (renamed from keyboards/handwired/sono1/t2pp/info.json)0
-rw-r--r--keyboards/handwired/sono1/t2pp/rules.mk0
-rw-r--r--keyboards/handwired/space_oddity/keyboard.json (renamed from keyboards/handwired/space_oddity/info.json)9
-rw-r--r--keyboards/handwired/space_oddity/rules.mk13
-rw-r--r--keyboards/handwired/split65/promicro/keyboard.json (renamed from keyboards/handwired/split65/promicro/info.json)10
-rw-r--r--keyboards/handwired/split65/promicro/rules.mk14
-rw-r--r--keyboards/handwired/split65/stm32/keyboard.json (renamed from keyboards/handwired/split65/stm32/info.json)12
-rw-r--r--keyboards/handwired/split65/stm32/rules.mk14
-rw-r--r--keyboards/handwired/split89/keyboard.json (renamed from keyboards/handwired/split89/info.json)9
-rw-r--r--keyboards/handwired/split89/rules.mk14
-rw-r--r--keyboards/handwired/split_cloud/keyboard.json (renamed from keyboards/handwired/split_cloud/info.json)0
-rw-r--r--keyboards/handwired/split_cloud/rules.mk0
-rw-r--r--keyboards/handwired/splittest/bluepill/info.json9
-rw-r--r--keyboards/handwired/splittest/bluepill/keyboard.json14
-rw-r--r--keyboards/handwired/splittest/bluepill/rules.mk1
-rw-r--r--keyboards/handwired/splittest/info.json3
-rw-r--r--keyboards/handwired/splittest/promicro/keyboard.json (renamed from keyboards/handwired/splittest/promicro/info.json)8
-rw-r--r--keyboards/handwired/splittest/promicro/rules.mk0
-rw-r--r--keyboards/handwired/splittest/rules.mk14
-rw-r--r--keyboards/handwired/splittest/teensy_2/keyboard.json (renamed from keyboards/handwired/splittest/teensy_2/info.json)8
-rw-r--r--keyboards/handwired/splittest/teensy_2/rules.mk0
-rw-r--r--keyboards/handwired/starrykeebs/dude09/keyboard.json (renamed from keyboards/handwired/starrykeebs/dude09/info.json)0
-rw-r--r--keyboards/handwired/starrykeebs/dude09/rules.mk1
-rw-r--r--keyboards/handwired/steamvan/rev1/keyboard.json (renamed from keyboards/handwired/steamvan/rev1/info.json)11
-rw-r--r--keyboards/handwired/steamvan/rev1/rules.mk14
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json (renamed from keyboards/handwired/stef9998/split_5x7/info.json)9
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rev1/rev1.c (renamed from keyboards/handwired/stef9998/split_5x7/split_5x7.c)0
-rw-r--r--keyboards/handwired/stef9998/split_5x7/rules.mk17
-rw-r--r--keyboards/handwired/sticc14/keyboard.json (renamed from keyboards/handwired/sticc14/info.json)8
-rw-r--r--keyboards/handwired/sticc14/rules.mk12
-rw-r--r--keyboards/handwired/stream_cheap/2x3/keyboard.json (renamed from keyboards/handwired/stream_cheap/2x3/info.json)8
-rw-r--r--keyboards/handwired/stream_cheap/2x3/rules.mk12
-rw-r--r--keyboards/handwired/stream_cheap/2x4/keyboard.json (renamed from keyboards/handwired/stream_cheap/2x4/info.json)11
-rw-r--r--keyboards/handwired/stream_cheap/2x4/rules.mk13
-rw-r--r--keyboards/handwired/stream_cheap/2x5/keyboard.json (renamed from keyboards/handwired/stream_cheap/2x5/info.json)8
-rw-r--r--keyboards/handwired/stream_cheap/2x5/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/astro65/keyboard.json (renamed from keyboards/handwired/swiftrax/astro65/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/astro65/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/bebol/keyboard.json (renamed from keyboards/handwired/swiftrax/bebol/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/bebol/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/beegboy/keyboard.json (renamed from keyboards/handwired/swiftrax/beegboy/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/beegboy/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/bumblebee/keyboard.json (renamed from keyboards/handwired/swiftrax/bumblebee/info.json)10
-rw-r--r--keyboards/handwired/swiftrax/bumblebee/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/cowfish/keyboard.json (renamed from keyboards/handwired/swiftrax/cowfish/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/cowfish/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/digicarp65/keyboard.json (renamed from keyboards/handwired/swiftrax/digicarp65/info.json)9
-rw-r--r--keyboards/handwired/swiftrax/digicarp65/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/digicarpice/keyboard.json (renamed from keyboards/handwired/swiftrax/digicarpice/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/digicarpice/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/equator/keyboard.json (renamed from keyboards/handwired/swiftrax/equator/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/equator/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/glacier/keyboard.json (renamed from keyboards/handwired/swiftrax/glacier/info.json)9
-rw-r--r--keyboards/handwired/swiftrax/glacier/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/joypad/keyboard.json (renamed from keyboards/handwired/swiftrax/joypad/info.json)9
-rw-r--r--keyboards/handwired/swiftrax/joypad/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/koalafications/keyboard.json (renamed from keyboards/handwired/swiftrax/koalafications/info.json)10
-rw-r--r--keyboards/handwired/swiftrax/koalafications/rules.mk14
-rw-r--r--keyboards/handwired/swiftrax/nodu/keyboard.json (renamed from keyboards/handwired/swiftrax/nodu/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/nodu/rules.mk12
-rw-r--r--keyboards/handwired/swiftrax/pandamic/keyboard.json (renamed from keyboards/handwired/swiftrax/pandamic/info.json)9
-rw-r--r--keyboards/handwired/swiftrax/pandamic/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/the_galleon/keyboard.json (renamed from keyboards/handwired/swiftrax/the_galleon/info.json)9
-rw-r--r--keyboards/handwired/swiftrax/the_galleon/rules.mk14
-rw-r--r--keyboards/handwired/swiftrax/unsplit/keyboard.json (renamed from keyboards/handwired/swiftrax/unsplit/info.json)8
-rw-r--r--keyboards/handwired/swiftrax/unsplit/rules.mk13
-rw-r--r--keyboards/handwired/swiftrax/walter/keyboard.json (renamed from keyboards/handwired/swiftrax/walter/info.json)10
-rw-r--r--keyboards/handwired/swiftrax/walter/rules.mk13
-rw-r--r--keyboards/handwired/symmetric70_proto/debug_config.h12
-rw-r--r--keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c35
-rw-r--r--keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h3
-rw-r--r--keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c5
-rw-r--r--keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c10
-rw-r--r--keyboards/handwired/symmetric70_proto/proton_c/info.json4
-rw-r--r--keyboards/handwired/symmetry60/keyboard.json (renamed from keyboards/handwired/symmetry60/info.json)12
-rw-r--r--keyboards/handwired/symmetry60/rules.mk13
-rw-r--r--keyboards/handwired/t111/keyboard.json (renamed from keyboards/handwired/t111/info.json)11
-rw-r--r--keyboards/handwired/t111/rules.mk13
-rw-r--r--keyboards/handwired/technicpad/keyboard.json (renamed from keyboards/handwired/technicpad/info.json)0
-rw-r--r--keyboards/handwired/technicpad/rules.mk1
-rw-r--r--keyboards/handwired/tennie/config.h2
-rw-r--r--keyboards/handwired/tennie/keyboard.json (renamed from keyboards/handwired/tennie/info.json)12
-rw-r--r--keyboards/handwired/tennie/rules.mk12
-rw-r--r--keyboards/handwired/terminus_mini/keyboard.json (renamed from keyboards/handwired/terminus_mini/info.json)8
-rw-r--r--keyboards/handwired/terminus_mini/keymaps/default/keymap.c5
-rw-r--r--keyboards/handwired/terminus_mini/rules.mk12
-rw-r--r--keyboards/handwired/tkk/keyboard.json (renamed from keyboards/handwired/tkk/info.json)0
-rw-r--r--keyboards/handwired/tkk/rules.mk1
-rw-r--r--keyboards/handwired/trackpoint/keyboard.json (renamed from keyboards/handwired/trackpoint/info.json)9
-rw-r--r--keyboards/handwired/trackpoint/rules.mk14
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/4x6_right/info.json)8
-rw-r--r--keyboards/handwired/tractyl_manuform/4x6_right/rules.mk17
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json)0
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk0
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json)5
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk5
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json)9
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h4
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c12
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json)8
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk2
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/info.json9
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/rules.mk17
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json (renamed from keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json)0
-rw-r--r--keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk0
-rw-r--r--keyboards/handwired/traveller/keyboard.json (renamed from keyboards/handwired/traveller/info.json)9
-rw-r--r--keyboards/handwired/traveller/rules.mk12
-rw-r--r--keyboards/handwired/traveller/traveller.c4
-rw-r--r--keyboards/handwired/tritium_numpad/keyboard.json (renamed from keyboards/handwired/tritium_numpad/info.json)9
-rw-r--r--keyboards/handwired/tritium_numpad/rules.mk12
-rw-r--r--keyboards/handwired/tsubasa/keyboard.json (renamed from keyboards/handwired/tsubasa/info.json)15
-rw-r--r--keyboards/handwired/tsubasa/rules.mk18
-rw-r--r--keyboards/handwired/twadlee/tp69/keyboard.json (renamed from keyboards/handwired/twadlee/tp69/info.json)7
-rw-r--r--keyboards/handwired/twadlee/tp69/rules.mk15
-rw-r--r--keyboards/handwired/twig/twig50/keyboard.json (renamed from keyboards/handwired/twig/twig50/info.json)13
-rw-r--r--keyboards/handwired/twig/twig50/rules.mk12
-rw-r--r--keyboards/handwired/unicomp_mini_m/keyboard.json (renamed from keyboards/handwired/unicomp_mini_m/info.json)8
-rw-r--r--keyboards/handwired/unicomp_mini_m/rules.mk12
-rw-r--r--keyboards/handwired/unk/rev1/keyboard.json (renamed from keyboards/handwired/unk/rev1/info.json)7
-rw-r--r--keyboards/handwired/unk/rev1/rules.mk0
-rw-r--r--keyboards/handwired/unk/rules.mk15
-rw-r--r--keyboards/handwired/uthol/rev1/keyboard.json (renamed from keyboards/handwired/uthol/rev1/info.json)11
-rw-r--r--keyboards/handwired/uthol/rev1/rules.mk7
-rw-r--r--keyboards/handwired/uthol/rev2/keyboard.json (renamed from keyboards/handwired/uthol/rev2/info.json)12
-rw-r--r--keyboards/handwired/uthol/rev2/rules.mk8
-rw-r--r--keyboards/handwired/uthol/rev3/keyboard.json (renamed from keyboards/handwired/uthol/rev3/info.json)18
-rw-r--r--keyboards/handwired/uthol/rev3/rules.mk11
-rw-r--r--keyboards/handwired/videowriter/keyboard.json (renamed from keyboards/handwired/videowriter/info.json)8
-rw-r--r--keyboards/handwired/videowriter/rules.mk12
-rw-r--r--keyboards/handwired/wabi/keyboard.json (renamed from keyboards/handwired/wabi/info.json)8
-rw-r--r--keyboards/handwired/wabi/rules.mk12
-rw-r--r--keyboards/handwired/wakizashi40/keyboard.json (renamed from keyboards/handwired/wakizashi40/info.json)8
-rw-r--r--keyboards/handwired/wakizashi40/rules.mk1
-rw-r--r--keyboards/handwired/woodpad/keyboard.json (renamed from keyboards/handwired/woodpad/info.json)8
-rw-r--r--keyboards/handwired/woodpad/rules.mk12
-rw-r--r--keyboards/handwired/woodpad/woodpad.c6
-rw-r--r--keyboards/handwired/wulkan/keyboard.json (renamed from keyboards/handwired/wulkan/info.json)10
-rw-r--r--keyboards/handwired/wulkan/rules.mk12
-rw-r--r--keyboards/handwired/wwa/helios/keyboard.json (renamed from keyboards/handwired/wwa/helios/info.json)0
-rw-r--r--keyboards/handwired/wwa/helios/rules.mk1
-rw-r--r--keyboards/handwired/wwa/kepler/keyboard.json (renamed from keyboards/handwired/wwa/kepler/info.json)0
-rw-r--r--keyboards/handwired/wwa/kepler/rules.mk1
-rw-r--r--keyboards/handwired/wwa/mercury/keyboard.json (renamed from keyboards/handwired/wwa/mercury/info.json)0
-rw-r--r--keyboards/handwired/wwa/mercury/rules.mk1
-rw-r--r--keyboards/handwired/wwa/soyuz/keyboard.json (renamed from keyboards/handwired/wwa/soyuz/info.json)0
-rw-r--r--keyboards/handwired/wwa/soyuz/rules.mk0
-rw-r--r--keyboards/handwired/wwa/soyuzxl/keyboard.json (renamed from keyboards/handwired/wwa/soyuzxl/info.json)0
-rw-r--r--keyboards/handwired/wwa/soyuzxl/rules.mk0
-rw-r--r--keyboards/handwired/xealous/rev1/keyboard.json (renamed from keyboards/handwired/xealous/rev1/info.json)12
-rw-r--r--keyboards/handwired/xealous/rev1/rules.mk0
-rw-r--r--keyboards/handwired/xealous/rules.mk14
-rw-r--r--keyboards/handwired/z150/keyboard.json (renamed from keyboards/handwired/z150/info.json)8
-rw-r--r--keyboards/handwired/z150/rules.mk13
-rw-r--r--keyboards/handwired/z150/z150.c18
-rw-r--r--keyboards/handwired/zergo/keyboard.json (renamed from keyboards/handwired/zergo/info.json)8
-rw-r--r--keyboards/handwired/zergo/rules.mk12
-rw-r--r--keyboards/handwired/ziyoulang_k3_mod/keyboard.json (renamed from keyboards/handwired/ziyoulang_k3_mod/info.json)0
-rw-r--r--keyboards/handwired/ziyoulang_k3_mod/rules.mk1
722 files changed, 2753 insertions, 3627 deletions
diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/keyboard.json
index 605c77875d..396b4c33cb 100644
--- a/keyboards/handwired/108key_trackpoint/info.json
+++ b/keyboards/handwired/108key_trackpoint/keyboard.json
@@ -15,6 +15,16 @@
"diode_direction": "COL2ROW",
"processor": "at90usb1286",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "ps2_mouse": true,
+ "ps2": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/108key_trackpoint/rules.mk b/keyboards/handwired/108key_trackpoint/rules.mk
index acdf7bf393..74035c9903 100644
--- a/keyboards/handwired/108key_trackpoint/rules.mk
+++ b/keyboards/handwired/108key_trackpoint/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
PS2_DRIVER = usart
diff --git a/keyboards/handwired/10k/info.json b/keyboards/handwired/10k/keyboard.json
index af75560e84..a3293601e3 100644
--- a/keyboards/handwired/10k/info.json
+++ b/keyboards/handwired/10k/keyboard.json
@@ -7,16 +7,19 @@
"cols": ["C6", "D7", "E6", "B4", "B5"],
"rows": ["B6"]
},
+ "build": {
+ "lto": true
+ },
"features": {
- "audio": false,
- "backlight": false,
"bootmagic": false,
"command": false,
"console": false,
"extrakey": false,
"mousekey": false,
- "nkro": false,
- "rgblight": false
+ "nkro": false
+ },
+ "split": {
+ "enabled": true
},
"usb": {
"vid": "0x6869",
diff --git a/keyboards/handwired/10k/rules.mk b/keyboards/handwired/10k/rules.mk
deleted file mode 100644
index b4310ab72a..0000000000
--- a/keyboards/handwired/10k/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-SPLIT_KEYBOARD = yes
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/2x5keypad/2x5keypad.c b/keyboards/handwired/2x5keypad/2x5keypad.c
index 873c579a17..cbd4c519b0 100644
--- a/keyboards/handwired/2x5keypad/2x5keypad.c
+++ b/keyboards/handwired/2x5keypad/2x5keypad.c
@@ -5,21 +5,21 @@ void matrix_init_kb(void)
{
matrix_init_user();
- setPinOutput(RED_LED);
- setPinOutput(BLUE_LED);
- setPinOutput(GREEN_LED);
+ gpio_set_pin_output(RED_LED);
+ gpio_set_pin_output(BLUE_LED);
+ gpio_set_pin_output(GREEN_LED);
}
void turn_off_leds(void)
{
- writePinLow(RED_LED);
- writePinLow(BLUE_LED);
- writePinLow(GREEN_LED);
+ gpio_write_pin_low(RED_LED);
+ gpio_write_pin_low(BLUE_LED);
+ gpio_write_pin_low(GREEN_LED);
}
void turn_on_led(pin_t pin)
{
- writePinHigh(pin);
+ gpio_write_pin_high(pin);
}
diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/keyboard.json
index b33273e19d..8b492c6fe6 100644
--- a/keyboards/handwired/2x5keypad/info.json
+++ b/keyboards/handwired/2x5keypad/keyboard.json
@@ -11,6 +11,14 @@
"tapping": {
"term": 250
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4"],
"rows": ["B3", "B2"]
diff --git a/keyboards/handwired/2x5keypad/rules.mk b/keyboards/handwired/2x5keypad/rules.mk
deleted file mode 100644
index 81d4ba4f3b..0000000000
--- a/keyboards/handwired/2x5keypad/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-AUDIO_ENABLE = no
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-COMMAND_ENABLE = no # Commands for debug and configuration
-CONSOLE_ENABLE= no # Console for debug
-EXTRAKEY_ENABLE = yes # Audio control and System control
-MOUSEKEY_ENABLE = yes # Mouse keys
-NKRO_ENABLE = yes # Enable N-Key Rollover
-
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/keyboard.json
index c1fec23580..7675acd73b 100644
--- a/keyboards/handwired/3dfoxc/info.json
+++ b/keyboards/handwired/3dfoxc/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["F0", "F1", "C7", "D5", "B7"]
diff --git a/keyboards/handwired/3dfoxc/rules.mk b/keyboards/handwired/3dfoxc/rules.mk
deleted file mode 100644
index c6b71a4aaa..0000000000
--- a/keyboards/handwired/3dfoxc/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/3dortho14u/rev1/info.json b/keyboards/handwired/3dortho14u/rev1/keyboard.json
index 9179bd3a1b..63773d405f 100644
--- a/keyboards/handwired/3dortho14u/rev1/info.json
+++ b/keyboards/handwired/3dortho14u/rev1/keyboard.json
@@ -7,18 +7,12 @@
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
- "audio": false,
- "backlight": false,
- "bluetooth": false,
- "bootmagic": true,
- "command": false,
- "console": true,
- "extrakey": true,
- "midi": false,
- "mousekey": true,
- "nkro": true,
- "rgblight": false,
- "unicode": false
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
},
"indicators": {
"caps_lock": "F0"
diff --git a/keyboards/handwired/3dortho14u/rev1/rules.mk b/keyboards/handwired/3dortho14u/rev1/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/3dortho14u/rev1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/3dortho14u/rev2/info.json b/keyboards/handwired/3dortho14u/rev2/keyboard.json
index 499d8603ce..9e048d643d 100644
--- a/keyboards/handwired/3dortho14u/rev2/info.json
+++ b/keyboards/handwired/3dortho14u/rev2/keyboard.json
@@ -7,18 +7,12 @@
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
- "audio": false,
- "backlight": false,
- "bluetooth": false,
- "bootmagic": true,
- "command": false,
- "console": true,
- "extrakey": true,
- "midi": false,
- "mousekey": true,
- "nkro": true,
- "rgblight": false,
- "unicode": false
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
},
"indicators": {
"caps_lock": "F4"
diff --git a/keyboards/handwired/3dortho14u/rev2/rules.mk b/keyboards/handwired/3dortho14u/rev2/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/3dortho14u/rev2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/3dp660/info.json b/keyboards/handwired/3dp660/keyboard.json
index 82132e4473..e01ff4610c 100644
--- a/keyboards/handwired/3dp660/info.json
+++ b/keyboards/handwired/3dp660/keyboard.json
@@ -11,6 +11,17 @@
"tapping": {
"term": 400
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B0", "B1", "B2", "B3", "B7"]
diff --git a/keyboards/handwired/3dp660/rules.mk b/keyboards/handwired/3dp660/rules.mk
deleted file mode 100644
index f5b61e673c..0000000000
--- a/keyboards/handwired/3dp660/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/3dp660_oled/info.json b/keyboards/handwired/3dp660_oled/info.json
deleted file mode 100644
index a43aca3464..0000000000
--- a/keyboards/handwired/3dp660_oled/info.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
- "manufacturer": "xia0",
- "keyboard_name": "handwired/3dp660_oled",
- "maintainer": "xia0",
- "bootloader": "atmel-dfu",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": true,
- "extrakey": true,
- "mousekey": true,
- "oled": true,
- "nkro": true,
- "wpm": true
- },
- "build": {
- "lto": true
- },
- "matrix_pins": {
- "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
- "rows": ["D5", "B0", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"]
- },
- "processor": "atmega32u4",
- "url": "",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x3661",
- "vid": "0x6662"
- },
- "layouts": {
- "LAYOUT_66_ansi": {
- "layout": [
- { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
- { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
- { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
- { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
- { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
- { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
- { "label": "Page Up", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
- { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
- { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
- { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "Page Down", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
- { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
- { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
- { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
- { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
- { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
- { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
- { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
- { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
- { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
- { "label": "Up", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
- { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
- { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
- { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
- { "label": "Left", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
- { "label": "Down", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
- { "label": "Up", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
- ]
- },
- "LAYOUT_66_iso": {
- "layout": [
- { "label": "~", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "!", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "@", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "#", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "$", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "%", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "^", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "&", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "*", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
- { "label": "(", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
- { "label": ")", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
- { "label": "_", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
- { "label": "+", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
- { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
- { "label": "Insert", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
- { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
- { "label": "{", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
- { "label": "}", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
- { "label": "Delete", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
- { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
- { "label": ":", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
- { "label": "\"", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
- { "label": "", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
- { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
- { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "\\", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
- { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
- { "label": "<", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
- { "label": ">", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
- { "label": "?", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
- { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
- { "label": "\u2191", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
- { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
- { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
- { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
- { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
- { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
- { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
- { "label": "\u2190", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
- { "label": "\u2193", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
- { "label": "\u2192", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
- ]
- },
- "LAYOUT_all": {
- "layout": [
- { "label": "GRAVE", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 },
- { "label": "1", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 },
- { "label": "2", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 },
- { "label": "3", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 },
- { "label": "4", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 },
- { "label": "5", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 },
- { "label": "6", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 },
- { "label": "7", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 },
- { "label": "8", "matrix": [5, 0], "w": 1, "x": 8, "y": 0 },
- { "label": "9", "matrix": [5, 1], "w": 1, "x": 9, "y": 0 },
- { "label": "0", "matrix": [5, 2], "w": 1, "x": 10, "y": 0 },
- { "label": "DASH", "matrix": [5, 3], "w": 1, "x": 11, "y": 0 },
- { "label": "EQUALSIGN", "matrix": [5, 4], "w": 1, "x": 12, "y": 0 },
- { "label": "YEN", "matrix": [5, 5], "w": 1, "x": 13, "y": 0 },
- { "label": "BACKSPACE", "matrix": [5, 6], "w": 1, "x": 14, "y": 0 },
- { "label": "PAGEUP", "matrix": [5, 7], "w": 1, "x": 15.5, "y": 0 },
- { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
- { "label": "Q", "matrix": [1, 1], "w": 1, "x": 1.5, "y": 1 },
- { "label": "W", "matrix": [1, 2], "w": 1, "x": 2.5, "y": 1 },
- { "label": "E", "matrix": [1, 3], "w": 1, "x": 3.5, "y": 1 },
- { "label": "R", "matrix": [1, 4], "w": 1, "x": 4.5, "y": 1 },
- { "label": "T", "matrix": [1, 5], "w": 1, "x": 5.5, "y": 1 },
- { "label": "Y", "matrix": [1, 6], "w": 1, "x": 6.5, "y": 1 },
- { "label": "U", "matrix": [1, 7], "w": 1, "x": 7.5, "y": 1 },
- { "label": "I", "matrix": [6, 0], "w": 1, "x": 8.5, "y": 1 },
- { "label": "O", "matrix": [6, 1], "w": 1, "x": 9.5, "y": 1 },
- { "label": "P", "matrix": [6, 2], "w": 1, "x": 10.5, "y": 1 },
- { "label": "LBRACKET", "matrix": [6, 3], "w": 1, "x": 11.5, "y": 1 },
- { "label": "RBRACKET", "matrix": [6, 4], "w": 1, "x": 12.5, "y": 1 },
- { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
- { "label": "PAGEDOWN", "matrix": [6, 7], "w": 1, "x": 15.5, "y": 1 },
- { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
- { "label": "A", "matrix": [2, 1], "w": 1, "x": 1.75, "y": 2 },
- { "label": "S", "matrix": [2, 2], "w": 1, "x": 2.75, "y": 2 },
- { "label": "D", "matrix": [2, 3], "w": 1, "x": 3.75, "y": 2 },
- { "label": "F", "matrix": [2, 4], "w": 1, "x": 4.75, "y": 2 },
- { "label": "G", "matrix": [2, 5], "w": 1, "x": 5.75, "y": 2 },
- { "label": "H", "matrix": [2, 6], "w": 1, "x": 6.75, "y": 2 },
- { "label": "J", "matrix": [2, 7], "w": 1, "x": 7.75, "y": 2 },
- { "label": "K", "matrix": [7, 0], "w": 1, "x": 8.75, "y": 2 },
- { "label": "L", "matrix": [7, 1], "w": 1, "x": 9.75, "y": 2 },
- { "label": "SEMICOLON", "matrix": [7, 2], "w": 1, "x": 10.75, "y": 2 },
- { "label": "QUOTE", "matrix": [7, 3], "w": 1, "x": 11.75, "y": 2 },
- { "label": "ISOHASH", "matrix": [7, 4], "w": 1, "x": 12.75, "y": 2 },
- { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
- { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
- { "label": "ISOBACKSLASH", "matrix": [3, 1], "w": 1, "x": 1.25, "y": 3 },
- { "label": "Z", "matrix": [3, 2], "w": 1, "x": 2.25, "y": 3 },
- { "label": "X", "matrix": [3, 3], "w": 1, "x": 3.25, "y": 3 },
- { "label": "C", "matrix": [3, 4], "w": 1, "x": 4.25, "y": 3 },
- { "label": "V", "matrix": [3, 5], "w": 1, "x": 5.25, "y": 3 },
- { "label": "B", "matrix": [3, 6], "w": 1, "x": 6.25, "y": 3 },
- { "label": "N", "matrix": [3, 7], "w": 1, "x": 7.25, "y": 3 },
- { "label": "M", "matrix": [8, 0], "w": 1, "x": 8.25, "y": 3 },
- { "label": "COMMA", "matrix": [8, 1], "w": 1, "x": 9.25, "y": 3 },
- { "label": "PERIOD", "matrix": [8, 2], "w": 1, "x": 10.25, "y": 3 },
- { "label": "SLASH", "matrix": [8, 3], "w": 1, "x": 11.25, "y": 3 },
- { "label": "JPBACKSLASH", "matrix": [8, 4], "w": 1, "x": 12.25, "y": 3 },
- { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
- { "label": "UP", "matrix": [8, 6], "w": 1, "x": 14.5, "y": 3 },
- { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
- { "label": "LALT", "matrix": [4, 1], "w": 1, "x": 1.25, "y": 4 },
- { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
- { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
- { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
- { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
- { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
- { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
- { "label": "RCTRL", "matrix": [9, 3], "w": 1, "x": 11.25, "y": 4 },
- { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
- { "label": "LEFT", "matrix": [9, 5], "w": 1, "x": 13.5, "y": 4 },
- { "label": "DOWN", "matrix": [9, 6], "w": 1, "x": 14.5, "y": 4 },
- { "label": "RIGHT", "matrix": [9, 7], "w": 1, "x": 15.5, "y": 4 }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/keyboards/handwired/3dp660_oled/keyboard.json b/keyboards/handwired/3dp660_oled/keyboard.json
new file mode 100644
index 0000000000..ef863b3b52
--- /dev/null
+++ b/keyboards/handwired/3dp660_oled/keyboard.json
@@ -0,0 +1,251 @@
+{
+ "manufacturer": "xia0",
+ "keyboard_name": "handwired/3dp660_oled",
+ "maintainer": "xia0",
+ "bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "oled": true,
+ "nkro": true,
+ "wpm": true
+ },
+ "build": {
+ "lto": true
+ },
+ "matrix_pins": {
+ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
+ "rows": ["D5", "B0", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"]
+ },
+ "processor": "atmega32u4",
+ "url": "",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x3661",
+ "vid": "0x6662"
+ },
+ "layouts": {
+ "LAYOUT_66_ansi": {
+ "layout": [
+ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
+ { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+ { "label": "Page Up", "matrix": [5, 7], "x": 15.5, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+ { "label": "|", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "Page Down", "matrix": [6, 7], "x": 15.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+ { "label": "Enter", "matrix": [7, 5], "w": 2.25, "x": 12.75, "y": 2 },
+ { "label": "Shift", "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+ { "label": "Up", "matrix": [8, 6], "x": 14.5, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+ { "label": "Win", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+ { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+ { "label": "Left", "matrix": [9, 5], "x": 13.5, "y": 4 },
+ { "label": "Down", "matrix": [9, 6], "x": 14.5, "y": 4 },
+ { "label": "Up", "matrix": [9, 7], "x": 15.5, "y": 4 }
+ ]
+ },
+ "LAYOUT_66_iso": {
+ "layout": [
+ { "label": "~", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "!", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "@", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "#", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "$", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "%", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "^", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "&", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "*", "matrix": [5, 0], "x": 8, "y": 0 },
+ { "label": "(", "matrix": [5, 1], "x": 9, "y": 0 },
+ { "label": ")", "matrix": [5, 2], "x": 10, "y": 0 },
+ { "label": "_", "matrix": [5, 3], "x": 11, "y": 0 },
+ { "label": "+", "matrix": [5, 4], "x": 12, "y": 0 },
+ { "label": "Backspace", "matrix": [5, 6], "w": 2, "x": 13, "y": 0 },
+ { "label": "Insert", "matrix": [5, 7], "x": 15.5, "y": 0 },
+ { "label": "Tab", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+ { "label": "{", "matrix": [6, 3], "x": 11.5, "y": 1 },
+ { "label": "}", "matrix": [6, 4], "x": 12.5, "y": 1 },
+ { "label": "Delete", "matrix": [6, 7], "x": 15.5, "y": 1 },
+ { "label": "Caps Lock", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+ { "label": ":", "matrix": [7, 2], "x": 10.75, "y": 2 },
+ { "label": "\"", "matrix": [7, 3], "x": 11.75, "y": 2 },
+ { "label": "", "matrix": [7, 4], "x": 12.75, "y": 2 },
+ { "h": 2, "label": "Enter", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 1 },
+ { "label": "Shift", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "label": "\\", "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+ { "label": "<", "matrix": [8, 1], "x": 9.25, "y": 3 },
+ { "label": ">", "matrix": [8, 2], "x": 10.25, "y": 3 },
+ { "label": "?", "matrix": [8, 3], "x": 11.25, "y": 3 },
+ { "label": "Shift", "matrix": [8, 5], "w": 2.25, "x": 12.25, "y": 3 },
+ { "label": "\u2191", "matrix": [8, 6], "x": 14.5, "y": 3 },
+ { "label": "Ctrl", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "label": "Win", "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 },
+ { "label": "Alt", "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 },
+ { "label": "Space", "matrix": [4, 6], "w": 6, "x": 3.75, "y": 4 },
+ { "label": "Alt", "matrix": [9, 2], "w": 1.25, "x": 9.75, "y": 4 },
+ { "label": "Ctrl", "matrix": [9, 3], "w": 1.25, "x": 11, "y": 4 },
+ { "label": "Menu", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+ { "label": "\u2190", "matrix": [9, 5], "x": 13.5, "y": 4 },
+ { "label": "\u2193", "matrix": [9, 6], "x": 14.5, "y": 4 },
+ { "label": "\u2192", "matrix": [9, 7], "x": 15.5, "y": 4 }
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ { "label": "GRAVE", "matrix": [0, 0], "x": 0, "y": 0 },
+ { "label": "1", "matrix": [0, 1], "x": 1, "y": 0 },
+ { "label": "2", "matrix": [0, 2], "x": 2, "y": 0 },
+ { "label": "3", "matrix": [0, 3], "x": 3, "y": 0 },
+ { "label": "4", "matrix": [0, 4], "x": 4, "y": 0 },
+ { "label": "5", "matrix": [0, 5], "x": 5, "y": 0 },
+ { "label": "6", "matrix": [0, 6], "x": 6, "y": 0 },
+ { "label": "7", "matrix": [0, 7], "x": 7, "y": 0 },
+ { "label": "8", "matrix": [5, 0], "x": 8, "y": 0 },
+ { "label": "9", "matrix": [5, 1], "x": 9, "y": 0 },
+ { "label": "0", "matrix": [5, 2], "x": 10, "y": 0 },
+ { "label": "DASH", "matrix": [5, 3], "x": 11, "y": 0 },
+ { "label": "EQUALSIGN", "matrix": [5, 4], "x": 12, "y": 0 },
+ { "label": "YEN", "matrix": [5, 5], "x": 13, "y": 0 },
+ { "label": "BACKSPACE", "matrix": [5, 6], "x": 14, "y": 0 },
+ { "label": "PAGEUP", "matrix": [5, 7], "x": 15.5, "y": 0 },
+ { "label": "TAB", "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 },
+ { "label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1 },
+ { "label": "W", "matrix": [1, 2], "x": 2.5, "y": 1 },
+ { "label": "E", "matrix": [1, 3], "x": 3.5, "y": 1 },
+ { "label": "R", "matrix": [1, 4], "x": 4.5, "y": 1 },
+ { "label": "T", "matrix": [1, 5], "x": 5.5, "y": 1 },
+ { "label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1 },
+ { "label": "U", "matrix": [1, 7], "x": 7.5, "y": 1 },
+ { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 1 },
+ { "label": "O", "matrix": [6, 1], "x": 9.5, "y": 1 },
+ { "label": "P", "matrix": [6, 2], "x": 10.5, "y": 1 },
+ { "label": "LBRACKET", "matrix": [6, 3], "x": 11.5, "y": 1 },
+ { "label": "RBRACKET", "matrix": [6, 4], "x": 12.5, "y": 1 },
+ { "label": "BACKSLASH", "matrix": [6, 5], "w": 1.5, "x": 13.5, "y": 1 },
+ { "label": "PAGEDOWN", "matrix": [6, 7], "x": 15.5, "y": 1 },
+ { "label": "CAPSLOCK", "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 },
+ { "label": "A", "matrix": [2, 1], "x": 1.75, "y": 2 },
+ { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 2 },
+ { "label": "D", "matrix": [2, 3], "x": 3.75, "y": 2 },
+ { "label": "F", "matrix": [2, 4], "x": 4.75, "y": 2 },
+ { "label": "G", "matrix": [2, 5], "x": 5.75, "y": 2 },
+ { "label": "H", "matrix": [2, 6], "x": 6.75, "y": 2 },
+ { "label": "J", "matrix": [2, 7], "x": 7.75, "y": 2 },
+ { "label": "K", "matrix": [7, 0], "x": 8.75, "y": 2 },
+ { "label": "L", "matrix": [7, 1], "x": 9.75, "y": 2 },
+ { "label": "SEMICOLON", "matrix": [7, 2], "x": 10.75, "y": 2 },
+ { "label": "QUOTE", "matrix": [7, 3], "x": 11.75, "y": 2 },
+ { "label": "ISOHASH", "matrix": [7, 4], "x": 12.75, "y": 2 },
+ { "label": "ENTER", "matrix": [7, 5], "w": 1.25, "x": 13.75, "y": 2 },
+ { "label": "LSHIFT", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 },
+ { "label": "ISOBACKSLASH", "matrix": [3, 1], "x": 1.25, "y": 3 },
+ { "label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3 },
+ { "label": "X", "matrix": [3, 3], "x": 3.25, "y": 3 },
+ { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 3 },
+ { "label": "V", "matrix": [3, 5], "x": 5.25, "y": 3 },
+ { "label": "B", "matrix": [3, 6], "x": 6.25, "y": 3 },
+ { "label": "N", "matrix": [3, 7], "x": 7.25, "y": 3 },
+ { "label": "M", "matrix": [8, 0], "x": 8.25, "y": 3 },
+ { "label": "COMMA", "matrix": [8, 1], "x": 9.25, "y": 3 },
+ { "label": "PERIOD", "matrix": [8, 2], "x": 10.25, "y": 3 },
+ { "label": "SLASH", "matrix": [8, 3], "x": 11.25, "y": 3 },
+ { "label": "JPBACKSLASH", "matrix": [8, 4], "x": 12.25, "y": 3 },
+ { "label": "RSHIFT", "matrix": [8, 5], "w": 1.25, "x": 13.25, "y": 3 },
+ { "label": "UP", "matrix": [8, 6], "x": 14.5, "y": 3 },
+ { "label": "LCTRL", "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 },
+ { "label": "LALT", "matrix": [4, 1], "x": 1.25, "y": 4 },
+ { "label": "LCMD", "matrix": [4, 2], "w": 1.25, "x": 2.25, "y": 4 },
+ { "label": "MUHENKAN", "matrix": [4, 3], "w": 1.25, "x": 3.5, "y": 4 },
+ { "label": "SPACE1", "matrix": [4, 5], "w": 2, "x": 4.75, "y": 4 },
+ { "label": "SPACE2", "matrix": [4, 6], "w": 2, "x": 6.75, "y": 4 },
+ { "label": "HENKAN", "matrix": [9, 0], "w": 1.25, "x": 8.75, "y": 4 },
+ { "label": "RCMD", "matrix": [9, 2], "w": 1.25, "x": 10, "y": 4 },
+ { "label": "RCTRL", "matrix": [9, 3], "x": 11.25, "y": 4 },
+ { "label": "FN", "matrix": [9, 4], "w": 1.25, "x": 12.25, "y": 4 },
+ { "label": "LEFT", "matrix": [9, 5], "x": 13.5, "y": 4 },
+ { "label": "DOWN", "matrix": [9, 6], "x": 14.5, "y": 4 },
+ { "label": "RIGHT", "matrix": [9, 7], "x": 15.5, "y": 4 }
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/handwired/3dp660_oled/rules.mk b/keyboards/handwired/3dp660_oled/rules.mk
deleted file mode 100644
index c80812f6e0..0000000000
--- a/keyboards/handwired/3dp660_oled/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file is intentionally blank
diff --git a/keyboards/handwired/412_64/info.json b/keyboards/handwired/412_64/keyboard.json
index 0468744b1b..736c1886bb 100644
--- a/keyboards/handwired/412_64/info.json
+++ b/keyboards/handwired/412_64/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0412",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"],
"rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"]
diff --git a/keyboards/handwired/412_64/rules.mk b/keyboards/handwired/412_64/rules.mk
deleted file mode 100644
index 0ad8161240..0000000000
--- a/keyboards/handwired/412_64/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/keyboard.json
index e2cc8dbf71..d68dcd1ec2 100644
--- a/keyboards/handwired/42/info.json
+++ b/keyboards/handwired/42/keyboard.json
@@ -21,6 +21,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "bluetooth": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/42/rules.mk b/keyboards/handwired/42/rules.mk
index 0c5b506f63..3437a35bdf 100644
--- a/keyboards/handwired/42/rules.mk
+++ b/keyboards/handwired/42/rules.mk
@@ -1,17 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/keyboard.json
index 8e33a60e2e..7883c1e784 100644
--- a/keyboards/handwired/6key/info.json
+++ b/keyboards/handwired/6key/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0007",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "dip_switch": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1"],
"rows": ["B4", "D0"]
diff --git a/keyboards/handwired/6key/rules.mk b/keyboards/handwired/6key/rules.mk
deleted file mode 100644
index 64e4af7ab7..0000000000
--- a/keyboards/handwired/6key/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-DIP_SWITCH_ENABLE = yes
diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/keyboard.json
index 63dc42e7db..702008de34 100644
--- a/keyboards/handwired/6macro/info.json
+++ b/keyboards/handwired/6macro/keyboard.json
@@ -26,6 +26,16 @@
"rgb_matrix": {
"driver": "ws2812"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "unicode": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2"],
"rows": ["B3", "B4"]
diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk
deleted file mode 100644
index 083cc21a34..0000000000
--- a/keyboards/handwired/6macro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-UNICODE_ENABLE = yes # Unicode
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/aball/info.json b/keyboards/handwired/aball/keyboard.json
index 173abdfb60..6ab686c518 100644
--- a/keyboards/handwired/aball/info.json
+++ b/keyboards/handwired/aball/keyboard.json
@@ -10,6 +10,12 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": false,
+ "pointing_device": true
+ },
"matrix_pins": {
"direct": [
[null]
diff --git a/keyboards/handwired/aball/rules.mk b/keyboards/handwired/aball/rules.mk
index d5e8e6ab98..84de35aeb1 100644
--- a/keyboards/handwired/aball/rules.mk
+++ b/keyboards/handwired/aball/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# Add trackball support
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = adns9800
diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/keyboard.json
index 65a4b49a69..d761764727 100644
--- a/keyboards/handwired/acacia/info.json
+++ b/keyboards/handwired/acacia/keyboard.json
@@ -7,6 +7,17 @@
"bootloader": "atmel-dfu",
"bootloader_instructions": "Enter the bootloader by using the small buttons on the PCB: press the RESET button while connected to QMK Toolbox.",
"diode_direction": "COL2ROW",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B4", "B3", "B2", "B1", "B0", "D2", "B6", "B7", "C7", "C6"],
"rows": ["B5", "D3", "D4", "D5", "D6"]
diff --git a/keyboards/handwired/acacia/rules.mk b/keyboards/handwired/acacia/rules.mk
deleted file mode 100644
index c70b7f10c7..0000000000
--- a/keyboards/handwired/acacia/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # N-Key Rollover
-LTO_ENABLE = yes # Link-time optimisation for smaller code
diff --git a/keyboards/handwired/aek64/aek64.c b/keyboards/handwired/aek64/aek64.c
index 0646d308d0..130d014616 100644
--- a/keyboards/handwired/aek64/aek64.c
+++ b/keyboards/handwired/aek64/aek64.c
@@ -24,13 +24,13 @@ void keyboard_pre_init_user(void) {
// Call the keyboard pre init code.
// Set our LED pins as output
- setPinOutput(C3);
+ gpio_set_pin_output(C3);
}
void matrix_init_kb(void) {
// Flash the led 1 sec on startup.
- writePinHigh(C3);
+ gpio_write_pin_high(C3);
wait_ms(1000);
- writePinLow(C3);
+ gpio_write_pin_low(C3);
}
diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/keyboard.json
index e71156e988..a06ed6decc 100644
--- a/keyboards/handwired/aek64/info.json
+++ b/keyboards/handwired/aek64/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "unicode": true
+ },
"matrix_pins": {
"cols": ["F0", "E6", "E7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "D3", "D0", "D1", "D2"],
"rows": ["E0", "E1", "C0", "C1", "C2"]
diff --git a/keyboards/handwired/aek64/rules.mk b/keyboards/handwired/aek64/rules.mk
deleted file mode 100644
index 1295dc41ba..0000000000
--- a/keyboards/handwired/aek64/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-UNICODE_ENABLE = yes # Enable support for arrow keys icon on the second layer.
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/keyboard.json
index e7c363794f..3f026a91fa 100644
--- a/keyboards/handwired/aim65/info.json
+++ b/keyboards/handwired/aim65/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0F34",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "C6", "B6", "B2", "F7", "F6", "F5", "F4"],
"rows": ["D0", "D4", "D7", "E6", "B4", "B5", "B3", "B1"]
diff --git a/keyboards/handwired/aim65/rules.mk b/keyboards/handwired/aim65/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/aim65/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/keyboard.json
index 65f1f804aa..65f1f804aa 100644
--- a/keyboards/handwired/alcor_dactyl/info.json
+++ b/keyboards/handwired/alcor_dactyl/keyboard.json
diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/keyboard.json
index 301c358140..d9ef295a4f 100644
--- a/keyboards/handwired/amigopunk/info.json
+++ b/keyboards/handwired/amigopunk/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x1805",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"],
"rows": ["C0", "C1", "C2", "C3", "C4", "C5"]
diff --git a/keyboards/handwired/amigopunk/rules.mk b/keyboards/handwired/amigopunk/rules.mk
deleted file mode 100644
index 9c75f75d52..0000000000
--- a/keyboards/handwired/amigopunk/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/keyboard.json
index 10916016cf..6a4b40bb21 100644
--- a/keyboards/handwired/angel/info.json
+++ b/keyboards/handwired/angel/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0805",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5"],
"rows": ["B6", "B2", "B5", "B4"]
diff --git a/keyboards/handwired/angel/rules.mk b/keyboards/handwired/angel/rules.mk
deleted file mode 100644
index 3b6a1809db..0000000000
--- a/keyboards/handwired/angel/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/keyboard.json
index d3f7962fe7..6a9d7130bd 100644
--- a/keyboards/handwired/aplx2/info.json
+++ b/keyboards/handwired/aplx2/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0030",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B5", "D3"],
"rows": ["D1"]
diff --git a/keyboards/handwired/aplx2/rules.mk b/keyboards/handwired/aplx2/rules.mk
deleted file mode 100644
index 3e66b069b3..0000000000
--- a/keyboards/handwired/aplx2/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/aranck/info.json b/keyboards/handwired/aranck/keyboard.json
index d7bf45b884..ddd72b0e65 100644
--- a/keyboards/handwired/aranck/info.json
+++ b/keyboards/handwired/aranck/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "audio": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/handwired/aranck/rules.mk b/keyboards/handwired/aranck/rules.mk
deleted file mode 100644
index 63666f07d7..0000000000
--- a/keyboards/handwired/aranck/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/keyboard.json
index 79016d5d21..237c1f0749 100644
--- a/keyboards/handwired/arrow_pad/info.json
+++ b/keyboards/handwired/arrow_pad/keyboard.json
@@ -9,6 +9,15 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3"],
"rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
index 820851f803..635667a080 100644
--- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
@@ -100,21 +100,19 @@ bool led_update_user(led_t led_state)
{
if (led_state.caps_lock) {
// output high
- DDRD |= (1<<6);
- PORTD |= (1<<6);
+ gpio_set_pin_output(D6);
+ gpio_write_pin_high(D6);
} else {
// Hi-Z
- DDRD &= ~(1<<6);
- PORTD &= ~(1<<6);
+ gpio_set_pin_input(D6);
}
if (led_state.num_lock) {
// output low
- DDRC |= (1<<7);
- PORTC |= ~(1<<7);
+ gpio_set_pin_output(C7);
+ gpio_write_pin_low(C7);
} else {
// Hi-Z
- DDRC &= ~(1<<7);
- PORTC &= ~(1<<7);
+ gpio_set_pin_input(C7);
}
return false;
}
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
index c3ab462ce3..b29717dc92 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -12,7 +12,7 @@
k19, k1A, k17 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \
+ { k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, k19, k1A } \
}
enum layers {
@@ -113,21 +113,19 @@ bool led_update_user(led_t led_state)
{
if (led_state.caps_lock) {
// output high
- DDRD |= (1<<6);
- PORTD |= (1<<6);
+ gpio_set_pin_output(D6);
+ gpio_write_pin_high(D6);
} else {
// Hi-Z
- DDRD &= ~(1<<6);
- PORTD &= ~(1<<6);
+ gpio_set_pin_input(D6);
}
if (led_state.num_lock) {
// output low
- DDRC |= (1<<7);
- PORTC |= ~(1<<7);
+ gpio_set_pin_output(C7);
+ gpio_write_pin_low(C7);
} else {
// Hi-Z
- DDRC &= ~(1<<7);
- PORTC &= ~(1<<7);
+ gpio_set_pin_input(C7);
}
return false;
}
diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
index fc044a0e1a..986442e645 100644
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -100,21 +100,19 @@ bool led_update_user(led_t led_state)
{
if (led_state.caps_lock) {
// output high
- DDRD |= (1<<6);
- PORTD |= (1<<6);
+ gpio_set_pin_output(D6);
+ gpio_write_pin_high(D6);
} else {
// Hi-Z
- DDRD &= ~(1<<6);
- PORTD &= ~(1<<6);
+ gpio_set_pin_input(D6);
}
if (led_state.num_lock) {
// output low
- DDRC |= (1<<7);
- PORTC |= ~(1<<7);
+ gpio_set_pin_output(C7);
+ gpio_write_pin_low(C7);
} else {
// Hi-Z
- DDRC &= ~(1<<7);
- PORTC &= ~(1<<7);
+ gpio_set_pin_input(C7);
}
return false;
}
diff --git a/keyboards/handwired/arrow_pad/rules.mk b/keyboards/handwired/arrow_pad/rules.mk
deleted file mode 100644
index df4dea661b..0000000000
--- a/keyboards/handwired/arrow_pad/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c
index 7b4e6f9586..eed4e0b443 100644
--- a/keyboards/handwired/atreus50/atreus50.c
+++ b/keyboards/handwired/atreus50/atreus50.c
@@ -3,8 +3,8 @@
void matrix_init_kb(void) {
// Turn status LED on
- //DDRE |= (1<<6);
- PORTE |= (1<<6);
+ //gpio_set_pin_output(E6);
+ gpio_write_pin_high(E6);
matrix_init_user();
};
diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/keyboard.json
index 3df8e9f7bb..dc62d3e849 100644
--- a/keyboards/handwired/atreus50/info.json
+++ b/keyboards/handwired/atreus50/keyboard.json
@@ -27,6 +27,14 @@
"ws2812": {
"pin": "C6"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/handwired/atreus50/keymaps/default/keymap.c b/keyboards/handwired/atreus50/keymaps/default/keymap.c
index c9de095cf8..ea6018bfcc 100644
--- a/keyboards/handwired/atreus50/keymaps/default/keymap.c
+++ b/keyboards/handwired/atreus50/keymaps/default/keymap.c
@@ -107,11 +107,6 @@ float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
@@ -119,7 +114,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_qwerty);
#endif
- persistent_default_layer_set(1UL<<_QWERTY);
+ set_single_persistent_default_layer(_QWERTY);
}
return false;
break;
@@ -128,7 +123,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_colemak);
#endif
- persistent_default_layer_set(1UL<<_COLEMAK);
+ set_single_persistent_default_layer(_COLEMAK);
}
return false;
break;
@@ -137,7 +132,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_dvorak);
#endif
- persistent_default_layer_set(1UL<<_DVORAK);
+ set_single_persistent_default_layer(_DVORAK);
}
return false;
break;
diff --git a/keyboards/handwired/atreus50/rules.mk b/keyboards/handwired/atreus50/rules.mk
deleted file mode 100644
index d9e1374773..0000000000
--- a/keyboards/handwired/atreus50/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/keyboard.json
index 0d12e92dbe..fe7818d97f 100644
--- a/keyboards/handwired/axon/info.json
+++ b/keyboards/handwired/axon/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"],
"rows": ["D5", "D6", "D4", "D0"]
diff --git a/keyboards/handwired/axon/rules.mk b/keyboards/handwired/axon/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/axon/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/baredev/rev1/info.json b/keyboards/handwired/baredev/rev1/keyboard.json
index ab7747d43a..470b926bb4 100644
--- a/keyboards/handwired/baredev/rev1/info.json
+++ b/keyboards/handwired/baredev/rev1/keyboard.json
@@ -23,19 +23,12 @@
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
- "audio": false,
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
- "midi": false,
"mousekey": true,
- "nkro": true,
- "rgblight": false,
- "unicode": false,
- "bluetooth": false,
- "backlight": false,
- "sleep_led": false
+ "nkro": true
},
"layout_aliases": {
"LAYOUT": "LAYOUT_abnt2"
diff --git a/keyboards/handwired/baredev/rev1/rules.mk b/keyboards/handwired/baredev/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/baredev/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
index 048500da8c..cccc03a287 100644
--- a/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
+++ b/keyboards/handwired/battleship_gamepad/battleship_gamepad.c
@@ -24,5 +24,5 @@ joystick_config_t joystick_axes[JOYSTICK_AXIS_COUNT] = {
/* joystick button code (thumbstick pressed) */
void keyboard_pre_init_kb(void) {
- setPinInputHigh(F6);
+ gpio_set_pin_input_high(F6);
}
diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/keyboard.json
index 06ef96ba21..3b4010ce40 100644
--- a/keyboards/handwired/battleship_gamepad/info.json
+++ b/keyboards/handwired/battleship_gamepad/keyboard.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "joystick": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/battleship_gamepad/rules.mk b/keyboards/handwired/battleship_gamepad/rules.mk
index a41273f890..c5ab560bca 100644
--- a/keyboards/handwired/battleship_gamepad/rules.mk
+++ b/keyboards/handwired/battleship_gamepad/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-JOYSTICK_ENABLE = yes
JOYSTICK_DRIVER = analog
diff --git a/keyboards/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/keyboard.json
index e5c9479453..76d9e42f83 100644
--- a/keyboards/handwired/bdn9_ble/info.json
+++ b/keyboards/handwired/bdn9_ble/keyboard.json
@@ -18,6 +18,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "bluetooth": true
+ },
"matrix_pins": {
"direct": [
["D1", "D0", "C6"],
diff --git a/keyboards/handwired/bdn9_ble/rules.mk b/keyboards/handwired/bdn9_ble/rules.mk
index 0dafe2f289..3437a35bdf 100644
--- a/keyboards/handwired/bdn9_ble/rules.mk
+++ b/keyboards/handwired/bdn9_ble/rules.mk
@@ -1,17 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/keyboard.json
index 6730c14a36..3baa7d77ce 100644
--- a/keyboards/handwired/bento/rev1/info.json
+++ b/keyboards/handwired/bento/rev1/keyboard.json
@@ -36,6 +36,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "rgblight": true,
+ "encoder": true
+ },
"matrix_pins": {
"direct": [
["D7", "B1", "D2"],
diff --git a/keyboards/handwired/bento/rev1/rules.mk b/keyboards/handwired/bento/rev1/rules.mk
deleted file mode 100644
index 6a4a067737..0000000000
--- a/keyboards/handwired/bento/rev1/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/keyboard.json
index 2481a63db5..8eff62a7ea 100644
--- a/keyboards/handwired/bigmac/info.json
+++ b/keyboards/handwired/bigmac/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x1010",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"],
"rows": ["F0", "F1", "C7", "D5", "B7"]
diff --git a/keyboards/handwired/bigmac/rules.mk b/keyboards/handwired/bigmac/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/handwired/bigmac/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/keyboard.json
index e8cf3c82db..a966044ebe 100644
--- a/keyboards/handwired/bolek/info.json
+++ b/keyboards/handwired/bolek/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x3708",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"],
"rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"]
diff --git a/keyboards/handwired/bolek/rules.mk b/keyboards/handwired/bolek/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/bolek/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/keyboard.json
index a4d0b11b58..b75caa6544 100644
--- a/keyboards/handwired/boss566y/redragon_vara/info.json
+++ b/keyboards/handwired/boss566y/redragon_vara/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D2", "D3", "C6", "D5", "C7", "D4", "D7", "B4", "B5", "B6"],
"rows": ["B0", "B1", "B2", "B3", "B7", "D0", "F0", "F1", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/boss566y/redragon_vara/rules.mk b/keyboards/handwired/boss566y/redragon_vara/rules.mk
deleted file mode 100644
index 42dce57024..0000000000
--- a/keyboards/handwired/boss566y/redragon_vara/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/keyboard.json
index 910a628ca6..e9093711d0 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "F7", "B1"]
@@ -25,6 +33,7 @@
"max_brightness": 120
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"bootmagic": {
"matrix": [5, 0]
diff --git a/keyboards/handwired/brain/rules.mk b/keyboards/handwired/brain/rules.mk
deleted file mode 100644
index df7d719da1..0000000000
--- a/keyboards/handwired/brain/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/bstk100/info.json b/keyboards/handwired/bstk100/keyboard.json
index 257203511a..b4f036631d 100644
--- a/keyboards/handwired/bstk100/info.json
+++ b/keyboards/handwired/bstk100/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xB100",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B5", "B4", "E6", "D7", "C6"],
"rows": ["B6", "B2", "B3", "B1", "F7"]
diff --git a/keyboards/handwired/bstk100/rules.mk b/keyboards/handwired/bstk100/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/bstk100/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/cans12er/info.json b/keyboards/handwired/cans12er/keyboard.json
index c51fad15ee..058f8a98b1 100644
--- a/keyboards/handwired/cans12er/info.json
+++ b/keyboards/handwired/cans12er/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D0", "D4", "C6", "D7"],
"rows": ["F7", "B1", "B3"]
diff --git a/keyboards/handwired/cans12er/rules.mk b/keyboards/handwired/cans12er/rules.mk
deleted file mode 100644
index 3b6a1809db..0000000000
--- a/keyboards/handwired/cans12er/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/keyboard.json
index a0f28d3eeb..c727e80181 100644
--- a/keyboards/handwired/carpolly/info.json
+++ b/keyboards/handwired/carpolly/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0017",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7"],
"rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/handwired/carpolly/rules.mk b/keyboards/handwired/carpolly/rules.mk
deleted file mode 100644
index c71e41438f..0000000000
--- a/keyboards/handwired/carpolly/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-# generated by KBFirmware JSON to QMK Parser
-# https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/keyboard.json
index 0bbdefe921..6c2626df64 100644
--- a/keyboards/handwired/chiron/info.json
+++ b/keyboards/handwired/chiron/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "D7", "E6", "B4", "B5"]
@@ -24,6 +34,7 @@
"pin": "D3"
},
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/chiron/rules.mk b/keyboards/handwired/chiron/rules.mk
deleted file mode 100644
index 9ca8ab3ebc..0000000000
--- a/keyboards/handwired/chiron/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-AUDIO_ENABLE = no
-AUTOLOG_ENABLE = no
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-COMMAND_ENABLE = no
-CONSOLE_ENABLE = no
-DEBUG_ENABLE = no
-EXTRAKEY_ENABLE = no
-LEADER_ENABLE = no
-MOUSEKEY_ENABLE = yes
-NKRO_ENABLE = no # Enable N-Key Rollover
-RGBLIGHT_ENABLE = yes
-SLEEP_LED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/keyboard.json
index 8caf00aefd..4b8284ab71 100644
--- a/keyboards/handwired/ck4x4/info.json
+++ b/keyboards/handwired/ck4x4/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B7", "B8", "B9", "B10"],
"rows": ["B3", "B4", "B5", "B6"]
diff --git a/keyboards/handwired/ck4x4/rules.mk b/keyboards/handwired/ck4x4/rules.mk
deleted file mode 100644
index 91a488483f..0000000000
--- a/keyboards/handwired/ck4x4/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-
-DEFAULT_FOLDER = handwired/ck4x4
-
-
diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/keyboard.json
index 7236fc7961..4ac953e560 100644
--- a/keyboards/handwired/cmd60/info.json
+++ b/keyboards/handwired/cmd60/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"],
"rows": ["F0", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/cmd60/rules.mk b/keyboards/handwired/cmd60/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/cmd60/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/keyboard.json
index 3676b624b1..1bf60673fb 100644
--- a/keyboards/handwired/co60/rev1/info.json
+++ b/keyboards/handwired/co60/rev1/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"device_version": "1.0.0"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "leader": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3", "B0"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/handwired/co60/rev1/rules.mk b/keyboards/handwired/co60/rev1/rules.mk
deleted file mode 100644
index 3d0b53a5dd..0000000000
--- a/keyboards/handwired/co60/rev1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LEADER_ENABLE = yes # Turn on leader support
diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/keyboard.json
index d51d450803..e772f0ba42 100644
--- a/keyboards/handwired/co60/rev6/info.json
+++ b/keyboards/handwired/co60/rev6/keyboard.json
@@ -3,6 +3,16 @@
"usb": {
"device_version": "6.0.0"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "leader": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"],
"rows": ["B0", "B1", "B2", "A15", "A10"]
diff --git a/keyboards/handwired/co60/rev6/rules.mk b/keyboards/handwired/co60/rev6/rules.mk
deleted file mode 100644
index ca3fc91ea5..0000000000
--- a/keyboards/handwired/co60/rev6/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = yes
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
-LEADER_ENABLE = yes
diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/keyboard.json
index 0fb11d0418..967c673d39 100644
--- a/keyboards/handwired/co60/rev7/info.json
+++ b/keyboards/handwired/co60/rev7/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"device_version": "7.0.0"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "leader": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"],
"rows": ["A8", "A2", "B13", "B2", "B10"]
diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk
deleted file mode 100644
index 3d43c0cadb..0000000000
--- a/keyboards/handwired/co60/rev7/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = yes
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality
-LEADER_ENABLE = yes
diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c
index 736db8d465..ede3fba82f 100644
--- a/keyboards/handwired/colorlice/colorlice.c
+++ b/keyboards/handwired/colorlice/colorlice.c
@@ -55,14 +55,14 @@ void suspend_wakeup_init_kb(void)
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- // writePin sets the pin high for 1 and low for 0.
+ // gpio_write_pin sets the pin high for 1 and low for 0.
// In this example the pins are inverted, setting
// it low/0 turns it on, and high/1 turns the LED off.
// This behavior depends on whether the LED is between the pin
// and VCC or the pin and GND.
- writePin(B2, !led_state.num_lock);
- writePin(C6, !led_state.caps_lock);
- writePin(B7, !led_state.scroll_lock);
+ gpio_write_pin(B2, !led_state.num_lock);
+ gpio_write_pin(C6, !led_state.caps_lock);
+ gpio_write_pin(B7, !led_state.scroll_lock);
}
return res;
}
diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/keyboard.json
index d81cd849ad..1a9549d863 100644
--- a/keyboards/handwired/colorlice/info.json
+++ b/keyboards/handwired/colorlice/keyboard.json
@@ -62,6 +62,18 @@
"led_process_limit": 4,
"sleep": true
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk
deleted file mode 100644
index 16e007dd34..0000000000
--- a/keyboards/handwired/colorlice/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Use link time optimization
-RGB_MATRIX_ENABLE = yes
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/keyboard.json
index 2786c33451..71719c8505 100644
--- a/keyboards/handwired/concertina/64key/info.json
+++ b/keyboards/handwired/concertina/64key/keyboard.json
@@ -14,6 +14,14 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/concertina/64key/rules.mk b/keyboards/handwired/concertina/64key/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/concertina/64key/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/keyboard.json
index a49ce18c4b..c75e324cf3 100644
--- a/keyboards/handwired/consolekeyboard/18key/info.json
+++ b/keyboards/handwired/consolekeyboard/18key/keyboard.json
@@ -20,6 +20,18 @@
"ws2812": {
"pin": "F4"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
"rows": ["D1", "D0"]
diff --git a/keyboards/handwired/consolekeyboard/18key/rules.mk b/keyboards/handwired/consolekeyboard/18key/rules.mk
deleted file mode 100644
index d4b9c78d5e..0000000000
--- a/keyboards/handwired/consolekeyboard/18key/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/keyboard.json
index c076b50fa3..87449fc21e 100644
--- a/keyboards/handwired/consolekeyboard/20key/info.json
+++ b/keyboards/handwired/consolekeyboard/20key/keyboard.json
@@ -20,6 +20,18 @@
"ws2812": {
"pin": "F4"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
"rows": ["D1", "D0"]
diff --git a/keyboards/handwired/consolekeyboard/20key/rules.mk b/keyboards/handwired/consolekeyboard/20key/rules.mk
deleted file mode 100644
index d4b9c78d5e..0000000000
--- a/keyboards/handwired/consolekeyboard/20key/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/keyboard.json
index 6f9c3a7d2d..21a894d5e4 100644
--- a/keyboards/handwired/consolekeyboard/27key/info.json
+++ b/keyboards/handwired/consolekeyboard/27key/keyboard.json
@@ -20,6 +20,18 @@
"ws2812": {
"pin": "F4"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"],
"rows": ["D1", "D0", "F7"]
diff --git a/keyboards/handwired/consolekeyboard/27key/rules.mk b/keyboards/handwired/consolekeyboard/27key/rules.mk
deleted file mode 100644
index d4b9c78d5e..0000000000
--- a/keyboards/handwired/consolekeyboard/27key/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link time optimize
diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/keyboard.json
index d0b726a1ff..159558e355 100644
--- a/keyboards/handwired/consolekeyboard/30key/info.json
+++ b/keyboards/handwired/consolekeyboard/30key/keyboard.json
@@ -20,6 +20,18 @@
"ws2812": {
"pin": "F4"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"],
"rows": ["D1", "D0", "F7"]
diff --git a/keyboards/handwired/consolekeyboard/30key/rules.mk b/keyboards/handwired/consolekeyboard/30key/rules.mk
deleted file mode 100644
index d4b9c78d5e..0000000000
--- a/keyboards/handwired/consolekeyboard/30key/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link time optimize
diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/keyboard.json
index c788072d92..d497942b95 100644
--- a/keyboards/handwired/croxsplit44/info.json
+++ b/keyboards/handwired/croxsplit44/keyboard.json
@@ -29,6 +29,15 @@
"ws2812": {
"pin": "C4"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"],
"rows": ["D4", "D5", "D6", "D7"]
diff --git a/keyboards/handwired/croxsplit44/rules.mk b/keyboards/handwired/croxsplit44/rules.mk
deleted file mode 100644
index 951dd07d6e..0000000000
--- a/keyboards/handwired/croxsplit44/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/keyboard.json
index 37f66a8029..1a1024fb18 100644
--- a/keyboards/handwired/curiosity/info.json
+++ b/keyboards/handwired/curiosity/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x4355",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"],
"rows": ["D0", "F7", "F6", "F5"]
diff --git a/keyboards/handwired/curiosity/rules.mk b/keyboards/handwired/curiosity/rules.mk
deleted file mode 100644
index 40f895a51b..0000000000
--- a/keyboards/handwired/curiosity/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = no # Use link time optimization
diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h
index 4d9d9bf5c2..701ad8da86 100644
--- a/keyboards/handwired/cyberstar/config.h
+++ b/keyboards/handwired/cyberstar/config.h
@@ -24,6 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD3
#define WS2812_PWM_CHANNEL 1
#define WS2812_PWM_PAL_MODE 1
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
-#define WS2812_DMA_CHANNEL 3
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_PWM_DMA_CHANNEL 3
#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/keyboard.json
index 6b2db46b1f..344c576462 100644
--- a/keyboards/handwired/cyberstar/info.json
+++ b/keyboards/handwired/cyberstar/keyboard.json
@@ -36,6 +36,13 @@
"diode_direction": "COL2ROW",
"processor": "STM32F072",
"bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"layout_aliases": {
"LAYOUT_all": "LAYOUT_split_space_split_bs"
},
diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk
index cc9d7bb3f5..0ab54aaaf7 100644
--- a/keyboards/handwired/cyberstar/rules.mk
+++ b/keyboards/handwired/cyberstar/rules.mk
@@ -1,15 +1,2 @@
# Wildcard to allow APM32 MCU
DFU_SUFFIX_ARGS = -v FFFF -p FFFF
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/keyboard.json
index 295fead587..99c8a67326 100644
--- a/keyboards/handwired/d48/info.json
+++ b/keyboards/handwired/d48/keyboard.json
@@ -42,9 +42,19 @@
"qmk": {
"tap_keycode_delay": 10
},
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "audio": true,
+ "rgblight": true,
+ "encoder": true,
+ "oled": true,
+ "unicode": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/d48/rules.mk b/keyboards/handwired/d48/rules.mk
index 7fa8dfdd34..62866f887a 100644
--- a/keyboards/handwired/d48/rules.mk
+++ b/keyboards/handwired/d48/rules.mk
@@ -1,18 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes
-USE_I2C = no
-RGBLIGHT_ENABLE = yes
-ENCODER_ENABLE = yes
-OLED_ENABLE = yes
-UNICODE_ENABLE = yes
-
SRC += ds1307.c taphold.c
diff --git a/keyboards/handwired/d48/taphold.c b/keyboards/handwired/d48/taphold.c
index 0b56a5a6a1..5360391b97 100644
--- a/keyboards/handwired/d48/taphold.c
+++ b/keyboards/handwired/d48/taphold.c
@@ -1,4 +1,7 @@
#include "taphold.h"
+#include "action_layer.h"
+#include "keyboard.h"
+#include "timer.h"
bool taphold_process(uint16_t keycode, keyrecord_t *record) {
for (int i = 0; i < taphold_config_size; i++) {
diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h
index 2a691aa63f..8788c58f3d 100644
--- a/keyboards/handwired/d48/taphold.h
+++ b/keyboards/handwired/d48/taphold.h
@@ -1,6 +1,8 @@
#pragma once
-#include "quantum.h"
+#include <stdint.h>
+#include <stdbool.h>
+#include "action.h"
typedef enum taphold_mode_t {
TAPHOLD_LAYER,
diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/keyboard.json
index e95c380d9c..339119e6fd 100644
--- a/keyboards/handwired/dactyl/info.json
+++ b/keyboards/handwired/dactyl/keyboard.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "unicode": true,
+ "swap_hands": true
+ },
"debounce": 15,
"tapping": {
"toggle": 1
diff --git a/keyboards/handwired/dactyl/rules.mk b/keyboards/handwired/dactyl/rules.mk
index bffd901b04..35b5df1973 100644
--- a/keyboards/handwired/dactyl/rules.mk
+++ b/keyboards/handwired/dactyl/rules.mk
@@ -1,17 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-POINTING_DEVICE_ENABLE = no
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-CUSTOM_MATRIX = yes # Custom matrix file for the Dactyl
-NKRO_ENABLE = yes # Enable N-Key Rollover
-UNICODE_ENABLE = yes # Unicode
-SWAP_HANDS_ENABLE = yes # Allow swapping hands of keyboard
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX = yes
# project specific files
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/dactyl_cc/info.json b/keyboards/handwired/dactyl_cc/keyboard.json
index e607bfad1a..e607bfad1a 100644
--- a/keyboards/handwired/dactyl_cc/info.json
+++ b/keyboards/handwired/dactyl_cc/keyboard.json
diff --git a/keyboards/handwired/dactyl_cc/rules.mk b/keyboards/handwired/dactyl_cc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dactyl_cc/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dactyl_kinesis/info.json b/keyboards/handwired/dactyl_kinesis/keyboard.json
index 91cb98e040..ee68a2c515 100644
--- a/keyboards/handwired/dactyl_kinesis/info.json
+++ b/keyboards/handwired/dactyl_kinesis/keyboard.json
@@ -14,10 +14,7 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": false,
- "audio": false,
- "backlight": false,
- "rgblight": false
+ "nkro": false
},
"rgblight": {
"led_count": 12
diff --git a/keyboards/handwired/dactyl_kinesis/rules.mk b/keyboards/handwired/dactyl_kinesis/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/dactyl_kinesis/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/keyboard.json
index d05e3a5d79..ba374c87a3 100644
--- a/keyboards/handwired/dactyl_left/info.json
+++ b/keyboards/handwired/dactyl_left/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D0", "B7", "B3", "B2", "B1", "B0"],
"rows": ["F0", "F1", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/dactyl_left/rules.mk b/keyboards/handwired/dactyl_left/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/dactyl_left/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/dactyl_lightcycle/info.json b/keyboards/handwired/dactyl_lightcycle/keyboard.json
index 4d581b974e..1b5f2dd39a 100644
--- a/keyboards/handwired/dactyl_lightcycle/info.json
+++ b/keyboards/handwired/dactyl_lightcycle/keyboard.json
@@ -14,9 +14,6 @@
"console": false,
"mousekey": true,
"extrakey": true,
- "audio": false,
- "rgblight": false,
- "backlight": false,
"nkro": false
},
"ws2812": {
diff --git a/keyboards/handwired/dactyl_lightcycle/rules.mk b/keyboards/handwired/dactyl_lightcycle/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dactyl_lightcycle/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
index 141bb47717..b779e9d3c1 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
index 375c208244..630b106ca7 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c
@@ -130,8 +130,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______
)
};
-
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
index bc309f5a78..d0136c4c51 100644
--- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/keymap.c
@@ -119,9 +119,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
____, ____, ____, ____
)
};
-
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
diff --git a/keyboards/handwired/dactyl_manuform/4x5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
index 76f13971d4..8f53dd0303 100644
--- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x5_5/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3435",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "F6"],
"rows": ["F7", "B1", "B3", "B2", "B4"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"development_board": "promicro",
diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
deleted file mode 100644
index 4240679233..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x5_5/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
index 5b415fbd2b..feb58db5db 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
index b447b5c18c..e218c65d42 100644
--- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
+++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/default/keymap.c
@@ -70,8 +70,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______
)
};
-
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
diff --git a/keyboards/handwired/dactyl_manuform/4x6/rules.mk b/keyboards/handwired/dactyl_manuform/4x6/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
index 60830dbf80..60830dbf80 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_4_3/keyboard.json
diff --git a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
deleted file mode 100644
index 3bbd261429..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_4_3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
index f54f0d56d2..a0607c7068 100644
--- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/4x6_5/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/4x6_5/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
index e6372961d8..b5681f4ca7 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/5x6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
index e9aba3fa18..e36acea627 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3536",
"device_version": "0.0.3"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"bootmagic": {
"matrix": [6, 5]
diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
deleted file mode 100644
index 04b1fc01b7..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_2_5/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
index e60286d166..1153bcdb44 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_5/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3536",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"bootmagic": {
"matrix": [6, 5]
diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
deleted file mode 100644
index c397f50ab5..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_5/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
index a00a3bda18..8a3e69f2ef 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_6/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3536",
"device_version": "0.0.3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
deleted file mode 100644
index 59ada7958f..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_6/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes \ No newline at end of file
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
index 78a602cb64..59d37ec15b 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keyboard.json
@@ -15,10 +15,7 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true,
- "audio": false,
- "backlight": false,
- "rgblight": false
+ "nkro": true
},
"split": {
"enabled": true,
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk b/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x6_68/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
index 68270606cc..bc734607cf 100644
--- a/keyboards/handwired/dactyl_manuform/5x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/5x7/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/5x7/rules.mk b/keyboards/handwired/dactyl_manuform/5x7/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/5x7/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
index 0295176c25..9391d3a46d 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/keyboard.json
@@ -5,11 +5,17 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [7, 0]
}
},
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
index 9be9110043..c018471cad 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/rules.mk
@@ -1,21 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-
-# Build Options
-# change yes to no to disable
-#
-SPLIT_KEYBOARD = yes
# split settings
# https://beta.docs.qmk.fm/developing-qmk/c-development/hardware_drivers/serial_driver
SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
index 245310fd3c..0ec00196ba 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/keyboard.json
@@ -5,6 +5,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
@@ -14,5 +15,11 @@
"pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6/promicro/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dactyl_manuform/6x6/rules.mk b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
index 84645084d3..29194b429e 100644
--- a/keyboards/handwired/dactyl_manuform/6x6/rules.mk
+++ b/keyboards/handwired/dactyl_manuform/6x6/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/dactyl_manuform/6x6/promicro
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
index 955060de7a..36051fb7fe 100644
--- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x6_4/keyboard.json
@@ -14,12 +14,21 @@
"ws2812": {
"pin": "D3"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk b/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x6_4/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
index 529d92bd3f..5ce0affbee 100644
--- a/keyboards/handwired/dactyl_manuform/6x7/info.json
+++ b/keyboards/handwired/dactyl_manuform/6x7/keyboard.json
@@ -14,10 +14,7 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": false,
- "audio": false,
- "backlight": false,
- "rgblight": false
+ "nkro": false
},
"ws2812": {
"pin": "D3"
diff --git a/keyboards/handwired/dactyl_manuform/6x7/rules.mk b/keyboards/handwired/dactyl_manuform/6x7/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dactyl_manuform/6x7/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dactyl_maximus/info.json b/keyboards/handwired/dactyl_maximus/keyboard.json
index 081fab571a..081fab571a 100644
--- a/keyboards/handwired/dactyl_maximus/info.json
+++ b/keyboards/handwired/dactyl_maximus/keyboard.json
diff --git a/keyboards/handwired/dactyl_maximus/rules.mk b/keyboards/handwired/dactyl_maximus/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/dactyl_maximus/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_minidox/3x5_3.c b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c
index 5afb908d02..5afb908d02 100644
--- a/keyboards/handwired/dactyl_minidox/3x5_3.c
+++ b/keyboards/handwired/dactyl_minidox/dactyl_minidox.c
diff --git a/keyboards/handwired/dactyl_minidox/info.json b/keyboards/handwired/dactyl_minidox/keyboard.json
index 36f71ea525..36f71ea525 100644
--- a/keyboards/handwired/dactyl_minidox/info.json
+++ b/keyboards/handwired/dactyl_minidox/keyboard.json
diff --git a/keyboards/handwired/dactyl_minidox/rules.mk b/keyboards/handwired/dactyl_minidox/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/dactyl_minidox/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/keyboard.json
index 2ae20d2f4a..572ea05b2f 100644
--- a/keyboards/handwired/dactyl_promicro/info.json
+++ b/keyboards/handwired/dactyl_promicro/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/handwired/dactyl_promicro/rules.mk b/keyboards/handwired/dactyl_promicro/rules.mk
deleted file mode 100644
index d3768185db..0000000000
--- a/keyboards/handwired/dactyl_promicro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/keyboard.json
index bfacb99a4b..f550a055c7 100644
--- a/keyboards/handwired/dactyl_rah/info.json
+++ b/keyboards/handwired/dactyl_rah/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/dactyl_rah/rules.mk b/keyboards/handwired/dactyl_rah/rules.mk
deleted file mode 100644
index b893863bb5..0000000000
--- a/keyboards/handwired/dactyl_rah/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/dactyl_tracer/info.json b/keyboards/handwired/dactyl_tracer/keyboard.json
index 29e5990666..29e5990666 100644
--- a/keyboards/handwired/dactyl_tracer/info.json
+++ b/keyboards/handwired/dactyl_tracer/keyboard.json
diff --git a/keyboards/handwired/dactyl_tracer/rules.mk b/keyboards/handwired/dactyl_tracer/rules.mk
deleted file mode 100644
index 3bbd261429..0000000000
--- a/keyboards/handwired/dactyl_tracer/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File intentionally blank
diff --git a/keyboards/handwired/dactylmacropad/info.json b/keyboards/handwired/dactylmacropad/keyboard.json
index 5d40a240a9..5d40a240a9 100644
--- a/keyboards/handwired/dactylmacropad/info.json
+++ b/keyboards/handwired/dactylmacropad/keyboard.json
diff --git a/keyboards/handwired/dactylmacropad/rules.mk b/keyboards/handwired/dactylmacropad/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/dactylmacropad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/keyboard.json
index 6b6508eb83..22044faab3 100644
--- a/keyboards/handwired/daishi/info.json
+++ b/keyboards/handwired/daishi/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "dynamic_macro": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"],
"rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"]
diff --git a/keyboards/handwired/daishi/rules.mk b/keyboards/handwired/daishi/rules.mk
deleted file mode 100644
index 41a36f4cca..0000000000
--- a/keyboards/handwired/daishi/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-ENCODER_ENABLE = yes # Add rotary encoder support
-DYNAMIC_MACRO_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
index 8308506512..8308506512 100644
--- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json
+++ b/keyboards/handwired/daskeyboard/daskeyboard4/keyboard.json
diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk b/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/daskeyboard/daskeyboard4/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/keyboard.json
index 372619565d..96e49388dc 100644
--- a/keyboards/handwired/datahand/info.json
+++ b/keyboards/handwired/datahand/keyboard.json
@@ -11,6 +11,14 @@
},
"processor": "at90usb1286",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"debounce": 0,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/datahand/matrix.c b/keyboards/handwired/datahand/matrix.c
index afce07e10d..0e31c09a1b 100644
--- a/keyboards/handwired/datahand/matrix.c
+++ b/keyboards/handwired/datahand/matrix.c
@@ -99,27 +99,27 @@ static void select_row(uint8_t row) {
*/
if (row & (1<<0)) {
- PORTE |= (1<<6);
+ gpio_write_pin_high(E6);
} else {
- PORTE &= ~(1<<6);
+ gpio_write_pin_low(E6);
}
if (row & (1<<1)) {
- PORTB |= (1<<7);
+ gpio_write_pin_high(B7);
} else {
- PORTB &= ~(1<<7);
+ gpio_write_pin_low(B7);
}
if (row & (1<<2)) {
- PORTD |= (1<<0);
+ gpio_write_pin_high(D0);
} else {
- PORTD &= ~(1<<0);
+ gpio_write_pin_low(D0);
}
if (row & (1<<3)) {
- PORTD |= (1<<1);
+ gpio_write_pin_high(D1);
} else {
- PORTD &= ~(1<<1);
+ gpio_write_pin_low(D1);
}
}
diff --git a/keyboards/handwired/datahand/rules.mk b/keyboards/handwired/datahand/rules.mk
index 447e7fdc02..a0a4f497e1 100644
--- a/keyboards/handwired/datahand/rules.mk
+++ b/keyboards/handwired/datahand/rules.mk
@@ -1,15 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-CUSTOM_MATRIX = yes # We definitely have a nonstandard matrix
+CUSTOM_MATRIX = yes
# Project specific files
SRC = matrix.c
diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/keyboard.json
index 404cf2e45d..c91df1ca8b 100644
--- a/keyboards/handwired/dc/mc/001/info.json
+++ b/keyboards/handwired/dc/mc/001/keyboard.json
@@ -19,6 +19,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"direct": [
["B4", "B0", "B1", "B2", "B3"]
diff --git a/keyboards/handwired/dc/mc/001/rules.mk b/keyboards/handwired/dc/mc/001/rules.mk
deleted file mode 100644
index c94a511d8b..0000000000
--- a/keyboards/handwired/dc/mc/001/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-EXTRAKEY_ENABLE = yes # Audio control and System control
-ENCODER_ENABLE = yes # Using a rotary encoder for volume control
-MOUSEKEY_ENABLE = no # Mouse keys
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/keyboard.json
index a077e7925d..e211821dae 100644
--- a/keyboards/handwired/ddg_56/info.json
+++ b/keyboards/handwired/ddg_56/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xB195",
"device_version": "0.0.1"
},
+ "features": {
+ "audio": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A2", "B8", "B13", "B14", "B4", "B11", "B12", "A13", "A15", "A8", "A7", "A6", "B0", "B1"],
"rows": ["B5", "B15", "B9", "B10", "A14"]
diff --git a/keyboards/handwired/ddg_56/rules.mk b/keyboards/handwired/ddg_56/rules.mk
deleted file mode 100644
index 93900acf53..0000000000
--- a/keyboards/handwired/ddg_56/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/handwired/dmote/info.json b/keyboards/handwired/dmote/keyboard.json
index fc52fee11e..fc52fee11e 100644
--- a/keyboards/handwired/dmote/info.json
+++ b/keyboards/handwired/dmote/keyboard.json
diff --git a/keyboards/handwired/dmote/rules.mk b/keyboards/handwired/dmote/rules.mk
deleted file mode 100644
index 876618b9d1..0000000000
--- a/keyboards/handwired/dmote/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# File is intentionally blank
diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/keyboard.json
index 4df4185010..4e45a5a920 100644
--- a/keyboards/handwired/dqz11n1g/info.json
+++ b/keyboards/handwired/dqz11n1g/keyboard.json
@@ -15,6 +15,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true,
+ "audio": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/dqz11n1g/matrix.c b/keyboards/handwired/dqz11n1g/matrix.c
index d93dd853b6..49b3c2da81 100644
--- a/keyboards/handwired/dqz11n1g/matrix.c
+++ b/keyboards/handwired/dqz11n1g/matrix.c
@@ -15,14 +15,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <avr/io.h>
-
#include "spi_master.h"
-#include "quantum.h"
#include "matrix.h"
static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
@@ -32,7 +25,7 @@ static void unselect_rows(void);
void matrix_init_custom(void) {
/* initialize row pins */
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- setPinOutput(row_pins[row]);
+ gpio_set_pin_output(row_pins[row]);
}
unselect_rows();
@@ -54,20 +47,20 @@ void matrix_init_custom(void) {
spi_start(slavePin, lsbFirst, mode, divisor);
/* Initialize pin controlling the shift register's SH/~LD pin */
- setPinOutput(ROW_SHIFT_PIN);
+ gpio_set_pin_output(ROW_SHIFT_PIN);
}
static void select_row(uint8_t row) {
pin_t pin = row_pins[row];
if (pin != NO_PIN) {
- writePinHigh(pin);
+ gpio_write_pin_high(pin);
}
}
static void unselect_row(uint8_t row) {
pin_t pin = row_pins[row];
if (pin != NO_PIN) {
- writePinLow(pin);
+ gpio_write_pin_low(pin);
}
}
@@ -82,12 +75,12 @@ bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
matrix_row_t current_row_value = 0;
/* Set shift register SH/~LD pin to "load" mode */
- writePinLow(ROW_SHIFT_PIN);
+ gpio_write_pin_low(ROW_SHIFT_PIN);
select_row(current_row);
matrix_output_select_delay();
/* Set shift register SH/~LD pin to "shift" mode */
- writePinHigh(ROW_SHIFT_PIN);
+ gpio_write_pin_high(ROW_SHIFT_PIN);
/* For each octet of columns... */
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index += 8) {
diff --git a/keyboards/handwired/dqz11n1g/rules.mk b/keyboards/handwired/dqz11n1g/rules.mk
index 220e353ab7..d998c6a884 100644
--- a/keyboards/handwired/dqz11n1g/rules.mk
+++ b/keyboards/handwired/dqz11n1g/rules.mk
@@ -2,17 +2,3 @@
CUSTOM_MATRIX = lite
SRC += matrix.c
SPI_DRIVER_REQUIRED = yes
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
-
diff --git a/keyboards/handwired/dygma/raise/ansi/ansi.c b/keyboards/handwired/dygma/raise/ansi/ansi.c
index c9e0cb288c..67b84c3bc8 100644
--- a/keyboards/handwired/dygma/raise/ansi/ansi.c
+++ b/keyboards/handwired/dygma/raise/ansi/ansi.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "raise.h"
// "led_map" is taken from kaleidoscope
// LHK = Left Hand Keys
diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/keyboard.json
index 0b6c9f6f67..0b6c9f6f67 100644
--- a/keyboards/handwired/dygma/raise/ansi/info.json
+++ b/keyboards/handwired/dygma/raise/ansi/keyboard.json
diff --git a/keyboards/handwired/dygma/raise/ansi/rules.mk b/keyboards/handwired/dygma/raise/ansi/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dygma/raise/ansi/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json
index b9bcd2e639..2d0c354f3b 100644
--- a/keyboards/handwired/dygma/raise/info.json
+++ b/keyboards/handwired/dygma/raise/info.json
@@ -24,8 +24,12 @@
"led_flush_limit": 100,
"sleep": true
},
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411",
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "rgb_matrix": true
+ },
"debounce": 0
}
diff --git a/keyboards/handwired/dygma/raise/iso/iso.c b/keyboards/handwired/dygma/raise/iso/iso.c
index 48ba85bf90..9643af7b8c 100644
--- a/keyboards/handwired/dygma/raise/iso/iso.c
+++ b/keyboards/handwired/dygma/raise/iso/iso.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "raise.h"
// "led_map" is taken from kaleidoscope
// LHK = Left Hand Keys
diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/keyboard.json
index 0b6c9f6f67..0b6c9f6f67 100644
--- a/keyboards/handwired/dygma/raise/iso/info.json
+++ b/keyboards/handwired/dygma/raise/iso/keyboard.json
diff --git a/keyboards/handwired/dygma/raise/iso/rules.mk b/keyboards/handwired/dygma/raise/iso/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/dygma/raise/iso/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/dygma/raise/leds.c b/keyboards/handwired/dygma/raise/leds.c
index 53fa389206..ad15644579 100644
--- a/keyboards/handwired/dygma/raise/leds.c
+++ b/keyboards/handwired/dygma/raise/leds.c
@@ -14,15 +14,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "leds.h"
+#include <string.h>
#include "i2c_master.h"
#include "led_tables.h"
#include "rgb_matrix.h"
-#include <string.h>
+#include "wait.h"
#include "raise.h"
#include "wire-protocol-constants.h"
#include "print.h"
-#include "leds.h"
// Color order of LEDs is Green, Red, Blue.
typedef struct PACKED {
diff --git a/keyboards/handwired/dygma/raise/leds.h b/keyboards/handwired/dygma/raise/leds.h
index c25a4326a9..1b7bfce2e2 100644
--- a/keyboards/handwired/dygma/raise/leds.h
+++ b/keyboards/handwired/dygma/raise/leds.h
@@ -16,8 +16,7 @@
#pragma once
-#include "quantum.h"
-#include "rgb_matrix.h"
+#include <stdint.h>
extern const uint8_t led_map[RGB_MATRIX_LED_COUNT];
diff --git a/keyboards/handwired/dygma/raise/matrix.c b/keyboards/handwired/dygma/raise/matrix.c
index bbcf697a59..3f241e8973 100644
--- a/keyboards/handwired/dygma/raise/matrix.c
+++ b/keyboards/handwired/dygma/raise/matrix.c
@@ -13,8 +13,9 @@
* 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"
+#include "matrix.h"
#include "i2c_master.h"
+#include "wait.h"
#include <string.h>
#include "wire-protocol-constants.h"
diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk
index ecf156629a..7a078c9757 100644
--- a/keyboards/handwired/dygma/raise/rules.mk
+++ b/keyboards/handwired/dygma/raise/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
CUSTOM_MATRIX = lite
# TODO(ibash) we don't actually need to enable raw, but there's some side effect
diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/keyboard.json
index 7e40afdedd..4179a4cdd6 100644
--- a/keyboards/handwired/eagleii/info.json
+++ b/keyboards/handwired/eagleii/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x9789",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D2", "C6", "E6", "D5", "B3", "D3", "D1", "C7", "F0", "B6", "B1", "F4"],
"rows": ["D0", "B5", "F1", "B2", "F7", "F6", "D4", "D7", "B4", "B7", "F5", "B0"]
diff --git a/keyboards/handwired/eagleii/rules.mk b/keyboards/handwired/eagleii/rules.mk
deleted file mode 100644
index 694c2ccd38..0000000000
--- a/keyboards/handwired/eagleii/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-CONSOLE_ENABLE = no
-COMMAND_ENABLE = no
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/keyboard.json
index 9a43e14c88..0da809d2ac 100644
--- a/keyboards/handwired/elrgo_s/info.json
+++ b/keyboards/handwired/elrgo_s/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3436",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/elrgo_s/rules.mk b/keyboards/handwired/elrgo_s/rules.mk
deleted file mode 100644
index 04b1fc01b7..0000000000
--- a/keyboards/handwired/elrgo_s/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/keyboard.json
index 17d7863237..8728b486a8 100644
--- a/keyboards/handwired/ergocheap/info.json
+++ b/keyboards/handwired/ergocheap/keyboard.json
@@ -11,13 +11,21 @@
"tapping": {
"term": 500
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "sleep_led": true
+ },
"matrix_pins": {
"cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"],
"rows": ["B5", "B6", "B7", "B9", "B8"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F103",
- "bootloader": "stm32duino",
+ "development_board": "bluepill",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/ergocheap/rules.mk b/keyboards/handwired/ergocheap/rules.mk
deleted file mode 100644
index 10c9a692df..0000000000
--- a/keyboards/handwired/ergocheap/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SLEEP_LED_ENABLE = yes
diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/keyboard.json
index 7e3baab9ad..5553db0a1f 100644
--- a/keyboards/handwired/evk/v1_3/info.json
+++ b/keyboards/handwired/evk/v1_3/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"],
"rows": ["B0", "B1", "B2", "B3", "B7", "D0"]
diff --git a/keyboards/handwired/evk/v1_3/rules.mk b/keyboards/handwired/evk/v1_3/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/evk/v1_3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c
index 7c68893968..a568ba3f86 100644
--- a/keyboards/handwired/evk/v1_3/v1_3.c
+++ b/keyboards/handwired/evk/v1_3/v1_3.c
@@ -23,22 +23,22 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// runs once when the firmware starts up
void matrix_init_kb(void) {
// Set the LEDs pins
- setPinOutput(D5); // Layer 1 Status LED
+ gpio_set_pin_output(D5); // Layer 1 Status LED
matrix_init_user();
}
// Set LED based on layer
__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
- writePin(D5, layer_state_cmp(state, 1));
+ gpio_write_pin(D5, layer_state_cmp(state, 1));
return state;
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if (res) {
- // writePin sets the pin high for 1 and low for 0.
- writePin(D4, led_state.caps_lock);
+ // gpio_write_pin sets the pin high for 1 and low for 0.
+ gpio_write_pin(D4, led_state.caps_lock);
}
return res;
}
diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/keyboard.json
index 41c1ab563f..1cde951881 100644
--- a/keyboards/handwired/fc200rt_qmk/info.json
+++ b/keyboards/handwired/fc200rt_qmk/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xFFFF",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"]
diff --git a/keyboards/handwired/fc200rt_qmk/rules.mk b/keyboards/handwired/fc200rt_qmk/rules.mk
deleted file mode 100644
index 5356b24d77..0000000000
--- a/keyboards/handwired/fc200rt_qmk/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/keyboard.json
index 66d556f7ac..11baaf78cc 100644
--- a/keyboards/handwired/fivethirteen/info.json
+++ b/keyboards/handwired/fivethirteen/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"],
"rows": ["F6", "F7", "B6", "B5", "B4"]
diff --git a/keyboards/handwired/fivethirteen/rules.mk b/keyboards/handwired/fivethirteen/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/fivethirteen/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/keyboard.json
index 262a26afb6..0bcec56b8f 100644
--- a/keyboards/handwired/floorboard/info.json
+++ b/keyboards/handwired/floorboard/keyboard.json
@@ -8,14 +8,20 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"],
"rows": ["A2", "A1", "A0", "B8"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
"community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
diff --git a/keyboards/handwired/floorboard/rules.mk b/keyboards/handwired/floorboard/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/floorboard/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/keyboard.json
index 24da71eb8d..f994b1fa48 100644
--- a/keyboards/handwired/frankie_macropad/info.json
+++ b/keyboards/handwired/frankie_macropad/keyboard.json
@@ -8,6 +8,21 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "grave_esc": false,
+ "magic": false,
+ "mousekey": false,
+ "nkro": false,
+ "space_cadet": false
+ },
"matrix_pins": {
"cols": ["B3", "B4", "B5", "B6"],
"rows": ["B0", "B1", "B2"]
diff --git a/keyboards/handwired/frankie_macropad/rules.mk b/keyboards/handwired/frankie_macropad/rules.mk
deleted file mode 100644
index 6587f1f698..0000000000
--- a/keyboards/handwired/frankie_macropad/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-LTO_ENABLE = yes
-SPACE_CADET_ENABLE = no
-MAGIC_ENABLE = no
-GRAVE_ESC_ENABLE = no
diff --git a/keyboards/handwired/frenchdev/frenchdev.c b/keyboards/handwired/frenchdev/frenchdev.c
index 65f1ccce4b..6ff0158b5b 100644
--- a/keyboards/handwired/frenchdev/frenchdev.c
+++ b/keyboards/handwired/frenchdev/frenchdev.c
@@ -4,13 +4,11 @@ extern inline void frenchdev_board_led_on(void);
extern inline void frenchdev_led_1_on(void);
extern inline void frenchdev_led_2_on(void);
extern inline void frenchdev_led_3_on(void);
-extern inline void frenchdev_led_on(uint8_t led);
extern inline void frenchdev_board_led_off(void);
extern inline void frenchdev_led_1_off(void);
extern inline void frenchdev_led_2_off(void);
extern inline void frenchdev_led_3_off(void);
-extern inline void frenchdev_led_off(uint8_t led);
extern inline void frenchdev_led_all_on(void);
extern inline void frenchdev_led_all_off(void);
@@ -32,12 +30,11 @@ void matrix_init_kb(void) {
- // unused pins - D4, D5, D7, E6
+ // unused pins - D4, D5, E6
// set as input with internal pull-ip enabled
- DDRD &= ~(1<<5 | 1<<4);
- DDRE &= ~(1<<6);
- PORTD |= (1<<5 | 1<<4);
- PORTE |= (1<<6);
+ gpio_set_pin_input_high(D4);
+ gpio_set_pin_input_high(D5);
+ gpio_set_pin_input_high(E6);
frenchdev_blink_all_leds();
frenchdev_blink_all_leds();
@@ -84,14 +81,14 @@ uint8_t init_mcp23018(void) {
// - input : input : 1
// - driving : output : 0
uint8_t data[] = {0b00000000, 0b00111111};
- mcp23018_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
if (!mcp23018_status) {
// set pull-up
// - unused : on : 1
// - input : on : 1
// - driving : off : 0
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
}
// SREG=sreg_prev;
diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h
index 0f1ac7dcaa..ff384724e1 100644
--- a/keyboards/handwired/frenchdev/frenchdev.h
+++ b/keyboards/handwired/frenchdev/frenchdev.h
@@ -27,18 +27,40 @@ uint8_t init_mcp23018(void);
#define LED_BRIGHTNESS_LO 15
#define LED_BRIGHTNESS_HI 255
+#define FRENCHDEV_BOARD_LED_PIN D6
+#define FRENCHDEV_LED_1_PIN B5
+#define FRENCHDEV_LED_2_PIN B6
+#define FRENCHDEV_LED_3_PIN B7
-inline void frenchdev_board_led_on(void) { DDRD |= (1<<6); PORTD |= (1<<6); }
-inline void frenchdev_led_1_on(void) { DDRB |= (1<<5); PORTB |= (1<<5); }
-inline void frenchdev_led_2_on(void) { DDRB |= (1<<6); PORTB |= (1<<6); }
-inline void frenchdev_led_3_on(void) { DDRB |= (1<<7); PORTB |= (1<<7); }
-inline void frenchdev_led_on(uint8_t led) { DDRB |= (1<<(led+4)); PORTB |= (1<<(led+4)); }
+inline void frenchdev_board_led_on(void) {
+ gpio_set_pin_output(FRENCHDEV_BOARD_LED_PIN);
+ gpio_write_pin_high(FRENCHDEV_BOARD_LED_PIN);
+}
+inline void frenchdev_led_1_on(void) {
+ gpio_set_pin_output(FRENCHDEV_LED_1_PIN);
+ gpio_write_pin_high(FRENCHDEV_LED_1_PIN);
+}
+inline void frenchdev_led_2_on(void) {
+ gpio_set_pin_output(FRENCHDEV_LED_2_PIN);
+ gpio_write_pin_high(FRENCHDEV_LED_2_PIN);
+}
+inline void frenchdev_led_3_on(void) {
+ gpio_set_pin_output(FRENCHDEV_LED_3_PIN);
+ gpio_write_pin_high(FRENCHDEV_LED_3_PIN);
+}
-inline void frenchdev_board_led_off(void) { DDRD &= ~(1<<6); PORTD &= ~(1<<6); }
-inline void frenchdev_led_1_off(void) { DDRB &= ~(1<<5); PORTB &= ~(1<<5); }
-inline void frenchdev_led_2_off(void) { DDRB &= ~(1<<6); PORTB &= ~(1<<6); }
-inline void frenchdev_led_3_off(void) { DDRB &= ~(1<<7); PORTB &= ~(1<<7); }
-inline void frenchdev_led_off(uint8_t led) { DDRB &= ~(1<<(led+4)); PORTB &= ~(1<<(led+4)); }
+inline void frenchdev_board_led_off(void) {
+ gpio_set_pin_input(FRENCHDEV_BOARD_LED_PIN);
+}
+inline void frenchdev_led_1_off(void) {
+ gpio_set_pin_input(FRENCHDEV_LED_1_PIN);
+}
+inline void frenchdev_led_2_off(void) {
+ gpio_set_pin_input(FRENCHDEV_LED_2_PIN);
+}
+inline void frenchdev_led_3_off(void) {
+ gpio_set_pin_input(FRENCHDEV_LED_3_PIN);
+}
inline void frenchdev_led_all_on(void)
{
diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/keyboard.json
index 8d031b3c42..ab811888a9 100644
--- a/keyboards/handwired/frenchdev/info.json
+++ b/keyboards/handwired/frenchdev/keyboard.json
@@ -9,6 +9,14 @@
},
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true
+ },
"tapping": {
"toggle": 1
},
diff --git a/keyboards/handwired/frenchdev/matrix.c b/keyboards/handwired/frenchdev/matrix.c
index af7c8b5444..7691eb762b 100644
--- a/keyboards/handwired/frenchdev/matrix.c
+++ b/keyboards/handwired/frenchdev/matrix.c
@@ -213,8 +213,12 @@ static void init_cols(void)
// init on teensy
// Input with pull-up(DDR:0, PORT:1)
- DDRF &= ~(1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0);
- PORTF |= (1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0);
+ gpio_set_pin_input_high(F0);
+ gpio_set_pin_input_high(F1);
+ gpio_set_pin_input_high(F4);
+ gpio_set_pin_input_high(F5);
+ gpio_set_pin_input_high(F6);
+ gpio_set_pin_input_high(F7);
}
static matrix_row_t read_cols(uint8_t row)
@@ -224,7 +228,7 @@ static matrix_row_t read_cols(uint8_t row)
return 0;
} else {
uint8_t data = 0;
- mcp23018_status = i2c_readReg(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_read_register(I2C_ADDR, GPIOB, &data, 1, I2C_TIMEOUT);
return ~data;
}
@@ -259,18 +263,20 @@ static void unselect_rows(void)
// set all rows hi-Z : 1
uint8_t data;
data = 0xFF & ~(0<<8);
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
}
// unselect on teensy
// Hi-Z(DDR:0, PORT:0) to unselect
- DDRB &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3);
- PORTB &= ~(1<<0 | 1<<1 | 1<<2 | 1<<3);
- DDRD &= ~(1<<2 | 1<<3);
- PORTD &= ~(1<<2 | 1<<3);
- DDRC &= ~(1<<6 | 1<<7);
- PORTC &= ~(1<<6 | 1<<7);
+ gpio_set_pin_input(B0);
+ gpio_set_pin_input(B1);
+ gpio_set_pin_input(B2);
+ gpio_set_pin_input(B3);
+ gpio_set_pin_input(D2);
+ gpio_set_pin_input(D3);
+ gpio_set_pin_input(C6);
+ gpio_set_pin_input(C7);
}
static void select_row(uint8_t row)
@@ -283,43 +289,43 @@ static void select_row(uint8_t row)
// set active row low : 0
// set other rows hi-Z : 1
uint8_t data = 0xFF & ~(1<<row) & ~(0<<8);
- mcp23018_status = i2c_writeReg(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
+ mcp23018_status = i2c_write_register(I2C_ADDR, GPIOA, &data, 1, I2C_TIMEOUT);
}
} else {
// select on teensy
// Output low(DDR:1, PORT:0) to select
switch (row) {
case 8:
- DDRB |= (1<<0);
- PORTB &= ~(1<<0);
+ gpio_set_pin_output(B0);
+ gpio_write_pin_low(B0);
break;
case 9:
- DDRB |= (1<<1);
- PORTB &= ~(1<<1);
+ gpio_set_pin_output(B1);
+ gpio_write_pin_low(B1);
break;
case 10:
- DDRB |= (1<<2);
- PORTB &= ~(1<<2);
+ gpio_set_pin_output(B2);
+ gpio_write_pin_low(B2);
break;
case 11:
- DDRB |= (1<<3);
- PORTB &= ~(1<<3);
+ gpio_set_pin_output(B3);
+ gpio_write_pin_low(B3);
break;
case 12:
- DDRD |= (1<<2);
- PORTD &= ~(1<<3);
+ gpio_set_pin_output(D2);
+ gpio_write_pin_low(D2);
break;
case 13:
- DDRD |= (1<<3);
- PORTD &= ~(1<<3);
+ gpio_set_pin_output(D3);
+ gpio_write_pin_low(D3);
break;
case 14:
- DDRC |= (1<<6);
- PORTC &= ~(1<<6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
break;
case 15:
- DDRC |= (1<<7);
- PORTC &= ~(1<<7);
+ gpio_set_pin_output(C7);
+ gpio_write_pin_low(C7);
break;
}
}
diff --git a/keyboards/handwired/frenchdev/rules.mk b/keyboards/handwired/frenchdev/rules.mk
index e226d0b517..9b396b7668 100644
--- a/keyboards/handwired/frenchdev/rules.mk
+++ b/keyboards/handwired/frenchdev/rules.mk
@@ -1,16 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-CUSTOM_MATRIX = yes # Custom matrix file (taken and adapted from the ErgoDox EZ to handle custom number of columns)
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no
+CUSTOM_MATRIX = yes
# project specific files
SRC = matrix.c
diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/keyboard.json
index 0be6c8cdb9..0d23776f4a 100644
--- a/keyboards/handwired/freoduo/info.json
+++ b/keyboards/handwired/freoduo/keyboard.json
@@ -8,12 +8,23 @@
"pid": "0x0602",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true,
+ "velocikey": true
+ },
"matrix_pins": {
"cols": ["B2", "B6", "F6", "B3", "B1", "F7"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"rgblight": {
diff --git a/keyboards/handwired/freoduo/rules.mk b/keyboards/handwired/freoduo/rules.mk
deleted file mode 100644
index ed940647bb..0000000000
--- a/keyboards/handwired/freoduo/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-VELOCIKEY_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/keyboard.json
index 34b1edc820..4984f3fc03 100644
--- a/keyboards/handwired/fruity60/info.json
+++ b/keyboards/handwired/fruity60/keyboard.json
@@ -18,6 +18,13 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "bluetooth": true
+ },
"community_layouts": ["60_tsangan_hhkb"],
"layouts": {
"LAYOUT_60_tsangan_hhkb": {
diff --git a/keyboards/handwired/fruity60/rules.mk b/keyboards/handwired/fruity60/rules.mk
index 79e2ef4eff..3437a35bdf 100644
--- a/keyboards/handwired/fruity60/rules.mk
+++ b/keyboards/handwired/fruity60/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c
index 25493d94c3..08735c29ba 100644
--- a/keyboards/handwired/gamenum/gamenum.c
+++ b/keyboards/handwired/gamenum/gamenum.c
@@ -3,11 +3,11 @@
void matrix_init_kb(void) {
// put your keyboard start-up code here
// runs once when the firmware starts up
- DDRC |= (1<<6);
- PORTC &= ~(1<<6);
+ gpio_set_pin_output(C6);
+ gpio_write_pin_low(C6);
- DDRD |= (1<<4);
- PORTD &= ~(1<<4);
+ gpio_set_pin_output(D4);
+ gpio_write_pin_low(D4);
matrix_init_user();
diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/keyboard.json
index 78dbfce5f7..17460f4dca 100644
--- a/keyboards/handwired/gamenum/info.json
+++ b/keyboards/handwired/gamenum/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x5678",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D7", "E6", "B4", "B5"],
"rows": ["B6", "B2", "B3", "B1", "F7"]
diff --git a/keyboards/handwired/gamenum/keymaps/default/keymap.c b/keyboards/handwired/gamenum/keymaps/default/keymap.c
index 8b768850c8..86bad4ebac 100644
--- a/keyboards/handwired/gamenum/keymaps/default/keymap.c
+++ b/keyboards/handwired/gamenum/keymaps/default/keymap.c
@@ -33,22 +33,22 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case TO(HDN):
if (record->event.pressed) {
- PORTC |= (1 << 6); // PC6 goes high
+ gpio_write_pin_high(C6);
}
return true;
case TO(OSY):
if (record->event.pressed) {
- PORTC &= ~(1 << 6); // PC6 goes high
- PORTD |= (1<<4);
+ gpio_write_pin_low(C6);
+ gpio_write_pin_high(D4);
}
return true;
case TO(DEF):
if (record->event.pressed) {
- PORTD &= ~(1 << 4); // PC6 goes high
+ gpio_write_pin_low(D4);
}
return true;
diff --git a/keyboards/handwired/gamenum/rules.mk b/keyboards/handwired/gamenum/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/gamenum/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/keyboard.json
index 899bd58bcb..af76a4dd76 100644
--- a/keyboards/handwired/hacked_motospeed/info.json
+++ b/keyboards/handwired/hacked_motospeed/keyboard.json
@@ -6,7 +6,8 @@
"usb": {
"vid": "0xFEED",
"pid": "0x0690",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "no_startup_check": true
},
"bluetooth": {
"driver": "rn42"
@@ -21,6 +22,15 @@
},
"processor": "at90usb1286",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "backlight": true,
+ "bluetooth": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/hacked_motospeed/rules.mk b/keyboards/handwired/hacked_motospeed/rules.mk
deleted file mode 100644
index 362a7fadbe..0000000000
--- a/keyboards/handwired/hacked_motospeed/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-NO_USB_STARTUP_CHECK = yes # Disable initialization only when usb is plugged in
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/keyboard.json
index 09e03bd063..88f001d075 100644
--- a/keyboards/handwired/heisenberg/info.json
+++ b/keyboards/handwired/heisenberg/keyboard.json
@@ -26,6 +26,16 @@
"ws2812": {
"pin": "D4"
},
+ "features": {
+ "audio": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D3", "D2", "D1", "D0"]
diff --git a/keyboards/handwired/heisenberg/rules.mk b/keyboards/handwired/heisenberg/rules.mk
deleted file mode 100644
index bf4e123153..0000000000
--- a/keyboards/handwired/heisenberg/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/keyboard.json
index 5bb94b0c40..dfc11eb532 100644
--- a/keyboards/handwired/hexon38/info.json
+++ b/keyboards/handwired/hexon38/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["C6", "D3", "D2", "D1", "D0", "B7", "F6", "F7", "B6", "B5", "B4", "D7"],
"rows": ["B0", "F0", "B2", "F4"]
diff --git a/keyboards/handwired/hexon38/rules.mk b/keyboards/handwired/hexon38/rules.mk
deleted file mode 100644
index fb9061cbb5..0000000000
--- a/keyboards/handwired/hexon38/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/keyboard.json
index 63017532e3..e062dcee6f 100644
--- a/keyboards/handwired/hnah108/info.json
+++ b/keyboards/handwired/hnah108/keyboard.json
@@ -56,6 +56,17 @@
},
"driver": "ws2812"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"],
"rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"]
diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk
deleted file mode 100644
index ec5f27bde8..0000000000
--- a/keyboards/handwired/hnah108/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/keyboard.json
index b35f3fc40c..649ad84d10 100644
--- a/keyboards/handwired/hnah40/info.json
+++ b/keyboards/handwired/hnah40/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.2",
"max_power": 100
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"],
"rows": ["B4", "B5", "B3", "D4"]
diff --git a/keyboards/handwired/hnah40/rules.mk b/keyboards/handwired/hnah40/rules.mk
deleted file mode 100644
index d4acd7ecd1..0000000000
--- a/keyboards/handwired/hnah40/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/keyboard.json
index 51a934564c..753b5dd00a 100644
--- a/keyboards/handwired/hnah40rgb/info.json
+++ b/keyboards/handwired/hnah40rgb/keyboard.json
@@ -65,6 +65,15 @@
"max_brightness": 200,
"react_on_keyup": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"],
"rows": ["B7", "D7", "F1", "F0"]
diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk
deleted file mode 100644
index 7c04c86483..0000000000
--- a/keyboards/handwired/hnah40rgb/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/keyboard.json
index 88079c32ad..0dbbb0472a 100644
--- a/keyboards/handwired/hwpm87/info.json
+++ b/keyboards/handwired/hwpm87/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"],
"rows": ["B0", "B1", "B2", "B3", "B4", "B5"]
diff --git a/keyboards/handwired/hwpm87/rules.mk b/keyboards/handwired/hwpm87/rules.mk
deleted file mode 100644
index 90f47aeb93..0000000000
--- a/keyboards/handwired/hwpm87/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-
diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/keyboard.json
index 4ec01887e1..91f56540e2 100644
--- a/keyboards/handwired/ibm_wheelwriter/info.json
+++ b/keyboards/handwired/ibm_wheelwriter/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x5F89",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
"rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2"]
diff --git a/keyboards/handwired/ibm_wheelwriter/rules.mk b/keyboards/handwired/ibm_wheelwriter/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/handwired/ibm_wheelwriter/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/iso85k/info.json b/keyboards/handwired/iso85k/keyboard.json
index 625a356e30..625a356e30 100644
--- a/keyboards/handwired/iso85k/info.json
+++ b/keyboards/handwired/iso85k/keyboard.json
diff --git a/keyboards/handwired/iso85k/rules.mk b/keyboards/handwired/iso85k/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/iso85k/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/itstleo9/promicro/info.json b/keyboards/handwired/itstleo9/promicro/keyboard.json
index 4cbc1050c0..4cbc1050c0 100644
--- a/keyboards/handwired/itstleo9/promicro/info.json
+++ b/keyboards/handwired/itstleo9/promicro/keyboard.json
diff --git a/keyboards/handwired/itstleo9/promicro/rules.mk b/keyboards/handwired/itstleo9/promicro/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/itstleo9/promicro/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/itstleo9/rp2040/info.json b/keyboards/handwired/itstleo9/rp2040/keyboard.json
index 0272150df1..0272150df1 100644
--- a/keyboards/handwired/itstleo9/rp2040/info.json
+++ b/keyboards/handwired/itstleo9/rp2040/keyboard.json
diff --git a/keyboards/handwired/itstleo9/rp2040/rules.mk b/keyboards/handwired/itstleo9/rp2040/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/itstleo9/rp2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/jankrp2040dactyl/info.json b/keyboards/handwired/jankrp2040dactyl/keyboard.json
index c4543b5d12..c4543b5d12 100644
--- a/keyboards/handwired/jankrp2040dactyl/info.json
+++ b/keyboards/handwired/jankrp2040dactyl/keyboard.json
diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/keyboard.json
index 6c83157843..25dfb005eb 100644
--- a/keyboards/handwired/jn68m/info.json
+++ b/keyboards/handwired/jn68m/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x1010",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"],
"rows": ["B0", "B1", "D5", "D3", "D2"]
diff --git a/keyboards/handwired/jn68m/rules.mk b/keyboards/handwired/jn68m/rules.mk
deleted file mode 100644
index d4acd7ecd1..0000000000
--- a/keyboards/handwired/jn68m/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c
index e6d6f05dd2..cb155ecb4b 100644
--- a/keyboards/handwired/jopr/jopr.c
+++ b/keyboards/handwired/jopr/jopr.c
@@ -1,7 +1,7 @@
#include "quantum.h"
void led_init_ports(void) {
- setPinOutput(F0);
- setPinOutput(F1);
- setPinOutput(F4);
+ gpio_set_pin_output(F0);
+ gpio_set_pin_output(F1);
+ gpio_set_pin_output(F4);
} \ No newline at end of file
diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/keyboard.json
index 78fb52cb99..c01e622325 100644
--- a/keyboards/handwired/jopr/info.json
+++ b/keyboards/handwired/jopr/keyboard.json
@@ -17,6 +17,15 @@
"ws2812": {
"pin": "F4"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "unicode": true
+ },
"matrix_pins": {
"cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"],
"rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"]
diff --git a/keyboards/handwired/jopr/rules.mk b/keyboards/handwired/jopr/rules.mk
deleted file mode 100644
index 5bb5e8e0dc..0000000000
--- a/keyboards/handwired/jopr/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-UNICODE_ENABLE = yes
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/keyboard.json
index 07a369a937..260fd6dffc 100644
--- a/keyboards/handwired/jot50/info.json
+++ b/keyboards/handwired/jot50/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"],
"rows": ["D7", "E6", "B4", "B6", "B2"]
diff --git a/keyboards/handwired/jot50/rules.mk b/keyboards/handwired/jot50/rules.mk
deleted file mode 100644
index 8135e80671..0000000000
--- a/keyboards/handwired/jot50/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c
index c0b54bb64d..6a982d2fcf 100644
--- a/keyboards/handwired/jotanck/jotanck.c
+++ b/keyboards/handwired/jotanck/jotanck.c
@@ -17,8 +17,8 @@
#include "quantum.h"
void keyboard_pre_init_kb(void) {
- setPinOutput(JOTANCK_LED1);
- setPinOutput(JOTANCK_LED2);
+ gpio_set_pin_output(JOTANCK_LED1);
+ gpio_set_pin_output(JOTANCK_LED2);
keyboard_pre_init_user();
}
diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/keyboard.json
index 0e4966218a..4c81ac1a61 100644
--- a/keyboards/handwired/jotanck/info.json
+++ b/keyboards/handwired/jotanck/keyboard.json
@@ -1,20 +1,30 @@
{
"keyboard_name": "Jotanck",
"manufacturer": "Jotix",
- "url": "",
+ "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/jotanck",
"maintainer": "jotix",
"usb": {
"vid": "0x4A4F",
"pid": "0x5458",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "tapping": {
+ "term": 175
+ },
+ "development_board": "promicro",
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"],
"rows": ["D7", "E6", "B6", "B2"]
},
"diode_direction": "COL2ROW",
- "processor": "atmega32u4",
- "bootloader": "caterina",
"community_layouts": ["ortho_4x12"],
"layouts": {
"LAYOUT_ortho_4x12": {
diff --git a/keyboards/handwired/jotanck/rules.mk b/keyboards/handwired/jotanck/rules.mk
deleted file mode 100644
index 696f338724..0000000000
--- a/keyboards/handwired/jotanck/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/jotlily60/info.json b/keyboards/handwired/jotlily60/keyboard.json
index 65faa354a5..65faa354a5 100644
--- a/keyboards/handwired/jotlily60/info.json
+++ b/keyboards/handwired/jotlily60/keyboard.json
diff --git a/keyboards/handwired/jotlily60/rules.mk b/keyboards/handwired/jotlily60/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/jotlily60/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c
index 02b4daafd6..7acb31b0df 100644
--- a/keyboards/handwired/jotpad16/jotpad16.c
+++ b/keyboards/handwired/jotpad16/jotpad16.c
@@ -1,8 +1,8 @@
#include "quantum.h"
void keyboard_pre_init_kb(void) {
- setPinOutput(JOTPAD16_LED1);
- setPinOutput(JOTPAD16_LED2);
+ gpio_set_pin_output(JOTPAD16_LED1);
+ gpio_set_pin_output(JOTPAD16_LED2);
keyboard_pre_init_user();
}
diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/keyboard.json
index 289ef636b4..944af735ef 100644
--- a/keyboards/handwired/jotpad16/info.json
+++ b/keyboards/handwired/jotpad16/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["E6", "D7", "B3", "B1"],
"rows": ["B6", "B2", "D2", "D3"]
diff --git a/keyboards/handwired/jotpad16/rules.mk b/keyboards/handwired/jotpad16/rules.mk
deleted file mode 100644
index 39356ef6f6..0000000000
--- a/keyboards/handwired/jotpad16/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/keyboard.json
index fd12142729..d1b974a59b 100644
--- a/keyboards/handwired/jtallbean/split_65/info.json
+++ b/keyboards/handwired/jtallbean/split_65/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"],
"rows": ["F4", "F1", "F0", "C7", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/handwired/jtallbean/split_65/rules.mk b/keyboards/handwired/jtallbean/split_65/rules.mk
deleted file mode 100644
index c644dd59ee..0000000000
--- a/keyboards/handwired/jtallbean/split_65/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Enable split keyboard support
diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c
index d408f5577b..b75b12137f 100644
--- a/keyboards/handwired/jtallbean/split_65/split_65.c
+++ b/keyboards/handwired/jtallbean/split_65/split_65.c
@@ -25,8 +25,8 @@ void matrix_init_kb(void) {
// runs once when the firmware starts up
// Set our LED pins as output
- setPinOutput(B0);
- writePinLow(B0);
+ gpio_set_pin_output(B0);
+ gpio_write_pin_low(B0);
matrix_init_user();
}
@@ -36,8 +36,8 @@ bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- // writePin sets the pin high for 1 and low for 0.
- writePin(B0, led_state.caps_lock);
+ // gpio_write_pin sets the pin high for 1 and low for 0.
+ gpio_write_pin(B0, led_state.caps_lock);
}
return res;
}
diff --git a/keyboards/handwired/juliet/info.json b/keyboards/handwired/juliet/keyboard.json
index d723557d4b..e08a026692 100644
--- a/keyboards/handwired/juliet/info.json
+++ b/keyboards/handwired/juliet/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x4069",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"],
"rows": ["F5", "D2", "D3", "F4"]
diff --git a/keyboards/handwired/juliet/rules.mk b/keyboards/handwired/juliet/rules.mk
deleted file mode 100644
index fa6fbf34d9..0000000000
--- a/keyboards/handwired/juliet/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/keyboard.json
index 3ec5d1c36f..62ea64604a 100644
--- a/keyboards/handwired/k8split/info.json
+++ b/keyboards/handwired/k8split/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xC868",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["D5", "D3", "D2", "D1", "D0", "B7"]
diff --git a/keyboards/handwired/k8split/rules.mk b/keyboards/handwired/k8split/rules.mk
deleted file mode 100644
index 3e66b069b3..0000000000
--- a/keyboards/handwired/k8split/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/keyboard.json
index 97d5f38774..edf69bc5d5 100644
--- a/keyboards/handwired/k_numpad17/info.json
+++ b/keyboards/handwired/k_numpad17/keyboard.json
@@ -11,6 +11,14 @@
"tapping": {
"term": 400
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B2", "B1", "F6", "F4"],
"rows": ["D1", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/k_numpad17/rules.mk b/keyboards/handwired/k_numpad17/rules.mk
deleted file mode 100644
index d090183808..0000000000
--- a/keyboards/handwired/k_numpad17/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/keyboard.json
index 69005c6579..127595a0ce 100644
--- a/keyboards/handwired/kbod/info.json
+++ b/keyboards/handwired/kbod/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"],
"rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"]
diff --git a/keyboards/handwired/kbod/rules.mk b/keyboards/handwired/kbod/rules.mk
deleted file mode 100644
index 14ece75f47..0000000000
--- a/keyboards/handwired/kbod/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/keyboard.json
index 6fcd1c12bb..542cd76811 100644
--- a/keyboards/handwired/ks63/info.json
+++ b/keyboards/handwired/ks63/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3061",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["B5", "B4", "E6", "D7", "C6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/ks63/rules.mk b/keyboards/handwired/ks63/rules.mk
deleted file mode 100644
index 12dd064c62..0000000000
--- a/keyboards/handwired/ks63/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/keyboard.json
index 243f9a5d7b..d7ad47355a 100644
--- a/keyboards/handwired/lagrange/info.json
+++ b/keyboards/handwired/lagrange/keyboard.json
@@ -14,11 +14,15 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"matrix_pins": {
"right": {
"cols": ["C7", "F7", "F6", "F5", "F4", "F1"],
"rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"]
}
+ },
+ "transport": {
+ "protocol": "custom"
}
},
"indicators": {
@@ -27,6 +31,13 @@
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "unicode": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/lagrange/lagrange.c b/keyboards/handwired/lagrange/lagrange.c
index 0c76512c57..4b80752518 100644
--- a/keyboards/handwired/lagrange/lagrange.c
+++ b/keyboards/handwired/lagrange/lagrange.c
@@ -35,7 +35,7 @@ bool is_keyboard_master(void) {
static int8_t is_master = -1;
if (is_master < 0) {
- while (readPin(SPI_SS_PIN)) {
+ while (gpio_read_pin(SPI_SS_PIN)) {
if (USB_Device_IsAddressSet()) {
is_master = 1;
return is_master;
@@ -53,7 +53,7 @@ bool is_keyboard_master(void) {
}
void keyboard_pre_init_kb(void) {
- setPinInputHigh(SPI_SS_PIN);
+ gpio_set_pin_input_high(SPI_SS_PIN);
keyboard_pre_init_user();
}
diff --git a/keyboards/handwired/lagrange/rules.mk b/keyboards/handwired/lagrange/rules.mk
index f4af87851c..1f2175e9cb 100644
--- a/keyboards/handwired/lagrange/rules.mk
+++ b/keyboards/handwired/lagrange/rules.mk
@@ -1,18 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-UNICODE_ENABLE = yes
-SPLIT_KEYBOARD = yes
-SPLIT_TRANSPORT = custom
-
SRC += transport.c
SPI_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/lagrange/transport.c b/keyboards/handwired/lagrange/transport.c
index 8f6973925f..3ff2e9f409 100644
--- a/keyboards/handwired/lagrange/transport.c
+++ b/keyboards/handwired/lagrange/transport.c
@@ -14,9 +14,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-#include <spi_master.h>
-
-#include "quantum.h"
+#include "spi_master.h"
#include "split_util.h"
#include "transport.h"
#include "timer.h"
@@ -55,7 +53,7 @@ bool shake_hands(bool master) {
* alignment. */
if (master) {
- writePinLow(SPI_SS_PIN);
+ gpio_write_pin_low(SPI_SS_PIN);
}
for (i = 0 ; i < 8 ; i += 1) {
@@ -66,7 +64,7 @@ bool shake_hands(bool master) {
}
if (master) {
- writePinHigh(SPI_SS_PIN);
+ gpio_write_pin_high(SPI_SS_PIN);
}
} while (i < 8);
@@ -178,8 +176,8 @@ void transport_master_init(void) {
* above depends on it and the SPI master driver won't do it
* before we call spi_start(). */
- writePinHigh(SPI_SS_PIN);
- setPinOutput(SPI_SS_PIN);
+ gpio_write_pin_high(SPI_SS_PIN);
+ gpio_set_pin_output(SPI_SS_PIN);
spi_init();
@@ -197,10 +195,10 @@ void transport_slave_init(void) {
* they're asserted making the MISO pin an output on both ends and
* leading to potential shorts. */
- setPinInputHigh(SPI_SS_PIN);
- setPinInput(SPI_SCK_PIN);
- setPinInput(SPI_MOSI_PIN);
- setPinOutput(SPI_MISO_PIN);
+ gpio_set_pin_input_high(SPI_SS_PIN);
+ gpio_set_pin_input(SPI_SCK_PIN);
+ gpio_set_pin_input(SPI_MOSI_PIN);
+ gpio_set_pin_output(SPI_MISO_PIN);
SPCR = _BV(SPE);
diff --git a/keyboards/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/keyboard.json
index 0a769a43f9..045fd7e875 100644
--- a/keyboards/handwired/leftynumpad/info.json
+++ b/keyboards/handwired/leftynumpad/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xBEEF",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["E6", "B4", "B5", "B6", "B2"],
"rows": ["D1", "D0", "D4", "C6", "D7"]
diff --git a/keyboards/handwired/leftynumpad/rules.mk b/keyboards/handwired/leftynumpad/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/leftynumpad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/lemonpad/info.json b/keyboards/handwired/lemonpad/keyboard.json
index 4655cde341..ba40689125 100644
--- a/keyboards/handwired/lemonpad/info.json
+++ b/keyboards/handwired/lemonpad/keyboard.json
@@ -10,6 +10,17 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"direct": [
["E6", "D7", "C6"],
diff --git a/keyboards/handwired/lemonpad/rules.mk b/keyboards/handwired/lemonpad/rules.mk
deleted file mode 100644
index 1b7b1b36a4..0000000000
--- a/keyboards/handwired/lemonpad/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/keyboard.json
index 835fa55bef..f8962bf761 100644
--- a/keyboards/handwired/lovelive9/info.json
+++ b/keyboards/handwired/lovelive9/keyboard.json
@@ -9,6 +9,15 @@
"device_version": "0.0.1",
"max_power": 400
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"],
"rows": [null]
diff --git a/keyboards/handwired/lovelive9/keymaps/default/keymap.c b/keyboards/handwired/lovelive9/keymaps/default/keymap.c
index 6d863449fe..4fc8e9be43 100644
--- a/keyboards/handwired/lovelive9/keymaps/default/keymap.c
+++ b/keyboards/handwired/lovelive9/keymaps/default/keymap.c
@@ -154,26 +154,22 @@ int aqours_color_v[] = {255, 255, 255, 255, 255, 255, 200, 255, 255};
void LED_default_set(void) {
- sethsv(aqours_color_h[2], aqours_color_s[2], aqours_color_v[2], (rgb_led_t *)&led[0]);
- sethsv(aqours_color_h[7], aqours_color_s[7], aqours_color_v[7], (rgb_led_t *)&led[1]);
- sethsv(aqours_color_h[1], aqours_color_s[1], aqours_color_v[1], (rgb_led_t *)&led[2]);
- sethsv(aqours_color_h[5], aqours_color_s[5], aqours_color_v[5], (rgb_led_t *)&led[3]);
- sethsv(aqours_color_h[8], aqours_color_s[8], aqours_color_v[8], (rgb_led_t *)&led[4]);
- sethsv(aqours_color_h[6], aqours_color_s[6], aqours_color_v[6], (rgb_led_t *)&led[5]);
- sethsv(aqours_color_h[0], aqours_color_s[0], aqours_color_v[0], (rgb_led_t *)&led[6]);
- sethsv(aqours_color_h[4], aqours_color_s[4], aqours_color_v[4], (rgb_led_t *)&led[7]);
- sethsv(aqours_color_h[3], aqours_color_s[3], aqours_color_v[3], (rgb_led_t *)&led[8]);
-
- rgblight_set();
-
+ rgblight_sethsv_at(aqours_color_h[2], aqours_color_s[2], aqours_color_v[2], 0);
+ rgblight_sethsv_at(aqours_color_h[7], aqours_color_s[7], aqours_color_v[7], 1);
+ rgblight_sethsv_at(aqours_color_h[1], aqours_color_s[1], aqours_color_v[1], 2);
+ rgblight_sethsv_at(aqours_color_h[5], aqours_color_s[5], aqours_color_v[5], 3);
+ rgblight_sethsv_at(aqours_color_h[8], aqours_color_s[8], aqours_color_v[8], 4);
+ rgblight_sethsv_at(aqours_color_h[6], aqours_color_s[6], aqours_color_v[6], 5);
+ rgblight_sethsv_at(aqours_color_h[0], aqours_color_s[0], aqours_color_v[0], 6);
+ rgblight_sethsv_at(aqours_color_h[4], aqours_color_s[4], aqours_color_v[4], 7);
+ rgblight_sethsv_at(aqours_color_h[3], aqours_color_s[3], aqours_color_v[3], 8);
}
void LED_layer_set(int aqours_index) {
for (int c = 0; c < 9; c++) {
- sethsv(aqours_color_h[aqours_index], aqours_color_s[aqours_index], aqours_color_v[aqours_index], (rgb_led_t *)&led[c]);
+ rgblight_sethsv_at(aqours_color_h[aqours_index], aqours_color_s[aqours_index], aqours_color_v[aqours_index], c);
}
- rgblight_set();
}
diff --git a/keyboards/handwired/lovelive9/rules.mk b/keyboards/handwired/lovelive9/rules.mk
deleted file mode 100644
index f99fed15e7..0000000000
--- a/keyboards/handwired/lovelive9/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/keyboard.json
index 41342fc2ec..b4bc53afc5 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
"layouts": {
"LAYOUT_ortho_5x5": {
"layout": [
diff --git a/keyboards/handwired/m40/5x5_macropad/rules.mk b/keyboards/handwired/m40/5x5_macropad/rules.mk
index fe66abc849..4df55cd220 100644
--- a/keyboards/handwired/m40/5x5_macropad/rules.mk
+++ b/keyboards/handwired/m40/5x5_macropad/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Disable unsupported hardware
AUDIO_SUPPORTED = no
-BACKLIGHT_SUPPORTED = no \ No newline at end of file
+BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/macro3/info.json b/keyboards/handwired/macro3/keyboard.json
index fa6cd1c471..fa6cd1c471 100644
--- a/keyboards/handwired/macro3/info.json
+++ b/keyboards/handwired/macro3/keyboard.json
diff --git a/keyboards/handwired/macro3/rules.mk b/keyboards/handwired/macro3/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/macro3/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h
index 95e7d9d1aa..b8e437bddf 100644
--- a/keyboards/handwired/macroboard/config.h
+++ b/keyboards/handwired/macroboard/config.h
@@ -20,8 +20,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_DRIVER PWMD4
#define WS2812_PWM_CHANNEL 4
#define WS2812_PWM_PAL_MODE 2
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM6 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 2 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_PWM_TARGET_PERIOD 800000
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json
deleted file mode 100644
index 5108d8ce50..0000000000
--- a/keyboards/handwired/macroboard/f401/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
- "rows": ["A4", "A3", "A2", "A1", "A0"]
- },
- "diode_direction": "COL2ROW",
- "ws2812": {
- "driver": "pwm"
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/macroboard/f401/keyboard.json b/keyboards/handwired/macroboard/f401/keyboard.json
new file mode 100644
index 0000000000..d5e217b2f3
--- /dev/null
+++ b/keyboards/handwired/macroboard/f401/keyboard.json
@@ -0,0 +1,23 @@
+{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["A5", "A6", "A7", "B0", "B1", "B10"],
+ "rows": ["A4", "A3", "A2", "A1", "A0"]
+ },
+ "diode_direction": "COL2ROW",
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ }
+}
diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk
deleted file mode 100644
index bc0cd6b97f..0000000000
--- a/keyboards/handwired/macroboard/f401/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json
deleted file mode 100644
index d7ff61f52b..0000000000
--- a/keyboards/handwired/macroboard/f411/info.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
- "rows": ["A15", "B3", "B4", "B5", "B7"]
- },
- "diode_direction": "COL2ROW",
- "ws2812": {
- "driver": "pwm"
- },
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
-}
diff --git a/keyboards/handwired/macroboard/f411/keyboard.json b/keyboards/handwired/macroboard/f411/keyboard.json
new file mode 100644
index 0000000000..8b1155d774
--- /dev/null
+++ b/keyboards/handwired/macroboard/f411/keyboard.json
@@ -0,0 +1,27 @@
+{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B12", "B13", "B14", "B15", "A8", "A10"],
+ "rows": ["A15", "B3", "B4", "B5", "B7"]
+ },
+ "diode_direction": "COL2ROW",
+ "audio": {
+ "driver": "pwm_hardware"
+ },
+ "ws2812": {
+ "driver": "pwm"
+ },
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true,
+ "audio": true
+ }
+}
diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk
deleted file mode 100644
index cdf33bfea5..0000000000
--- a/keyboards/handwired/macroboard/f411/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
-AUDIO_DRIVER = pwm_hardware
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/keyboard.json
index 9ec845614c..dbcae2f21a 100644
--- a/keyboards/handwired/magicforce61/info.json
+++ b/keyboards/handwired/magicforce61/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"],
"rows": ["D0", "D1", "D2", "D3", "D4"]
diff --git a/keyboards/handwired/magicforce61/rules.mk b/keyboards/handwired/magicforce61/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/magicforce61/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/keyboard.json
index dcffe0f5d7..a9afdf913a 100644
--- a/keyboards/handwired/magicforce68/info.json
+++ b/keyboards/handwired/magicforce68/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"],
"rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/handwired/magicforce68/rules.mk b/keyboards/handwired/magicforce68/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/magicforce68/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/keyboard.json
index 5c17825a63..aa612c1ff0 100644
--- a/keyboards/handwired/marauder/info.json
+++ b/keyboards/handwired/marauder/keyboard.json
@@ -17,6 +17,18 @@
"ws2812": {
"pin": "D3"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"],
"rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"]
diff --git a/keyboards/handwired/marauder/rules.mk b/keyboards/handwired/marauder/rules.mk
deleted file mode 100644
index a14973e3ef..0000000000
--- a/keyboards/handwired/marauder/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Link Time Optimization, shrinks the output slightly
diff --git a/keyboards/handwired/marek128b/ergosplit44/info.json b/keyboards/handwired/marek128b/ergosplit44/keyboard.json
index 8e0c71fc06..8e0c71fc06 100644
--- a/keyboards/handwired/marek128b/ergosplit44/info.json
+++ b/keyboards/handwired/marek128b/ergosplit44/keyboard.json
diff --git a/keyboards/handwired/marek128b/ergosplit44/rules.mk b/keyboards/handwired/marek128b/ergosplit44/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/marek128b/ergosplit44/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/keyboard.json
index 057552e621..057552e621 100644
--- a/keyboards/handwired/maverick0197/keydeck8/info.json
+++ b/keyboards/handwired/maverick0197/keydeck8/keyboard.json
diff --git a/keyboards/handwired/maverick0197/keydeck8/rules.mk b/keyboards/handwired/maverick0197/keydeck8/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/maverick0197/keydeck8/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/keyboard.json
index a61a11bc94..16e6653a33 100644
--- a/keyboards/handwired/mechboards_micropad/info.json
+++ b/keyboards/handwired/mechboards_micropad/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0001",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B2", "B3", "B1", "F7"],
"rows": ["B6"]
diff --git a/keyboards/handwired/mechboards_micropad/rules.mk b/keyboards/handwired/mechboards_micropad/rules.mk
deleted file mode 100644
index d4acd7ecd1..0000000000
--- a/keyboards/handwired/mechboards_micropad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json
deleted file mode 100644
index eeaa9c392b..0000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
- "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
- },
- "diode_direction": "COL2ROW",
- "indicators": {
- "caps_lock": "C13",
- "on_state": 0
- },
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
-}
diff --git a/keyboards/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
index 8266e704bc..4a9e2a5380 100644
--- a/keyboards/handwired/meck_tkl/info.json
+++ b/keyboards/handwired/meck_tkl/blackpill_f401/keyboard.json
@@ -6,8 +6,36 @@
"usb": {
"vid": "0x474B",
"pid": "0x0001",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "nkro": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
+ "matrix_pins": {
+ "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"],
+ "rows": ["B15", "A8", "A9", "B14", "A15", "B3"]
+ },
+ "diode_direction": "COL2ROW",
+ "indicators": {
+ "caps_lock": "C13",
+ "on_state": 0
},
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "board": "BLACKPILL_STM32_F401",
"layouts": {
"LAYOUT_tkl_ansi": {
"layout": [
diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk b/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
deleted file mode 100644
index b5f27c93ea..0000000000
--- a/keyboards/handwired/meck_tkl/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h
deleted file mode 100644
index 30221cc216..0000000000
--- a/keyboards/handwired/meck_tkl/config.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2021 Gabriel Kim (@gabrielkim13)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/handwired/meck_tkl/rules.mk b/keyboards/handwired/meck_tkl/rules.mk
index 6213285117..cdf3900ff0 100644
--- a/keyboards/handwired/meck_tkl/rules.mk
+++ b/keyboards/handwired/meck_tkl/rules.mk
@@ -1,15 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
AUDIO_SUPPORTED = no
BACKLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/keyboard.json
index ba2b6d0ed5..9642927f1a 100644
--- a/keyboards/handwired/minorca/info.json
+++ b/keyboards/handwired/minorca/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6660",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B0", "B1", "B2", "B3"]
diff --git a/keyboards/handwired/minorca/rules.mk b/keyboards/handwired/minorca/rules.mk
deleted file mode 100644
index 283a46b6ae..0000000000
--- a/keyboards/handwired/minorca/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/keyboard.json
index 59062f16dc..02c4348781 100644
--- a/keyboards/handwired/misterdeck/info.json
+++ b/keyboards/handwired/misterdeck/keyboard.json
@@ -11,6 +11,14 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D7", "E6", "B4", "B5"],
"rows": ["D1", "D0", "D4"]
diff --git a/keyboards/handwired/misterdeck/rules.mk b/keyboards/handwired/misterdeck/rules.mk
deleted file mode 100644
index 20825c8cfa..0000000000
--- a/keyboards/handwired/misterdeck/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json
index 9454bcda70..9454bcda70 100644
--- a/keyboards/handwired/ms_sculpt_mobile/astar/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/astar/keyboard.json
diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk b/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/astar/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json
index 8ef1cb0a84..918f166c61 100644
--- a/keyboards/handwired/ms_sculpt_mobile/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/info.json
@@ -2,6 +2,14 @@
"manufacturer": "Microsoftplus",
"url": "",
"maintainer": "qmk",
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
diff --git a/keyboards/handwired/ms_sculpt_mobile/rules.mk b/keyboards/handwired/ms_sculpt_mobile/rules.mk
index 6fd84c8244..8a3cc6858c 100644
--- a/keyboards/handwired/ms_sculpt_mobile/rules.mk
+++ b/keyboards/handwired/ms_sculpt_mobile/rules.mk
@@ -1,14 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
DEFAULT_FOLDER = handwired/ms_sculpt_mobile/teensy2pp
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json
index 2d500a8ae2..2d500a8ae2 100644
--- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json
+++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/keyboard.json
diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/mutepad/info.json b/keyboards/handwired/mutepad/keyboard.json
index 5adb2505fb..9bb273d4e8 100644
--- a/keyboards/handwired/mutepad/info.json
+++ b/keyboards/handwired/mutepad/keyboard.json
@@ -9,6 +9,15 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B1", "B3", "B2", "B6"],
"rows": ["F6"]
diff --git a/keyboards/handwired/mutepad/rules.mk b/keyboards/handwired/mutepad/rules.mk
deleted file mode 100644
index 131aa72aeb..0000000000
--- a/keyboards/handwired/mutepad/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/keyboard.json
index eae71d9508..f2da286f19 100644
--- a/keyboards/handwired/myskeeb/info.json
+++ b/keyboards/handwired/myskeeb/keyboard.json
@@ -6,7 +6,8 @@
"usb": {
"vid": "0xFEED",
"pid": "0x6060",
- "device_version": "1.0.0"
+ "device_version": "1.0.0",
+ "no_startup_check": true
},
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"],
@@ -14,6 +15,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"matrix_pins": {
"right": {
@@ -23,6 +25,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "oled": true
+ },
"debounce": 0,
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/myskeeb/rules.mk b/keyboards/handwired/myskeeb/rules.mk
deleted file mode 100644
index e09e2e2bbe..0000000000
--- a/keyboards/handwired/myskeeb/rules.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-AUDIO_ENABLE = no # Audio output
-SPLIT_KEYBOARD = yes # Enables split keyboard support
-OLED_ENABLE = yes
-NO_USB_STARTUP_CHECK = yes
diff --git a/keyboards/handwired/nicekey/info.json b/keyboards/handwired/nicekey/keyboard.json
index 066e5b852f..0ae1b3280b 100644
--- a/keyboards/handwired/nicekey/info.json
+++ b/keyboards/handwired/nicekey/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6464",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6"],
"rows": ["B6"]
diff --git a/keyboards/handwired/nicekey/rules.mk b/keyboards/handwired/nicekey/rules.mk
deleted file mode 100644
index 59c896dbff..0000000000
--- a/keyboards/handwired/nicekey/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/nortontechpad/info.json b/keyboards/handwired/nortontechpad/keyboard.json
index 51871b42e3..51871b42e3 100644
--- a/keyboards/handwired/nortontechpad/info.json
+++ b/keyboards/handwired/nortontechpad/keyboard.json
diff --git a/keyboards/handwired/nortontechpad/rules.mk b/keyboards/handwired/nortontechpad/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/nortontechpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/keyboard.json
index b5298dfae4..b48eba771b 100644
--- a/keyboards/handwired/not_so_minidox/info.json
+++ b/keyboards/handwired/not_so_minidox/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "D4"],
"rows": ["D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/not_so_minidox/rules.mk b/keyboards/handwired/not_so_minidox/rules.mk
deleted file mode 100644
index 8ea05b5f74..0000000000
--- a/keyboards/handwired/not_so_minidox/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/novem/info.json b/keyboards/handwired/novem/keyboard.json
index bc70d64ed4..bc4fe2c1c9 100644
--- a/keyboards/handwired/novem/info.json
+++ b/keyboards/handwired/novem/keyboard.json
@@ -15,6 +15,11 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/novem/rules.mk b/keyboards/handwired/novem/rules.mk
deleted file mode 100644
index ca9d24172d..0000000000
--- a/keyboards/handwired/novem/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/keyboard.json
index a4b37eec4a..c87205c917 100644
--- a/keyboards/handwired/nozbe_macro/info.json
+++ b/keyboards/handwired/nozbe_macro/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6"],
"rows": ["B0"]
diff --git a/keyboards/handwired/nozbe_macro/rules.mk b/keyboards/handwired/nozbe_macro/rules.mk
deleted file mode 100644
index b325f3f0c7..0000000000
--- a/keyboards/handwired/nozbe_macro/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/numpad20/info.json b/keyboards/handwired/numpad20/keyboard.json
index 5c96b7e5db..7e3888bbe0 100644
--- a/keyboards/handwired/numpad20/info.json
+++ b/keyboards/handwired/numpad20/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0504",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D0", "F5", "F4"],
"rows": ["F6", "B1", "B3", "B6", "B5"]
diff --git a/keyboards/handwired/numpad20/rules.mk b/keyboards/handwired/numpad20/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/numpad20/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json
index 001705ee72..7cbf1b3c0b 100644
--- a/keyboards/handwired/obuwunkunubi/spaget/info.json
+++ b/keyboards/handwired/obuwunkunubi/spaget/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x6969",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "unicode": true
+ },
"matrix_pins": {
"cols": ["B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/obuwunkunubi/spaget/rules.mk b/keyboards/handwired/obuwunkunubi/spaget/rules.mk
deleted file mode 100644
index 9652815de2..0000000000
--- a/keyboards/handwired/obuwunkunubi/spaget/rules.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-UNICODE_ENABLE = yes # Unicode
-AUDIO_ENABLE = no # Audio output
-
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes # Enable encoder support
diff --git a/keyboards/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/keyboard.json
index ac892719ad..6c48bfcc36 100644
--- a/keyboards/handwired/oem_ansi_fullsize/info.json
+++ b/keyboards/handwired/oem_ansi_fullsize/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"],
"rows": ["F5", "F4", "F3", "F2", "F1", "F0"]
diff --git a/keyboards/handwired/oem_ansi_fullsize/rules.mk b/keyboards/handwired/oem_ansi_fullsize/rules.mk
deleted file mode 100644
index 6fe874e748..0000000000
--- a/keyboards/handwired/oem_ansi_fullsize/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/keyboard.json
index e943b65643..dcff4541f1 100644
--- a/keyboards/handwired/oem_iso_fullsize/info.json
+++ b/keyboards/handwired/oem_iso_fullsize/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x7070",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["C2", "C1", "E0", "D4", "D5", "A4", "A0", "B2", "B0", "E7", "E6", "D6", "B1", "B3", "D3", "D2", "B6", "F7", "F0", "F1", "F2"],
"rows": ["C0", "B4", "F3", "F4", "F5", "F6"]
diff --git a/keyboards/handwired/oem_iso_fullsize/rules.mk b/keyboards/handwired/oem_iso_fullsize/rules.mk
deleted file mode 100644
index ac49f53a20..0000000000
--- a/keyboards/handwired/oem_iso_fullsize/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
index 69a7ea87a7..29e2f3f17d 100644
--- a/keyboards/handwired/onekey/blackpill_f401/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401/keyboard.json
@@ -1,6 +1,11 @@
{
"keyboard_name": "Onekey Blackpill STM32F401",
"development_board": "blackpill_f401",
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["B0"],
"rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
index ed9435c740..413bf7a7f3 100644
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/keyboard.json
@@ -2,6 +2,11 @@
"keyboard_name": "Onekey Blackpill STM32F401 TinyUF2",
"development_board": "blackpill_f401",
"bootloader": "tinyuf2",
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["B0"],
"rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
index 5ee8ec3d5e..077fee4b3b 100644
--- a/keyboards/handwired/onekey/blackpill_f411/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411/keyboard.json
@@ -1,6 +1,11 @@
{
"keyboard_name": "Onekey Blackpill STM32F411",
"development_board": "blackpill_f411",
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["B0"],
"rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk
deleted file mode 100644
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f411/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
index 8e8b52080a..e37bf6f54d 100644
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json
+++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/keyboard.json
@@ -2,6 +2,11 @@
"keyboard_name": "Onekey Blackpill STM32F411 TinyUF2",
"development_board": "blackpill_f411",
"bootloader": "tinyuf2",
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["B0"],
"rows": ["A7"]
diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
deleted file mode 100755
index 1071cf62ee..0000000000
--- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/keyboard.json
index 5f1fecc95b..5f1fecc95b 100644
--- a/keyboards/handwired/onekey/bluepill/info.json
+++ b/keyboards/handwired/onekey/bluepill/keyboard.json
diff --git a/keyboards/handwired/onekey/bluepill/rules.mk b/keyboards/handwired/onekey/bluepill/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
index 9460b43f5f..4267222cfc 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/info.json
+++ b/keyboards/handwired/onekey/bluepill_f103c6/keyboard.json
@@ -15,5 +15,8 @@
"apa102": {
"data_pin": "A1",
"clock_pin": "A2"
+ },
+ "build": {
+ "lto": true
}
}
diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
index 71bc488563..c37cc1dc1f 100644
--- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
+++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk
@@ -7,9 +7,6 @@ BOOTLOADER_TYPE = stm32duino
DFU_ARGS = -d 1EAF:0003 -a 2 -R
DFU_SUFFIX_ARGS = -v 1EAF -p 0003
-# LTO is required to fit the firmware into the available 24K of flash
-LTO_ENABLE = yes
-
# EEPROM emulation not supported yet (need to implement a proper firmware size
# check first, otherwise the chance of the EEPROM backing store overwriting
# some part of the firmware code is really high).
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json
index 65174155b3..65174155b3 100644
--- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json
+++ b/keyboards/handwired/onekey/bluepill_uf2boot/keyboard.json
diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk b/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/bluepill_uf2boot/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/keyboard.json
index b8532cbec0..b8532cbec0 100644
--- a/keyboards/handwired/onekey/elite_c/info.json
+++ b/keyboards/handwired/onekey/elite_c/keyboard.json
diff --git a/keyboards/handwired/onekey/elite_c/rules.mk b/keyboards/handwired/onekey/elite_c/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/elite_c/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
index dfb57df2b3..dfb57df2b3 100644
--- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json
+++ b/keyboards/handwired/onekey/evb_wb32f3g71/keyboard.json
diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
index 8a94f5e8b1..8a94f5e8b1 100644
--- a/keyboards/handwired/onekey/evb_wb32fq95/info.json
+++ b/keyboards/handwired/onekey/evb_wb32fq95/keyboard.json
diff --git a/keyboards/handwired/onekey/info.json b/keyboards/handwired/onekey/info.json
index 17bb84a82c..2d266f5ea3 100644
--- a/keyboards/handwired/onekey/info.json
+++ b/keyboards/handwired/onekey/info.json
@@ -17,10 +17,7 @@
"extrakey": true,
"console": false,
"command": false,
- "nkro": false,
- "backlight": false,
- "rgblight": false,
- "audio": false
+ "nkro": false
},
"community_layouts": ["ortho_1x1"],
"layouts": {
diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/keyboard.json
index 5c0c92ef5d..3c09934227 100644
--- a/keyboards/handwired/onekey/kb2040/info.json
+++ b/keyboards/handwired/onekey/kb2040/keyboard.json
@@ -8,5 +8,8 @@
"ws2812": {
"pin": "GP17",
"driver": "vendor"
+ },
+ "features": {
+ "oled": true
}
}
diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk
deleted file mode 100644
index dd68e9d3b0..0000000000
--- a/keyboards/handwired/onekey/kb2040/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/keyboard.json
index 26de66e198..26de66e198 100644
--- a/keyboards/handwired/onekey/nucleo_f446re/info.json
+++ b/keyboards/handwired/onekey/nucleo_f446re/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_f446re/rules.mk b/keyboards/handwired/onekey/nucleo_f446re/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/nucleo_f446re/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/nucleo_g431rb/info.json b/keyboards/handwired/onekey/nucleo_g431rb/keyboard.json
index 4e5e3b1cba..4e5e3b1cba 100644
--- a/keyboards/handwired/onekey/nucleo_g431rb/info.json
+++ b/keyboards/handwired/onekey/nucleo_g431rb/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_g431rb/rules.mk b/keyboards/handwired/onekey/nucleo_g431rb/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/nucleo_g431rb/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/nucleo_g474re/info.json b/keyboards/handwired/onekey/nucleo_g474re/keyboard.json
index 02f59be74e..02f59be74e 100644
--- a/keyboards/handwired/onekey/nucleo_g474re/info.json
+++ b/keyboards/handwired/onekey/nucleo_g474re/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_g474re/rules.mk b/keyboards/handwired/onekey/nucleo_g474re/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/nucleo_g474re/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/info.json b/keyboards/handwired/onekey/nucleo_h723zg/keyboard.json
index 7596d007b2..7596d007b2 100644
--- a/keyboards/handwired/onekey/nucleo_h723zg/info.json
+++ b/keyboards/handwired/onekey/nucleo_h723zg/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_h723zg/rules.mk b/keyboards/handwired/onekey/nucleo_h723zg/rules.mk
deleted file mode 100755
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/nucleo_h723zg/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/keyboard.json
index f6af0826fb..f6af0826fb 100644
--- a/keyboards/handwired/onekey/nucleo_l432kc/info.json
+++ b/keyboards/handwired/onekey/nucleo_l432kc/keyboard.json
diff --git a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk b/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/nucleo_l432kc/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/keyboard.json
index 178e6185de..178e6185de 100644
--- a/keyboards/handwired/onekey/promicro/info.json
+++ b/keyboards/handwired/onekey/promicro/keyboard.json
diff --git a/keyboards/handwired/onekey/promicro/rules.mk b/keyboards/handwired/onekey/promicro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/promicro/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/keyboard.json
index 93dbc4c30d..93dbc4c30d 100644
--- a/keyboards/handwired/onekey/proton_c/info.json
+++ b/keyboards/handwired/onekey/proton_c/keyboard.json
diff --git a/keyboards/handwired/onekey/proton_c/rules.mk b/keyboards/handwired/onekey/proton_c/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/proton_c/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/keyboard.json
index 40eb896232..40eb896232 100644
--- a/keyboards/handwired/onekey/rp2040/info.json
+++ b/keyboards/handwired/onekey/rp2040/keyboard.json
diff --git a/keyboards/handwired/onekey/rp2040/rules.mk b/keyboards/handwired/onekey/rp2040/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/rp2040/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
index 28aa8a2fdc..28aa8a2fdc 100644
--- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json
+++ b/keyboards/handwired/onekey/sipeed_longan_nano/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/keyboard.json
index 41210a3bbb..41210a3bbb 100644
--- a/keyboards/handwired/onekey/stm32f0_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f0_disco/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f0_disco/rules.mk b/keyboards/handwired/onekey/stm32f0_disco/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/stm32f0_disco/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/stm32f3_disco/info.json b/keyboards/handwired/onekey/stm32f3_disco/keyboard.json
index b541cd8ae4..b541cd8ae4 100644
--- a/keyboards/handwired/onekey/stm32f3_disco/info.json
+++ b/keyboards/handwired/onekey/stm32f3_disco/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f3_disco/rules.mk b/keyboards/handwired/onekey/stm32f3_disco/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/stm32f3_disco/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/stm32f405_feather/info.json b/keyboards/handwired/onekey/stm32f405_feather/keyboard.json
index 80e41cddf2..80e41cddf2 100644
--- a/keyboards/handwired/onekey/stm32f405_feather/info.json
+++ b/keyboards/handwired/onekey/stm32f405_feather/keyboard.json
diff --git a/keyboards/handwired/onekey/stm32f405_feather/rules.mk b/keyboards/handwired/onekey/stm32f405_feather/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/stm32f405_feather/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/keyboard.json
index d7720a01d3..d7720a01d3 100644
--- a/keyboards/handwired/onekey/teensy_2/info.json
+++ b/keyboards/handwired/onekey/teensy_2/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_2/rules.mk b/keyboards/handwired/onekey/teensy_2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_2/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/keyboard.json
index f7de463fca..f7de463fca 100644
--- a/keyboards/handwired/onekey/teensy_2pp/info.json
+++ b/keyboards/handwired/onekey/teensy_2pp/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_2pp/rules.mk b/keyboards/handwired/onekey/teensy_2pp/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/onekey/teensy_2pp/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/onekey/teensy_32/info.json b/keyboards/handwired/onekey/teensy_32/keyboard.json
index 6d82d300ba..6d82d300ba 100644
--- a/keyboards/handwired/onekey/teensy_32/info.json
+++ b/keyboards/handwired/onekey/teensy_32/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_32/rules.mk b/keyboards/handwired/onekey/teensy_32/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/teensy_32/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/teensy_35/info.json b/keyboards/handwired/onekey/teensy_35/keyboard.json
index 59cc1decdc..59cc1decdc 100644
--- a/keyboards/handwired/onekey/teensy_35/info.json
+++ b/keyboards/handwired/onekey/teensy_35/keyboard.json
diff --git a/keyboards/handwired/onekey/teensy_35/rules.mk b/keyboards/handwired/onekey/teensy_35/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/onekey/teensy_35/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/onekey/teensy_lc/info.json b/keyboards/handwired/onekey/teensy_lc/keyboard.json
index a81b90fa8a..a81b90fa8a 100644
--- a/keyboards/handwired/onekey/teensy_lc/info.json
+++ b/keyboards/handwired/onekey/teensy_lc/keyboard.json
diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/keyboard.json
index 14c8718256..5ba08dfc2d 100644
--- a/keyboards/handwired/orbweaver/info.json
+++ b/keyboards/handwired/orbweaver/keyboard.json
@@ -10,7 +10,8 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "rgb_matrix": true
},
"rgb_matrix": {
"center_point": [40, 30],
diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk
deleted file mode 100644
index 01f9d9397a..0000000000
--- a/keyboards/handwired/orbweaver/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add support for 3731 RGB matrix controller
-RGB_MATRIX_ENABLE = yes
diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/keyboard.json
index 3fed9e2460..097ac3863d 100644
--- a/keyboards/handwired/ortho5x13/info.json
+++ b/keyboards/handwired/ortho5x13/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x050D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D3", "D2", "D1", "D0", "D4"]
diff --git a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
index d725397199..0cf3573a07 100644
--- a/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
+++ b/keyboards/handwired/ortho5x13/keymaps/default/keymap.c
@@ -175,11 +175,6 @@ float tone_dvorak[][2] = SONG(DVORAK_SOUND);
float tone_colemak[][2] = SONG(COLEMAK_SOUND);
#endif
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
case QWERTY:
@@ -187,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_qwerty);
#endif
- persistent_default_layer_set(1UL<<_QWERTY);
+ set_single_persistent_default_layer(_QWERTY);
}
return false;
break;
@@ -196,7 +191,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_colemak);
#endif
- persistent_default_layer_set(1UL<<_COLEMAK);
+ set_single_persistent_default_layer(_COLEMAK);
}
return false;
break;
@@ -205,7 +200,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef AUDIO_ENABLE
PLAY_SONG(tone_dvorak);
#endif
- persistent_default_layer_set(1UL<<_DVORAK);
+ set_single_persistent_default_layer(_DVORAK);
}
return false;
break;
diff --git a/keyboards/handwired/ortho5x13/rules.mk b/keyboards/handwired/ortho5x13/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/ortho5x13/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/keyboard.json
index 67b4cc4c2e..fe34f2b800 100644
--- a/keyboards/handwired/ortho5x14/info.json
+++ b/keyboards/handwired/ortho5x14/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x050D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
"rows": ["F0", "F1", "C7", "D5", "B7"]
diff --git a/keyboards/handwired/ortho5x14/rules.mk b/keyboards/handwired/ortho5x14/rules.mk
deleted file mode 100644
index c8758ba64c..0000000000
--- a/keyboards/handwired/ortho5x14/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/keyboard.json
index b2280b6204..5cd01b1f6d 100644
--- a/keyboards/handwired/ortho_brass/info.json
+++ b/keyboards/handwired/ortho_brass/keyboard.json
@@ -15,6 +15,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "qmk-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true
+ },
"community_layouts": ["ortho_4x12"],
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x12"
diff --git a/keyboards/handwired/ortho_brass/rules.mk b/keyboards/handwired/ortho_brass/rules.mk
index 36acc6fd92..6642cf3a9c 100644
--- a/keyboards/handwired/ortho_brass/rules.mk
+++ b/keyboards/handwired/ortho_brass/rules.mk
@@ -1,11 +1 @@
-# Build Options
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable RGB underlight.
-
RGBLIGHT_SUPPORTED = no
diff --git a/keyboards/handwired/osborne1/info.json b/keyboards/handwired/osborne1/keyboard.json
index 2f613b5876..8cbcb3cc8b 100644
--- a/keyboards/handwired/osborne1/info.json
+++ b/keyboards/handwired/osborne1/keyboard.json
@@ -10,7 +10,8 @@
"console": true,
"extrakey": false,
"mousekey": false,
- "nkro": false
+ "nkro": false,
+ "bluetooth": true
},
"bluetooth": {
"driver": "bluefruit_le"
diff --git a/keyboards/handwired/osborne1/rules.mk b/keyboards/handwired/osborne1/rules.mk
deleted file mode 100644
index 9ccac102c7..0000000000
--- a/keyboards/handwired/osborne1/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/keyboard.json
index f6bd2d2f23..8108f51985 100644
--- a/keyboards/handwired/owlet60/info.json
+++ b/keyboards/handwired/owlet60/keyboard.json
@@ -32,6 +32,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"debounce": 9,
"community_layouts": ["alice", "alice_split_bs"],
"layout_aliases": {
diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c
index b233dd7a52..43895468e9 100644
--- a/keyboards/handwired/owlet60/matrix.c
+++ b/keyboards/handwired/owlet60/matrix.c
@@ -129,19 +129,19 @@ void matrix_print(void)
// uses standard row code
static void select_row(uint8_t row)
{
- setPinOutput(row_pins[row]);
- writePinLow(row_pins[row]);
+ gpio_set_pin_output(row_pins[row]);
+ gpio_write_pin_low(row_pins[row]);
}
static void unselect_row(uint8_t row)
{
- setPinInputHigh(row_pins[row]);
+ gpio_set_pin_input_high(row_pins[row]);
}
static void unselect_rows(void)
{
for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
- setPinInputHigh(row_pins[x]);
+ gpio_set_pin_input_high(row_pins[x]);
}
}
@@ -149,10 +149,10 @@ static void init_pins(void) { // still need some fixing, this might not work
unselect_rows(); // with the loop
/*
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- setPinInputHigh(col_pins[x]);
+ gpio_set_pin_input_high(col_pins[x]);
}
*/
- setPinInputHigh(dat_pin);
+ gpio_set_pin_input_high(dat_pin);
}
static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
@@ -173,7 +173,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Select the col pin to read (active low)
select_col_analog(col_index);
wait_us(30);
- uint8_t pin_state = readPin(dat_pin);
+ uint8_t pin_state = gpio_read_pin(dat_pin);
// Populate the matrix row with the state of the col pin
current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
@@ -201,8 +201,8 @@ void matrix_init(void) {
matrix_init_kb();
- setPinInput(D5);
- setPinInput(B0);
+ gpio_set_pin_input(D5);
+ gpio_set_pin_input(B0);
}
// modified for per col read matrix scan
@@ -273,27 +273,27 @@ static void select_col_analog(uint8_t col) {
static void mux_pin_control(const uint8_t binary[]) {
// set pin0
- setPinOutput(col_select_pins[0]);
+ gpio_set_pin_output(col_select_pins[0]);
if(binary[2] == 0) {
- writePinLow(col_select_pins[0]);
+ gpio_write_pin_low(col_select_pins[0]);
}
else {
- writePinHigh(col_select_pins[0]);
+ gpio_write_pin_high(col_select_pins[0]);
}
// set pin1
- setPinOutput(col_select_pins[1]);
+ gpio_set_pin_output(col_select_pins[1]);
if(binary[1] == 0) {
- writePinLow(col_select_pins[1]);
+ gpio_write_pin_low(col_select_pins[1]);
}
else {
- writePinHigh(col_select_pins[1]);
+ gpio_write_pin_high(col_select_pins[1]);
}
// set pin2
- setPinOutput(col_select_pins[2]);
+ gpio_set_pin_output(col_select_pins[2]);
if(binary[0] == 0) {
- writePinLow(col_select_pins[2]);
+ gpio_write_pin_low(col_select_pins[2]);
}
else {
- writePinHigh(col_select_pins[2]);
+ gpio_write_pin_high(col_select_pins[2]);
}
}
diff --git a/keyboards/handwired/owlet60/rules.mk b/keyboards/handwired/owlet60/rules.mk
index dd125034f2..09c02c88b0 100644
--- a/keyboards/handwired/owlet60/rules.mk
+++ b/keyboards/handwired/owlet60/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
CUSTOM_MATRIX = yes
-OLED_ENABLE = no
SRC += matrix.c
diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/keyboard.json
index 3d8e02cf40..184d7b323c 100644
--- a/keyboards/handwired/p65rgb/info.json
+++ b/keyboards/handwired/p65rgb/keyboard.json
@@ -65,6 +65,18 @@
"rgblight": {
"max_brightness": 180
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"],
"rows": ["C7", "C6", "B6", "B5", "D5"]
diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk
deleted file mode 100644
index 5e57c341f1..0000000000
--- a/keyboards/handwired/p65rgb/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/petruziamini/info.json b/keyboards/handwired/petruziamini/keyboard.json
index dcd60f2dc7..1d864d5dbb 100644
--- a/keyboards/handwired/petruziamini/info.json
+++ b/keyboards/handwired/petruziamini/keyboard.json
@@ -10,12 +10,31 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true
+ "nkro": true,
+ "rgblight": true
},
"matrix_pins": {
"cols": ["D7", "C6", "D4", "D0", "D1", "F4", "F5", "F6", "F7", "B1"],
"rows": ["B4", "E6", "B3", "B2"]
},
+ "ws2812": {
+ "pin": "B6"
+ },
+ "rgblight": {
+ "led_count": 28,
+ "animations": {
+ "breathing": true,
+ "rainbow_mood": true,
+ "rainbow_swirl": true,
+ "snake": true,
+ "knight": true,
+ "christmas": true,
+ "static_gradient": true,
+ "rgb_test": true,
+ "alternating": true,
+ "twinkle": true
+ }
+ },
"usb": {
"device_version": "1.0.0",
"pid": "0x0000",
diff --git a/keyboards/handwired/petruziamini/keymaps/default/keymap.c b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
index c0972785d4..b3c3cdba94 100644
--- a/keyboards/handwired/petruziamini/keymaps/default/keymap.c
+++ b/keyboards/handwired/petruziamini/keymaps/default/keymap.c
@@ -6,25 +6,61 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/*
* ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
- * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
+ * │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
+ * │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │
* ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ A │ B │ C │ D │ E │ F │ G │ H │ I │ J │
- * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┤
- * │ A │ B │ │ D │ │ │ G │ │ I │ J │
- * └───┴───┴───┴───┴───┴───┴───┴───┴───┴───┘
+ * │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │
+ * ├───┼───┼───┴───┴───┼───┴───┴───┼───┼───┤
+ * │ 1 │ ' │ Backspace │ Space │ ` │ 2 │
+ * └───┴───┴───────────┴───────────┴───┴───┘
*/
[0] = LAYOUT(
- KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
- KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
- KC_A, KC_B, KC_C, KC_D, KC_E, KC_F, KC_G, KC_H, KC_I, KC_J,
- KC_A, KC_B, KC_C, KC_D, LT(1, KC_E), KC_F
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, LT(1, KC_D), LSFT_T(KC_F), KC_G, KC_H, LSFT_T(KC_J), LT(2, KC_K), KC_L, KC_SCLN,
+ KC_Z, LCTL_T(KC_X), LALT_T(KC_C), KC_V, KC_B, KC_N, KC_M, LALT_T(KC_COMM), LCTL_T(KC_DOT), KC_SLSH,
+ TG(7), LT(3, KC_QUOT), KC_BSPC, LT(5, KC_SPC), LT(4, KC_GRV), TG(6)
),
[1] = LAYOUT(
- KC_NO, QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO
+ KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_SLSH, KC_ASTR, KC_7, KC_8, KC_9,
+ KC_NO, KC_RALT, KC_NO, KC_LSFT, KC_NO, KC_CALC, KC_MINS, KC_4, KC_5, KC_6,
+ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PLUS, KC_1, KC_2, KC_3,
+ KC_NO, KC_NO, KC_NO, KC_EQUAL, KC_0, KC_DOT
+),
+ [2] = LAYOUT(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_NO, KC_NO, KC_NO, KC_NO, KC_DEL,
+ KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_F11, KC_F12, 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
+),
+ [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_LGUI, KC_NO, KC_NO
+),
+ [4] = LAYOUT(
+ KC_NO, QK_BOOT, 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_NO, KC_NO, KC_NO, KC_NO, KC_NO
+),
+ [5] = LAYOUT(
+ KC_ESC, KC_NO, KC_NO, KC_NO, KC_MYCM, KC_PSCR, KC_NO, KC_NO, KC_NO, KC_DEL,
+ KC_NO, KC_NO, KC_NO, KC_ENT, KC_TAB, KC_CAPS, KC_ENT, 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
+),
+ [6] = LAYOUT(
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_Y, KC_F1, KC_NO, LGUI(KC_G), KC_ESC,
+ KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_CAPS, KC_F2, KC_NO, KC_MNXT, KC_VOLU,
+ KC_LCTL, KC_X, KC_C, KC_V, KC_B, KC_NO, KC_F3, KC_NO, KC_MPLY, KC_VOLD,
+ KC_NO, KC_NO, KC_SPC, KC_F3, KC_F2, TG(6)
+),
+ [7] = LAYOUT(
+ RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_TW, KC_NO, KC_NO, RGB_VAI, RGB_SAI, RGB_HUI, RGB_TOG,
+ RGB_M_SW, RGB_M_SN, RGB_M_K, KC_NO, KC_NO, KC_NO, RGB_VAD, RGB_SAD, RGB_HUD, RGB_MOD,
+ RGB_M_X, RGB_M_G, RGB_M_T, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_RMOD,
+ TG(7), KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
)
-};
+}; \ No newline at end of file
diff --git a/keyboards/handwired/petruziamini/readme.md b/keyboards/handwired/petruziamini/readme.md
index 1b303c49c6..cf5526d0df 100644
--- a/keyboards/handwired/petruziamini/readme.md
+++ b/keyboards/handwired/petruziamini/readme.md
@@ -1,8 +1,9 @@
# PetruziaMini
-![PetruziaMini](https://i.imgur.com/uk2BSazh.jpeg)
+![PetruziaMini](https://i.imgur.com/Q9EmAJj.jpeg)
+
+36 key ortholinear keyboard intended to be mapped as a split keyboard, with RGB lighting support.
-36 key ortholinear keyboard intended to be mapped as a split keyboard.
* Keyboard Maintainer: [LLLKST](https://github.com/LLLKST)
* Hardware Supported: *promicro compatible controller*
diff --git a/keyboards/handwired/petruziamini/rules.mk b/keyboards/handwired/petruziamini/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/petruziamini/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/phantagom/baragon/info.json b/keyboards/handwired/phantagom/baragon/keyboard.json
index 390f114dd9..390f114dd9 100644
--- a/keyboards/handwired/phantagom/baragon/info.json
+++ b/keyboards/handwired/phantagom/baragon/keyboard.json
diff --git a/keyboards/handwired/phantagom/baragon/rules.mk b/keyboards/handwired/phantagom/baragon/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/phantagom/baragon/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/phantagom/varan/info.json b/keyboards/handwired/phantagom/varan/keyboard.json
index a767d45de0..a767d45de0 100644
--- a/keyboards/handwired/phantagom/varan/info.json
+++ b/keyboards/handwired/phantagom/varan/keyboard.json
diff --git a/keyboards/handwired/phantagom/varan/rules.mk b/keyboards/handwired/phantagom/varan/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/phantagom/varan/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/keyboard.json
index 0a826c6ba8..b1c96a495e 100644
--- a/keyboards/handwired/pilcrow/info.json
+++ b/keyboards/handwired/pilcrow/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"],
"rows": ["B4", "F7", "B1", "B3"]
diff --git a/keyboards/handwired/pilcrow/rules.mk b/keyboards/handwired/pilcrow/rules.mk
deleted file mode 100644
index b6e2a5f9a4..0000000000
--- a/keyboards/handwired/pilcrow/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
index 4e0935f79c..f43fd45a85 100644
--- a/keyboards/handwired/pill60/blackpill_f411/info.json
+++ b/keyboards/handwired/pill60/blackpill_f401/keyboard.json
@@ -1,10 +1,13 @@
{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
+ "development_board": "blackpill_f401"
}
diff --git a/keyboards/handwired/pill60/blackpill_f401/rules.mk b/keyboards/handwired/pill60/blackpill_f401/rules.mk
deleted file mode 100644
index 3d2bfceea9..0000000000
--- a/keyboards/handwired/pill60/blackpill_f401/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
index 8d85a2e930..4d47a6b434 100644
--- a/keyboards/handwired/pill60/blackpill_f401/info.json
+++ b/keyboards/handwired/pill60/blackpill_f411/keyboard.json
@@ -1,10 +1,13 @@
{
+ "usb": {
+ "shared_endpoint": {
+ "keyboard": true
+ }
+ },
"matrix_pins": {
"cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"],
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
+ "development_board": "blackpill_f411"
}
diff --git a/keyboards/handwired/pill60/blackpill_f411/rules.mk b/keyboards/handwired/pill60/blackpill_f411/rules.mk
deleted file mode 100644
index b5f27c93ea..0000000000
--- a/keyboards/handwired/pill60/blackpill_f411/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-KEYBOARD_SHARED_EP = yes
diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/keyboard.json
index 028b1d89d8..3c52f8ad2b 100644
--- a/keyboards/handwired/pill60/bluepill/info.json
+++ b/keyboards/handwired/pill60/bluepill/keyboard.json
@@ -4,6 +4,5 @@
"rows": ["B4", "B3", "A15", "B13", "B5"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F103",
- "bootloader": "stm32duino"
+ "development_board": "bluepill"
}
diff --git a/keyboards/handwired/pill60/bluepill/rules.mk b/keyboards/handwired/pill60/bluepill/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/pill60/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json
index ac8c9013ba..7812956177 100644
--- a/keyboards/handwired/pill60/info.json
+++ b/keyboards/handwired/pill60/info.json
@@ -3,6 +3,16 @@
"manufacturer": "IktaS",
"url": "https://github.com/IktaS/Pill60",
"maintainer": "IktaS <[email protected]>",
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true
+ },
"usb": {
"vid": "0x4454",
"pid": "0x5444",
diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk
index 6bb5fa1581..9299a64d61 100644
--- a/keyboards/handwired/pill60/rules.mk
+++ b/keyboards/handwired/pill60/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-ENCODER_ENABLE = yes
-
DEFAULT_FOLDER = handwired/pill60/bluepill
diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/keyboard.json
index 63856fa739..9ff34b339e 100644
--- a/keyboards/handwired/polly40/info.json
+++ b/keyboards/handwired/polly40/keyboard.json
@@ -21,11 +21,7 @@
"extrakey": true,
"console": false,
"command": false,
- "nkro": true,
- "backlight": false,
- "rgblight": false,
- "audio": false,
- "key_lock": false
+ "nkro": true
},
"layouts": {
"LAYOUT": {
diff --git a/keyboards/handwired/polly40/keymaps/default/keymap.c b/keyboards/handwired/polly40/keymaps/default/keymap.c
index a89e438ae8..b1ef23bc28 100644
--- a/keyboards/handwired/polly40/keymaps/default/keymap.c
+++ b/keyboards/handwired/polly40/keymaps/default/keymap.c
@@ -28,7 +28,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[1] = 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_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_ENT,
- KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), MAGIC_TOGGLE_NKRO, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______,
+ KC_PSCR, KC_MPLY, KC_VOLD, KC_VOLU, LSG(KC_S), NK_TOGG, KC_COMM, KC_DOT, KC_SLSH, KC_PGUP, _______,
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_PGDN, _______
),
diff --git a/keyboards/handwired/polly40/rules.mk b/keyboards/handwired/polly40/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/handwired/polly40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/keyboard.json
index b6944f2916..13e83147bb 100644
--- a/keyboards/handwired/postageboard/mini/info.json
+++ b/keyboards/handwired/postageboard/mini/keyboard.json
@@ -8,5 +8,12 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/postageboard/mini/rules.mk b/keyboards/handwired/postageboard/mini/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/handwired/postageboard/mini/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/keyboard.json
index a1ea87df86..78ab5d028e 100644
--- a/keyboards/handwired/postageboard/r1/info.json
+++ b/keyboards/handwired/postageboard/r1/keyboard.json
@@ -8,5 +8,12 @@
},
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ }
}
diff --git a/keyboards/handwired/postageboard/r1/rules.mk b/keyboards/handwired/postageboard/r1/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/handwired/postageboard/r1/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/keyboard.json
index 9a4d4b9636..ea8f6821a2 100644
--- a/keyboards/handwired/prime_exl/info.json
+++ b/keyboards/handwired/prime_exl/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6578",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"],
"rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"]
diff --git a/keyboards/handwired/prime_exl/rules.mk b/keyboards/handwired/prime_exl/rules.mk
deleted file mode 100644
index 9ce191fd81..0000000000
--- a/keyboards/handwired/prime_exl/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/keyboard.json
index c463d5baa7..4ff9bb1049 100644
--- a/keyboards/handwired/prime_exl_plus/info.json
+++ b/keyboards/handwired/prime_exl_plus/keyboard.json
@@ -26,6 +26,15 @@
"ws2812": {
"pin": "D4"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"],
"rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"]
diff --git a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
index cc7f5de31e..1865b6c502 100644
--- a/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
+++ b/keyboards/handwired/prime_exl_plus/prime_exl_plus.c
@@ -17,22 +17,22 @@
void matrix_init_kb(void) {
// set CapsLock LED to output and low
- setPinOutput(B0);
- writePinLow(B0);
+ gpio_set_pin_output(B0);
+ gpio_write_pin_low(B0);
// set NumLock LED to output and low
- setPinOutput(B1);
- writePinLow(B1);
+ gpio_set_pin_output(B1);
+ gpio_write_pin_low(B1);
// set ScrollLock LED to output and low
- setPinOutput(B2);
- writePinLow(B2);
+ gpio_set_pin_output(B2);
+ gpio_write_pin_low(B2);
}
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(B1, led_state.num_lock);
- writePin(B0, led_state.caps_lock);
- //writePin(B2, led_state.scroll_lock);
+ gpio_write_pin(B1, led_state.num_lock);
+ gpio_write_pin(B0, led_state.caps_lock);
+ //gpio_write_pin(B2, led_state.scroll_lock);
}
return res;
}
@@ -41,9 +41,9 @@ bool led_update_kb(led_t led_state) {
layer_state_t layer_state_set_kb(layer_state_t state)
{
if (get_highest_layer(state) == 1) {
- writePinHigh(B2);
+ gpio_write_pin_high(B2);
} else {
- writePinLow(B2);
+ gpio_write_pin_low(B2);
}
return layer_state_set_user(state);
}
diff --git a/keyboards/handwired/prime_exl_plus/rules.mk b/keyboards/handwired/prime_exl_plus/rules.mk
deleted file mode 100644
index 18684e62d3..0000000000
--- a/keyboards/handwired/prime_exl_plus/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/keyboard.json
index a89fe9ec57..721107e064 100644
--- a/keyboards/handwired/prkl30/feather/info.json
+++ b/keyboards/handwired/prkl30/feather/keyboard.json
@@ -1,4 +1,14 @@
{
+ "features": {
+ "bluetooth": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
"rgblight": {
"saturation_steps": 8,
"brightness_steps": 8,
diff --git a/keyboards/handwired/prkl30/feather/rules.mk b/keyboards/handwired/prkl30/feather/rules.mk
index aaab95b9e0..3437a35bdf 100644
--- a/keyboards/handwired/prkl30/feather/rules.mk
+++ b/keyboards/handwired/prkl30/feather/rules.mk
@@ -1,18 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-ENCODER_ENABLE = yes
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
-
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/keyboard.json
index 395cb9f276..d681781c8b 100644
--- a/keyboards/handwired/prkl30/promicro/info.json
+++ b/keyboards/handwired/prkl30/promicro/keyboard.json
@@ -1,4 +1,14 @@
{
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/prkl30/promicro/rules.mk b/keyboards/handwired/prkl30/promicro/rules.mk
deleted file mode 100644
index a4e07e76d8..0000000000
--- a/keyboards/handwired/prkl30/promicro/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-ENCODER_ENABLE = yes
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no
-AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE = yes # This can be enabled if a ws2812 strip is connected to the expansion port.
diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/keyboard.json
index c26325069b..6ee1ed8ca1 100644
--- a/keyboards/handwired/promethium/info.json
+++ b/keyboards/handwired/promethium/keyboard.json
@@ -16,6 +16,18 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "nkro": true,
+ "ps2_mouse": true,
+ "ps2": true,
+ "bluetooth": true
+ },
+ "build": {
+ "lto": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c
index ff73e51d5e..7db69a2a97 100644
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif
#include "eeconfig.h"
#include "process_unicode.h"
-#include "quantum.h"
#ifdef RGBSPS_ENABLE
#include "rgbsps.h"
#include "rgbtheme.h"
@@ -941,9 +940,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-void persistent_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
+void persistent_default_layer_set(uint8_t default_layer) {
+ set_single_persistent_default_layer(default_layer);
#ifdef RGBSPS_ENABLE
led_set_default_layer_indicator();
#endif
@@ -1120,14 +1118,14 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// layout switchers
case QWERTY:
if (record->event.pressed) {
- persistent_default_layer_set(1UL<<_QWERTY);
+ persistent_default_layer_set(_QWERTY);
}
return false;
break;
#ifdef LAYOUT_DVORAK
case DVORAK:
if (record->event.pressed) {
- persistent_default_layer_set(1UL<<_DVORAK);
+ persistent_default_layer_set(_DVORAK);
}
return false;
break;
@@ -1135,7 +1133,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef LAYOUT_COLEMAK
case COLEMAK:
if (record->event.pressed) {
- persistent_default_layer_set(1UL<<_COLEMAK);
+ persistent_default_layer_set(_COLEMAK);
}
return false;
break;
@@ -1143,7 +1141,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef LAYOUT_WORKMAN
case WORKMAN:
if (record->event.pressed) {
- persistent_default_layer_set(1UL<<_WORKMAN);
+ persistent_default_layer_set(_WORKMAN);
}
return false;
break;
@@ -1151,7 +1149,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
#ifdef LAYOUT_NORMAN
case NORMAN:
if (record->event.pressed) {
- persistent_default_layer_set(1UL<<_NORMAN);
+ persistent_default_layer_set(_NORMAN);
}
return false;
break;
diff --git a/keyboards/handwired/promethium/rgbsps.c b/keyboards/handwired/promethium/rgbsps.c
index 957726e775..7dc26f4a5e 100644
--- a/keyboards/handwired/promethium/rgbsps.c
+++ b/keyboards/handwired/promethium/rgbsps.c
@@ -1,8 +1,15 @@
+#include "keyboard.h"
#include "ws2812.h"
#include "rgbsps.h"
rgb_led_t led[RGBSPS_NUM];
+void keyboard_pre_init_kb(void) {
+ ws2812_init();
+
+ keyboard_pre_init_user();
+}
+
void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b) {
led[index].r = r;
led[index].g = g;
diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk
index d6b97ed810..7f20880066 100644
--- a/keyboards/handwired/promethium/rules.mk
+++ b/keyboards/handwired/promethium/rules.mk
@@ -1,28 +1,11 @@
# Processor frequency
F_CPU = 8000000
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
PS2_DRIVER = interrupt
CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
WS2812_DRIVER_REQUIRED = yes
ANALOG_DRIVER_REQUIRED = yes
SRC += rgbsps.c
SRC += matrix.c
-
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/keyboard.json
index ad83f34999..fac20aeebe 100644
--- a/keyboards/handwired/pterodactyl/info.json
+++ b/keyboards/handwired/pterodactyl/keyboard.json
@@ -10,6 +10,15 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "nkro": true,
+ "unicode": true,
+ "bluetooth": true
+ },
"debounce": 0,
"tapping": {
"toggle": 1
diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c
index 0dff65eda6..54da26a7d4 100644
--- a/keyboards/handwired/pterodactyl/matrix.c
+++ b/keyboards/handwired/pterodactyl/matrix.c
@@ -182,14 +182,14 @@ void init_expander(void) {
uint8_t data[] = { expander_input_pin_mask, 0};
# endif
#endif
- expander_status = i2c_writeReg(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
+ expander_status = i2c_write_register(I2C_ADDR, IODIRA, data, sizeof(data), I2C_TIMEOUT);
if (!expander_status) {
// set pull-up
// - unused : off : 0
// - input : on : 1
// - driving : off : 0
- expander_status = i2c_writeReg(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
+ expander_status = i2c_write_register(I2C_ADDR, GPPUA, data, sizeof(data), I2C_TIMEOUT);
}
}
@@ -305,7 +305,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Read columns from expander, unless it's in an error state
if (! expander_status) {
uint8_t data;
- i2c_readReg(I2C_ADDR, EXPANDER_COL_REGISTER, &data, 1, I2C_TIMEOUT);
+ i2c_read_register(I2C_ADDR, EXPANDER_COL_REGISTER, &data, 1, I2C_TIMEOUT);
current_matrix[current_row] |= (~data) & expander_input_pin_mask;
}
@@ -329,7 +329,7 @@ static void select_row(uint8_t row) {
// set active row low : 0
// set other rows hi-Z : 1
uint8_t data = 0xFF & ~(1<<row);
- i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &data, 1, I2C_TIMEOUT);
+ i2c_write_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &data, 1, I2C_TIMEOUT);
}
// select on teensy
@@ -385,7 +385,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
return false;
}
- i2c_writeReg(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT);
+ i2c_write_register(I2C_ADDR, EXPANDER_ROW_REGISTER, &column_state, 1, I2C_TIMEOUT);
column_state = ~column_state;
} else {
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
diff --git a/keyboards/handwired/pterodactyl/rules.mk b/keyboards/handwired/pterodactyl/rules.mk
index 108e1498a8..e332a03eaa 100644
--- a/keyboards/handwired/pterodactyl/rules.mk
+++ b/keyboards/handwired/pterodactyl/rules.mk
@@ -1,21 +1,7 @@
# Processor frequency
F_CPU = 8000000
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-UNICODE_ENABLE = yes
CUSTOM_MATRIX = yes
-BLUETOOTH_ENABLE = yes
SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/keyboard.json
index c8b5e9d4d8..7aa2470cc1 100644
--- a/keyboards/handwired/pteron/info.json
+++ b/keyboards/handwired/pteron/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["D7", "E6", "B4", "B5", "B6"]
diff --git a/keyboards/handwired/pteron/rules.mk b/keyboards/handwired/pteron/rules.mk
deleted file mode 100644
index a77b52c38b..0000000000
--- a/keyboards/handwired/pteron/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no
diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/keyboard.json
index 6770e467eb..266aefec1f 100644
--- a/keyboards/handwired/pteron38/info.json
+++ b/keyboards/handwired/pteron38/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2"],
"rows": ["E6", "B4", "B5", "B6"]
diff --git a/keyboards/handwired/pteron38/rules.mk b/keyboards/handwired/pteron38/rules.mk
deleted file mode 100644
index 3e66b069b3..0000000000
--- a/keyboards/handwired/pteron38/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/keyboard.json
index da32096bf1..26321317eb 100644
--- a/keyboards/handwired/pteron44/info.json
+++ b/keyboards/handwired/pteron44/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x542C",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["E6", "B4", "B5", "B6"]
diff --git a/keyboards/handwired/pteron44/rules.mk b/keyboards/handwired/pteron44/rules.mk
deleted file mode 100644
index 3e66b069b3..0000000000
--- a/keyboards/handwired/pteron44/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/keyboard.json
index bcd6f686b8..bcd6f686b8 100644
--- a/keyboards/handwired/pytest/basic/info.json
+++ b/keyboards/handwired/pytest/basic/keyboard.json
diff --git a/keyboards/handwired/pytest/basic/rules.mk b/keyboards/handwired/pytest/basic/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pytest/basic/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/pytest/has_community/info.json b/keyboards/handwired/pytest/has_community/keyboard.json
index 59dcee260c..59dcee260c 100644
--- a/keyboards/handwired/pytest/has_community/info.json
+++ b/keyboards/handwired/pytest/has_community/keyboard.json
diff --git a/keyboards/handwired/pytest/has_community/rules.mk b/keyboards/handwired/pytest/has_community/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pytest/has_community/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/keyboard.json
index 6c2d0dea4d..6c2d0dea4d 100644
--- a/keyboards/handwired/pytest/macro/info.json
+++ b/keyboards/handwired/pytest/macro/keyboard.json
diff --git a/keyboards/handwired/pytest/macro/rules.mk b/keyboards/handwired/pytest/macro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/pytest/macro/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/proto/keyboard.json
index 7fba95f9d1..0015ac5f66 100644
--- a/keyboards/handwired/qc60/info.json
+++ b/keyboards/handwired/qc60/proto/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x0C60",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false,
+ "rgblight": true
+ },
"rgblight": {
"led_count": 1
},
@@ -20,6 +29,7 @@
},
"diode_direction": "ROW2COL",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/qc60/proto/rules.mk b/keyboards/handwired/qc60/proto/rules.mk
deleted file mode 100644
index 7ad666d1a3..0000000000
--- a/keyboards/handwired/qc60/proto/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-RGBLIGHT_ENABLE = yes \ No newline at end of file
diff --git a/keyboards/handwired/qc60/rules.mk b/keyboards/handwired/qc60/rules.mk
index 9af766b35c..4905848cf9 100644
--- a/keyboards/handwired/qc60/rules.mk
+++ b/keyboards/handwired/qc60/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/qc60/proto
diff --git a/keyboards/handwired/rabijl/rotary_numpad/info.json b/keyboards/handwired/rabijl/rotary_numpad/keyboard.json
index dafeec0fc0..dafeec0fc0 100644
--- a/keyboards/handwired/rabijl/rotary_numpad/info.json
+++ b/keyboards/handwired/rabijl/rotary_numpad/keyboard.json
diff --git a/keyboards/handwired/rabijl/rotary_numpad/rules.mk b/keyboards/handwired/rabijl/rotary_numpad/rules.mk
deleted file mode 100644
index 1287472e49..0000000000
--- a/keyboards/handwired/rabijl/rotary_numpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# file intentionally left blank
diff --git a/keyboards/handwired/rd_61_qmk/info.json b/keyboards/handwired/rd_61_qmk/keyboard.json
index be07d95924..be07d95924 100644
--- a/keyboards/handwired/rd_61_qmk/info.json
+++ b/keyboards/handwired/rd_61_qmk/keyboard.json
diff --git a/keyboards/handwired/rd_61_qmk/rules.mk b/keyboards/handwired/rd_61_qmk/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/rd_61_qmk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/keyboard.json
index 993bcf407e..993bcf407e 100644
--- a/keyboards/handwired/reclined/info.json
+++ b/keyboards/handwired/reclined/keyboard.json
diff --git a/keyboards/handwired/reclined/rules.mk b/keyboards/handwired/reclined/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/reclined/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/keyboard.json
index ca0dffdc83..d1a5831fc3 100644
--- a/keyboards/handwired/retro_refit/info.json
+++ b/keyboards/handwired/retro_refit/keyboard.json
@@ -9,6 +9,14 @@
"device_version": "0.0.1",
"force_nkro": true
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"],
"rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"]
diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c
index b7e1ec03fa..b62d94d741 100644
--- a/keyboards/handwired/retro_refit/retro_refit.c
+++ b/keyboards/handwired/retro_refit/retro_refit.c
@@ -6,8 +6,8 @@ void matrix_init_kb(void) {
// runs once when the firmware starts up
// Disable status LED on KB, enable status LED on Teensy (KB_STATUS = !TEENSY_STATUS)
- DDRD |= (1<<6);
- PORTD |= (1<<6);
+ gpio_set_pin_output(D6);
+ gpio_write_pin_high(D6);
matrix_init_user();
};
@@ -15,9 +15,9 @@ void matrix_init_kb(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(D0, !led_state.caps_lock);
- writePin(D1, !led_state.num_lock);
- writePin(C6, !led_state.scroll_lock);
+ gpio_write_pin(D0, !led_state.caps_lock);
+ gpio_write_pin(D1, !led_state.num_lock);
+ gpio_write_pin(C6, !led_state.scroll_lock);
}
return res;
diff --git a/keyboards/handwired/retro_refit/rules.mk b/keyboards/handwired/retro_refit/rules.mk
deleted file mode 100644
index eb35f5c4d2..0000000000
--- a/keyboards/handwired/retro_refit/rules.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-# BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/keyboard.json
index 933973d5f3..53fc613760 100644
--- a/keyboards/handwired/riblee_f401/info.json
+++ b/keyboards/handwired/riblee_f401/keyboard.json
@@ -6,7 +6,10 @@
"usb": {
"vid": "0xFEED",
"pid": "0x002A",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"tapping": {
"term": 175
@@ -20,9 +23,14 @@
"pin": "A0",
"levels": 5
},
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401",
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "backlight": true
+ },
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
diff --git a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
index d3fadcace2..f39f439c50 100644
--- a/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f401/keymaps/default/keymap.c
@@ -160,7 +160,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,
_______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk
deleted file mode 100644
index 4c2d255a18..0000000000
--- a/keyboards/handwired/riblee_f401/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/keyboard.json
index 1c957e9940..47d6349ba7 100644
--- a/keyboards/handwired/riblee_f411/info.json
+++ b/keyboards/handwired/riblee_f411/keyboard.json
@@ -6,7 +6,10 @@
"usb": {
"vid": "0xFEED",
"pid": "0x002B",
- "device_version": "0.0.1"
+ "device_version": "0.0.1",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"tapping": {
"term": 175
@@ -16,9 +19,13 @@
"rows": ["A6", "A5", "A4", "A3", "A2"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F411",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411",
+ "development_board": "blackpill_f411",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"community_layouts": ["ortho_5x12"],
"layouts": {
"LAYOUT_ortho_5x12": {
diff --git a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
index c1ff5682fc..74308a1c19 100644
--- a/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
+++ b/keyboards/handwired/riblee_f411/keymaps/default/keymap.c
@@ -160,7 +160,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,
_______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL,
_______, _______, MU_NEXT, AU_ON, AU_OFF, AG_NORM, AG_SWAP, QWERTY, COLEMAK, DVORAK, _______, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, NK_TOGG, CG_LSWP, CG_LNRM, _______, _______, _______,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
)
diff --git a/keyboards/handwired/riblee_f411/rules.mk b/keyboards/handwired/riblee_f411/rules.mk
deleted file mode 100644
index 4741169e4d..0000000000
--- a/keyboards/handwired/riblee_f411/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/riblee_split/info.json b/keyboards/handwired/riblee_split/keyboard.json
index 49b5ca3a54..49b5ca3a54 100644
--- a/keyboards/handwired/riblee_split/info.json
+++ b/keyboards/handwired/riblee_split/keyboard.json
diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/keyboard.json
index 214eb64dfc..1536474343 100644
--- a/keyboards/handwired/rs60/info.json
+++ b/keyboards/handwired/rs60/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x4260",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D4", "D0", "D1", "D2", "D3", "F4", "F5", "F6", "F7", "B1", "B3"],
"rows": ["B5", "B6", "B4", "B2", "E6"]
diff --git a/keyboards/handwired/rs60/rules.mk b/keyboards/handwired/rs60/rules.mk
deleted file mode 100644
index c827f15dcf..0000000000
--- a/keyboards/handwired/rs60/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled
-AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below
-RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port.
diff --git a/keyboards/handwired/scottokeebs/scotto108/info.json b/keyboards/handwired/scottokeebs/scotto108/keyboard.json
index 0781bb4cae..0781bb4cae 100644
--- a/keyboards/handwired/scottokeebs/scotto108/info.json
+++ b/keyboards/handwired/scottokeebs/scotto108/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto108/rules.mk b/keyboards/handwired/scottokeebs/scotto108/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scotto108/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto34/info.json b/keyboards/handwired/scottokeebs/scotto34/keyboard.json
index 6fcce38d70..6fcce38d70 100644
--- a/keyboards/handwired/scottokeebs/scotto34/info.json
+++ b/keyboards/handwired/scottokeebs/scotto34/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto34/rules.mk b/keyboards/handwired/scottokeebs/scotto34/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/scottokeebs/scotto34/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/scottokeebs/scotto36/info.json b/keyboards/handwired/scottokeebs/scotto36/keyboard.json
index fe8ecb6629..fe8ecb6629 100644
--- a/keyboards/handwired/scottokeebs/scotto36/info.json
+++ b/keyboards/handwired/scottokeebs/scotto36/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto36/rules.mk b/keyboards/handwired/scottokeebs/scotto36/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scotto36/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto40/info.json b/keyboards/handwired/scottokeebs/scotto40/keyboard.json
index b10f677c4d..b10f677c4d 100644
--- a/keyboards/handwired/scottokeebs/scotto40/info.json
+++ b/keyboards/handwired/scottokeebs/scotto40/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto40/rules.mk b/keyboards/handwired/scottokeebs/scotto40/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scotto40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto61/info.json b/keyboards/handwired/scottokeebs/scotto61/keyboard.json
index 8614ec81eb..cf321a2e97 100644
--- a/keyboards/handwired/scottokeebs/scotto61/info.json
+++ b/keyboards/handwired/scottokeebs/scotto61/keyboard.json
@@ -10,8 +10,7 @@
"console": false,
"extrakey": true,
"mousekey": true,
- "nkro": true,
- "rgblight": false
+ "nkro": true
},
"matrix_pins": {
"cols": ["GP6", "GP7", "GP8", "GP9", "GP10", "GP11", "GP12", "GP13", "GP22", "GP20", "GP19", "GP18", "GP17", "GP16"],
diff --git a/keyboards/handwired/scottokeebs/scotto61/rules.mk b/keyboards/handwired/scottokeebs/scotto61/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scotto61/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scotto9/info.json b/keyboards/handwired/scottokeebs/scotto9/keyboard.json
index a42d206300..a42d206300 100644
--- a/keyboards/handwired/scottokeebs/scotto9/info.json
+++ b/keyboards/handwired/scottokeebs/scotto9/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scotto9/rules.mk b/keyboards/handwired/scottokeebs/scotto9/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scotto9/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoalp/info.json b/keyboards/handwired/scottokeebs/scottoalp/info.json
deleted file mode 100644
index 7a4210bb40..0000000000
--- a/keyboards/handwired/scottokeebs/scottoalp/info.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
- "manufacturer": "ScottoKeebs",
- "keyboard_name": "ScottoAlp",
- "maintainer": "joe-scotto",
- "development_board": "promicro",
- "diode_direction": "COL2ROW",
- "features": {
- "bootmagic": true,
- "command": false,
- "console": false,
- "extrakey": true,
- "mousekey": true,
- "nkro": true
- },
- "matrix_pins": {
- // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0
- "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"],
-
- // 15, 14, 16, 10
- "rows": ["B1", "B3", "B2", "B6"]
- },
- "url": "https://scottokeebs.com",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0x0007",
- "vid": "0x534B"
- },
- "layouts": {
- "LAYOUT_ortho_3x10_5": {
- "layout": [
- // Row 1
- { "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 },
-
- // Row 2
- { "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 },
-
- // Row 3
- { "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 },
-
- // Row 4
- { "matrix": [3, 1], "x": 1.5, "y": 3 },
- { "matrix": [3, 2], "x": 2.5, "y": 3 },
- { "matrix": [3, 4], "x": 3.5, "y": 3, "w": 3 },
- { "matrix": [3, 6], "x": 6.5, "y": 3 },
- { "matrix": [3, 7], "x": 7.5, "y": 3 }
- ]
- }
- }
-}
diff --git a/keyboards/handwired/scottokeebs/scottoalp/keyboard.json b/keyboards/handwired/scottokeebs/scottoalp/keyboard.json
new file mode 100644
index 0000000000..5bce6ae62c
--- /dev/null
+++ b/keyboards/handwired/scottokeebs/scottoalp/keyboard.json
@@ -0,0 +1,80 @@
+{
+ "manufacturer": "ScottoKeebs",
+ "keyboard_name": "ScottoAlp",
+ "maintainer": "joe-scotto",
+ "bootmagic": {
+ "matrix": [0, 1]
+ },
+ "build": {
+ "lto": true
+ },
+ "development_board": "promicro",
+ "diode_direction": "COL2ROW",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
+ "matrix_pins": {
+ "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7", "D0"],
+ "rows": ["B1", "B3", "B2", "B6"]
+ },
+ "url": "https://scottokeebs.com",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0x0007",
+ "vid": "0x534B"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "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, 1], "x": 0, "y": 3},
+ {"matrix": [3, 2], "x": 2, "y": 3},
+ {"matrix": [3, 3], "x": 3, "y": 3},
+ {"matrix": [3, 5], "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}
+ ]
+ }
+ }
+} \ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c b/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c
index 88b4a4b0b4..cc334629f6 100644
--- a/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c
+++ b/keyboards/handwired/scottokeebs/scottoalp/keymaps/default/keymap.c
@@ -18,28 +18,28 @@ 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_ortho_3x10_5(
- 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_BSPC,
- LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH),
- KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT)
+ [0] = 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_ENT, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_BSPC, KC_QUOT,
+ KC_LSFT, LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, RSFT_T(KC_SLSH), KC_RSFT,
+ KC_ESC, KC_LGUI, KC_LALT, LGUI_T(KC_SPC), LT(1, KC_TAB), LT(2, KC_ENT), KC_ESC
),
- [1] = LAYOUT_ortho_3x10_5(
- KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL,
- KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,
- LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS),
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [1] = LAYOUT(
+ KC_TRNS, KC_UNDS, KC_MINS, KC_PLUS, KC_EQL, KC_COLN, KC_GRV, KC_MRWD, KC_MPLY, KC_MFFD, KC_DEL, KC_TRNS,
+ KC_TRNS, KC_LCBR, KC_LPRN, KC_RPRN, KC_RCBR, KC_PIPE, KC_ESC, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_TRNS,
+ KC_TRNS, LSFT_T(KC_LBRC), KC_QUOT, KC_DQUO, KC_RBRC, KC_SCLN, KC_TILDE, KC_VOLD, KC_MUTE, KC_VOLU, RSFT_T(KC_BSLS), KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [2] = LAYOUT_ortho_3x10_5(
- KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC,
- KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
- KC_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [2] = LAYOUT(
+ KC_TRNS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_CAPS, KC_BSPC, KC_TRNS,
+ 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_LSFT, KC_NO, KC_NO, KC_NO, MO(3), KC_NO, KC_NO, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
),
- [3] = LAYOUT_ortho_3x10_5(
- KC_NO, KC_NO, KC_NO, 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_F6, KC_F7, KC_F8, KC_F9, KC_F10,
- KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ [3] = LAYOUT(
+ 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_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS,
+ KC_TRNS, KC_F11, KC_NO, KC_NO, QK_BOOT, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_F12, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
)
}; \ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoalp/readme.md b/keyboards/handwired/scottokeebs/scottoalp/readme.md
index 07c7d889de..3f49d61199 100644
--- a/keyboards/handwired/scottokeebs/scottoalp/readme.md
+++ b/keyboards/handwired/scottokeebs/scottoalp/readme.md
@@ -2,7 +2,7 @@
![ScottoAlp](https://i.imgur.com/XKpYcMgh.jpeg)
-A 35-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs).
+A 35 or 43-key ortholinear keyboard with a 3u spacebar and is compatible with both MX or Alps. Case files available [here](https://github.com/joe-scotto/scottokeebs).
* Keyboard Maintainer: [Joe Scotto](https://github.com/joe-scotto)
* Hardware Supported: ATmega32U4
@@ -22,6 +22,6 @@ See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_to
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
+* **Bootmagic reset**: Hold down the key at (0,1) 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 \ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoalp/rules.mk b/keyboards/handwired/scottokeebs/scottoalp/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottoalp/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottocmd/info.json b/keyboards/handwired/scottokeebs/scottocmd/keyboard.json
index a26b95c1db..a26b95c1db 100644
--- a/keyboards/handwired/scottokeebs/scottocmd/info.json
+++ b/keyboards/handwired/scottokeebs/scottocmd/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottocmd/rules.mk b/keyboards/handwired/scottokeebs/scottocmd/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottocmd/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottodeck/info.json b/keyboards/handwired/scottokeebs/scottodeck/keyboard.json
index 0607918cae..0607918cae 100644
--- a/keyboards/handwired/scottokeebs/scottodeck/info.json
+++ b/keyboards/handwired/scottokeebs/scottodeck/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottodeck/rules.mk b/keyboards/handwired/scottokeebs/scottodeck/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottodeck/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoergo/info.json b/keyboards/handwired/scottokeebs/scottoergo/keyboard.json
index 4f6d955271..4f6d955271 100644
--- a/keyboards/handwired/scottokeebs/scottoergo/info.json
+++ b/keyboards/handwired/scottokeebs/scottoergo/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoergo/rules.mk b/keyboards/handwired/scottokeebs/scottoergo/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottoergo/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofly/info.json b/keyboards/handwired/scottokeebs/scottofly/keyboard.json
index 5255a5baf4..5255a5baf4 100644
--- a/keyboards/handwired/scottokeebs/scottofly/info.json
+++ b/keyboards/handwired/scottokeebs/scottofly/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottofly/rules.mk b/keyboards/handwired/scottokeebs/scottofly/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottofly/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottofrog/info.json b/keyboards/handwired/scottokeebs/scottofrog/keyboard.json
index 147f2d8aa7..147f2d8aa7 100644
--- a/keyboards/handwired/scottokeebs/scottofrog/info.json
+++ b/keyboards/handwired/scottokeebs/scottofrog/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottofrog/rules.mk b/keyboards/handwired/scottokeebs/scottofrog/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottofrog/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottogame/info.json b/keyboards/handwired/scottokeebs/scottogame/keyboard.json
index 912cfdfaaa..912cfdfaaa 100644
--- a/keyboards/handwired/scottokeebs/scottogame/info.json
+++ b/keyboards/handwired/scottokeebs/scottogame/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottogame/rules.mk b/keyboards/handwired/scottokeebs/scottogame/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/handwired/scottokeebs/scottogame/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/info.json b/keyboards/handwired/scottokeebs/scottoinvader/keyboard.json
index 2a9054cd4f..2a9054cd4f 100644
--- a/keyboards/handwired/scottokeebs/scottoinvader/info.json
+++ b/keyboards/handwired/scottokeebs/scottoinvader/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk b/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottoinvader/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottokatana/info.json b/keyboards/handwired/scottokeebs/scottokatana/keyboard.json
index 4b5779b6d9..4b5779b6d9 100644
--- a/keyboards/handwired/scottokeebs/scottokatana/info.json
+++ b/keyboards/handwired/scottokeebs/scottokatana/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottokatana/rules.mk b/keyboards/handwired/scottokeebs/scottokatana/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottokatana/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottolong/info.json b/keyboards/handwired/scottokeebs/scottolong/keyboard.json
index 156772d213..156772d213 100644
--- a/keyboards/handwired/scottokeebs/scottolong/info.json
+++ b/keyboards/handwired/scottokeebs/scottolong/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottolong/rules.mk b/keyboards/handwired/scottokeebs/scottolong/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottolong/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json b/keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json
index f238564c7f..f238564c7f 100644
--- a/keyboards/handwired/scottokeebs/scottomacrodeck/info.json
+++ b/keyboards/handwired/scottokeebs/scottomacrodeck/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk b/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/scottokeebs/scottomacrodeck/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/scottokeebs/scottomouse/info.json b/keyboards/handwired/scottokeebs/scottomouse/keyboard.json
index 36f92f48e2..36f92f48e2 100644
--- a/keyboards/handwired/scottokeebs/scottomouse/info.json
+++ b/keyboards/handwired/scottokeebs/scottomouse/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottomouse/rules.mk b/keyboards/handwired/scottokeebs/scottomouse/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottomouse/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottonum/info.json b/keyboards/handwired/scottokeebs/scottonum/keyboard.json
index f71f75d62b..f71f75d62b 100644
--- a/keyboards/handwired/scottokeebs/scottonum/info.json
+++ b/keyboards/handwired/scottokeebs/scottonum/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottonum/rules.mk b/keyboards/handwired/scottokeebs/scottonum/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottonum/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottoslant/info.json b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
index ebaa1b530c..8c9de39cd6 100644
--- a/keyboards/handwired/scottokeebs/scottoslant/info.json
+++ b/keyboards/handwired/scottokeebs/scottoslant/keyboard.json
@@ -12,6 +12,9 @@
"mousekey": true,
"nkro": true
},
+ "build": {
+ "lto": true
+ },
"matrix_pins": {
"cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5"],
"rows": ["B1", "B3", "B2", "B6"]
diff --git a/keyboards/handwired/scottokeebs/scottoslant/rules.mk b/keyboards/handwired/scottokeebs/scottoslant/rules.mk
deleted file mode 100644
index 4da205a168..0000000000
--- a/keyboards/handwired/scottokeebs/scottoslant/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/scottokeebs/scottosplit/info.json b/keyboards/handwired/scottokeebs/scottosplit/keyboard.json
index 66d24db0cd..66d24db0cd 100644
--- a/keyboards/handwired/scottokeebs/scottosplit/info.json
+++ b/keyboards/handwired/scottokeebs/scottosplit/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottosplit/rules.mk b/keyboards/handwired/scottokeebs/scottosplit/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottosplit/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/scottokeebs/scottostarter/info.json b/keyboards/handwired/scottokeebs/scottostarter/keyboard.json
index 5e6a70114b..5e6a70114b 100644
--- a/keyboards/handwired/scottokeebs/scottostarter/info.json
+++ b/keyboards/handwired/scottokeebs/scottostarter/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottostarter/rules.mk b/keyboards/handwired/scottokeebs/scottostarter/rules.mk
deleted file mode 100644
index 7ff128fa69..0000000000
--- a/keyboards/handwired/scottokeebs/scottostarter/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank \ No newline at end of file
diff --git a/keyboards/handwired/scottokeebs/scottowing/info.json b/keyboards/handwired/scottokeebs/scottowing/keyboard.json
index 91bfaa1f92..91bfaa1f92 100644
--- a/keyboards/handwired/scottokeebs/scottowing/info.json
+++ b/keyboards/handwired/scottokeebs/scottowing/keyboard.json
diff --git a/keyboards/handwired/scottokeebs/scottowing/rules.mk b/keyboards/handwired/scottokeebs/scottowing/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/scottokeebs/scottowing/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/keyboard.json
index f2cfef37a8..f2cfef37a8 100644
--- a/keyboards/handwired/sejin_eat1010r2/info.json
+++ b/keyboards/handwired/sejin_eat1010r2/keyboard.json
diff --git a/keyboards/handwired/sejin_eat1010r2/rules.mk b/keyboards/handwired/sejin_eat1010r2/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/sejin_eat1010r2/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/keyboard.json
index b99e41bda5..5e46cc4f32 100644
--- a/keyboards/handwired/selene/info.json
+++ b/keyboards/handwired/selene/keyboard.json
@@ -14,14 +14,21 @@
"ws2812": {
"pin": "A3"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"],
"rows": ["B10", "B9", "B15", "B14", "B13", "B8"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk
deleted file mode 100644
index a8a8f03322..0000000000
--- a/keyboards/handwired/selene/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/selene/selene.c b/keyboards/handwired/selene/selene.c
index a3702ce02e..b0924c06f4 100644
--- a/keyboards/handwired/selene/selene.c
+++ b/keyboards/handwired/selene/selene.c
@@ -18,9 +18,9 @@
#include "selene.h"
void matrix_init_kb(void){
- setPinOutput(NUM_LOCK_PIN);
- setPinOutput(CAPS_LOCK_PIN);
- setPinOutput(SCROLL_LOCK_PIN);
+ gpio_set_pin_output(NUM_LOCK_PIN);
+ gpio_set_pin_output(CAPS_LOCK_PIN);
+ gpio_set_pin_output(SCROLL_LOCK_PIN);
}
void keyboard_post_init_user(void) {
@@ -30,9 +30,9 @@ void keyboard_post_init_user(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(NUM_LOCK_PIN, led_state.num_lock);
- writePin(CAPS_LOCK_PIN, led_state.caps_lock);
- writePin(SCROLL_LOCK_PIN, led_state.scroll_lock);
+ gpio_write_pin(NUM_LOCK_PIN, led_state.num_lock);
+ gpio_write_pin(CAPS_LOCK_PIN, led_state.caps_lock);
+ gpio_write_pin(SCROLL_LOCK_PIN, led_state.scroll_lock);
}
return res;
}
diff --git a/keyboards/handwired/sick68/info.json b/keyboards/handwired/sick68/keyboard.json
index 14232fd6c3..f5fbe24873 100644
--- a/keyboards/handwired/sick68/info.json
+++ b/keyboards/handwired/sick68/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x5F00",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
"rows": ["D3", "D2", "D1", "D0", "D4"]
diff --git a/keyboards/handwired/sick68/rules.mk b/keyboards/handwired/sick68/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/sick68/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/keyboard.json
index fc1e39eb33..86457a704e 100644
--- a/keyboards/handwired/sick_pad/info.json
+++ b/keyboards/handwired/sick_pad/keyboard.json
@@ -8,14 +8,20 @@
"pid": "0xDA20",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B9", "B15", "B14", "B13"],
"rows": ["B0", "B1", "B2", "B3", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
"community_layouts": ["numpad_5x4"],
"layouts": {
"LAYOUT_numpad_5x4": {
diff --git a/keyboards/handwired/sick_pad/rules.mk b/keyboards/handwired/sick_pad/rules.mk
deleted file mode 100644
index 61bbba1c9e..0000000000
--- a/keyboards/handwired/sick_pad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/keyboard.json
index d36024c67c..91ee5b1fb6 100644
--- a/keyboards/handwired/skakunm_dactyl/info.json
+++ b/keyboards/handwired/skakunm_dactyl/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x3060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C6", "D7", "E6", "B4", "B5"],
"rows": ["B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/skakunm_dactyl/rules.mk b/keyboards/handwired/skakunm_dactyl/rules.mk
deleted file mode 100644
index 7f1fc659cc..0000000000
--- a/keyboards/handwired/skakunm_dactyl/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/keyboard.json
index 95abaeb9c7..4fd99ebeee 100644
--- a/keyboards/handwired/slash/info.json
+++ b/keyboards/handwired/slash/keyboard.json
@@ -18,6 +18,12 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "bluetooth": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/slash/rules.mk b/keyboards/handwired/slash/rules.mk
index ca7f6f843f..3437a35bdf 100644
--- a/keyboards/handwired/slash/rules.mk
+++ b/keyboards/handwired/slash/rules.mk
@@ -1,16 +1,2 @@
# Processor frequency
F_CPU = 8000000
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-BLUETOOTH_ENABLE = yes
diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/keyboard.json
index 162f5601b5..3ff80ad2fd 100644
--- a/keyboards/handwired/snatchpad/info.json
+++ b/keyboards/handwired/snatchpad/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0x7370",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "key_lock": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B1", "B3", "B2"],
"rows": ["F4", "F5", "F6"]
diff --git a/keyboards/handwired/snatchpad/rules.mk b/keyboards/handwired/snatchpad/rules.mk
deleted file mode 100644
index 74f5b93cb9..0000000000
--- a/keyboards/handwired/snatchpad/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-KEY_LOCK_ENABLE = yes
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json
index 57b78c81bf..85a698d2f4 100644
--- a/keyboards/handwired/sono1/info.json
+++ b/keyboards/handwired/sono1/info.json
@@ -3,6 +3,14 @@
"manufacturer": "ASKeyboard",
"url": "",
"maintainer": "DmNosachev",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"usb": {
"vid": "0x515A",
"pid": "0x5331"
diff --git a/keyboards/handwired/sono1/rules.mk b/keyboards/handwired/sono1/rules.mk
index e2e79966be..9b472f28f2 100644
--- a/keyboards/handwired/sono1/rules.mk
+++ b/keyboards/handwired/sono1/rules.mk
@@ -1,14 +1 @@
DEFAULT_FOLDER = handwired/sono1/t2pp
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/sono1/sono1.c b/keyboards/handwired/sono1/sono1.c
index d19f188a19..449289a1e9 100644
--- a/keyboards/handwired/sono1/sono1.c
+++ b/keyboards/handwired/sono1/sono1.c
@@ -18,17 +18,17 @@
void matrix_init_kb(void) {
/* LED pins setup */
- setPinOutput(LED_KANA_PIN);
- setPinOutput(LED_CAPS_LOCK_PIN);
- setPinOutput(LED_CTRL_XFER_PIN);
- setPinOutput(LED_NUM_LOCK_PIN);
- setPinOutput(LED_KB_LOCK_PIN);
+ gpio_set_pin_output(LED_KANA_PIN);
+ gpio_set_pin_output(LED_CAPS_LOCK_PIN);
+ gpio_set_pin_output(LED_CTRL_XFER_PIN);
+ gpio_set_pin_output(LED_NUM_LOCK_PIN);
+ gpio_set_pin_output(LED_KB_LOCK_PIN);
- writePinHigh(LED_KANA_PIN);
- writePinHigh(LED_CAPS_LOCK_PIN);
- writePinHigh(LED_CTRL_XFER_PIN);
- writePinHigh(LED_NUM_LOCK_PIN);
- writePinHigh(LED_KB_LOCK_PIN);
+ gpio_write_pin_high(LED_KANA_PIN);
+ gpio_write_pin_high(LED_CAPS_LOCK_PIN);
+ gpio_write_pin_high(LED_CTRL_XFER_PIN);
+ gpio_write_pin_high(LED_NUM_LOCK_PIN);
+ gpio_write_pin_high(LED_KB_LOCK_PIN);
matrix_init_user();
}
@@ -36,9 +36,9 @@ void matrix_init_kb(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(LED_NUM_LOCK_PIN, !led_state.num_lock);
- writePin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
- writePin(LED_CTRL_XFER_PIN, !led_state.scroll_lock);
+ gpio_write_pin(LED_NUM_LOCK_PIN, !led_state.num_lock);
+ gpio_write_pin(LED_CAPS_LOCK_PIN, !led_state.caps_lock);
+ gpio_write_pin(LED_CTRL_XFER_PIN, !led_state.scroll_lock);
}
return res;
}
diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/keyboard.json
index f6e874a77f..7a4b7420be 100644
--- a/keyboards/handwired/sono1/stm32f103/info.json
+++ b/keyboards/handwired/sono1/stm32f103/keyboard.json
@@ -13,6 +13,5 @@
"kana": "A2",
"on_state": 0
},
- "processor": "STM32F103",
- "bootloader": "stm32duino"
+ "development_board": "bluepill"
}
diff --git a/keyboards/handwired/sono1/stm32f103/rules.mk b/keyboards/handwired/sono1/stm32f103/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/sono1/stm32f103/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/keyboard.json
index 37ab6723ba..37ab6723ba 100644
--- a/keyboards/handwired/sono1/t2pp/info.json
+++ b/keyboards/handwired/sono1/t2pp/keyboard.json
diff --git a/keyboards/handwired/sono1/t2pp/rules.mk b/keyboards/handwired/sono1/t2pp/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/sono1/t2pp/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/keyboard.json
index b0e72ccabd..b02b48ac62 100644
--- a/keyboards/handwired/space_oddity/info.json
+++ b/keyboards/handwired/space_oddity/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6060",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "dynamic_macro": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"],
"rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
diff --git a/keyboards/handwired/space_oddity/rules.mk b/keyboards/handwired/space_oddity/rules.mk
deleted file mode 100644
index 8b3a3ef369..0000000000
--- a/keyboards/handwired/space_oddity/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
-DYNAMIC_MACRO_ENABLE = yes
diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/keyboard.json
index ea41cb3ac1..5efdd93629 100644
--- a/keyboards/handwired/split65/promicro/info.json
+++ b/keyboards/handwired/split65/promicro/keyboard.json
@@ -1,4 +1,13 @@
{
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"],
@@ -6,6 +15,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3"
},
"processor": "atmega32u4",
diff --git a/keyboards/handwired/split65/promicro/rules.mk b/keyboards/handwired/split65/promicro/rules.mk
deleted file mode 100644
index 3bc7f499ec..0000000000
--- a/keyboards/handwired/split65/promicro/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/keyboard.json
index 61aff0e7ea..6763c5eb88 100644
--- a/keyboards/handwired/split65/stm32/info.json
+++ b/keyboards/handwired/split65/stm32/keyboard.json
@@ -6,11 +6,17 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "A9"
},
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "audio": true,
+ "oled": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/split65/stm32/rules.mk b/keyboards/handwired/split65/stm32/rules.mk
index 5033bd1e21..c6e2988321 100644
--- a/keyboards/handwired/split65/stm32/rules.mk
+++ b/keyboards/handwired/split65/stm32/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
-OLED_ENABLE = yes
-SPLIT_KEYBOARD = yes
SERIAL_DRIVER = usart
diff --git a/keyboards/handwired/split89/info.json b/keyboards/handwired/split89/keyboard.json
index dfc1198c58..d30105844a 100644
--- a/keyboards/handwired/split89/info.json
+++ b/keyboards/handwired/split89/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"],
"rows": ["F6", "F7", "B1", "B3", "B2", "B6"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/handwired/split89/rules.mk b/keyboards/handwired/split89/rules.mk
deleted file mode 100644
index 8ea05b5f74..0000000000
--- a/keyboards/handwired/split89/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/split_cloud/info.json b/keyboards/handwired/split_cloud/keyboard.json
index 6d28728f69..6d28728f69 100644
--- a/keyboards/handwired/split_cloud/info.json
+++ b/keyboards/handwired/split_cloud/keyboard.json
diff --git a/keyboards/handwired/split_cloud/rules.mk b/keyboards/handwired/split_cloud/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/split_cloud/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/info.json
deleted file mode 100644
index 17b7f86a6f..0000000000
--- a/keyboards/handwired/splittest/bluepill/info.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "matrix_pins": {
- "cols": ["B1"],
- "rows": ["B10"]
- },
- "diode_direction": "COL2ROW",
- "processor": "STM32F103",
- "bootloader": "stm32duino"
-}
diff --git a/keyboards/handwired/splittest/bluepill/keyboard.json b/keyboards/handwired/splittest/bluepill/keyboard.json
new file mode 100644
index 0000000000..5c061a7119
--- /dev/null
+++ b/keyboards/handwired/splittest/bluepill/keyboard.json
@@ -0,0 +1,14 @@
+{
+ "matrix_pins": {
+ "cols": ["B1"],
+ "rows": ["B10"]
+ },
+ "diode_direction": "COL2ROW",
+ "development_board": "bluepill",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ }
+}
diff --git a/keyboards/handwired/splittest/bluepill/rules.mk b/keyboards/handwired/splittest/bluepill/rules.mk
deleted file mode 100644
index 8b13789179..0000000000
--- a/keyboards/handwired/splittest/bluepill/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/keyboards/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json
index 73ffb66e9b..07cac23aad 100644
--- a/keyboards/handwired/splittest/info.json
+++ b/keyboards/handwired/splittest/info.json
@@ -8,6 +8,9 @@
"pid": "0x1111",
"device_version": "1.0.0"
},
+ "split": {
+ "enabled": true
+ },
"rgblight": {
"led_count": 12,
"split_count": [6, 6],
diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/keyboard.json
index f376520765..2f5929cc00 100644
--- a/keyboards/handwired/splittest/promicro/info.json
+++ b/keyboards/handwired/splittest/promicro/keyboard.json
@@ -11,5 +11,11 @@
"pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "caterina"
+ "bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ }
}
diff --git a/keyboards/handwired/splittest/promicro/rules.mk b/keyboards/handwired/splittest/promicro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/splittest/promicro/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/splittest/rules.mk b/keyboards/handwired/splittest/rules.mk
index cc924d61d8..ae4d823b53 100644
--- a/keyboards/handwired/splittest/rules.mk
+++ b/keyboards/handwired/splittest/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/splittest/promicro
diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/keyboard.json
index 72e9d022b9..68ab3f92c4 100644
--- a/keyboards/handwired/splittest/teensy_2/info.json
+++ b/keyboards/handwired/splittest/teensy_2/keyboard.json
@@ -11,5 +11,11 @@
"pin": "D3"
},
"processor": "atmega32u4",
- "bootloader": "halfkay"
+ "bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": false,
+ "console": true
+ }
}
diff --git a/keyboards/handwired/splittest/teensy_2/rules.mk b/keyboards/handwired/splittest/teensy_2/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/splittest/teensy_2/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/starrykeebs/dude09/info.json b/keyboards/handwired/starrykeebs/dude09/keyboard.json
index 6e91adeb1e..6e91adeb1e 100644
--- a/keyboards/handwired/starrykeebs/dude09/info.json
+++ b/keyboards/handwired/starrykeebs/dude09/keyboard.json
diff --git a/keyboards/handwired/starrykeebs/dude09/rules.mk b/keyboards/handwired/starrykeebs/dude09/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/starrykeebs/dude09/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/keyboard.json
index 54164b5738..9808d50faa 100644
--- a/keyboards/handwired/steamvan/rev1/info.json
+++ b/keyboards/handwired/steamvan/rev1/keyboard.json
@@ -8,6 +8,17 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "leader": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"],
"rows": ["A6", "A5", "A4", "A3"]
diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk
deleted file mode 100644
index 30e27ae8b8..0000000000
--- a/keyboards/handwired/steamvan/rev1/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = yes
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = yes # Enable keyboard underlight functionality
-LEADER_ENABLE = yes
-
diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
index f1471efe8e..fe277ebde0 100644
--- a/keyboards/handwired/stef9998/split_5x7/info.json
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/keyboard.json
@@ -8,12 +8,21 @@
"pid": "0x6063",
"device_version": "1.0.0"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
index 18543078c7..18543078c7 100644
--- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c
+++ b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c
diff --git a/keyboards/handwired/stef9998/split_5x7/rules.mk b/keyboards/handwired/stef9998/split_5x7/rules.mk
index f74fc17545..f06c490f00 100644
--- a/keyboards/handwired/stef9998/split_5x7/rules.mk
+++ b/keyboards/handwired/stef9998/split_5x7/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
-
-DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1 \ No newline at end of file
+DEFAULT_FOLDER = handwired/stef9998/split_5x7/rev1
diff --git a/keyboards/handwired/sticc14/info.json b/keyboards/handwired/sticc14/keyboard.json
index 8659152f52..1c0d683a7c 100644
--- a/keyboards/handwired/sticc14/info.json
+++ b/keyboards/handwired/sticc14/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "B2", "B3"],
"rows": ["F4", "F5", "F6", "F7", "B1"]
diff --git a/keyboards/handwired/sticc14/rules.mk b/keyboards/handwired/sticc14/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/sticc14/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/stream_cheap/2x3/info.json b/keyboards/handwired/stream_cheap/2x3/keyboard.json
index 074a5f8954..b10b4f7a7c 100644
--- a/keyboards/handwired/stream_cheap/2x3/info.json
+++ b/keyboards/handwired/stream_cheap/2x3/keyboard.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"direct": [
["D1", "C6", "B4"],
diff --git a/keyboards/handwired/stream_cheap/2x3/rules.mk b/keyboards/handwired/stream_cheap/2x3/rules.mk
deleted file mode 100644
index 3b6a1809db..0000000000
--- a/keyboards/handwired/stream_cheap/2x3/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/stream_cheap/2x4/info.json b/keyboards/handwired/stream_cheap/2x4/keyboard.json
index 8bd5ca4fcc..72e5e1814c 100644
--- a/keyboards/handwired/stream_cheap/2x4/info.json
+++ b/keyboards/handwired/stream_cheap/2x4/keyboard.json
@@ -10,6 +10,17 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"direct": [
["D1", "D0", "D4", "C6"],
diff --git a/keyboards/handwired/stream_cheap/2x4/rules.mk b/keyboards/handwired/stream_cheap/2x4/rules.mk
deleted file mode 100644
index 3ced86d55c..0000000000
--- a/keyboards/handwired/stream_cheap/2x4/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Enable optimizations
diff --git a/keyboards/handwired/stream_cheap/2x5/info.json b/keyboards/handwired/stream_cheap/2x5/keyboard.json
index be24426de0..ccf47996e3 100644
--- a/keyboards/handwired/stream_cheap/2x5/info.json
+++ b/keyboards/handwired/stream_cheap/2x5/keyboard.json
@@ -10,6 +10,14 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"direct": [
["D1", "C6", "B4", "B5", "B2"],
diff --git a/keyboards/handwired/stream_cheap/2x5/rules.mk b/keyboards/handwired/stream_cheap/2x5/rules.mk
deleted file mode 100644
index 3b6a1809db..0000000000
--- a/keyboards/handwired/stream_cheap/2x5/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/keyboard.json
index 01ab1df856..c72c0e4b3d 100644
--- a/keyboards/handwired/swiftrax/astro65/info.json
+++ b/keyboards/handwired/swiftrax/astro65/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEAEF",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["E6", "D5", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B0", "B3", "F7", "B1", "B2"]
diff --git a/keyboards/handwired/swiftrax/astro65/rules.mk b/keyboards/handwired/swiftrax/astro65/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/swiftrax/astro65/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/keyboard.json
index b833dfbdf6..242d1b99a9 100644
--- a/keyboards/handwired/swiftrax/bebol/info.json
+++ b/keyboards/handwired/swiftrax/bebol/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEAC4",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B1", "D2", "D3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"],
"rows": ["B2", "B3", "F7", "F0", "B7"]
diff --git a/keyboards/handwired/swiftrax/bebol/rules.mk b/keyboards/handwired/swiftrax/bebol/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/swiftrax/bebol/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/keyboard.json
index e35d1f36e7..75edd62c1e 100644
--- a/keyboards/handwired/swiftrax/beegboy/info.json
+++ b/keyboards/handwired/swiftrax/beegboy/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEAC5",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D5", "D3"],
"rows": ["B1", "B0", "B3", "B2", "D0", "B7", "D2", "D1", "B5", "B4", "C6", "B6"]
diff --git a/keyboards/handwired/swiftrax/beegboy/rules.mk b/keyboards/handwired/swiftrax/beegboy/rules.mk
deleted file mode 100644
index da25f7f3dc..0000000000
--- a/keyboards/handwired/swiftrax/beegboy/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no # Rotary Encoder
diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/keyboard.json
index e2cad64ad8..9a68fe1b4f 100644
--- a/keyboards/handwired/swiftrax/bumblebee/info.json
+++ b/keyboards/handwired/swiftrax/bumblebee/keyboard.json
@@ -14,6 +14,16 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"],
"rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"]
diff --git a/keyboards/handwired/swiftrax/bumblebee/rules.mk b/keyboards/handwired/swiftrax/bumblebee/rules.mk
deleted file mode 100644
index 0ca8090ba8..0000000000
--- a/keyboards/handwired/swiftrax/bumblebee/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Rotary Encoder
diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/keyboard.json
index 8aea3b0c1b..efa8c39d19 100644
--- a/keyboards/handwired/swiftrax/cowfish/info.json
+++ b/keyboards/handwired/swiftrax/cowfish/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEB53",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B3", "B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "B4", "C6", "D7", "C7", "D2", "D3", "D5"],
"rows": ["D0", "D1", "B7", "E6", "D4", "D6"]
diff --git a/keyboards/handwired/swiftrax/cowfish/rules.mk b/keyboards/handwired/swiftrax/cowfish/rules.mk
deleted file mode 100644
index 6fe874e748..0000000000
--- a/keyboards/handwired/swiftrax/cowfish/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/keyboard.json
index 7d8ea44f3b..59442c33ec 100644
--- a/keyboards/handwired/swiftrax/digicarp65/info.json
+++ b/keyboards/handwired/swiftrax/digicarp65/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xE7F1",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["B2", "B1", "F4", "F1", "F0"]
diff --git a/keyboards/handwired/swiftrax/digicarp65/rules.mk b/keyboards/handwired/swiftrax/digicarp65/rules.mk
deleted file mode 100644
index 21a966bffa..0000000000
--- a/keyboards/handwired/swiftrax/digicarp65/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Rotary Encoder
diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/keyboard.json
index 538a39c14b..6d857f5998 100644
--- a/keyboards/handwired/swiftrax/digicarpice/info.json
+++ b/keyboards/handwired/swiftrax/digicarpice/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xE79A",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"],
"rows": ["F0", "D5", "D7", "D6", "D4"]
diff --git a/keyboards/handwired/swiftrax/digicarpice/rules.mk b/keyboards/handwired/swiftrax/digicarpice/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/swiftrax/digicarpice/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/keyboard.json
index 3e53acb40c..6a539c786a 100644
--- a/keyboards/handwired/swiftrax/equator/info.json
+++ b/keyboards/handwired/swiftrax/equator/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xE984",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["B2", "B3", "C7", "B4", "B5"]
diff --git a/keyboards/handwired/swiftrax/equator/rules.mk b/keyboards/handwired/swiftrax/equator/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/swiftrax/equator/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/keyboard.json
index ddfb4ce1ad..d455cbe266 100644
--- a/keyboards/handwired/swiftrax/glacier/info.json
+++ b/keyboards/handwired/swiftrax/glacier/keyboard.json
@@ -25,6 +25,15 @@
"ws2812": {
"pin": "B0"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"],
"rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"]
diff --git a/keyboards/handwired/swiftrax/glacier/rules.mk b/keyboards/handwired/swiftrax/glacier/rules.mk
deleted file mode 100644
index 9be7a1985b..0000000000
--- a/keyboards/handwired/swiftrax/glacier/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output \ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/keyboard.json
index e55940cf0c..b894dcbe54 100644
--- a/keyboards/handwired/swiftrax/joypad/info.json
+++ b/keyboards/handwired/swiftrax/joypad/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xEA68",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C7", "B4", "D0", "C2"],
"rows": ["C6", "B3", "B0", "B1", "D6", "D5"]
diff --git a/keyboards/handwired/swiftrax/joypad/rules.mk b/keyboards/handwired/swiftrax/joypad/rules.mk
deleted file mode 100644
index deedc37998..0000000000
--- a/keyboards/handwired/swiftrax/joypad/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/keyboard.json
index 0b456af7aa..78686a8e70 100644
--- a/keyboards/handwired/swiftrax/koalafications/info.json
+++ b/keyboards/handwired/swiftrax/koalafications/keyboard.json
@@ -8,6 +8,16 @@
"pid": "0xEA44",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true,
+ "wpm": true
+ },
"matrix_pins": {
"cols": ["F0", "D5", "D3", "D2", "B3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"],
"rows": ["B1", "B2", "E6", "F1", "F4", "F5"]
diff --git a/keyboards/handwired/swiftrax/koalafications/rules.mk b/keyboards/handwired/swiftrax/koalafications/rules.mk
deleted file mode 100644
index efd14377bf..0000000000
--- a/keyboards/handwired/swiftrax/koalafications/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/keyboard.json
index 9deacb8238..47c604c35f 100644
--- a/keyboards/handwired/swiftrax/nodu/info.json
+++ b/keyboards/handwired/swiftrax/nodu/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEA6E",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"],
"rows": ["B0", "B3", "F5", "F4", "F1"]
diff --git a/keyboards/handwired/swiftrax/nodu/rules.mk b/keyboards/handwired/swiftrax/nodu/rules.mk
deleted file mode 100644
index ab2c49da70..0000000000
--- a/keyboards/handwired/swiftrax/nodu/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/keyboard.json
index 97ea8928cc..9fce9c80c5 100644
--- a/keyboards/handwired/swiftrax/pandamic/info.json
+++ b/keyboards/handwired/swiftrax/pandamic/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xEB0E",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D0"],
"rows": ["D1", "D2", "B5", "B7", "D3", "D5", "D6", "D4", "D7", "B4"]
diff --git a/keyboards/handwired/swiftrax/pandamic/rules.mk b/keyboards/handwired/swiftrax/pandamic/rules.mk
deleted file mode 100644
index 0d8c75f6af..0000000000
--- a/keyboards/handwired/swiftrax/pandamic/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Rotary Encoder
diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/keyboard.json
index 2e0771e22c..1d87ce1893 100644
--- a/keyboards/handwired/swiftrax/the_galleon/info.json
+++ b/keyboards/handwired/swiftrax/the_galleon/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xEA2D",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "oled": true
+ },
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2"],
"rows": ["B1", "B0", "D2", "B7", "D5", "D3", "D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6"]
diff --git a/keyboards/handwired/swiftrax/the_galleon/rules.mk b/keyboards/handwired/swiftrax/the_galleon/rules.mk
deleted file mode 100644
index dec78ae408..0000000000
--- a/keyboards/handwired/swiftrax/the_galleon/rules.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no # Rotary Encoder
-OLED_ENABLE = yes
diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/keyboard.json
index 545e0b66e5..bb18c0dea8 100644
--- a/keyboards/handwired/swiftrax/unsplit/info.json
+++ b/keyboards/handwired/swiftrax/unsplit/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xEAB1",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["D1", "D2", "D3", "D5", "D4", "D6", "C6", "C7", "F6", "F5", "F4", "F1"],
"rows": ["B6", "D7", "B5", "B4"]
diff --git a/keyboards/handwired/swiftrax/unsplit/rules.mk b/keyboards/handwired/swiftrax/unsplit/rules.mk
deleted file mode 100644
index d737227db3..0000000000
--- a/keyboards/handwired/swiftrax/unsplit/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = no # Rotary Encoder \ No newline at end of file
diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/keyboard.json
index 804f88503b..cbf603a4ff 100644
--- a/keyboards/handwired/swiftrax/walter/info.json
+++ b/keyboards/handwired/swiftrax/walter/keyboard.json
@@ -26,6 +26,16 @@
"ws2812": {
"pin": "E6"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
"rows": ["B2", "B1", "F4", "F1", "F0"]
diff --git a/keyboards/handwired/swiftrax/walter/rules.mk b/keyboards/handwired/swiftrax/walter/rules.mk
deleted file mode 100644
index 5e11a757b7..0000000000
--- a/keyboards/handwired/swiftrax/walter/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-ENCODER_ENABLE = yes # Rotary Encder
diff --git a/keyboards/handwired/symmetric70_proto/debug_config.h b/keyboards/handwired/symmetric70_proto/debug_config.h
index cba99e402f..5a575eb479 100644
--- a/keyboards/handwired/symmetric70_proto/debug_config.h
+++ b/keyboards/handwired/symmetric70_proto/debug_config.h
@@ -8,23 +8,23 @@
#include <gpio.h>
static inline void setDebugPinOutput_Low(void) {
- setPinOutput(MATRIX_DEBUG_PIN);
- writePinLow(MATRIX_DEBUG_PIN);
+ gpio_set_pin_output(MATRIX_DEBUG_PIN);
+ gpio_write_pin_low(MATRIX_DEBUG_PIN);
}
#define MATRIX_DEBUG_PIN_INIT() setDebugPinOutput_Low()
#ifdef MATRIX_DEBUG_SCAN
-# define MATRIX_DEBUG_SCAN_START() writePinHigh(MATRIX_DEBUG_PIN)
-# define MATRIX_DEBUG_SCAN_END() writePinLow(MATRIX_DEBUG_PIN)
+# define MATRIX_DEBUG_SCAN_START() gpio_write_pin_high(MATRIX_DEBUG_PIN)
+# define MATRIX_DEBUG_SCAN_END() gpio_write_pin_low(MATRIX_DEBUG_PIN)
#else
# define MATRIX_DEBUG_SCAN_START()
# define MATRIX_DEBUG_SCAN_END()
#endif
#ifdef MATRIX_DEBUG_DELAY
-# define MATRIX_DEBUG_DELAY_START() writePinHigh(MATRIX_DEBUG_PIN)
-# define MATRIX_DEBUG_DELAY_END() writePinLow(MATRIX_DEBUG_PIN)
+# define MATRIX_DEBUG_DELAY_START() gpio_write_pin_high(MATRIX_DEBUG_PIN)
+# define MATRIX_DEBUG_DELAY_END() gpio_write_pin_low(MATRIX_DEBUG_PIN)
#else
# define MATRIX_DEBUG_DELAY_START()
# define MATRIX_DEBUG_DELAY_END()
diff --git a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
index 8a303714cf..786c1b4a73 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_debug/matrix.c
@@ -14,12 +14,11 @@ 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 <stdint.h>
-#include <stdbool.h>
+#include "atomic_util.h"
#include "util.h"
+#include "wait.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#ifndef readPort
# include "gpio_extr.h"
#endif
@@ -63,13 +62,13 @@ extern matrix_row_t matrix[MATRIX_ROWS]; // debounced values
static inline void setPinOutput_writeLow(pin_t pin) {
ATOMIC_BLOCK_FORCEON {
- setPinOutput(pin);
- writePinLow(pin);
+ gpio_set_pin_output(pin);
+ gpio_write_pin_low(pin);
}
}
static inline void setPinInputHigh_atomic(pin_t pin) {
- ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+ ATOMIC_BLOCK_FORCEON { gpio_set_pin_input_high(pin); }
}
// matrix code
@@ -81,7 +80,7 @@ static void init_pins(void) {
for (int col = 0; col < MATRIX_COLS; col++) {
pin_t pin = direct_pins[row][col];
if (pin != NO_PIN) {
- setPinInputHigh(pin);
+ gpio_set_pin_input_high(pin);
}
}
}
@@ -94,7 +93,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
pin_t pin = direct_pins[current_row][col_index];
if (pin != NO_PIN) {
- current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+ current_row_value |= gpio_read_pin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
}
}
@@ -121,8 +120,8 @@ static void unselect_rows(void) {
static void init_pins(void) {
# ifdef MATRIX_MUL_SELECT
- setPinOutput(MATRIX_MUL_SELECT);
- writePinLow(MATRIX_MUL_SELECT);
+ gpio_set_pin_output(MATRIX_MUL_SELECT);
+ gpio_write_pin_low(MATRIX_MUL_SELECT);
# endif
unselect_rows();
for (uint8_t x = 0; x < MATRIX_COLS; x++) {
@@ -142,10 +141,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
// Select the col pin to read (active low)
# ifdef MATRIX_MUL_SELECT
- writePin(MATRIX_MUL_SELECT, col_sel[col_index]);
+ gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]);
waitInputPinDelay();
# endif
- uint8_t pin_state = readPin(col_pins[col_index]);
+ uint8_t pin_state = gpio_read_pin(col_pins[col_index]);
// Populate the matrix row with the state of the col pin
current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
@@ -161,7 +160,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
is_pressed = false;
for (uint8_t i = 0; i < ARRAY_SIZE(delay_ports); i++) {
# ifdef MATRIX_IO_DELAY_MULSEL
- writePin(MATRIX_MUL_SELECT, delay_sel[i]);
+ gpio_write_pin(MATRIX_MUL_SELECT, delay_sel[i]);
waitInputPinDelay();
# endif
is_pressed |= ((readPort(delay_ports[i]) & delay_masks[i]) != delay_masks[i]);
@@ -175,10 +174,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
MATRIX_DEBUG_DELAY_START();
# ifdef MATRIX_MUL_SELECT
- writePin(MATRIX_MUL_SELECT, col_sel[col_index]);
+ gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]);
waitInputPinDelay();
# endif
- while (readPin(col_pins[col_index]) == 0) {
+ while (gpio_read_pin(col_pins[col_index]) == 0) {
}
MATRIX_DEBUG_DELAY_END();
}
@@ -194,10 +193,10 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
MATRIX_DEBUG_DELAY_END();
MATRIX_DEBUG_DELAY_START();
# ifdef MATRIX_MUL_SELECT
- writePin(MATRIX_MUL_SELECT, col_sel[col_index]);
+ gpio_write_pin(MATRIX_MUL_SELECT, col_sel[col_index]);
waitInputPinDelay();
# endif
- state |= (readPin(col_pins[col_index]) == 0);
+ state |= (gpio_read_pin(col_pins[col_index]) == 0);
}
MATRIX_DEBUG_DELAY_END();
} while (state);
@@ -251,7 +250,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t current_row_value = last_row_value;
// Check row pin state
- if (readPin(row_pins[row_index]) == 0) {
+ if (gpio_read_pin(row_pins[row_index]) == 0) {
// Pin LO, set col bit
current_row_value |= (MATRIX_ROW_SHIFTER << current_col);
key_pressed = true;
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
index e31cb5f3a5..437fa93a20 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/gpio_extr.h
@@ -1,4 +1,7 @@
#pragma once
+
+#include <stdint.h>
+
// clang-format off
#if defined(__AVR__)
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
index 2bc97bd9e8..842df65dbd 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix.c
@@ -15,17 +15,14 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// clang-format off
-#include <stdint.h>
-#include <stdbool.h>
-#include <gpio.h>
#ifndef readPort
# include "gpio_extr.h"
#endif
+#include "atomic_util.h"
#include "util.h"
#include "matrix.h"
#include "matrix_extr.h"
#include "debounce.h"
-#include "quantum.h"
#define ALWAYS_INLINE inline __attribute__((always_inline))
#define NO_INLINE __attribute__((noinline))
diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
index bca53da24c..25ecc668e5 100644
--- a/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
+++ b/keyboards/handwired/symmetric70_proto/matrix_fast/matrix_extension_74hc15x.c
@@ -16,6 +16,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// clang-format off
+#include "atomic_util.h"
+#include "gpio.h"
+#include "wait.h"
+
#if defined(MATRIX_EXTENSION_74HC157)
# define MATRIX_DEVICES MCU_GPIOa, MCU_GPIOb
# define IS_74HC15x(dev) ((dev)==MCU_GPIOa || (dev)==MCU_GPIOb)
@@ -47,9 +51,9 @@ static const pin_t sel_pins[] = { MATRIX_EXT_74HC15x };
LOCAL_FUNC ALWAYS_INLINE void select74HC15x(uint8_t devid);
LOCAL_FUNC
void select74HC15x(uint8_t devid) {
- writePin(sel_pins[0], devid&1);
+ gpio_write_pin(sel_pins[0], devid&1);
#if defined(MATRIX_EXTENSION_74HC153)
- writePin(sel_pins[1], devid&2);
+ gpio_write_pin(sel_pins[1], devid&2);
#endif
}
@@ -63,7 +67,7 @@ LOCAL_FUNC port_width_t readPortMultiplexer(uint8_t devid, pin_t port) {
#define readMatrixPort(dev, port) \
((dev) == MCU_GPIO)? readPort(port): (IS_74HC15x(dev))? readPortMultiplexer((dev)-MCU_GPIOa, port):0
-#define INIT_74HC15X(x) setPinOutput(x); writePinLow(x);
+#define INIT_74HC15X(x) gpio_set_pin_output(x); gpio_write_pin_low(x);
LOCAL_FUNC
void init_74hc15x(void) {
MAP(INIT_74HC15X, MATRIX_EXT_74HC15x)
diff --git a/keyboards/handwired/symmetric70_proto/proton_c/info.json b/keyboards/handwired/symmetric70_proto/proton_c/info.json
index a6f017ae75..1fd231bbc4 100644
--- a/keyboards/handwired/symmetric70_proto/proton_c/info.json
+++ b/keyboards/handwired/symmetric70_proto/proton_c/info.json
@@ -1,6 +1,4 @@
{
"keyboard_name": "Symmetric70 prototype proton-c",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C"
+ "development_board": "proton_c"
}
diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/keyboard.json
index 3f8427f3c8..e8cbe495b1 100644
--- a/keyboards/handwired/symmetry60/info.json
+++ b/keyboards/handwired/symmetry60/keyboard.json
@@ -28,6 +28,18 @@
"ws2812": {
"pin": "B1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/handwired/symmetry60/rules.mk b/keyboards/handwired/symmetry60/rules.mk
deleted file mode 100644
index a44795bae0..0000000000
--- a/keyboards/handwired/symmetry60/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes # Use link time optimization
diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/keyboard.json
index f25b079098..f65a3f087e 100644
--- a/keyboards/handwired/t111/info.json
+++ b/keyboards/handwired/t111/keyboard.json
@@ -8,13 +8,20 @@
"pid": "0x6FAA",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B15", "B11", "B10", "B1", "B0", "A10", "A9", "A7", "A6", "A5", "A4", "A8", "B13", "B14"],
"rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"]
},
"diode_direction": "ROW2COL",
- "processor": "STM32F103",
- "bootloader": "stm32duino",
+ "development_board": "bluepill",
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/t111/rules.mk b/keyboards/handwired/t111/rules.mk
deleted file mode 100644
index 2542c545bf..0000000000
--- a/keyboards/handwired/t111/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/technicpad/info.json b/keyboards/handwired/technicpad/keyboard.json
index 92a0be7f27..92a0be7f27 100644
--- a/keyboards/handwired/technicpad/info.json
+++ b/keyboards/handwired/technicpad/keyboard.json
diff --git a/keyboards/handwired/technicpad/rules.mk b/keyboards/handwired/technicpad/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/technicpad/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h
index 7c77f53a82..dcbcfeaaa8 100644
--- a/keyboards/handwired/tennie/config.h
+++ b/keyboards/handwired/tennie/config.h
@@ -17,8 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define RGBW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/handwired/tennie/info.json b/keyboards/handwired/tennie/keyboard.json
index 32198e1cf6..36c1266d50 100644
--- a/keyboards/handwired/tennie/info.json
+++ b/keyboards/handwired/tennie/keyboard.json
@@ -26,7 +26,17 @@
}
},
"ws2812": {
- "pin": "D1"
+ "pin": "D1",
+ "rgbw": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
},
"matrix_pins": {
"cols": ["D7", "E6", "B4", "B5"],
diff --git a/keyboards/handwired/tennie/rules.mk b/keyboards/handwired/tennie/rules.mk
deleted file mode 100644
index 477ce541fd..0000000000
--- a/keyboards/handwired/tennie/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/keyboard.json
index 5593be8bb7..1bf37da57b 100644
--- a/keyboards/handwired/terminus_mini/info.json
+++ b/keyboards/handwired/terminus_mini/keyboard.json
@@ -12,6 +12,14 @@
"term": 150,
"toggle": 1
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"],
"rows": ["B5", "B4", "D7", "D6"]
diff --git a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
index 5b0dc9f383..e6d8bb6f05 100644
--- a/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
+++ b/keyboards/handwired/terminus_mini/keymaps/default/keymap.c
@@ -201,11 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
};
-void persistant_default_layer_set(uint16_t default_layer) {
- eeconfig_update_default_layer(default_layer);
- default_layer_set(default_layer);
-}
-
// Cases to switch default layer to QWERTY, COLEMAK or DVORAK and to access ADJUST layer
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch (keycode) {
diff --git a/keyboards/handwired/terminus_mini/rules.mk b/keyboards/handwired/terminus_mini/rules.mk
deleted file mode 100644
index 304b8ba7b9..0000000000
--- a/keyboards/handwired/terminus_mini/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/keyboard.json
index 911c95426d..911c95426d 100644
--- a/keyboards/handwired/tkk/info.json
+++ b/keyboards/handwired/tkk/keyboard.json
diff --git a/keyboards/handwired/tkk/rules.mk b/keyboards/handwired/tkk/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/tkk/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/keyboard.json
index 92098b09c6..94ed022878 100644
--- a/keyboards/handwired/trackpoint/info.json
+++ b/keyboards/handwired/trackpoint/keyboard.json
@@ -15,6 +15,15 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "ps2": true,
+ "ps2_mouse": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/trackpoint/rules.mk b/keyboards/handwired/trackpoint/rules.mk
index ca3836ef06..74035c9903 100644
--- a/keyboards/handwired/trackpoint/rules.mk
+++ b/keyboards/handwired/trackpoint/rules.mk
@@ -1,15 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = no # Audio output
-
-PS2_MOUSE_ENABLE = yes
-PS2_ENABLE = yes
PS2_DRIVER = usart
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
index 321202383f..825c59ac72 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/keyboard.json
@@ -18,6 +18,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D3",
"bootmagic": {
"matrix": [4, 5]
@@ -28,6 +29,13 @@
},
"processor": "at90usb1286",
"bootloader": "atmel-dfu",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "pointing_device": true
+ },
"layouts": {
"LAYOUT_4x6_right": {
"layout": [
diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
index aabe18457a..0f3d0657aa 100644
--- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk
@@ -1,19 +1,2 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-RGB_MATRIX_ENABLE = no
-
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = yes
-
-SPLIT_KEYBOARD = yes
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
index eebc5d5546..eebc5d5546 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
index 92e0baace1..e6c0e42bde 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/keyboard.json
@@ -22,5 +22,8 @@
"split_count": [10, 10]
},
"processor": "atmega32u4",
- "bootloader": "atmel-dfu"
+ "bootloader": "atmel-dfu",
+ "build": {
+ "lto": true
+ }
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
deleted file mode 100644
index 16c76d7f49..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-LTO_ENABLE := yes
-RGBLIGHT_ENABLE = no
-OLED_ENABLE = no
-AUDIO_ENABLE = no
-ENCODER_ENABLE = no
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
index 3a7f97f8d2..a2818e7176 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h
@@ -26,8 +26,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_CHANNEL 1 // default: 2
#define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
-// #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+// #define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM3 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define DEBUG_LED_PIN C13
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
index eafb77fce2..499390c610 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/keyboard.json
@@ -12,6 +12,9 @@
"led_count": 20,
"split_count": [10, 10]
},
+ "audio": {
+ "driver": "dac_additive"
+ },
"ws2812": {
"pin": "A6",
"driver": "pwm"
@@ -21,6 +24,8 @@
{"pin_a": "A7", "pin_b": "A8"}
]
},
- "processor": "STM32F303",
- "bootloader": "stm32-dfu"
+ "development_board": "proton_c",
+ "features": {
+ "console": true
+ }
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
index ab601e31f9..22915ec000 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk
@@ -1,5 +1,3 @@
# KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE = yes
SERIAL_DRIVER = usart
-AUDIO_DRIVER = dac_additive
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
index 2ad18267ad..87f830e175 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h
@@ -27,8 +27,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2
#define WS2812_EXTERNAL_PULLUP
//#define WS2812_PWM_COMPLEMENTARY_OUTPUT // Define for a complementary timer output (TIMx_CHyN); omit for a normal timer output (TIMx_CHy).
-#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
-#define WS2812_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7 // DMA Stream for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
+#define WS2812_PWM_DMA_CHANNEL 3 // DMA Channel for TIMx_UP, see the respective reference manual for the appropriate values for your MCU.
#define WS2812_PWM_TARGET_PERIOD 800000
#define DEBUG_LED_PIN C13
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
index a0c3ee0f4e..dbacb1685c 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c
@@ -14,12 +14,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "quantum.h"
+#include "tractyl_manuform.h"
-void keyboard_pre_init_sub(void) { setPinInputHigh(A0); }
+void keyboard_pre_init_sub(void) { gpio_set_pin_input_high(A0); }
void matrix_scan_sub_kb(void) {
- if (!readPin(A0)) {
+ if (!gpio_read_pin(A0)) {
reset_keyboard();
}
}
@@ -44,7 +44,7 @@ __attribute__((weak)) void bootmagic_scan(void) {
}
#endif
- if (matrix_get_row(row) & (1 << col) || !readPin(A0)) {
+ if (matrix_get_row(row) & (1 << col) || !gpio_read_pin(A0)) {
eeconfig_disable();
bootloader_jump();
}
@@ -53,9 +53,9 @@ __attribute__((weak)) void bootmagic_scan(void) {
#ifdef USB_VBUS_PIN
bool usb_vbus_state(void) {
- setPinInputLow(USB_VBUS_PIN);
+ gpio_set_pin_input_low(USB_VBUS_PIN);
wait_us(5);
- return readPin(USB_VBUS_PIN);
+ return gpio_read_pin(USB_VBUS_PIN);
}
#endif
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
index e5a6dc6c7a..7182ee1701 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/keyboard.json
@@ -15,6 +15,9 @@
"build": {
"debounce_type": "asym_eager_defer_pk"
},
+ "audio": {
+ "driver": "pwm_hardware"
+ },
"ws2812": {
"pin": "A1",
"driver": "pwm"
@@ -24,7 +27,10 @@
{"pin_a": "A13", "pin_b": "A14"}
]
},
+ "development_board": "blackpill_f411",
"processor": "STM32F411",
"bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F411"
+ "features": {
+ "console": true
+ }
}
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
index 0c4b05ee7e..f26cbbced1 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk
@@ -1,6 +1,4 @@
KEYBOARD_SHARED_EP = yes
-CONSOLE_ENABLE = yes
MOUSE_SHARED_EP = yes
SERIAL_DRIVER = usart
-AUDIO_DRIVER = pwm_hardware
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
index eaaf00bbbd..b28f309fdb 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json
@@ -5,10 +5,19 @@
"device_version": "0.0.1"
},
"split": {
+ "enabled": true,
"bootmagic": {
"matrix": [6, 5]
}
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true,
+ "swap_hands": true,
+ "pointing_device": true
+ },
"layouts": {
"LAYOUT_5x6_right": {
"layout": [
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
index a689be3dd5..b7f7c949ec 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/rules.mk
@@ -1,21 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-SWAP_HANDS_ENABLE = yes
-
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = pmw3360
MOUSE_SHARED_EP = yes
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/tractyl_manuform/5x6_right/teensy2pp
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
index a131ac085b..a131ac085b 100644
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json
+++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/keyboard.json
diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/keyboard.json
index ea1b3e3530..e6941036f5 100644
--- a/keyboards/handwired/traveller/info.json
+++ b/keyboards/handwired/traveller/keyboard.json
@@ -15,6 +15,15 @@
"ws2812": {
"pin": "B2"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"],
"rows": ["D0", "D1", "D3", "D2"]
diff --git a/keyboards/handwired/traveller/rules.mk b/keyboards/handwired/traveller/rules.mk
deleted file mode 100644
index aa4c817d2a..0000000000
--- a/keyboards/handwired/traveller/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c
index 91c6f603b1..f18a64ca86 100644
--- a/keyboards/handwired/traveller/traveller.c
+++ b/keyboards/handwired/traveller/traveller.c
@@ -11,8 +11,8 @@ void matrix_init_kb(void) {
#endif
// Turn status LED on
- setPinOutput(C7);
- writePinHigh(C7);
+ gpio_set_pin_output(C7);
+ gpio_write_pin_high(C7);
matrix_init_user();
}
diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/keyboard.json
index 2e2fc6c81f..b87f476821 100644
--- a/keyboards/handwired/tritium_numpad/info.json
+++ b/keyboards/handwired/tritium_numpad/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0x6060",
"device_version": "0.0.3"
},
+ "features": {
+ "backlight": true,
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["F4", "F6", "B1", "B2"],
"rows": ["D1", "D0", "D4", "C6", "D7", "E6"]
diff --git a/keyboards/handwired/tritium_numpad/rules.mk b/keyboards/handwired/tritium_numpad/rules.mk
deleted file mode 100644
index ad6bc60f96..0000000000
--- a/keyboards/handwired/tritium_numpad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-RGBLIGHT_ENABLE = no # Enable keyboard underlight functionality
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-AUDIO_ENABLE = no
diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/keyboard.json
index 62c418c995..05fd05968a 100644
--- a/keyboards/handwired/tsubasa/info.json
+++ b/keyboards/handwired/tsubasa/keyboard.json
@@ -22,6 +22,21 @@
"ws2812": {
"pin": "D2"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "oled": true,
+ "rgblight": true,
+ "wpm": true
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["C6", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/tsubasa/rules.mk b/keyboards/handwired/tsubasa/rules.mk
deleted file mode 100644
index 5838d93ad5..0000000000
--- a/keyboards/handwired/tsubasa/rules.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-LTO_ENABLE = yes
-
-ENCODER_ENABLE = yes
-
-OLED_ENABLE = yes
-WPM_ENABLE = yes
diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/keyboard.json
index afd79a9bcc..27e0325f92 100644
--- a/keyboards/handwired/twadlee/tp69/info.json
+++ b/keyboards/handwired/twadlee/tp69/keyboard.json
@@ -15,6 +15,13 @@
"diode_direction": "COL2ROW",
"processor": "MKL26Z64",
"bootloader": "halfkay",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/twadlee/tp69/rules.mk b/keyboards/handwired/twadlee/tp69/rules.mk
index b73afc0e44..43b04f34f7 100644
--- a/keyboards/handwired/twadlee/tp69/rules.mk
+++ b/keyboards/handwired/twadlee/tp69/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-PS2_MOUSE_ENABLE = no
-
USE_CHIBIOS_CONTRIB = yes
-
diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/keyboard.json
index 24eb51d03c..f1cc2f5a96 100644
--- a/keyboards/handwired/twig/twig50/info.json
+++ b/keyboards/handwired/twig/twig50/keyboard.json
@@ -12,14 +12,21 @@
"tapping": {
"term": 150
},
+ "features": {
+ "audio": true,
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"],
"rows": ["B7", "B6", "B5", "B4"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
"debounce": 8,
"layouts": {
"LAYOUT_diag_4x14": {
diff --git a/keyboards/handwired/twig/twig50/rules.mk b/keyboards/handwired/twig/twig50/rules.mk
deleted file mode 100644
index 60962ea47d..0000000000
--- a/keyboards/handwired/twig/twig50/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = yes # Audio output
diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/keyboard.json
index 0b110c98bd..50ae033028 100644
--- a/keyboards/handwired/unicomp_mini_m/info.json
+++ b/keyboards/handwired/unicomp_mini_m/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": false,
+ "console": true,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "B7", "D5", "D4", "D3", "D2"],
"rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1"]
diff --git a/keyboards/handwired/unicomp_mini_m/rules.mk b/keyboards/handwired/unicomp_mini_m/rules.mk
deleted file mode 100644
index 7ae681a542..0000000000
--- a/keyboards/handwired/unicomp_mini_m/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/keyboard.json
index 171ae7bb02..acaca15f3b 100644
--- a/keyboards/handwired/unk/rev1/info.json
+++ b/keyboards/handwired/unk/rev1/keyboard.json
@@ -20,6 +20,7 @@
},
"diode_direction": "COL2ROW",
"split": {
+ "enabled": true,
"soft_serial_pin": "D0",
"matrix_pins": {
"right": {
@@ -30,6 +31,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "command": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/unk/rev1/rules.mk b/keyboards/handwired/unk/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/unk/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/unk/rules.mk b/keyboards/handwired/unk/rules.mk
index c8a36bee0f..d4536e0cbb 100644
--- a/keyboards/handwired/unk/rules.mk
+++ b/keyboards/handwired/unk/rules.mk
@@ -1,16 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
-SPLIT_KEYBOARD = yes
-
DEFAULT_FOLDER = handwired/unk/rev1
diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/keyboard.json
index 02802966b2..dd5746e884 100644
--- a/keyboards/handwired/uthol/rev1/info.json
+++ b/keyboards/handwired/uthol/rev1/keyboard.json
@@ -3,6 +3,17 @@
"usb": {
"device_version": "0.0.1"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"],
"rows": ["D1", "D0", "D4", "C6", "D7"]
diff --git a/keyboards/handwired/uthol/rev1/rules.mk b/keyboards/handwired/uthol/rev1/rules.mk
deleted file mode 100644
index c06a99e1e4..0000000000
--- a/keyboards/handwired/uthol/rev1/rules.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/keyboard.json
index 9185e97c43..95ca5946a9 100644
--- a/keyboards/handwired/uthol/rev2/info.json
+++ b/keyboards/handwired/uthol/rev2/keyboard.json
@@ -12,6 +12,18 @@
"ws2812": {
"pin": "E6"
},
+ "build": {
+ "lto": true
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": false,
+ "nkro": true,
+ "rgblight": true
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"],
"rows": ["B1", "F7", "F6", "F5", "F4"]
diff --git a/keyboards/handwired/uthol/rev2/rules.mk b/keyboards/handwired/uthol/rev2/rules.mk
deleted file mode 100644
index c6e22b8dd2..0000000000
--- a/keyboards/handwired/uthol/rev2/rules.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-NKRO_ENABLE = yes
-LTO_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/keyboard.json
index dbbce9139d..8d826772b0 100644
--- a/keyboards/handwired/uthol/rev3/info.json
+++ b/keyboards/handwired/uthol/rev3/keyboard.json
@@ -1,7 +1,10 @@
{
"keyboard_name": "UtholThree",
"usb": {
- "device_version": "0.0.3"
+ "device_version": "0.0.3",
+ "shared_endpoint": {
+ "keyboard": true
+ }
},
"rgblight": {
"led_count": 39,
@@ -37,7 +40,14 @@
{"pin_a": "C15", "pin_b": "C14", "resolution": 2}
]
},
- "processor": "STM32F401",
- "bootloader": "stm32-dfu",
- "board": "BLACKPILL_STM32_F401"
+ "development_board": "blackpill_f401",
+ "features": {
+ "bootmagic": true,
+ "nkro": true,
+ "oled": true,
+ "wpm": true,
+ "extrakey": true,
+ "encoder": true,
+ "rgblight": true
+ }
}
diff --git a/keyboards/handwired/uthol/rev3/rules.mk b/keyboards/handwired/uthol/rev3/rules.mk
deleted file mode 100644
index 1577cf8a77..0000000000
--- a/keyboards/handwired/uthol/rev3/rules.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes
-NKRO_ENABLE = yes
-KEYBOARD_SHARED_EP = yes
-OLED_ENABLE = yes
-WPM_ENABLE = yes
-EXTRAKEY_ENABLE = yes
-ENCODER_ENABLE = yes
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/keyboard.json
index 14c33f399f..c8b0141767 100644
--- a/keyboards/handwired/videowriter/info.json
+++ b/keyboards/handwired/videowriter/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x5657",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"]
diff --git a/keyboards/handwired/videowriter/rules.mk b/keyboards/handwired/videowriter/rules.mk
deleted file mode 100644
index 6e0404820c..0000000000
--- a/keyboards/handwired/videowriter/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/wabi/info.json b/keyboards/handwired/wabi/keyboard.json
index 8c833feeb4..26c82a209c 100644
--- a/keyboards/handwired/wabi/info.json
+++ b/keyboards/handwired/wabi/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xB07D",
"device_version": "0.0.2"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"],
"rows": ["D5", "F5", "F6", "F7", "B0"]
diff --git a/keyboards/handwired/wabi/rules.mk b/keyboards/handwired/wabi/rules.mk
deleted file mode 100644
index 309e55c9f4..0000000000
--- a/keyboards/handwired/wabi/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/keyboard.json
index 3a72e5d310..495d9a0376 100644
--- a/keyboards/handwired/wakizashi40/info.json
+++ b/keyboards/handwired/wakizashi40/keyboard.json
@@ -6,18 +6,12 @@
"bootloader": "atmel-dfu",
"diode_direction": "COL2ROW",
"features": {
- "audio": false,
- "backlight": false,
- "bluetooth": false,
"bootmagic": true,
"command": false,
"console": true,
"extrakey": true,
- "midi": false,
"mousekey": true,
- "nkro": true,
- "rgblight": false,
- "unicode": false
+ "nkro": true
},
"matrix_pins": {
"cols": ["F4", "F6", "F7", "B1", "B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
diff --git a/keyboards/handwired/wakizashi40/rules.mk b/keyboards/handwired/wakizashi40/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/wakizashi40/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/woodpad/info.json b/keyboards/handwired/woodpad/keyboard.json
index f3394897fc..3af8bd19df 100644
--- a/keyboards/handwired/woodpad/info.json
+++ b/keyboards/handwired/woodpad/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x6069",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "command": true,
+ "console": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B1", "B3", "B2", "B6"],
"rows": ["D1", "D0", "D4", "C6", "D7"]
diff --git a/keyboards/handwired/woodpad/rules.mk b/keyboards/handwired/woodpad/rules.mk
deleted file mode 100644
index fce764c22d..0000000000
--- a/keyboards/handwired/woodpad/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/woodpad/woodpad.c b/keyboards/handwired/woodpad/woodpad.c
index 71bc0ba71e..92b3131e7b 100644
--- a/keyboards/handwired/woodpad/woodpad.c
+++ b/keyboards/handwired/woodpad/woodpad.c
@@ -17,14 +17,14 @@
#include "woodpad.h"
void keyboard_pre_init_kb(void) {
- setPinOutput(F7);
+ gpio_set_pin_output(F7);
keyboard_pre_init_user();
}
inline void numlock_led_on(void) {
- writePinHigh(F7);
+ gpio_write_pin_high(F7);
}
inline void numlock_led_off(void) {
- writePinLow(F7);
+ gpio_write_pin_low(F7);
}
diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/keyboard.json
index 9bb1d9cd94..eceeb5c145 100644
--- a/keyboards/handwired/wulkan/info.json
+++ b/keyboards/handwired/wulkan/keyboard.json
@@ -14,9 +14,13 @@
"rows": ["B8", "A0", "A1", "A2"]
},
"diode_direction": "COL2ROW",
- "processor": "STM32F303",
- "bootloader": "stm32-dfu",
- "board": "QMK_PROTON_C",
+ "development_board": "proton_c",
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "nkro": true
+ },
"community_layouts": ["ortho_4x12"],
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x12"
diff --git a/keyboards/handwired/wulkan/rules.mk b/keyboards/handwired/wulkan/rules.mk
index e664c34540..934dd273a6 100644
--- a/keyboards/handwired/wulkan/rules.mk
+++ b/keyboards/handwired/wulkan/rules.mk
@@ -1,13 +1 @@
-# Build Options
-# change yes to no to disable
-#
-BACKLIGHT_ENABLE = no
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-AUDIO_ENABLE = no
-RGBLIGHT_ENABLE = no
NO_SUSPEND_POWER_DOWN = yes
diff --git a/keyboards/handwired/wwa/helios/info.json b/keyboards/handwired/wwa/helios/keyboard.json
index 64b2010396..64b2010396 100644
--- a/keyboards/handwired/wwa/helios/info.json
+++ b/keyboards/handwired/wwa/helios/keyboard.json
diff --git a/keyboards/handwired/wwa/helios/rules.mk b/keyboards/handwired/wwa/helios/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/wwa/helios/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/kepler/info.json b/keyboards/handwired/wwa/kepler/keyboard.json
index f962d632b4..f962d632b4 100644
--- a/keyboards/handwired/wwa/kepler/info.json
+++ b/keyboards/handwired/wwa/kepler/keyboard.json
diff --git a/keyboards/handwired/wwa/kepler/rules.mk b/keyboards/handwired/wwa/kepler/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/wwa/kepler/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/mercury/info.json b/keyboards/handwired/wwa/mercury/keyboard.json
index bb89858da2..bb89858da2 100644
--- a/keyboards/handwired/wwa/mercury/info.json
+++ b/keyboards/handwired/wwa/mercury/keyboard.json
diff --git a/keyboards/handwired/wwa/mercury/rules.mk b/keyboards/handwired/wwa/mercury/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/wwa/mercury/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank
diff --git a/keyboards/handwired/wwa/soyuz/info.json b/keyboards/handwired/wwa/soyuz/keyboard.json
index 9670f312a6..9670f312a6 100644
--- a/keyboards/handwired/wwa/soyuz/info.json
+++ b/keyboards/handwired/wwa/soyuz/keyboard.json
diff --git a/keyboards/handwired/wwa/soyuz/rules.mk b/keyboards/handwired/wwa/soyuz/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/wwa/soyuz/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/wwa/soyuzxl/info.json b/keyboards/handwired/wwa/soyuzxl/keyboard.json
index 9180344176..9180344176 100644
--- a/keyboards/handwired/wwa/soyuzxl/info.json
+++ b/keyboards/handwired/wwa/soyuzxl/keyboard.json
diff --git a/keyboards/handwired/wwa/soyuzxl/rules.mk b/keyboards/handwired/wwa/soyuzxl/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/wwa/soyuzxl/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/keyboard.json
index b8b45e5ee1..9f926a3602 100644
--- a/keyboards/handwired/xealous/rev1/info.json
+++ b/keyboards/handwired/xealous/rev1/keyboard.json
@@ -17,8 +17,20 @@
"rows": ["B5", "B4", "E6", "D7", "D4"]
},
"diode_direction": "COL2ROW",
+ "split": {
+ "enabled": true
+ },
"processor": "atmega32u4",
"bootloader": "caterina",
+ "features": {
+ "bootmagic": false,
+ "mousekey": false,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "audio": true
+ },
"layouts": {
"LAYOUT": {
"layout": [
diff --git a/keyboards/handwired/xealous/rev1/rules.mk b/keyboards/handwired/xealous/rev1/rules.mk
deleted file mode 100644
index e69de29bb2..0000000000
--- a/keyboards/handwired/xealous/rev1/rules.mk
+++ /dev/null
diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk
index aff4db8cfd..4a97d066df 100644
--- a/keyboards/handwired/xealous/rules.mk
+++ b/keyboards/handwired/xealous/rules.mk
@@ -1,17 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-AUDIO_ENABLE = yes # Audio output
-RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight.
-SPLIT_KEYBOARD = yes # Use shared split_common code
-
SRC += matrix.c
DEFAULT_FOLDER = handwired/xealous/rev1
diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/keyboard.json
index f027c7da1f..0658bb5233 100644
--- a/keyboards/handwired/z150/info.json
+++ b/keyboards/handwired/z150/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": false
+ },
"matrix_pins": {
"cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"],
"rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"]
diff --git a/keyboards/handwired/z150/rules.mk b/keyboards/handwired/z150/rules.mk
deleted file mode 100644
index 421d72570e..0000000000
--- a/keyboards/handwired/z150/rules.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = no # Commands for debug and configuration
-NKRO_ENABLE = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c
index a887a95bfd..ab6709eed7 100644
--- a/keyboards/handwired/z150/z150.c
+++ b/keyboards/handwired/z150/z150.c
@@ -17,13 +17,13 @@
#include "quantum.h"
void matrix_init_kb(void) {
- setPinOutput(NUM_LOCK_LED_PIN);
- setPinOutput(CAPS_LOCK_LED_PIN);
- setPinOutput(SCROLL_LOCK_LED_PIN);
+ gpio_set_pin_output(NUM_LOCK_LED_PIN);
+ gpio_set_pin_output(CAPS_LOCK_LED_PIN);
+ gpio_set_pin_output(SCROLL_LOCK_LED_PIN);
- writePinLow(NUM_LOCK_LED_PIN);
- writePinLow(CAPS_LOCK_LED_PIN);
- writePinLow(SCROLL_LOCK_LED_PIN);
+ gpio_write_pin_low(NUM_LOCK_LED_PIN);
+ gpio_write_pin_low(CAPS_LOCK_LED_PIN);
+ gpio_write_pin_low(SCROLL_LOCK_LED_PIN);
matrix_init_user();
}
@@ -31,9 +31,9 @@ void matrix_init_kb(void) {
bool led_update_kb(led_t led_state) {
bool res = led_update_user(led_state);
if(res) {
- writePin(NUM_LOCK_LED_PIN, !led_state.num_lock);
- writePin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
- writePin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
+ gpio_write_pin(NUM_LOCK_LED_PIN, !led_state.num_lock);
+ gpio_write_pin(CAPS_LOCK_LED_PIN, !led_state.caps_lock);
+ gpio_write_pin(SCROLL_LOCK_LED_PIN, !led_state.scroll_lock);
}
return res;
}
diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/keyboard.json
index 56b1b8f0cd..7ee2cd4774 100644
--- a/keyboards/handwired/zergo/info.json
+++ b/keyboards/handwired/zergo/keyboard.json
@@ -8,6 +8,14 @@
"pid": "0xB92B",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "command": true,
+ "console": false,
+ "extrakey": false,
+ "mousekey": false,
+ "nkro": true
+ },
"matrix_pins": {
"cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"],
"rows": ["B1", "D7", "C3", "D6", "D5", "D4"]
diff --git a/keyboards/handwired/zergo/rules.mk b/keyboards/handwired/zergo/rules.mk
deleted file mode 100644
index 7d0adddded..0000000000
--- a/keyboards/handwired/zergo/rules.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no # Mouse keys
-EXTRAKEY_ENABLE = no # Audio control and System control
-CONSOLE_ENABLE = no # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/handwired/ziyoulang_k3_mod/info.json b/keyboards/handwired/ziyoulang_k3_mod/keyboard.json
index 5d4ca7a254..5d4ca7a254 100644
--- a/keyboards/handwired/ziyoulang_k3_mod/info.json
+++ b/keyboards/handwired/ziyoulang_k3_mod/keyboard.json
diff --git a/keyboards/handwired/ziyoulang_k3_mod/rules.mk b/keyboards/handwired/ziyoulang_k3_mod/rules.mk
deleted file mode 100644
index 6e7633bfe0..0000000000
--- a/keyboards/handwired/ziyoulang_k3_mod/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally left blank