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

Add per-module UHK module phases.

Browse Source
This commit is contained in:
László Monda
2017-09-28 02:24:28 +02:00
parent d43bbbbf51
commit 5473c102ec
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/slave_drivers/uhk_module_driver.c
+11 -7
View File
@@ -10,7 +10,7 @@
uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT]; uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
static uhk_module_state_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT]; static uhk_module_state_t uhkModuleTargetStates[UHK_MODULE_MAX_COUNT];
uhk_module_phase_t uhkModulePhase = UhkModulePhase_RequestKeyStates; static uhk_module_phase_t uhkModulePhases[UHK_MODULE_MAX_COUNT];
i2c_message_t rxMessage; i2c_message_t rxMessage;
i2c_message_t txMessage; i2c_message_t txMessage;
@@ -33,6 +33,9 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
uhkModuleSourceState->ledPwmBrightness = MAX_PWM_BRIGHTNESS; uhkModuleSourceState->ledPwmBrightness = MAX_PWM_BRIGHTNESS;
uhkModuleTargetState->ledPwmBrightness = 0; uhkModuleTargetState->ledPwmBrightness = 0;
uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId;
*uhkModulePhase = UhkModulePhase_RequestKeyStates;
} }
status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
@@ -40,24 +43,25 @@ 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_state_t *uhkModuleSourceState = UhkModuleStates + uhkModuleId;
uhk_module_state_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId; uhk_module_state_t *uhkModuleTargetState = uhkModuleTargetStates + uhkModuleId;
uhk_module_phase_t *uhkModulePhase = uhkModulePhases + uhkModuleId;
switch (uhkModulePhase) { switch (*uhkModulePhase) {
case UhkModulePhase_RequestKeyStates: case UhkModulePhase_RequestKeyStates:
txMessage.data[0] = SlaveCommand_RequestKeyStates; txMessage.data[0] = SlaveCommand_RequestKeyStates;
txMessage.length = 1; txMessage.length = 1;
status = tx(); status = tx();
uhkModulePhase = UhkModulePhase_ReceiveKeystates; *uhkModulePhase = UhkModulePhase_ReceiveKeystates;
break; break;
case UhkModulePhase_ReceiveKeystates: case UhkModulePhase_ReceiveKeystates:
status = rx(); status = rx();
uhkModulePhase = UhkModulePhase_ProcessKeystates; *uhkModulePhase = UhkModulePhase_ProcessKeystates;
break; break;
case UhkModulePhase_ProcessKeystates: case UhkModulePhase_ProcessKeystates:
if (CRC16_IsMessageValid(&rxMessage)) { if (CRC16_IsMessageValid(&rxMessage)) {
BoolBitsToBytes(rxMessage.data, CurrentKeyStates[SlotId_LeftKeyboardHalf], LEFT_KEYBOARD_HALF_KEY_COUNT); BoolBitsToBytes(rxMessage.data, CurrentKeyStates[SlotId_LeftKeyboardHalf], LEFT_KEYBOARD_HALF_KEY_COUNT);
} }
status = kStatus_Uhk_NoOp; status = kStatus_Uhk_NoOp;
uhkModulePhase = UhkModulePhase_SetTestLed; *uhkModulePhase = UhkModulePhase_SetTestLed;
break; break;
case UhkModulePhase_SetTestLed: case UhkModulePhase_SetTestLed:
if (uhkModuleSourceState->isTestLedOn == uhkModuleTargetState->isTestLedOn) { if (uhkModuleSourceState->isTestLedOn == uhkModuleTargetState->isTestLedOn) {
@@ -69,7 +73,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
status = tx(); status = tx();
uhkModuleTargetState->isTestLedOn = uhkModuleSourceState->isTestLedOn; uhkModuleTargetState->isTestLedOn = uhkModuleSourceState->isTestLedOn;
} }
uhkModulePhase = UhkModulePhase_SetLedPwmBrightness; *uhkModulePhase = UhkModulePhase_SetLedPwmBrightness;
break; break;
case UhkModulePhase_SetLedPwmBrightness: case UhkModulePhase_SetLedPwmBrightness:
if (uhkModuleSourceState->ledPwmBrightness == uhkModuleTargetState->ledPwmBrightness) { if (uhkModuleSourceState->ledPwmBrightness == uhkModuleTargetState->ledPwmBrightness) {
@@ -81,7 +85,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
status = tx(); status = tx();
uhkModuleTargetState->ledPwmBrightness = uhkModuleSourceState->ledPwmBrightness; uhkModuleTargetState->ledPwmBrightness = uhkModuleSourceState->ledPwmBrightness;
} }
uhkModulePhase = UhkModulePhase_RequestKeyStates; *uhkModulePhase = UhkModulePhase_RequestKeyStates;
break; break;
} }