diff options
author | Ryan <fauxpark@gmail.com> | 2023-03-11 05:41:58 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-11 05:41:58 +1100 |
commit | e933e0411f442fa411d3d5ec488180fee241e2ef (patch) | |
tree | f091f00a1408d752389385ff793c2878ec99e368 /keyboards/spaceholdings | |
parent | 1022afa6c24a64c78d1c9be99a695ff5335876f7 (diff) |
Move matrix config to info.json, part 5 (#20003)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/spaceholdings')
-rwxr-xr-x | keyboards/spaceholdings/nebula12/config.h | 7 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula12/info.json | 5 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula12b/config.h | 7 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula12b/info.json | 5 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula68/config.h | 8 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula68/info.json | 5 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula68b/config.h | 7 | ||||
-rwxr-xr-x | keyboards/spaceholdings/nebula68b/info.json | 5 |
8 files changed, 20 insertions, 29 deletions
diff --git a/keyboards/spaceholdings/nebula12/config.h b/keyboards/spaceholdings/nebula12/config.h index fb56b1ddda..8199836860 100755 --- a/keyboards/spaceholdings/nebula12/config.h +++ b/keyboards/spaceholdings/nebula12/config.h @@ -24,13 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* LSE clock */ #define STM32_LSECLK 32768 -#define MATRIX_ROW_PINS { A8, C15, A0, A1 } -#define MATRIX_COL_PINS { A9, C13, C14 } -// To enable debugger set A13 A14 -> A5 A7 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE diff --git a/keyboards/spaceholdings/nebula12/info.json b/keyboards/spaceholdings/nebula12/info.json index fac12196b1..898a6ea11e 100755 --- a/keyboards/spaceholdings/nebula12/info.json +++ b/keyboards/spaceholdings/nebula12/info.json @@ -8,6 +8,11 @@ "pid": "0x5337", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "C13", "C14"], + "rows": ["A8", "C15", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { diff --git a/keyboards/spaceholdings/nebula12b/config.h b/keyboards/spaceholdings/nebula12b/config.h index 9c44c01b7a..0928d190df 100755 --- a/keyboards/spaceholdings/nebula12b/config.h +++ b/keyboards/spaceholdings/nebula12b/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B7, B4, F7, F6 } -#define MATRIX_COL_PINS { F4, F5, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB options */ #define RGB_DI_PIN D5 diff --git a/keyboards/spaceholdings/nebula12b/info.json b/keyboards/spaceholdings/nebula12b/info.json index 400e5790c9..8d5af9da50 100755 --- a/keyboards/spaceholdings/nebula12b/info.json +++ b/keyboards/spaceholdings/nebula12b/info.json @@ -8,6 +8,11 @@ "pid": "0x5332", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "D7"], + "rows": ["B7", "B4", "F7", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/spaceholdings/nebula68/config.h b/keyboards/spaceholdings/nebula68/config.h index 5e9d0a58e5..a3b44e4afe 100755 --- a/keyboards/spaceholdings/nebula68/config.h +++ b/keyboards/spaceholdings/nebula68/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 } -#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 } -// To enable debugger set A13 A14 -> A5 A7 - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/spaceholdings/nebula68/info.json b/keyboards/spaceholdings/nebula68/info.json index 77bda023d3..9ee3469f0d 100755 --- a/keyboards/spaceholdings/nebula68/info.json +++ b/keyboards/spaceholdings/nebula68/info.json @@ -8,6 +8,11 @@ "pid": "0x5336", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A13", "A10", "A9", "A14", "A15", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3", "A5"], + "rows": ["B3", "B4", "B5", "A8", "A4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/spaceholdings/nebula68b/config.h b/keyboards/spaceholdings/nebula68b/config.h index ee00fb233c..08ce4cb92d 100755 --- a/keyboards/spaceholdings/nebula68b/config.h +++ b/keyboards/spaceholdings/nebula68b/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D4, D6, D7, B4, E6 } -#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B5, B6, C6, C7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB options */ #define RGB_DI_PIN B7 diff --git a/keyboards/spaceholdings/nebula68b/info.json b/keyboards/spaceholdings/nebula68b/info.json index b1ca0f0fd0..ef5d1b6b9c 100755 --- a/keyboards/spaceholdings/nebula68b/info.json +++ b/keyboards/spaceholdings/nebula68b/info.json @@ -8,6 +8,11 @@ "pid": "0x5338", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "D2", "D3", "D5", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["D4", "D6", "D7", "B4", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { |