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

Rename uhk_module_state_t to uhk_module_vars_t.

Browse Source
This commit is contained in:
László Monda
2017-09-28 16:57:46 +02:00
parent 4666b24c69
commit de21cfc07e
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,8 +8,8 @@
#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_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT];
static uhk_module_state_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT]; static uhk_module_vars_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT];
static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT]; static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
static i2c_message_t rxMessage; static i2c_message_t rxMessage;
@@ -25,8 +25,8 @@ static status_t rx(void) {
void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId) void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
{ {
uhk_module_state_t* uhkModuleSourceState = UhkModuleStates + uhkModuleId; uhk_module_vars_t* uhkModuleSourceState = UhkModuleVars + uhkModuleId;
uhk_module_state_t* uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId; uhk_module_vars_t* uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
uhkModuleSourceState->isTestLedOn = true; uhkModuleSourceState->isTestLedOn = true;
uhkModuleTargetState->isTestLedOn = false; uhkModuleTargetState->isTestLedOn = false;
@@ -41,8 +41,8 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
{ {
status_t status = kStatus_Uhk_IdleSlave; status_t status = kStatus_Uhk_IdleSlave;
uhk_module_state_t *uhkModuleSourceState = UhkModuleStates + uhkModuleId; uhk_module_vars_t *uhkModuleSourceState = UhkModuleVars + uhkModuleId;
uhk_module_state_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId; uhk_module_vars_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId; uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId;
switch (*uhkModulePhase) { switch (*uhkModulePhase) {

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

@@ -31,11 +31,11 @@
typedef struct { typedef struct {
uint8_t ledPwmBrightness; uint8_t ledPwmBrightness;
bool isTestLedOn; bool isTestLedOn;
} uhk_module_state_t; } uhk_module_vars_t;
// Variables: // Variables:
extern uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; extern uhk_module_vars_t UhkModuleVars[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].isTestLedOn = ledState; UhkModuleVars[0].isTestLedOn = ledState;
} }
void readMergeSensor(void) void readMergeSensor(void)
@@ -134,7 +134,7 @@ void setLedPwm(void)
{ {
uint8_t brightnessPercent = GenericHidInBuffer[1]; uint8_t brightnessPercent = GenericHidInBuffer[1];
LedPwm_SetBrightness(brightnessPercent); LedPwm_SetBrightness(brightnessPercent);
UhkModuleStates[0].ledPwmBrightness = brightnessPercent; UhkModuleVars[0].ledPwmBrightness = brightnessPercent;
} }
void getAdcValue(void) void getAdcValue(void)