From 56555c61e1396a0b1f85105abe78f0a2b3a7c4f3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 10 Jan 2023 13:48:20 +1100 Subject: Migrate `LAYOUTS` to data driven (#19541) * Migrate `LAYOUTS` to data driven, 0-9 * Migrate `LAYOUTS` to data driven, A * Migrate `LAYOUTS` to data driven, B * Migrate `LAYOUTS` to data driven, C * Migrate `LAYOUTS` to data driven, D * Migrate `LAYOUTS` to data driven, E * Migrate `LAYOUTS` to data driven, F * Migrate `LAYOUTS` to data driven, G * Migrate `LAYOUTS` to data driven, H * Migrate `LAYOUTS` to data driven, handwired * Migrate `LAYOUTS` to data driven, I * Migrate `LAYOUTS` to data driven, J * Migrate `LAYOUTS` to data driven, K * Migrate `LAYOUTS` to data driven, L * Migrate `LAYOUTS` to data driven, M * Migrate `LAYOUTS` to data driven, N * Migrate `LAYOUTS` to data driven, O * Migrate `LAYOUTS` to data driven, P * Migrate `LAYOUTS` to data driven, Q * Migrate `LAYOUTS` to data driven, R * Migrate `LAYOUTS` to data driven, S * Migrate `LAYOUTS` to data driven, T * Migrate `LAYOUTS` to data driven, U * Migrate `LAYOUTS` to data driven, V * Migrate `LAYOUTS` to data driven, W * Migrate `LAYOUTS` to data driven, X * Migrate `LAYOUTS` to data driven, Y * Migrate `LAYOUTS` to data driven, Z --- keyboards/pabile/p20/info.json | 1 + keyboards/pabile/p20/ver1/rules.mk | 2 -- keyboards/pabile/p20/ver2/rules.mk | 2 -- keyboards/pabile/p40/info.json | 1 + keyboards/pabile/p40/rules.mk | 2 -- 5 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/pabile') diff --git a/keyboards/pabile/p20/info.json b/keyboards/pabile/p20/info.json index e1fbb231ce..08288d0c5d 100644 --- a/keyboards/pabile/p20/info.json +++ b/keyboards/pabile/p20/info.json @@ -6,6 +6,7 @@ "vid": "0x6666", "pid": "0x6667" }, + "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { "layout": [ diff --git a/keyboards/pabile/p20/ver1/rules.mk b/keyboards/pabile/p20/ver1/rules.mk index 2fc8c8885b..8d59bcc03e 100644 --- a/keyboards/pabile/p20/ver1/rules.mk +++ b/keyboards/pabile/p20/ver1/rules.mk @@ -20,5 +20,3 @@ AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes # Unicode IOS_DEVICE_ENABLE = no # connect to IOS Device ENCODER_ENABLE = yes - -LAYOUTS = ortho_5x4 numpad_5x4 diff --git a/keyboards/pabile/p20/ver2/rules.mk b/keyboards/pabile/p20/ver2/rules.mk index fc387fabe6..93de3f1243 100644 --- a/keyboards/pabile/p20/ver2/rules.mk +++ b/keyboards/pabile/p20/ver2/rules.mk @@ -20,5 +20,3 @@ AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes # Unicode IOS_DEVICE_ENABLE = no # connect to IOS Device ENCODER_ENABLE = no - -LAYOUTS = ortho_5x4 numpad_5x4 diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index ee7534c071..42e4dcd6b5 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -8,6 +8,7 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/pabile/p40/rules.mk b/keyboards/pabile/p40/rules.mk index 19525f4b37..7293fc306d 100644 --- a/keyboards/pabile/p40/rules.mk +++ b/keyboards/pabile/p40/rules.mk @@ -18,5 +18,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output UNICODE_ENABLE = yes # Unicode IOS_DEVICE_ENABLE = no # connect to IOS Device - -LAYOUTS = ortho_4x10 -- cgit v1.2.3 From f6dd8dea2e493dc549a60fee99de871c4088d09a Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Tue, 31 Jan 2023 06:03:30 +1100 Subject: Remove usages of config_common.h from config.h files. (#19714) --- keyboards/pabile/p18/config.h | 1 - keyboards/pabile/p20/ver1/config.h | 1 - keyboards/pabile/p20/ver2/config.h | 1 - keyboards/pabile/p40/config.h | 1 - keyboards/pabile/p40_ortho/config.h | 1 - keyboards/pabile/p42/config.h | 1 - 6 files changed, 6 deletions(-) (limited to 'keyboards/pabile') diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h index a13313413d..3ccd8c14a0 100644 --- a/keyboards/pabile/p18/config.h +++ b/keyboards/pabile/p18/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h index 231e491d9b..b1dd19db98 100644 --- a/keyboards/pabile/p20/ver1/config.h +++ b/keyboards/pabile/p20/ver1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h index 13bce5132d..ec770be66b 100644 --- a/keyboards/pabile/p20/ver2/config.h +++ b/keyboards/pabile/p20/ver2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h index f90aefef0c..ed86969299 100644 --- a/keyboards/pabile/p40/config.h +++ b/keyboards/pabile/p40/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h index 5a8c1625d5..0ddcdb1f9b 100644 --- a/keyboards/pabile/p40_ortho/config.h +++ b/keyboards/pabile/p40_ortho/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h index 0a6fe4a2fc..372ec60d37 100644 --- a/keyboards/pabile/p42/config.h +++ b/keyboards/pabile/p42/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" /* key matrix size */ #define MATRIX_ROWS 4 -- cgit v1.2.3 From f9aeea64c1f85d388485503e52035b5f7533ed26 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 8 Feb 2023 18:41:46 +1100 Subject: Migrate `MCU` and `BOOTLOADER` to data-driven (#19529) --- keyboards/pabile/p18/info.json | 2 ++ keyboards/pabile/p18/rules.mk | 6 ------ keyboards/pabile/p20/ver1/info.json | 4 +++- keyboards/pabile/p20/ver1/rules.mk | 6 ------ keyboards/pabile/p20/ver2/info.json | 4 +++- keyboards/pabile/p20/ver2/rules.mk | 6 ------ keyboards/pabile/p40/info.json | 2 ++ keyboards/pabile/p40/rules.mk | 6 ------ keyboards/pabile/p40_ortho/info.json | 2 ++ keyboards/pabile/p40_ortho/rules.mk | 6 ------ keyboards/pabile/p42/info.json | 2 ++ keyboards/pabile/p42/rules.mk | 6 ------ 12 files changed, 14 insertions(+), 38 deletions(-) (limited to 'keyboards/pabile') diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index d6338182c6..ce40842afe 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -8,6 +8,8 @@ "pid": "0x6668", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pabile/p18/rules.mk b/keyboards/pabile/p18/rules.mk index 9c9341f36a..9d58ddf305 100644 --- a/keyboards/pabile/p18/rules.mk +++ b/keyboards/pabile/p18/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json index 18b5e4bd2b..cea8ee87a0 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/info.json @@ -2,5 +2,7 @@ "keyboard_name": "P20 ver1", "usb": { "device_version": "0.0.1" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/pabile/p20/ver1/rules.mk b/keyboards/pabile/p20/ver1/rules.mk index 8d59bcc03e..8341cf19a2 100644 --- a/keyboards/pabile/p20/ver1/rules.mk +++ b/keyboards/pabile/p20/ver1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p20/ver2/info.json b/keyboards/pabile/p20/ver2/info.json index dae1f84edb..d3c8d8aafc 100644 --- a/keyboards/pabile/p20/ver2/info.json +++ b/keyboards/pabile/p20/ver2/info.json @@ -2,5 +2,7 @@ "keyboard_name": "P20 ver2", "usb": { "device_version": "0.0.2" - } + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/pabile/p20/ver2/rules.mk b/keyboards/pabile/p20/ver2/rules.mk index 93de3f1243..58a6708914 100644 --- a/keyboards/pabile/p20/ver2/rules.mk +++ b/keyboards/pabile/p20/ver2/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p40/info.json b/keyboards/pabile/p40/info.json index 42e4dcd6b5..703a3b1f80 100644 --- a/keyboards/pabile/p40/info.json +++ b/keyboards/pabile/p40/info.json @@ -8,6 +8,8 @@ "pid": "0x6666", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "community_layouts": ["ortho_4x10"], "layouts": { "LAYOUT_ortho_4x10": { diff --git a/keyboards/pabile/p40/rules.mk b/keyboards/pabile/p40/rules.mk index 7293fc306d..9871ad5be7 100644 --- a/keyboards/pabile/p40/rules.mk +++ b/keyboards/pabile/p40/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p40_ortho/info.json b/keyboards/pabile/p40_ortho/info.json index a630973622..72cfe178b1 100644 --- a/keyboards/pabile/p40_ortho/info.json +++ b/keyboards/pabile/p40_ortho/info.json @@ -7,6 +7,8 @@ "pid": "0x6669", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT_ortho_4x10": { "layout": [ diff --git a/keyboards/pabile/p40_ortho/rules.mk b/keyboards/pabile/p40_ortho/rules.mk index 7293fc306d..9871ad5be7 100644 --- a/keyboards/pabile/p40_ortho/rules.mk +++ b/keyboards/pabile/p40_ortho/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json index 5c1c2c8589..f1ef5eda34 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/info.json @@ -8,6 +8,8 @@ "pid": "0x6670", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/pabile/p42/rules.mk b/keyboards/pabile/p42/rules.mk index 7293fc306d..9871ad5be7 100644 --- a/keyboards/pabile/p42/rules.mk +++ b/keyboards/pabile/p42/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = caterina - # Build Options # change yes to no to disable # -- cgit v1.2.3 From 2da0827d4ffbcba161126d6001f370e97d0172a8 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 16:08:25 +1100 Subject: Remove matrix size defines (#19581) --- keyboards/pabile/p18/config.h | 4 ---- keyboards/pabile/p20/ver1/config.h | 4 ---- keyboards/pabile/p20/ver2/config.h | 4 ---- keyboards/pabile/p40/config.h | 4 ---- keyboards/pabile/p40_ortho/config.h | 4 ---- keyboards/pabile/p42/config.h | 4 ---- 6 files changed, 24 deletions(-) (limited to 'keyboards/pabile') diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h index 3ccd8c14a0..391e429afe 100644 --- a/keyboards/pabile/p18/config.h +++ b/keyboards/pabile/p18/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 5 - /* pin-out for PROMICRO */ #define MATRIX_ROW_PINS { D1, D0, D4, C6 } #define MATRIX_COL_PINS { D2, D7, E6, B4, B5 } diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h index b1dd19db98..a8e50b43c4 100644 --- a/keyboards/pabile/p20/ver1/config.h +++ b/keyboards/pabile/p20/ver1/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 - /* pin-out */ #define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 } #define MATRIX_COL_PINS { D0, B2, D4, B6 } diff --git a/keyboards/pabile/p20/ver2/config.h b/keyboards/pabile/p20/ver2/config.h index ec770be66b..ff82e3e1ad 100644 --- a/keyboards/pabile/p20/ver2/config.h +++ b/keyboards/pabile/p20/ver2/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 4 - /* pin-out */ #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } #define MATRIX_COL_PINS { D1, D0, D4, B2 } diff --git a/keyboards/pabile/p40/config.h b/keyboards/pabile/p40/config.h index ed86969299..b8bc06ce43 100644 --- a/keyboards/pabile/p40/config.h +++ b/keyboards/pabile/p40/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 10 - /* pin-out for PCB ver0.01 452019 */ #define MATRIX_ROW_PINS { F6, B3, B2, B6 } diff --git a/keyboards/pabile/p40_ortho/config.h b/keyboards/pabile/p40_ortho/config.h index 0ddcdb1f9b..6759ee13fd 100644 --- a/keyboards/pabile/p40_ortho/config.h +++ b/keyboards/pabile/p40_ortho/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 10 - /* pin-out */ #define MATRIX_ROW_PINS { D1, D0, F4, F5 } #define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B2, B3, B1, F7, F6 } diff --git a/keyboards/pabile/p42/config.h b/keyboards/pabile/p42/config.h index 372ec60d37..f4a236a0c0 100644 --- a/keyboards/pabile/p42/config.h +++ b/keyboards/pabile/p42/config.h @@ -18,10 +18,6 @@ along with this program. If not, see . #pragma once -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 11 - /* pin-out for PROMICRO */ #define MATRIX_ROW_PINS { D1, D0, D4, C6 } #define MATRIX_COL_PINS { D7, E6, B4, B5, D2, D3, F7, B1, B3, B2, B6 } -- cgit v1.2.3 From 7e0299117b389b1c7fcdfa2f20891ba2287ea771 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 09:45:12 +1100 Subject: Move encoder config to data driven (#19923) Co-authored-by: Nick Brassel --- keyboards/pabile/p18/config.h | 4 ---- keyboards/pabile/p18/info.json | 6 ++++++ keyboards/pabile/p20/ver1/config.h | 3 --- keyboards/pabile/p20/ver1/info.json | 6 ++++++ 4 files changed, 12 insertions(+), 7 deletions(-) (limited to 'keyboards/pabile') diff --git a/keyboards/pabile/p18/config.h b/keyboards/pabile/p18/config.h index 391e429afe..2b450e8fff 100644 --- a/keyboards/pabile/p18/config.h +++ b/keyboards/pabile/p18/config.h @@ -22,10 +22,6 @@ along with this program. If not, see . /* pin-out for PROMICRO */ #define MATRIX_ROW_PINS { D1, D0, D4, C6 } #define MATRIX_COL_PINS { D2, D7, E6, B4, B5 } - -/* Encoder position for PROMICRO */ -#define ENCODERS_PAD_A { B6, F6 } -#define ENCODERS_PAD_B { F4, F5 } /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pabile/p18/info.json b/keyboards/pabile/p18/info.json index ce40842afe..3859d7852f 100644 --- a/keyboards/pabile/p18/info.json +++ b/keyboards/pabile/p18/info.json @@ -8,6 +8,12 @@ "pid": "0x6668", "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "B6", "pin_b": "F4"}, + {"pin_a": "F6", "pin_b": "F5"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/pabile/p20/ver1/config.h b/keyboards/pabile/p20/ver1/config.h index a8e50b43c4..4505e2718e 100644 --- a/keyboards/pabile/p20/ver1/config.h +++ b/keyboards/pabile/p20/ver1/config.h @@ -21,9 +21,6 @@ along with this program. If not, see . /* pin-out */ #define MATRIX_ROW_PINS { B3, B4, B5, D7, E6 } #define MATRIX_COL_PINS { D0, B2, D4, B6 } - -#define ENCODERS_PAD_A { F5, F7 } -#define ENCODERS_PAD_B { F6, B1 } /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW \ No newline at end of file diff --git a/keyboards/pabile/p20/ver1/info.json b/keyboards/pabile/p20/ver1/info.json index cea8ee87a0..1c5781995f 100644 --- a/keyboards/pabile/p20/ver1/info.json +++ b/keyboards/pabile/p20/ver1/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "0.0.1" }, + "encoder": { + "rotary": [ + {"pin_a": "F5", "pin_b": "F6"}, + {"pin_a": "F7", "pin_b": "B1"} + ] + }, "processor": "atmega32u4", "bootloader": "caterina" } -- cgit v1.2.3