From bea13f063a9704446c366b0975d2c687370a74e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 5 Oct 2017 20:27:57 +0200 Subject: [PATCH] UpperCamelCase UhkModuleStates now that it's a global. --- right/src/slave_drivers/uhk_module_driver.c | 8 ++++---- right/src/slave_drivers/uhk_module_driver.h | 2 +- right/src/usb_protocol_handler.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c index ef3d284..98bfcfe 100644 --- a/right/src/slave_drivers/uhk_module_driver.c +++ b/right/src/slave_drivers/uhk_module_driver.c @@ -8,7 +8,7 @@ #include "bool_array_converter.h" #include "crc16.h" -uhk_module_state_t uhkModuleStates[UHK_MODULE_MAX_COUNT]; +uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; static i2c_message_t txMessage; @@ -39,7 +39,7 @@ static status_t rx(i2c_message_t *rxMessage, uint8_t i2cAddress) void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId) { - uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId; + uhk_module_state_t *uhkModuleState = UhkModuleStates + uhkModuleDriverId; uhk_module_vars_t *uhkModuleSourceVars = &uhkModuleState->sourceVars; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; @@ -60,7 +60,7 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId) status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) { status_t status = kStatus_Uhk_IdleSlave; - uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId; + uhk_module_state_t *uhkModuleState = UhkModuleStates + uhkModuleDriverId; uhk_module_vars_t *uhkModuleSourceVars = &uhkModuleState->sourceVars; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; @@ -215,5 +215,5 @@ void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId) if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) { Slaves[SlaveId_LeftLedDriver].isConnected = false; } - uhkModuleStates[uhkModuleDriverId].isEnumerated = false; + UhkModuleStates[uhkModuleDriverId].isEnumerated = false; } diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h index f3c7db5..c5b9f99 100644 --- a/right/src/slave_drivers/uhk_module_driver.h +++ b/right/src/slave_drivers/uhk_module_driver.h @@ -77,7 +77,7 @@ // Variables: - extern uhk_module_state_t uhkModuleStates[UHK_MODULE_MAX_COUNT]; + extern uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; // Functions: diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index ee27f14..ff213ab 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -80,7 +80,7 @@ void setTestLed(void) { uint8_t ledState = GenericHidInBuffer[1]; TEST_LED_SET(ledState); - uhkModuleStates[0].sourceVars.isTestLedOn = ledState; + UhkModuleStates[0].sourceVars.isTestLedOn = ledState; } // To be removed. Now it's already part of getKeyboardState() @@ -147,7 +147,7 @@ void setLedPwm(void) { uint8_t brightnessPercent = GenericHidInBuffer[1]; LedPwm_SetBrightness(brightnessPercent); - uhkModuleStates[0].sourceVars.ledPwmBrightness = brightnessPercent; + UhkModuleStates[0].sourceVars.ledPwmBrightness = brightnessPercent; } void getAdcValue(void)