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

Add uhk_module_state_t containing module variables and phase. Merge uhkModuleTargetStates and uhkModulePhases to uhkModuleStates.

Browse Source
This commit is contained in:
László Monda
2017-09-28 17:06:56 +02:00
parent de21cfc07e
commit ef2c4a1e7f
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,8 +9,7 @@
#include "crc16.h" #include "crc16.h"
uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT]; uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT];
static uhk_module_vars_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT]; static uhk_module_state_t uhkModuleStates[UHK_MODULE_MAX_COUNT];
static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
static i2c_message_t rxMessage; static i2c_message_t rxMessage;
static i2c_message_t txMessage; static i2c_message_t txMessage;
@@ -25,25 +24,27 @@ static status_t rx(void) {
void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId) void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
{ {
uhk_module_vars_t* uhkModuleSourceState = UhkModuleVars + uhkModuleId; uhk_module_vars_t* uhkModuleSourceVars = UhkModuleVars + uhkModuleId;
uhk_module_vars_t* uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId; uhk_module_state_t* uhkModuleState = uhkModuleStates + uhkModuleId;
uhk_module_vars_t* uhkModuleTargetVars = &uhkModuleState->targetVars;
uhkModuleSourceState->isTestLedOn = true; uhkModuleSourceVars->isTestLedOn = true;
uhkModuleTargetState->isTestLedOn = false; uhkModuleTargetVars->isTestLedOn = false;
uhkModuleSourceState->ledPwmBrightness = MAX_PWM_BRIGHTNESS; uhkModuleSourceVars->ledPwmBrightness = MAX_PWM_BRIGHTNESS;
uhkModuleTargetState->ledPwmBrightness = 0; uhkModuleTargetVars->ledPwmBrightness = 0;
uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase;
*uhkModulePhase = UhkModulePhase_RequestKeyStates; *uhkModulePhase = UhkModulePhase_RequestKeyStates;
} }
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_vars_t *uhkModuleSourceState = UhkModuleVars + uhkModuleId; uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleId;
uhk_module_vars_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId; uhk_module_state_t* uhkModuleState = uhkModuleStates + uhkModuleId;
uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId; uhk_module_vars_t* uhkModuleTargetVars = &uhkModuleState->targetVars;
uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase;
switch (*uhkModulePhase) { switch (*uhkModulePhase) {
case UhkModulePhase_RequestKeyStates: case UhkModulePhase_RequestKeyStates:
@@ -64,26 +65,26 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
*uhkModulePhase = UhkModulePhase_SetTestLed; *uhkModulePhase = UhkModulePhase_SetTestLed;
break; break;
case UhkModulePhase_SetTestLed: case UhkModulePhase_SetTestLed:
if (uhkModuleSourceState->isTestLedOn == uhkModuleTargetState->isTestLedOn) { if (uhkModuleSourceVars->isTestLedOn == uhkModuleTargetVars->isTestLedOn) {
status = kStatus_Uhk_NoTransfer; status = kStatus_Uhk_NoTransfer;
} else { } else {
txMessage.data[0] = SlaveCommand_SetTestLed; txMessage.data[0] = SlaveCommand_SetTestLed;
txMessage.data[1] = uhkModuleSourceState->isTestLedOn; txMessage.data[1] = uhkModuleSourceVars->isTestLedOn;
txMessage.length = 2; txMessage.length = 2;
status = tx(); status = tx();
uhkModuleTargetState->isTestLedOn = uhkModuleSourceState->isTestLedOn; uhkModuleTargetVars->isTestLedOn = uhkModuleSourceVars->isTestLedOn;
} }
*uhkModulePhase = UhkModulePhase_SetLedPwmBrightness; *uhkModulePhase = UhkModulePhase_SetLedPwmBrightness;
break; break;
case UhkModulePhase_SetLedPwmBrightness: case UhkModulePhase_SetLedPwmBrightness:
if (uhkModuleSourceState->ledPwmBrightness == uhkModuleTargetState->ledPwmBrightness) { if (uhkModuleSourceVars->ledPwmBrightness == uhkModuleTargetVars->ledPwmBrightness) {
status = kStatus_Uhk_NoTransfer; status = kStatus_Uhk_NoTransfer;
} else { } else {
txMessage.data[0] = SlaveCommand_SetLedPwmBrightness; txMessage.data[0] = SlaveCommand_SetLedPwmBrightness;
txMessage.data[1] = uhkModuleSourceState->ledPwmBrightness; txMessage.data[1] = uhkModuleSourceVars->ledPwmBrightness;
txMessage.length = 2; txMessage.length = 2;
status = tx(); status = tx();
uhkModuleTargetState->ledPwmBrightness = uhkModuleSourceState->ledPwmBrightness; uhkModuleTargetVars->ledPwmBrightness = uhkModuleSourceVars->ledPwmBrightness;
} }
*uhkModulePhase = UhkModulePhase_RequestKeyStates; *uhkModulePhase = UhkModulePhase_RequestKeyStates;
break; break;

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

@@ -33,6 +33,11 @@
bool isTestLedOn; bool isTestLedOn;
} uhk_module_vars_t; } uhk_module_vars_t;
typedef struct {
uhk_module_phase_t phase;
uhk_module_vars_t targetVars;
} uhk_module_state_t;
// Variables: // Variables:
extern uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT]; extern uhk_module_vars_t UhkModuleVars[UHK_MODULE_MAX_COUNT];