Skip to content

Commit

Permalink
Data-Driven Keyboard Conversions: K, Part 4
Browse files Browse the repository at this point in the history
Converts `rules.mk` entries to data-driven where applicable. Renames
`info.json` to `keyboard.json` in instances where `rules.mk` can be
safely deleted.

Affects:

  - `keyboardio/model01`
  - `keycapsss/plaid_pad`
  - `keycapsss/plaid_pad/rev1`
  - `keycapsss/plaid_pad/rev2`
  - `keycapsss/plaid_pad/rev3`
  - `keychron/q10/ansi_encoder`
  - `keychron/q10/iso_encoder`
  - `keychron/q12/ansi_encoder`
  - `keychron/q12/iso_encoder`
  - `keychron/q6/ansi`
  - `keychron/q6/ansi_encoder`
  - `keychron/q6/iso`
  - `keychron/q6/iso_encoder`
  - `keychron/q65/ansi_encoder`
  - `keychron/v1/ansi`
  - `keychron/v1/ansi_encoder`
  - `keychron/v1/iso`
  - `keychron/v1/iso_encoder`
  - `keychron/v1/jis`
  - `keychron/v1/jis_encoder`
  - `keychron/v10/ansi_encoder`
  - `keychron/v10/iso_encoder`
  - `keychron/v3/ansi_encoder`
  - `keychron/v3/iso_encoder`
  - `keychron/v3/jis_encoder`
  - `keychron/v5/ansi`
  - `keychron/v5/ansi_encoder`
  - `keychron/v5/iso`
  - `keychron/v5/iso_encoder`
  - `keychron/v6/ansi`
  - `keychron/v6/ansi_encoder`
  - `keychron/v6/iso`
  - `keychron/v6/iso_encoder`
  - `keygem/kg60ansi`
  - `keygem/kg65rgbv2`
  - `keyhive/honeycomb`
  - `keyhive/lattice60`
  - `keyhive/navi10/rev0`
  - `keyhive/navi10/rev2`
  - `keyhive/navi10/rev3`
  - `keyhive/uno/rev1`
  - `keyhive/uno/rev2`
  • Loading branch information
noroadsleft committed Apr 21, 2024
1 parent 5ab3b27 commit 7eafce5
Show file tree
Hide file tree
Showing 83 changed files with 354 additions and 579 deletions.
7 changes: 7 additions & 0 deletions keyboards/keyboardio/model01/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,13 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"console": true,
"rgb_matrix": true
},
"debounce": 0,
"layouts": {
"LAYOUT": {
Expand Down
13 changes: 0 additions & 13 deletions keyboards/keyboardio/model01/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +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 = no # Commands for debug and configuration
NKRO_ENABLE = no # Enable N-Key Rollover

CUSTOM_MATRIX = yes
I2C_DRIVER_REQUIRED = yes
SRC += leds.c \
matrix.c

# You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
8 changes: 0 additions & 8 deletions keyboards/keycapsss/plaid_pad/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,6 @@
"qmk": {
"tap_keycode_delay": 60
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false
},
"matrix_pins": {
"cols": ["B0", "D7", "D6", "D5"],
"rows": ["C0", "C1", "C2", "C3"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,14 @@
{"pin_a": "D1", "pin_b": "D0"},
{"pin_a": "B2", "pin_b": "B1"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true
}
}
1 change: 0 additions & 1 deletion keyboards/keycapsss/plaid_pad/rev1/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,14 @@
{"pin_a": "B4", "pin_b": "B3"},
{"pin_a": "D4", "pin_b": "B5"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true
}
}
1 change: 0 additions & 1 deletion keyboards/keycapsss/plaid_pad/rev2/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,15 @@
{"pin_a": "B4", "pin_b": "B3"},
{"pin_a": "D4", "pin_b": "B5"}
]
},
"features": {
"bootmagic": true,
"command": false,
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": false,
"encoder": true,
"oled": true
}
}
2 changes: 0 additions & 2 deletions keyboards/keycapsss/plaid_pad/rev3/rules.mk

This file was deleted.

9 changes: 9 additions & 0 deletions keyboards/keychron/q10/ansi_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_ansi_89": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q10/ansi_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
9 changes: 9 additions & 0 deletions keyboards/keychron/q10/iso_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_iso_90": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q10/iso_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
9 changes: 9 additions & 0 deletions keyboards/keychron/q12/ansi_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_ansi_103": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q12/ansi_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
9 changes: 9 additions & 0 deletions keyboards/keychron/q12/iso_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"layouts": {
"LAYOUT_iso_104": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q12/iso_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
11 changes: 11 additions & 0 deletions keyboards/keychron/q6/ansi/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"dip_switch": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT_ansi_108": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q6/ansi/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
12 changes: 12 additions & 0 deletions keyboards/keychron/q6/ansi_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT_ansi_109": {
"layout": [
Expand Down
17 changes: 0 additions & 17 deletions keyboards/keychron/q6/ansi_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,20 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
11 changes: 11 additions & 0 deletions keyboards/keychron/q6/iso/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,17 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"dip_switch": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT_iso_109": {
"layout": [
Expand Down
16 changes: 0 additions & 16 deletions keyboards/keychron/q6/iso/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
12 changes: 12 additions & 0 deletions keyboards/keychron/q6/iso_encoder/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@
},
"processor": "STM32L432",
"bootloader": "stm32-dfu",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"encoder": true,
"dip_switch": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT_iso_110": {
"layout": [
Expand Down
17 changes: 0 additions & 17 deletions keyboards/keychron/q6/iso_encoder/rules.mk
Original file line number Diff line number Diff line change
@@ -1,20 +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 = no # Console for debug
COMMAND_ENABLE = no # Commands for debug and configuration
NKRO_ENABLE = yes # Enable USB 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 # Enable Encoder
DIP_SWITCH_ENABLE = yes
RGB_MATRIX_ENABLE = yes
LTO_ENABLE = yes

# custom matrix setup
CUSTOM_MATRIX = lite

Expand Down
Loading

0 comments on commit 7eafce5

Please sign in to comment.