From a8cb94ef15fb517452c99aab68f5d6e5f8a11585 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Wed, 31 May 2017 01:34:35 +0200 Subject: [PATCH] Extract KEY_STATE_BUFFER_SIZE --- right/src/slave_drivers/slave_driver_uhk_module.c | 7 ++----- right/src/slave_drivers/slave_driver_uhk_module.h | 1 + 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/right/src/slave_drivers/slave_driver_uhk_module.c b/right/src/slave_drivers/slave_driver_uhk_module.c index 7e6f30b..7a83d4e 100644 --- a/right/src/slave_drivers/slave_driver_uhk_module.c +++ b/right/src/slave_drivers/slave_driver_uhk_module.c @@ -11,7 +11,7 @@ uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; uhk_module_field_t currentUhkModuleField = UhkModuleField_SendKeystatesRequestCommand; uhk_module_state_t uhkModuleExternalStates[UHK_MODULE_MAX_COUNT]; uint8_t txBuffer[2]; -uint8_t rxBuffer[LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1]; +uint8_t rxBuffer[KEY_STATE_BUFFER_SIZE]; void UhkModuleSlaveDriver_Init() { @@ -34,14 +34,11 @@ void UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) currentUhkModuleField = UhkModuleField_ReceiveKeystates; break; case UhkModuleField_ReceiveKeystates: -// I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT); - I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, LEFT_KEYBOARD_HALF_KEY_COUNT/8+1); + I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, KEY_STATE_BUFFER_SIZE); currentUhkModuleField = UhkModuleField_SendPwmBrightnessCommand; break; case UhkModuleField_SendPwmBrightnessCommand: -// memset(rxBuffer, 0, LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1); BoolBitsToBytes(rxBuffer, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT); - txBuffer[0] = SlaveCommand_SetLedPwmBrightness; txBuffer[1] = uhkModuleInternalState->ledPwmBrightness; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2); diff --git a/right/src/slave_drivers/slave_driver_uhk_module.h b/right/src/slave_drivers/slave_driver_uhk_module.h index dbcbb22..84be347 100644 --- a/right/src/slave_drivers/slave_driver_uhk_module.h +++ b/right/src/slave_drivers/slave_driver_uhk_module.h @@ -8,6 +8,7 @@ // Macros: #define UHK_MODULE_MAX_COUNT 1 + #define KEY_STATE_BUFFER_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1) // Typedefs: