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/amjkeyboard/amj60/info.json | 1 + keyboards/amjkeyboard/amj60/rules.mk | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 3b106beb18..e8f18ad478 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,7 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/amjkeyboard/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk index 602667e948..77fe1ed6e1 100644 --- a/keyboards/amjkeyboard/amj60/rules.mk +++ b/keyboards/amjkeyboard/amj60/rules.mk @@ -16,5 +16,3 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output - -LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift -- 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/amjkeyboard/amj60/config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index c0cf02c057..1fc029b655 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/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 -- 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/amjkeyboard/amj60/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 1fc029b655..d0d18e13b6 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -74,9 +74,6 @@ along with this program. If not, see . /* 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/amjkeyboard/amj60/config.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index d0d18e13b6..ba94e69858 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -71,9 +71,6 @@ along with this program. If not, see . //# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* 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 11b6bb8179ce93c5954c96e24ef6dd09c497a131 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 7 Feb 2023 11:05:37 +1100 Subject: Remove unused Bootmagic row/col defines from config.h (#19761) --- keyboards/amjkeyboard/amj60/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index ba94e69858..2e4ad89bde 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -91,7 +91,3 @@ along with this program. If not, see . //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING //#define NO_ACTION_ONESHOT - -/* Bootmagic Lite key configuration */ -//#define BOOTMAGIC_LITE_ROW 0 -//#define BOOTMAGIC_LITE_COLUMN 0 -- 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/amjkeyboard/amj60/info.json | 2 ++ keyboards/amjkeyboard/amj60/rules.mk | 6 ------ 2 files changed, 2 insertions(+), 6 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index e8f18ad478..e0cc144cb8 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,8 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "processor": "atmega32u4", + "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_all": { diff --git a/keyboards/amjkeyboard/amj60/rules.mk b/keyboards/amjkeyboard/amj60/rules.mk index 77fe1ed6e1..262dfb657d 100644 --- a/keyboards/amjkeyboard/amj60/rules.mk +++ b/keyboards/amjkeyboard/amj60/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 7fad94ba2d5092abe451d0bbc95caaa37fec95bc Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Feb 2023 08:13:41 +1100 Subject: Remove unused RGBLight defines from config.h (#19859) --- keyboards/amjkeyboard/amj60/config.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 2e4ad89bde..fbc330f67b 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -63,12 +63,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING # define RGBLIGHT_EFFECT_TWINKLE -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -//# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -//# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -//# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -- 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/amjkeyboard/amj60/config.h | 3 --- keyboards/amjkeyboard/amj60/info.json | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index fbc330f67b..8328574f36 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -38,9 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN B2 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B6 #define BACKLIGHT_LEVELS 4 #define BACKLIGHT_BREATHING diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index e0cc144cb8..750f7bec99 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,10 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "B2", + "on_state": 0 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["60_ansi", "60_hhkb", "60_iso", "60_ansi_split_bs_rshift"], -- 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/amjkeyboard/amj60/config.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 8328574f36..825edef631 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/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 14 - /* * Keyboard Matrix Assignments * -- cgit v1.2.3 From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/amjkeyboard/amj60/config.h | 4 ---- keyboards/amjkeyboard/amj60/info.json | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'keyboards/amjkeyboard/amj60') diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 825edef631..0a38f73032 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 4 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 750f7bec99..d624894691 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,11 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 -- cgit v1.2.3