From 04719c774d895d0cec3bcbe69291d32916280b08 Mon Sep 17 00:00:00 2001 From: Evgenii Vilkov Date: Wed, 31 May 2023 20:46:03 +0200 Subject: Fix backlight sync on suspend_power_down for split keyboards (#21079) --- quantum/split_common/transactions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'quantum/split_common') diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index b3c80f1194..8cd018a6ec 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -412,7 +412,7 @@ static void backlight_handlers_slave(matrix_row_t master_matrix[], matrix_row_t uint8_t backlight_level = split_shmem->backlight_level; split_shared_memory_unlock(); - backlight_set(backlight_level); + backlight_level_noeeprom(backlight_level); } # define TRANSACTIONS_BACKLIGHT_MASTER() TRANSACTION_HANDLER_MASTER(backlight) -- cgit v1.2.3 From da2d2f947d5c30aebea17f414fb22ad50fe5410b Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Jul 2023 23:42:56 +1000 Subject: quantum: remove direct `quantum.h` includes (#21507) --- quantum/split_common/split_util.c | 2 +- quantum/split_common/split_util.h | 1 - quantum/split_common/transactions.c | 39 ++++++++++++++++++++++++++++++++++++- quantum/split_common/transactions.h | 4 ++-- quantum/split_common/transport.h | 4 ++-- 5 files changed, 43 insertions(+), 7 deletions(-) (limited to 'quantum/split_common') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index a431383454..87838c3195 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -18,8 +18,8 @@ #include "keyboard.h" #include "timer.h" #include "transport.h" -#include "quantum.h" #include "wait.h" +#include "debug.h" #include "usb_util.h" #ifdef EE_HANDS diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h index 5c9a260a14..ab42c85e9f 100644 --- a/quantum/split_common/split_util.h +++ b/quantum/split_common/split_util.h @@ -2,7 +2,6 @@ #include #include -#include #include "matrix.h" diff --git a/quantum/split_common/transactions.c b/quantum/split_common/transactions.c index 8cd018a6ec..2b9423cd63 100644 --- a/quantum/split_common/transactions.c +++ b/quantum/split_common/transactions.c @@ -20,13 +20,50 @@ #include "crc.h" #include "debug.h" #include "matrix.h" -#include "quantum.h" +#include "host.h" +#include "action_util.h" +#include "sync_timer.h" +#include "wait.h" #include "transactions.h" #include "transport.h" #include "transaction_id_define.h" #include "split_util.h" #include "synchronization_util.h" +#ifdef BACKLIGHT_ENABLE +# include "backlight.h" +#endif +#ifdef RGBLIGHT_ENABLE +# include "rgblight.h" +#endif +#ifdef LED_MATRIX_ENABLE +# include "led_matrix.h" +#endif +#ifdef RGB_MATRIX_ENABLE +# include "rgb_matrix.h" +#endif +#ifdef OLED_ENABLE +# include "oled_driver.h" +#endif +#ifdef ST7565_ENABLE +# include "st7565.h" +#endif +#ifdef ENCODER_ENABLE +# include "encoder.h" +#endif +#ifdef HAPTIC_ENABLE +# include "haptic.h" +#endif +#ifdef POINTING_DEVICE_ENABLE +# include "pointing_device.h" +#endif +#ifdef OS_DETECTION_ENABLE +# include "os_detection.h" +#endif +#ifdef WPM_ENABLE +# include "wpm.h" +#endif + #define SYNC_TIMER_OFFSET 2 #ifndef FORCED_SYNC_THROTTLE_MS diff --git a/quantum/split_common/transactions.h b/quantum/split_common/transactions.h index e38ec79ce9..af3e68a15f 100644 --- a/quantum/split_common/transactions.h +++ b/quantum/split_common/transactions.h @@ -16,8 +16,8 @@ #pragma once -#include "stdint.h" -#include "stdbool.h" +#include +#include #include "matrix.h" #include "transaction_id_define.h" diff --git a/quantum/split_common/transport.h b/quantum/split_common/transport.h index a3d6f1dfe9..2e2b918d45 100644 --- a/quantum/split_common/transport.h +++ b/quantum/split_common/transport.h @@ -16,8 +16,8 @@ #pragma once -#include "stdint.h" -#include "stdbool.h" +#include +#include #include "progmem.h" #include "action_layer.h" -- cgit v1.2.3 From b090354143612d2c0f5c8629510542de5bd4e29e Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 21 Jul 2023 09:17:39 +1000 Subject: haptic: naming cleanups (#21551) --- quantum/split_common/split_util.c | 1 + 1 file changed, 1 insertion(+) (limited to 'quantum/split_common') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 87838c3195..fca95e0847 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -21,6 +21,7 @@ #include "wait.h" #include "debug.h" #include "usb_util.h" +#include "bootloader.h" #ifdef EE_HANDS # include "eeconfig.h" -- cgit v1.2.3 From 625671d1cf44ddbade756cd058149cd3971b317c Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Thu, 20 Jul 2023 18:40:05 -0700 Subject: [Bug] Fix compilation error when Split Watchdog enabled (#21543) --- quantum/split_common/split_util.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'quantum/split_common') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index fca95e0847..1db02df3b2 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -31,6 +31,10 @@ # include "rgblight.h" #endif +#if defined(SPLIT_WATCHDOG_ENABLE) +# include "bootloader.h" +#endif + #ifndef SPLIT_USB_TIMEOUT # define SPLIT_USB_TIMEOUT 2000 #endif -- cgit v1.2.3 From d136d490538d38085d938bd2e15d9c73236ff1a5 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 22 Jul 2023 06:43:14 +1000 Subject: Revert "[Bug] Fix compilation error when Split Watchdog enabled" (#21572) --- quantum/split_common/split_util.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'quantum/split_common') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index 1db02df3b2..fca95e0847 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -31,10 +31,6 @@ # include "rgblight.h" #endif -#if defined(SPLIT_WATCHDOG_ENABLE) -# include "bootloader.h" -#endif - #ifndef SPLIT_USB_TIMEOUT # define SPLIT_USB_TIMEOUT 2000 #endif -- cgit v1.2.3 From 6018b56c5595b97e45837d1ee9c96d9c3d795c43 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 1 Aug 2023 00:43:10 +1000 Subject: Remove old OLED API code (#21651) --- quantum/split_common/split_util.c | 3 --- quantum/split_common/split_util.h | 1 - 2 files changed, 4 deletions(-) (limited to 'quantum/split_common') diff --git a/quantum/split_common/split_util.c b/quantum/split_common/split_util.c index fca95e0847..5d044c4ea0 100644 --- a/quantum/split_common/split_util.c +++ b/quantum/split_common/split_util.c @@ -206,9 +206,6 @@ void split_pre_init(void) { #endif if (is_keyboard_master()) { -#if defined(USE_I2C) && defined(SSD1306OLED) - matrix_master_OLED_init(); -#endif transport_master_init(); } } diff --git a/quantum/split_common/split_util.h b/quantum/split_common/split_util.h index ab42c85e9f..f83b05b6a6 100644 --- a/quantum/split_common/split_util.h +++ b/quantum/split_common/split_util.h @@ -7,7 +7,6 @@ extern volatile bool isLeftHand; -void matrix_master_OLED_init(void); void split_pre_init(void); void split_post_init(void); -- cgit v1.2.3