From 3b181c1f87a0024fd22cd0d9558637264e1958cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Wed, 31 May 2017 21:45:33 +0200 Subject: [PATCH] Rename UHK module *state* identifiers to *phase*. --- .../slave_drivers/slave_driver_led_driver.h | 4 +++ .../slave_drivers/slave_driver_uhk_module.c | 32 +++++++++---------- .../slave_drivers/slave_driver_uhk_module.h | 16 +++++----- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/right/src/slave_drivers/slave_driver_led_driver.h b/right/src/slave_drivers/slave_driver_led_driver.h index 4d3313d..06206dc 100644 --- a/right/src/slave_drivers/slave_driver_led_driver.h +++ b/right/src/slave_drivers/slave_driver_led_driver.h @@ -15,6 +15,10 @@ LedDriverPhase_Initialized, } led_driver_phase_t; + typedef enum { + + } led_driver_state_t; + // Functions: extern void LedSlaveDriver_Init(); diff --git a/right/src/slave_drivers/slave_driver_uhk_module.c b/right/src/slave_drivers/slave_driver_uhk_module.c index d869e56..6482402 100644 --- a/right/src/slave_drivers/slave_driver_uhk_module.c +++ b/right/src/slave_drivers/slave_driver_uhk_module.c @@ -9,7 +9,7 @@ #include "crc16.h" uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; -uhk_module_field_t currentUhkModuleField = UhkModuleField_SendKeystatesRequestCommand; +uhk_module_phase_t uhkModulePhase = UhkModulePhase_SendKeystatesRequestCommand; uhk_module_state_t uhkModuleExternalStates[UHK_MODULE_MAX_COUNT]; uint8_t txBuffer[2]; uint8_t rxBuffer[KEY_STATE_BUFFER_SIZE]; @@ -28,48 +28,48 @@ void UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) uhk_module_state_t *uhkModuleInternalState = UhkModuleStates + uhkModuleId; //uhk_module_state_t *uhkModuleExternalState = uhkModuleExternalStates + uhkModuleId; - switch (currentUhkModuleField) { - case UhkModuleField_SendKeystatesRequestCommand: + switch (uhkModulePhase) { + case UhkModulePhase_SendKeystatesRequestCommand: txBuffer[0] = SlaveCommand_GetKeyStates; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 1); - currentUhkModuleField = UhkModuleField_ReceiveKeystates; + uhkModulePhase = UhkModulePhase_ReceiveKeystates; break; - case UhkModuleField_ReceiveKeystates: + case UhkModulePhase_ReceiveKeystates: I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, KEY_STATE_BUFFER_SIZE); - currentUhkModuleField = UhkModuleField_SendPwmBrightnessCommand; + uhkModulePhase = UhkModulePhase_SendPwmBrightnessCommand; break; - case UhkModuleField_SendPwmBrightnessCommand: + case UhkModulePhase_SendPwmBrightnessCommand: if (CRC16_IsMessageValid(rxBuffer, KEY_STATE_SIZE)) { 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); - currentUhkModuleField = UhkModuleField_SendTestLedCommand; + uhkModulePhase = UhkModulePhase_SendTestLedCommand; break; - case UhkModuleField_SendTestLedCommand: + case UhkModulePhase_SendTestLedCommand: txBuffer[0] = SlaveCommand_SetTestLed; txBuffer[1] = uhkModuleInternalState->isTestLedOn; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2); - currentUhkModuleField = UhkModuleField_SendDisableKeyMatrixScanState; + uhkModulePhase = UhkModulePhase_SendDisableKeyMatrixScanState; break; - case UhkModuleField_SendDisableKeyMatrixScanState: + case UhkModulePhase_SendDisableKeyMatrixScanState: txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState; txBuffer[1] = TestStates.disableKeyMatrixScan; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2); - currentUhkModuleField = UhkModuleField_SendLedPwmBrightness; + uhkModulePhase = UhkModulePhase_SendLedPwmBrightness; break; - case UhkModuleField_SendLedPwmBrightness: + case UhkModulePhase_SendLedPwmBrightness: txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState; txBuffer[1] = TestStates.disableKeyMatrixScan; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2); - currentUhkModuleField = UhkModuleField_DisableLedSdb; + uhkModulePhase = UhkModulePhase_DisableLedSdb; break; - case UhkModuleField_DisableLedSdb: + case UhkModulePhase_DisableLedSdb: txBuffer[0] = SlaveCommand_SetDisableLedSdb; txBuffer[1] = TestStates.disableLedSdb; I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2); - currentUhkModuleField = UhkModuleField_SendKeystatesRequestCommand; + uhkModulePhase = UhkModulePhase_SendKeystatesRequestCommand; break; } } diff --git a/right/src/slave_drivers/slave_driver_uhk_module.h b/right/src/slave_drivers/slave_driver_uhk_module.h index c94d1f6..55fe693 100644 --- a/right/src/slave_drivers/slave_driver_uhk_module.h +++ b/right/src/slave_drivers/slave_driver_uhk_module.h @@ -15,14 +15,14 @@ // Typedefs: typedef enum { - UhkModuleField_SendKeystatesRequestCommand, - UhkModuleField_ReceiveKeystates, - UhkModuleField_SendPwmBrightnessCommand, - UhkModuleField_SendTestLedCommand, - UhkModuleField_SendDisableKeyMatrixScanState, - UhkModuleField_SendLedPwmBrightness, - UhkModuleField_DisableLedSdb, - } uhk_module_field_t; + UhkModulePhase_SendKeystatesRequestCommand, + UhkModulePhase_ReceiveKeystates, + UhkModulePhase_SendPwmBrightnessCommand, + UhkModulePhase_SendTestLedCommand, + UhkModulePhase_SendDisableKeyMatrixScanState, + UhkModulePhase_SendLedPwmBrightness, + UhkModulePhase_DisableLedSdb, + } uhk_module_phase_t; typedef struct { uint8_t ledPwmBrightness;