uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UpperCamelCase UhkModuleStates now that it's a global.

Browse Source
This commit is contained in:
László Monda
2017-10-05 20:27:57 +02:00
parent 9842a6ff60
commit bea13f063a
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
right/src/slave_drivers/uhk_module_driver.c
View File

@@ -8,7 +8,7 @@
#include "bool_array_converter.h" #include "bool_array_converter.h"
#include "crc16.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; 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) 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 *uhkModuleSourceVars = &uhkModuleState->sourceVars;
uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; 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 UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
{ {
status_t status = kStatus_Uhk_IdleSlave; 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 *uhkModuleSourceVars = &uhkModuleState->sourceVars;
uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars;
uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase;
@@ -215,5 +215,5 @@ void UhkModuleSlaveDriver_Disconnect(uint8_t uhkModuleDriverId)
if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) { if (uhkModuleDriverId == SlaveId_LeftKeyboardHalf) {
Slaves[SlaveId_LeftLedDriver].isConnected = false; Slaves[SlaveId_LeftLedDriver].isConnected = false;
} }
uhkModuleStates[uhkModuleDriverId].isEnumerated = false; UhkModuleStates[uhkModuleDriverId].isEnumerated = false;
} }

2
right/src/slave_drivers/uhk_module_driver.h
View File

@@ -77,7 +77,7 @@
// Variables: // Variables:
extern uhk_module_state_t uhkModuleStates[UHK_MODULE_MAX_COUNT]; extern uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
// Functions: // Functions:

4
right/src/usb_protocol_handler.c
View File

@@ -80,7 +80,7 @@ void setTestLed(void)
{ {
uint8_t ledState = GenericHidInBuffer[1]; uint8_t ledState = GenericHidInBuffer[1];
TEST_LED_SET(ledState); TEST_LED_SET(ledState);
uhkModuleStates[0].sourceVars.isTestLedOn = ledState; UhkModuleStates[0].sourceVars.isTestLedOn = ledState;
} }
// To be removed. Now it's already part of getKeyboardState() // To be removed. Now it's already part of getKeyboardState()
@@ -147,7 +147,7 @@ void setLedPwm(void)
{ {
uint8_t brightnessPercent = GenericHidInBuffer[1]; uint8_t brightnessPercent = GenericHidInBuffer[1];
LedPwm_SetBrightness(brightnessPercent); LedPwm_SetBrightness(brightnessPercent);
uhkModuleStates[0].sourceVars.ledPwmBrightness = brightnessPercent; UhkModuleStates[0].sourceVars.ledPwmBrightness = brightnessPercent;
} }
void getAdcValue(void) void getAdcValue(void)