From fa558abef33fbb2965704a2f4c91dab8f5ab8432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 28 Dec 2017 00:08:29 +0100 Subject: [PATCH] Add LED_DRIVERS_ENABLED --- right/src/config.h | 1 + right/src/config_parser/parse_config.c | 4 +++- right/src/slave_drivers/uhk_module_driver.c | 2 ++ right/src/slave_scheduler.c | 3 +++ right/src/slave_scheduler.h | 3 +++ 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/right/src/config.h b/right/src/config.h index f5d3291..ef6b6b5 100644 --- a/right/src/config.h +++ b/right/src/config.h @@ -4,6 +4,7 @@ // Macros: #define I2C_WATCHDOG + #define LED_DRIVERS_ENABLED // #define LED_DRIVER_STRESS_TEST #endif diff --git a/right/src/config_parser/parse_config.c b/right/src/config_parser/parse_config.c index 98e9608..09e9e90 100644 --- a/right/src/config_parser/parse_config.c +++ b/right/src/config_parser/parse_config.c @@ -8,6 +8,7 @@ #include "led_display.h" #include "slave_scheduler.h" #include "slave_drivers/is31fl3731_driver.h" +#include "config.h" static parser_error_t parseModuleConfiguration(config_buffer_t *buffer) { @@ -142,9 +143,10 @@ parser_error_t ParseConfig(config_buffer_t *buffer) IconsAndLayerTextsBrightness = iconsAndLayerTextsBrightness; AlphanumericSegmentsBrightness = alphanumericSegmentsBrightness; KeyBacklightBrightness = keyBacklightBrightness; +#ifdef LED_DRIVERS_ENABLED Slaves[SlaveId_LeftLedDriver].isConnected = false; Slaves[SlaveId_RightLedDriver].isConnected = false; - +#endif // Update mouse key speeds MouseMoveState.initialSpeed = mouseMoveInitialSpeed; diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c index 4af7176..878aa2ae 100644 --- a/right/src/slave_drivers/uhk_module_driver.c +++ b/right/src/slave_drivers/uhk_module_driver.c @@ -265,8 +265,10 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId) { +#ifdef LED_DRIVERS_ENABLED if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) { Slaves[SlaveId_LeftLedDriver].isConnected = false; } UhkModuleStates[uhkModuleDriverId].moduleId = 0; +#endif } diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c index c4eb607..a3613da 100644 --- a/right/src/slave_scheduler.c +++ b/right/src/slave_scheduler.c @@ -6,6 +6,7 @@ #include "slave_drivers/kboot_driver.h" #include "i2c.h" #include "i2c_addresses.h" +#include "config.h" uint32_t I2cSlaveScheduler_Counter; @@ -29,6 +30,7 @@ uhk_slave_t Slaves[] = { .update = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleDriverId_RightAddon, }, +#ifdef LED_DRIVERS_ENABLED { .init = LedSlaveDriver_Init, .update = LedSlaveDriver_Update, @@ -39,6 +41,7 @@ uhk_slave_t Slaves[] = { .update = LedSlaveDriver_Update, .perDriverId = LedDriverId_Left, }, +#endif { .init = KbootSlaveDriver_Init, .update = KbootSlaveDriver_Update, diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h index 13e00ab..cd667a3 100644 --- a/right/src/slave_scheduler.h +++ b/right/src/slave_scheduler.h @@ -4,6 +4,7 @@ // Includes: #include "fsl_common.h" + #include "config.h" // Typedefs: @@ -11,8 +12,10 @@ SlaveId_LeftKeyboardHalf, SlaveId_LeftAddon, SlaveId_RightAddon, +#ifdef LED_DRIVERS_ENABLED SlaveId_RightLedDriver, SlaveId_LeftLedDriver, +#endif SlaveId_KbootDriver, } slave_id_t;