Skip to content

Commit

Permalink
Data-Driven Keyboard Conversions: I
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:

  - `ibm/model_m/mschwingen`
  - `ibm/model_m/teensypp`
  - `ibm/model_m_4th_gen/overnumpad_1xb`
  - `ibnuda/squiggle/rev1`
  - `idobao/id42`
  - `idobao/id61`
  - `idobao/id63`
  - `idobao/id67`
  - `idobao/id80/v3/ansi`
  - `idobao/id87/v2`
  - `idobao/montex/v2`
  - `ingrained`
  - `inland/kb83`
  - `input_club/ergodox_infinity`
  • Loading branch information
noroadsleft committed Apr 16, 2024
1 parent 130a2a3 commit 35060f5
Show file tree
Hide file tree
Showing 28 changed files with 81 additions and 148 deletions.
12 changes: 12 additions & 0 deletions keyboards/ibm/model_m/mschwingen/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,18 @@
},
"processor": "atmega32u4",
"bootloader": "lufa-dfu",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"console": true,
"command": true,
"key_lock": true,
"dynamic_macro": true
},
"build": {
"lto": true
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
20 changes: 1 addition & 19 deletions keyboards/ibm/model_m/mschwingen/rules.mk
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
# 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

CUSTOM_MATRIX = lite
KEY_LOCK_ENABLE = yes

DYNAMIC_MACRO_ENABLE = yes

UART_DEBUG = no

SRC += matrix.c
UART_DRIVER_REQUIRED = yes
SPI_DRIVER_REQUIRED = yes

OPT_DEFS += -DSLEEP_LED_ENABLE # we need our own sleep callbacks to turn of WS2812 LEDs

LTO_ENABLE = yes
OPT_DEFS += -DSLEEP_LED_ENABLE

DEFAULT_FOLDER = ibm/model_m/mschwingen/led_wired
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
"diode_direction": "ROW2COL",
"processor": "at90usb1286",
"bootloader": "halfkay",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": false
},
"layouts": {
"LAYOUT": {
"layout": [
Expand Down
12 changes: 0 additions & 12 deletions keyboards/ibm/model_m/teensypp/rules.mk

This file was deleted.

11 changes: 10 additions & 1 deletion keyboards/ibm/model_m_4th_gen/overnumpad_1xb/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"usb": {
"vid": "0x16C0",
"pid": "0x27DB",
"device_version": "0.0.1"
"device_version": "0.0.1",
"shared_endpoint": {
"keyboard": true
}
},
"indicators": {
"caps_lock": "C11",
Expand All @@ -16,6 +19,12 @@
"processor": "STM32F446", // RET6
"bootloader": "stm32-dfu",
"diode_direction": "ROW2COL",
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"haptic": true
},
"matrix_pins": {
// All pins in order from left-to-right, as seen on the keyboard:
// C3, C2, C1, C0, A3, A4, A5, A6, A7, C4, C5, B0, B1, B10, B12, B13, B14, B15, C6, C7, C8, C9, A8, A9, A10,
Expand Down
16 changes: 0 additions & 16 deletions keyboards/ibm/model_m_4th_gen/overnumpad_1xb/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
# 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
ENCODER_ENABLE = no # Enable rotary encoder support
AUDIO_ENABLE = no # Audio output
KEYBOARD_SHARED_EP = yes # Free up some extra endpoints - needed if console+mouse+extra

HAPTIC_ENABLE = yes
HAPTIC_DRIVER = solenoid
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"features": {
"bootmagic": false,
"mousekey": false,
"extrakey": false,
"console": true
},
"community_layouts": ["split_3x5_3"],
"layouts": {
"LAYOUT": {
Expand Down
12 changes: 0 additions & 12 deletions keyboards/ibnuda/squiggle/rev1/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"extrakey": true,
"console": false,
"command": false,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "B3"
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id42/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "F0"
Expand Down
5 changes: 0 additions & 5 deletions keyboards/idobao/id61/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "B7"
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id63/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"extrakey": true,
"command": false,
"console": false,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "F0"
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id67/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"extrakey": true,
"console": false,
"command": false,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"rgb_matrix": {
"animations": {
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id80/v3/ansi/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"extrakey": true,
"console": false,
"command": false,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "E2"
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/id87/v2/rules.mk

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
"console": false,
"extrakey": true,
"mousekey": true,
"nkro": true
"nkro": true,
"rgb_matrix": true
},
"ws2812": {
"pin": "B1"
Expand Down
4 changes: 0 additions & 4 deletions keyboards/idobao/montex/v2/rules.mk

This file was deleted.

12 changes: 11 additions & 1 deletion keyboards/ingrained/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@
"usb": {
"vid": "0xB33F",
"pid": "0x58E4",
"device_version": "0.0.1"
"device_version": "0.0.1",
"no_startup_check": true
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"unicode": true
},
"build": {
"lto": true
},
"community_layouts": ["split_3x5_3", "split_3x6_3"],
"layouts": {
"LAYOUT_split_3x6_3": {
Expand Down
15 changes: 0 additions & 15 deletions keyboards/ingrained/rules.mk
Original file line number Diff line number Diff line change
@@ -1,19 +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 = 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
UNICODE_ENABLE = yes
CUSTOM_MATRIX = lite
NO_USB_STARTUP_CHECK = yes
LTO_ENABLE = yes

SRC += matrix.c
I2C_DRIVER_REQUIRED = yes
9 changes: 9 additions & 0 deletions keyboards/inland/kb83/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,15 @@
},
"processor": "WB32FQ95",
"bootloader": "wb32-dfu",
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"nkro": true,
"rgb_matrix": true,
"dip_switch": true,
"encoder": true
},
"matrix_pins": {
"cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"],
"rows": ["B15", "C6", "C7", "C8", "C9", "A8"]
Expand Down
18 changes: 1 addition & 17 deletions keyboards/inland/kb83/rules.mk
Original file line number Diff line number Diff line change
@@ -1,17 +1 @@
# 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
KEYBOARD_SHARED_EP = no
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 # DPI Switch
ENCODER_ENABLE = yes
RGB_MATRIX_ENABLE = yes
#RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED
#RGB_MATRIX_CUSTOM_USER = yes
12 changes: 12 additions & 0 deletions keyboards/input_club/ergodox_infinity/info.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,18 @@
},
"processor": "MK20DX256",
"bootloader": "kiibohd",
"features": {
"bootmagic": false,
"mousekey": true,
"extrakey": true,
"command": true,
"nkro": true,
"led_matrix": true,
"unicode": true,
"swap_hands": true,
"sleep_led": true,
"st7565": true
},
"board": "IC_TEENSY_3_1",
"tapping": {
"toggle": 1
Expand Down
19 changes: 0 additions & 19 deletions keyboards/input_club/ergodox_infinity/rules.mk
Original file line number Diff line number Diff line change
@@ -1,20 +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 = yes # Enable N-Key Rollover
UNICODE_ENABLE = yes # Unicode
SWAP_HANDS_ENABLE= yes # Allow swapping hands of keyboard
SLEEP_LED_ENABLE = yes

RGBLIGHT_ENABLE = no

SERIAL_DRIVER = usart

ST7565_ENABLE = yes

LED_MATRIX_ENABLE = yes

0 comments on commit 35060f5

Please sign in to comment.