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/pjb/eros/info.json | 1 + keyboards/pjb/eros/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index bda8ab15fb..e1217d7728 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -17,6 +17,7 @@ "LAYOUT_tkl_ansi_tsangan_f13_split_back": "LAYOUT_tkl_f13_ansi_tsangan_split_bs", "LAYOUT_tkl_ansi_tsangan_f13_split_shift": "LAYOUT_tkl_f13_ansi_tsangan_split_rshift" }, + "community_layouts": ["tkl_f13_ansi", "tkl_f13_ansi_split_bs_rshift", "tkl_f13_ansi_tsangan"], "layouts": { "LAYOUT_tkl_f13_ansi_split_bs_rshift": { "layout": [ diff --git a/keyboards/pjb/eros/rules.mk b/keyboards/pjb/eros/rules.mk index 70f7fdde37..696b8ca99e 100644 --- a/keyboards/pjb/eros/rules.mk +++ b/keyboards/pjb/eros/rules.mk @@ -15,5 +15,3 @@ COMMAND_ENABLE = yes # Commands for debug and configuration BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Enable audio output - -LAYOUTS = tkl_f13_ansi tkl_f13_ansi_split_bs_rshift tkl_f13_ansi_tsangan -- 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/pjb/eros/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h index c8d9692461..c20ea0f66a 100644 --- a/keyboards/pjb/eros/config.h +++ b/keyboards/pjb/eros/config.h @@ -16,7 +16,6 @@ #pragma once -#include "config_common.h" #define MATRIX_ROWS 6 #define MATRIX_COLS 17 -- 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/pjb/eros/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h index c20ea0f66a..784e044071 100644 --- a/keyboards/pjb/eros/config.h +++ b/keyboards/pjb/eros/config.h @@ -24,7 +24,6 @@ #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 } #define DIODE_DIRECTION COL2ROW -#define DEBOUNCE 5 #define LED_CAPS_LOCK_PIN D6 #define LED_SCROLL_LOCK_PIN D0 -- 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/pjb/eros/info.json | 2 ++ keyboards/pjb/eros/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index e1217d7728..0da1a7db5b 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -8,6 +8,8 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "layout_aliases": { "LAYOUT_all_f13": "LAYOUT_tkl_f13_ansi_split_bs_rshift", "LAYOUT_tkl_ansi_f13": "LAYOUT_tkl_f13_ansi", diff --git a/keyboards/pjb/eros/rules.mk b/keyboards/pjb/eros/rules.mk index 696b8ca99e..12dca933d7 100644 --- a/keyboards/pjb/eros/rules.mk +++ b/keyboards/pjb/eros/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 f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 13:14:29 +1100 Subject: Move LED indicator config to data driven (#19800) --- keyboards/pjb/eros/config.h | 4 ---- keyboards/pjb/eros/info.json | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h index 784e044071..cceef3dc82 100644 --- a/keyboards/pjb/eros/config.h +++ b/keyboards/pjb/eros/config.h @@ -24,7 +24,3 @@ #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 } #define DIODE_DIRECTION COL2ROW - -#define LED_CAPS_LOCK_PIN D6 -#define LED_SCROLL_LOCK_PIN D0 -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/pjb/eros/info.json b/keyboards/pjb/eros/info.json index 0da1a7db5b..cbba6dcecc 100644 --- a/keyboards/pjb/eros/info.json +++ b/keyboards/pjb/eros/info.json @@ -8,6 +8,11 @@ "pid": "0x4552", "device_version": "2.0.0" }, + "indicators": { + "caps_lock": "D6", + "scroll_lock": "D0", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { -- 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/pjb/eros/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/pjb') diff --git a/keyboards/pjb/eros/config.h b/keyboards/pjb/eros/config.h index cceef3dc82..932c66ba01 100644 --- a/keyboards/pjb/eros/config.h +++ b/keyboards/pjb/eros/config.h @@ -17,9 +17,6 @@ #pragma once -#define MATRIX_ROWS 6 -#define MATRIX_COLS 17 - #define MATRIX_ROW_PINS { B2, B1, B0, D7, B7, D1 } #define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, D4, D5, B4, D3, D2, E6, B3 } -- cgit v1.2.3