Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Data-Driven conversion pt2 #60

Merged
merged 11 commits into from
May 14, 2024
Merged

Data-Driven conversion pt2 #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dd64e3a
charybdis/3x5: dd conversion pt2
Apr 30, 2024
38f0bfb
charybdis/3x6: dd conversion pt2
Apr 30, 2024
daeafea
charybdis/4x6: dd conversion pt2
Apr 30, 2024
a6ff8ef
dilemma/3x5_2: dd conversion pt2
Apr 30, 2024
8c50770
dilemma/3x5_3: dd conversion pt2
Apr 30, 2024
ba8094d
dilemma/3x5_3: fix double definition of encoders (info.json vs config.h)
Apr 30, 2024
99c2a7b
dilemma/4x6_4: dd conversion pt2
Apr 30, 2024
7345d6a
dilemma/4x6_4: fix double definition of split transport (info.json vs…
Apr 30, 2024
9b005f5
scylla: dd conversion pt2
Apr 30, 2024
e290728
skeletyl: dd conversion pt2
Apr 30, 2024
86374b0
tbkmini: dd conversion pt2
Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions keyboards/bastardkb/charybdis/3x5/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true,
"pointing_device": true
}
"ws2812": {
"pin": "GP0",
Expand Down
2 changes: 0 additions & 2 deletions keyboards/bastardkb/charybdis/3x5/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360

SERIAL_DRIVER = vendor
3 changes: 3 additions & 0 deletions keyboards/bastardkb/charybdis/3x6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,10 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true,
"pointing_device": true
}
"ws2812": {
"pin": "GP0",
Expand Down
2 changes: 0 additions & 2 deletions keyboards/bastardkb/charybdis/3x6/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360

SERIAL_DRIVER = vendor
3 changes: 3 additions & 0 deletions keyboards/bastardkb/charybdis/4x6/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true,
"pointing_device": true,
}
"ws2812": {
"pin": "GP0",
Expand Down
2 changes: 0 additions & 2 deletions keyboards/bastardkb/charybdis/4x6/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

POINTING_DEVICE_ENABLE = yes # Enable trackball
POINTING_DEVICE_DRIVER = pmw3360

SERIAL_DRIVER = vendor
6 changes: 6 additions & 0 deletions keyboards/bastardkb/dilemma/3x5_2/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
"usb": {
"device_version": "1.0.0",
"pid": "0x1835"
},
"features": {
"bootmagic": true,
"mousekey": true,
"extrakey": true,
"pointing_device": true
},
"matrix_pins": {
"cols": ["GP8", "GP9", "GP7", "GP6", "GP27"],
Expand Down
12 changes: 0 additions & 12 deletions keyboards/bastardkb/dilemma/3x5_2/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,12 @@
# 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

AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = no # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = no # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix functionality

SERIAL_DRIVER = vendor

POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi # Assembled version uses SPI.

SPLIT_KEYBOARD = yes
6 changes: 0 additions & 6 deletions keyboards/bastardkb/dilemma/3x5_3/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@
#define CRC8_USE_TABLE
#define CRC8_OPTIMIZE_SPEED

/* Encoders. */
#define ENCODERS_PAD_A \
{ GP25 }
#define ENCODERS_PAD_B \
{ GP24 }

/* Cirque trackpad over SPI. */
#define SPI_DRIVER SPID0
#define SPI_SCK_PIN GP22
Expand Down
1 change: 1 addition & 0 deletions keyboards/bastardkb/dilemma/3x5_3/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"pointing_device": true,
"caps_word": true,
"tri_layer": true
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/dilemma/3x5_3/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
SERIAL_DRIVER = vendor

POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
3 changes: 0 additions & 3 deletions keyboards/bastardkb/dilemma/4x6_4/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,5 @@
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U

/* RGB matrix support. */
#define SPLIT_TRANSPORT_MIRROR

// Reduce soft serial speed: Work around rp2040 issues
#define SELECT_SOFT_SERIAL_SPEED 4
1 change: 1 addition & 0 deletions keyboards/bastardkb/dilemma/4x6_4/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"mousekey": true,
"nkro": true,
"rgb_matrix": true,
"pointing_device": true,
"caps_word": true,
"tri_layer": true
},
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/dilemma/4x6_4/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
SERIAL_DRIVER = vendor

POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = cirque_pinnacle_spi
2 changes: 2 additions & 0 deletions keyboards/bastardkb/scylla/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true
}
"ws2812": {
"pin": "GP0",
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/scylla/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

Expand Down
2 changes: 2 additions & 0 deletions keyboards/bastardkb/skeletyl/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true
}
"ws2812": {
"pin": "GP0",
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/skeletyl/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

Expand Down
2 changes: 2 additions & 0 deletions keyboards/bastardkb/tbkmini/info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@
},
"features": {
"bootmagic": true,
"mousekey": false,
"extrakey": true,
"rgb_matrix": true
}
"ws2812": {
"pin": "GP0",
Expand Down
1 change: 0 additions & 1 deletion keyboards/bastardkb/tbkmini/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
AUDIO_SUPPORTED = no # Audio is not supported
RGB_MATRIX_SUPPORTED = yes # RGB matrix is supported and enabled by default
RGBLIGHT_SUPPORTED = yes # RGB underglow is supported, but not enabled by default
RGB_MATRIX_ENABLE = yes # Enable keyboard RGB matrix functionality

SPLIT_KEYBOARD = yes

Expand Down
Loading