From a9f1105f98ecca299d401f81cd5cc1699683e2ce Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 15 Feb 2024 18:11:50 +1100 Subject: LED drivers: add support for shutdown pin (#23058) * LED drivers: add support for shutdown pin * Update candidate boards --- keyboards/skyloong/gk61/pro/config.h | 2 +- keyboards/skyloong/gk61/pro/pro.c | 8 ++------ keyboards/skyloong/gk61/pro_48/config.h | 2 +- keyboards/skyloong/gk61/pro_48/pro_48.c | 8 ++------ keyboards/skyloong/gk61/v1/config.h | 3 +-- keyboards/skyloong/gk61/v1/v1.c | 11 +++-------- 6 files changed, 10 insertions(+), 24 deletions(-) (limited to 'keyboards/skyloong') diff --git a/keyboards/skyloong/gk61/pro/config.h b/keyboards/skyloong/gk61/pro/config.h index 5e6d6d0e6a..db02496f8b 100644 --- a/keyboards/skyloong/gk61/pro/config.h +++ b/keyboards/skyloong/gk61/pro/config.h @@ -4,9 +4,9 @@ #pragma once #define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND +#define IS31FL3743A_SDB_PIN C1 #define CAPS_LOCK_INDEX 28 #define WIN_MOD_INDEX 16 #define MAC_MOD_INDEX 17 #define WIN_LOCK_INDEX 54 -#define SDB C1 //RGB matrix Power control PIN diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c index 6240d9cead..55fcf3b41f 100644 --- a/keyboards/skyloong/gk61/pro/pro.c +++ b/keyboards/skyloong/gk61/pro/pro.c @@ -213,14 +213,14 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { void suspend_power_down_kb() { # ifdef RGB_MATRIX_ENABLE - writePinLow(SDB); + writePinLow(IS31FL3743A_SDB_PIN); # endif suspend_power_down_user(); } void suspend_wakeup_init_kb() { # ifdef RGB_MATRIX_ENABLE - writePinHigh(SDB); + writePinHigh(IS31FL3743A_SDB_PIN); # endif suspend_wakeup_init_user(); } @@ -228,8 +228,4 @@ void suspend_wakeup_init_kb() { void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; -# ifdef RGB_MATRIX_ENABLE - setPinOutput(SDB); - writePinHigh(SDB); -# endif } diff --git a/keyboards/skyloong/gk61/pro_48/config.h b/keyboards/skyloong/gk61/pro_48/config.h index 18f3ef3e72..5b4976e2da 100644 --- a/keyboards/skyloong/gk61/pro_48/config.h +++ b/keyboards/skyloong/gk61/pro_48/config.h @@ -4,10 +4,10 @@ #pragma once #define IS31FL3743A_I2C_ADDRESS_1 IS31FL3743A_I2C_ADDRESS_GND_GND +#define IS31FL3743A_SDB_PIN A4 #define CAPS_LOCK_INDEX 28 #define WIN_MOD_INDEX 16 #define MAC_MOD_INDEX 17 -#define SDB A4 #define g_suspend_state rgb_matrix_get_suspend_state() diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c index dc1058a08b..ffa04f2c05 100644 --- a/keyboards/skyloong/gk61/pro_48/pro_48.c +++ b/keyboards/skyloong/gk61/pro_48/pro_48.c @@ -149,12 +149,12 @@ bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) { void suspend_power_down_kb(void) { - writePinLow(SDB); + writePinLow(IS31FL3743A_SDB_PIN); suspend_power_down_user(); } void suspend_wakeup_init_kb(void) { - writePinHigh(SDB); + writePinHigh(IS31FL3743A_SDB_PIN); suspend_wakeup_init_user(); } #endif @@ -220,8 +220,4 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { void board_init(void) { // JTAG-DP Disabled and SW-DP Disabled AFIO->MAPR = (AFIO->MAPR & ~AFIO_MAPR_SWJ_CFG_Msk) | AFIO_MAPR_SWJ_CFG_DISABLE; -# ifdef RGB_MATRIX_ENABLE - setPinOutput(SDB); - writePinHigh(SDB); -# endif } diff --git a/keyboards/skyloong/gk61/v1/config.h b/keyboards/skyloong/gk61/v1/config.h index 146a19e6fd..d1dae51219 100644 --- a/keyboards/skyloong/gk61/v1/config.h +++ b/keyboards/skyloong/gk61/v1/config.h @@ -16,5 +16,4 @@ #pragma once #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND - -#define SDB C1 +#define SNLED27351_SDB_PIN C1 diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c index 1ee3522b50..cb362b5359 100644 --- a/keyboards/skyloong/gk61/v1/v1.c +++ b/keyboards/skyloong/gk61/v1/v1.c @@ -102,18 +102,13 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { #endif // RGB_MATRIX_ENABLE void suspend_power_down_kb() { - writePinLow(SDB); + writePinLow(SNLED27351_SDB_PIN); suspend_power_down_user(); } void suspend_wakeup_init_kb() { - writePinHigh(SDB); - - suspend_wakeup_init_user(); -} + writePinHigh(SNLED27351_SDB_PIN); -void board_init(void) { - setPinOutput(SDB); - writePinHigh(SDB); + suspend_wakeup_init_user(); } -- cgit v1.2.3