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/atset/at16/info.json | 1 + keyboards/atset/at16/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json index 65a51448b4..e0a151da60 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -7,6 +7,7 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}] diff --git a/keyboards/atset/at16/rules.mk b/keyboards/atset/at16/rules.mk index 6025e7ecc5..73ac281e0b 100644 --- a/keyboards/atset/at16/rules.mk +++ b/keyboards/atset/at16/rules.mk @@ -16,5 +16,3 @@ 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 - -LAYOUTS = ortho_4x4 -- 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/atset/at1/config.h | 1 - keyboards/atset/at12/config.h | 1 - keyboards/atset/at16/config.h | 1 - keyboards/atset/at3/config.h | 1 - keyboards/atset/at6/config.h | 1 - keyboards/atset/at9/config.h | 1 - 6 files changed, 6 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index 635faf9b4e..45d6d37409 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 1 diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index d27b4b646a..a215c26e5d 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index 400244a66e..e714329e48 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 4 diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index 5195939cf9..c568c22c50 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 1 diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index b443529631..60aad34fdc 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 2 diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index bf9819c4b9..d364d46e2b 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -15,7 +15,6 @@ #pragma once -#include "config_common.h" /* Key matrix size */ #define MATRIX_ROWS 3 -- cgit v1.2.3 From b867522f8cf90aef6f4531e669e35aba5ec0bf1c Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 31 Jan 2023 07:45:41 +1100 Subject: Clean up Force NKRO in config.h (#19718) --- keyboards/atset/at1/config.h | 22 ---------------------- keyboards/atset/at12/config.h | 22 ---------------------- keyboards/atset/at16/config.h | 22 ---------------------- keyboards/atset/at3/config.h | 22 ---------------------- keyboards/atset/at6/config.h | 22 ---------------------- keyboards/atset/at9/config.h | 21 --------------------- 6 files changed, 131 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index 45d6d37409..adf10a2aa8 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -43,25 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO - diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index a215c26e5d..7811ed4612 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -43,25 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO - diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index e714329e48..24a136c2a0 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -43,25 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO - diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index c568c22c50..0f67fa1574 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -43,25 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO - diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index 60aad34fdc..a063166eb3 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -43,25 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO - diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index d364d46e2b..eafa858c1f 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -43,24 +43,3 @@ * This is userful for the Windows task manager shortcut (ctrl+shift+esc). */ // #define GRAVE_ESC_CTRL_OVERRIDE - -/* - * Force NKRO - * - * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved - * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the - * makefile for this to work.) - * - * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N) - * until the next keyboard reset. - * - * NKRO may prevent your keystrokes from being detected in the BIOS, but it is - * fully operational during normal computer usage. - * - * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N) - * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by - * bootmagic, NKRO mode will always be enabled until it is toggled again during a - * power-up. - - */ -//#define FORCE_NKRO -- cgit v1.2.3 From f20a05440ed38bb3de754b2193e56d3e41a939a1 Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 3 Feb 2023 11:04:10 +1100 Subject: Remove unused `MATRIX_HAS_GHOST` from config.h (#19726) --- keyboards/atset/at1/config.h | 4 ---- keyboards/atset/at12/config.h | 4 ---- keyboards/atset/at16/config.h | 4 ---- keyboards/atset/at3/config.h | 4 ---- keyboards/atset/at6/config.h | 4 ---- keyboards/atset/at9/config.h | 4 ---- 6 files changed, 24 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index adf10a2aa8..e4b2ff449e 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index 7811ed4612..6f3d72aab2 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index 24a136c2a0..3c18c4dd17 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index 0f67fa1574..cc5253abf9 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index a063166eb3..43ea0b4fe7 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index eafa858c1f..8fd3f10635 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -30,10 +30,6 @@ /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 -/* define if matrix has ghost (lacks anti-ghosting diodes) */ -//#define MATRIX_HAS_GHOST - - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From ebb512db827e84619e7151fcf76e3daf9328fe59 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 4 Feb 2023 06:19:58 +1100 Subject: Debounce defines cleanup (#19742) * Clean up `DEBOUNCE` in config.h, 0-9 * Clean up `DEBOUNCE` in config.h, A * Clean up `DEBOUNCE` in config.h, B * Clean up `DEBOUNCE` in config.h, C * Clean up `DEBOUNCE` in config.h, D * Clean up `DEBOUNCE` in config.h, E * Clean up `DEBOUNCE` in config.h, F * Clean up `DEBOUNCE` in config.h, G * Clean up `DEBOUNCE` in config.h, H * Clean up `DEBOUNCE` in config.h, handwired * Clean up `DEBOUNCE` in config.h, I * Clean up `DEBOUNCE` in config.h, J * Clean up `DEBOUNCE` in config.h, K * Clean up `DEBOUNCE` in config.h, L * Clean up `DEBOUNCE` in config.h, M * Clean up `DEBOUNCE` in config.h, N * Clean up `DEBOUNCE` in config.h, O * Clean up `DEBOUNCE` in config.h, P * Clean up `DEBOUNCE` in config.h, Q * Clean up `DEBOUNCE` in config.h, R * Clean up `DEBOUNCE` in config.h, S * Clean up `DEBOUNCE` in config.h, T * Clean up `DEBOUNCE` in config.h, U * Clean up `DEBOUNCE` in config.h, V * Clean up `DEBOUNCE` in config.h, W * Clean up `DEBOUNCE` in config.h, X * Clean up `DEBOUNCE` in config.h, Y * Clean up `DEBOUNCE` in config.h, Z * Remove default debounce from info.json * Migrate non-default debounce to info.json --- keyboards/atset/at1/config.h | 4 ---- keyboards/atset/at12/config.h | 4 ---- keyboards/atset/at16/config.h | 4 ---- keyboards/atset/at3/config.h | 4 ---- keyboards/atset/at6/config.h | 4 ---- keyboards/atset/at9/config.h | 4 ---- 6 files changed, 24 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index e4b2ff449e..b625c4b223 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index 6f3d72aab2..e824f65daf 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index 3c18c4dd17..2f05ec8ad8 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index cc5253abf9..b6f8245805 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index 43ea0b4fe7..13c7e0639c 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index 8fd3f10635..788ec42fe2 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -26,10 +26,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ -- cgit v1.2.3 From a988f8a169112e31b21ff7c61870ab483c396cf3 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 6 Feb 2023 13:40:23 +1100 Subject: Remove unused `GRAVE_ESC_CTRL_OVERRIDE` from config.h (#19752) --- keyboards/atset/at1/config.h | 5 ----- keyboards/atset/at12/config.h | 5 ----- keyboards/atset/at16/config.h | 5 ----- keyboards/atset/at3/config.h | 5 ----- keyboards/atset/at6/config.h | 5 ----- keyboards/atset/at9/config.h | 5 ----- 6 files changed, 30 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index b625c4b223..eef66013e8 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index e824f65daf..8607713ee1 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index 2f05ec8ad8..d50f776439 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index b6f8245805..f8b33e0190 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index 13c7e0639c..0384ebd4a5 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index 788ec42fe2..f2aa39f862 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -30,8 +30,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* If defined, GRAVE_ESC will always act as ESC when CTRL is held. - * This is userful for the Windows task manager shortcut (ctrl+shift+esc). - */ -// #define GRAVE_ESC_CTRL_OVERRIDE -- 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/atset/at1/info.json | 2 ++ keyboards/atset/at1/rules.mk | 6 ------ keyboards/atset/at12/info.json | 2 ++ keyboards/atset/at12/rules.mk | 6 ------ keyboards/atset/at16/info.json | 2 ++ keyboards/atset/at16/rules.mk | 6 ------ keyboards/atset/at3/info.json | 2 ++ keyboards/atset/at3/rules.mk | 6 ------ keyboards/atset/at6/info.json | 2 ++ keyboards/atset/at6/rules.mk | 6 ------ keyboards/atset/at9/info.json | 2 ++ keyboards/atset/at9/rules.mk | 6 ------ 12 files changed, 12 insertions(+), 36 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json index b73f4de3ae..15dad62519 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}] diff --git a/keyboards/atset/at1/rules.mk b/keyboards/atset/at1/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at1/rules.mk +++ b/keyboards/atset/at1/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json index 28a535db48..75945900e9 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}] diff --git a/keyboards/atset/at12/rules.mk b/keyboards/atset/at12/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at12/rules.mk +++ b/keyboards/atset/at12/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json index e0a151da60..073d153474 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { diff --git a/keyboards/atset/at16/rules.mk b/keyboards/atset/at16/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at16/rules.mk +++ b/keyboards/atset/at16/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json index 6f8eab5e62..10c007aef1 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}] diff --git a/keyboards/atset/at3/rules.mk b/keyboards/atset/at3/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at3/rules.mk +++ b/keyboards/atset/at3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json index abdaf10b9f..47c5c1dbd9 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] diff --git a/keyboards/atset/at6/rules.mk b/keyboards/atset/at6/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at6/rules.mk +++ b/keyboards/atset/at6/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # Build Options # change yes to no to disable # diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json index b550240ce7..1efa4f5d48 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/info.json @@ -7,6 +7,8 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] diff --git a/keyboards/atset/at9/rules.mk b/keyboards/atset/at9/rules.mk index 73ac281e0b..5356b24d77 100644 --- a/keyboards/atset/at9/rules.mk +++ b/keyboards/atset/at9/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - # 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/atset/at1/config.h | 4 ---- keyboards/atset/at12/config.h | 4 ---- keyboards/atset/at16/config.h | 4 ---- keyboards/atset/at3/config.h | 4 ---- keyboards/atset/at6/config.h | 4 ---- keyboards/atset/at9/config.h | 4 ---- 6 files changed, 24 deletions(-) (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/config.h b/keyboards/atset/at1/config.h index eef66013e8..11b4549d46 100644 --- a/keyboards/atset/at1/config.h +++ b/keyboards/atset/at1/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 1 - #define MATRIX_ROW_PINS { D2 } #define MATRIX_COL_PINS { B6 } diff --git a/keyboards/atset/at12/config.h b/keyboards/atset/at12/config.h index 8607713ee1..77ace78035 100644 --- a/keyboards/atset/at12/config.h +++ b/keyboards/atset/at12/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 3 - #define MATRIX_ROW_PINS { D3, D2, D1, D0 } #define MATRIX_COL_PINS { B6, B5, B4 } diff --git a/keyboards/atset/at16/config.h b/keyboards/atset/at16/config.h index d50f776439..6db5e0ead5 100644 --- a/keyboards/atset/at16/config.h +++ b/keyboards/atset/at16/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 4 - #define MATRIX_ROW_PINS { D3, D2, D1, D0 } #define MATRIX_COL_PINS { B6, B5, B4, B2 } diff --git a/keyboards/atset/at3/config.h b/keyboards/atset/at3/config.h index f8b33e0190..b9d7f7c641 100644 --- a/keyboards/atset/at3/config.h +++ b/keyboards/atset/at3/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 1 -#define MATRIX_COLS 3 - #define MATRIX_ROW_PINS { D2 } #define MATRIX_COL_PINS { B6, B5, B4 } diff --git a/keyboards/atset/at6/config.h b/keyboards/atset/at6/config.h index 0384ebd4a5..522ad5fec3 100644 --- a/keyboards/atset/at6/config.h +++ b/keyboards/atset/at6/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 2 -#define MATRIX_COLS 3 - #define MATRIX_ROW_PINS { D2, D1 } #define MATRIX_COL_PINS { B6, B5, B4 } diff --git a/keyboards/atset/at9/config.h b/keyboards/atset/at9/config.h index f2aa39f862..cc0fa4cbc8 100644 --- a/keyboards/atset/at9/config.h +++ b/keyboards/atset/at9/config.h @@ -16,10 +16,6 @@ #pragma once -/* Key matrix size */ -#define MATRIX_ROWS 3 -#define MATRIX_COLS 3 - #define MATRIX_ROW_PINS { D2, D1, D0 } #define MATRIX_COL_PINS { B6, B5, B4 } -- cgit v1.2.3 From ea772468650f7c79a9919a4770d371839985bef0 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Feb 2023 09:32:18 +1100 Subject: Migrate some more layouts to data driven (#19889) --- keyboards/atset/at1/at1.c | 15 --------------- keyboards/atset/at1/at1.h | 22 ---------------------- keyboards/atset/at1/info.json | 4 +++- keyboards/atset/at12/at12.c | 15 --------------- keyboards/atset/at12/at12.h | 29 ----------------------------- keyboards/atset/at12/info.json | 15 ++++++++++++++- keyboards/atset/at16/at16.c | 15 --------------- keyboards/atset/at16/at16.h | 29 ----------------------------- keyboards/atset/at16/info.json | 19 ++++++++++++++++++- keyboards/atset/at3/at3.c | 15 --------------- keyboards/atset/at3/at3.h | 22 ---------------------- keyboards/atset/at3/info.json | 6 +++++- keyboards/atset/at6/at6.c | 15 --------------- keyboards/atset/at6/at6.h | 24 ------------------------ keyboards/atset/at6/info.json | 9 ++++++++- keyboards/atset/at9/at9.c | 15 --------------- keyboards/atset/at9/at9.h | 26 -------------------------- keyboards/atset/at9/info.json | 12 +++++++++++- 18 files changed, 59 insertions(+), 248 deletions(-) delete mode 100644 keyboards/atset/at1/at1.c delete mode 100644 keyboards/atset/at1/at1.h delete mode 100644 keyboards/atset/at12/at12.c delete mode 100644 keyboards/atset/at12/at12.h delete mode 100644 keyboards/atset/at16/at16.c delete mode 100644 keyboards/atset/at16/at16.h delete mode 100644 keyboards/atset/at3/at3.c delete mode 100644 keyboards/atset/at3/at3.h delete mode 100644 keyboards/atset/at6/at6.c delete mode 100644 keyboards/atset/at6/at6.h delete mode 100644 keyboards/atset/at9/at9.c delete mode 100644 keyboards/atset/at9/at9.h (limited to 'keyboards/atset') diff --git a/keyboards/atset/at1/at1.c b/keyboards/atset/at1/at1.c deleted file mode 100644 index 4ed5d7cb29..0000000000 --- a/keyboards/atset/at1/at1.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at1.h" diff --git a/keyboards/atset/at1/at1.h b/keyboards/atset/at1/at1.h deleted file mode 100644 index 64a90d00ca..0000000000 --- a/keyboards/atset/at1/at1.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT( \ - k00 \ -) \ -{ \ - { k00 } \ -} - diff --git a/keyboards/atset/at1/info.json b/keyboards/atset/at1/info.json index 15dad62519..8e68513a43 100644 --- a/keyboards/atset/at1/info.json +++ b/keyboards/atset/at1/info.json @@ -11,7 +11,9 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]} + ] } } } \ No newline at end of file diff --git a/keyboards/atset/at12/at12.c b/keyboards/atset/at12/at12.c deleted file mode 100644 index 94474365a8..0000000000 --- a/keyboards/atset/at12/at12.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at12.h" diff --git a/keyboards/atset/at12/at12.h b/keyboards/atset/at12/at12.h deleted file mode 100644 index 74bc86c5f2..0000000000 --- a/keyboards/atset/at12/at12.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22, \ - k30, k31, k32 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 }, \ - { k30, k31, k32 } \ -} - diff --git a/keyboards/atset/at12/info.json b/keyboards/atset/at12/info.json index 75945900e9..e7914318b8 100644 --- a/keyboards/atset/at12/info.json +++ b/keyboards/atset/at12/info.json @@ -11,7 +11,20 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]} + ] } } } \ No newline at end of file diff --git a/keyboards/atset/at16/at16.c b/keyboards/atset/at16/at16.c deleted file mode 100644 index 4b24974504..0000000000 --- a/keyboards/atset/at16/at16.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at16.h" diff --git a/keyboards/atset/at16/at16.h b/keyboards/atset/at16/at16.h deleted file mode 100644 index 128ed7f161..0000000000 --- a/keyboards/atset/at16/at16.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} - diff --git a/keyboards/atset/at16/info.json b/keyboards/atset/at16/info.json index 073d153474..3ea641eec9 100644 --- a/keyboards/atset/at16/info.json +++ b/keyboards/atset/at16/info.json @@ -12,7 +12,24 @@ "community_layouts": ["ortho_4x4"], "layouts": { "LAYOUT_ortho_4x4": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k03", "x":3, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k23", "x":3, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "y":3}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":3, "y":0, "matrix": [0, 3]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":3, "y":1, "matrix": [1, 3]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]}, + {"x":3, "y":2, "matrix": [2, 3]}, + {"x":0, "y":3, "matrix": [3, 0]}, + {"x":1, "y":3, "matrix": [3, 1]}, + {"x":2, "y":3, "matrix": [3, 2]}, + {"x":3, "y":3, "matrix": [3, 3]} + ] } } } diff --git a/keyboards/atset/at3/at3.c b/keyboards/atset/at3/at3.c deleted file mode 100644 index 18a5182f0f..0000000000 --- a/keyboards/atset/at3/at3.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at3.h" diff --git a/keyboards/atset/at3/at3.h b/keyboards/atset/at3/at3.h deleted file mode 100644 index 817b154483..0000000000 --- a/keyboards/atset/at3/at3.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02 \ -) \ -{ \ - { k00, k01, k02 } \ -} - diff --git a/keyboards/atset/at3/info.json b/keyboards/atset/at3/info.json index 10c007aef1..1241361d71 100644 --- a/keyboards/atset/at3/info.json +++ b/keyboards/atset/at3/info.json @@ -11,7 +11,11 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]} + ] } } } \ No newline at end of file diff --git a/keyboards/atset/at6/at6.c b/keyboards/atset/at6/at6.c deleted file mode 100644 index f7b525526b..0000000000 --- a/keyboards/atset/at6/at6.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at6.h" diff --git a/keyboards/atset/at6/at6.h b/keyboards/atset/at6/at6.h deleted file mode 100644 index 26a8d35d71..0000000000 --- a/keyboards/atset/at6/at6.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 } \ -} - diff --git a/keyboards/atset/at6/info.json b/keyboards/atset/at6/info.json index 47c5c1dbd9..03be76e696 100644 --- a/keyboards/atset/at6/info.json +++ b/keyboards/atset/at6/info.json @@ -11,7 +11,14 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]} + ] } } } diff --git a/keyboards/atset/at9/at9.c b/keyboards/atset/at9/at9.c deleted file mode 100644 index 8800764033..0000000000 --- a/keyboards/atset/at9/at9.c +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "at9.h" diff --git a/keyboards/atset/at9/at9.h b/keyboards/atset/at9/at9.h deleted file mode 100644 index 574bcfddaf..0000000000 --- a/keyboards/atset/at9/at9.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/atset/at9/info.json b/keyboards/atset/at9/info.json index 1efa4f5d48..ecff089964 100644 --- a/keyboards/atset/at9/info.json +++ b/keyboards/atset/at9/info.json @@ -11,7 +11,17 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}] + "layout": [ + {"x":0, "y":0, "matrix": [0, 0]}, + {"x":1, "y":0, "matrix": [0, 1]}, + {"x":2, "y":0, "matrix": [0, 2]}, + {"x":0, "y":1, "matrix": [1, 0]}, + {"x":1, "y":1, "matrix": [1, 1]}, + {"x":2, "y":1, "matrix": [1, 2]}, + {"x":0, "y":2, "matrix": [2, 0]}, + {"x":1, "y":2, "matrix": [2, 1]}, + {"x":2, "y":2, "matrix": [2, 2]} + ] } } } -- cgit v1.2.3