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

Add i2c_message_t and use it all across the codebase. This will allow handling variable-length I2C messages and validation with minimal effort. The test LED and brightness PWM update features got temporarily broken and will fix them soon.

Browse Source
This commit is contained in:
László Monda
2017-09-25 03:03:14 +02:00
parent ef9d9ee9a7
commit b88c6e4291
11 changed files with 93 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,8 +10,9 @@
uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
uhk_module_phase_t uhkModulePhase = UhkModulePhase_RequestKeyStates;
uint8_t txBuffer[2];
uint8_t rxBuffer[KEY_STATE_BUFFER_SIZE];
i2c_message_t rxMessage;
i2c_message_t txMessage;
void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
{
@@ -27,31 +28,34 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
switch (uhkModulePhase) {
case UhkModulePhase_RequestKeyStates:
txBuffer[0] = SlaveCommand_RequestKeyStates;
status = I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, txBuffer, 1);
txMessage.data[0] = SlaveCommand_RequestKeyStates;
txMessage.length = 1;
status = I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage);
uhkModulePhase = UhkModulePhase_ReceiveKeystates;
break;
case UhkModulePhase_ReceiveKeystates:
status = I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, rxBuffer, KEY_STATE_BUFFER_SIZE);
status = I2cAsyncReadMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &rxMessage);
uhkModulePhase = UhkModulePhase_ProcessKeystates;
break;
case UhkModulePhase_ProcessKeystates:
if (CRC16_IsMessageValid(rxBuffer, KEY_STATE_SIZE)) {
BoolBitsToBytes(rxBuffer, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
if (CRC16_IsMessageValid(&rxMessage)) {
BoolBitsToBytes(rxMessage.data, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
}
status = kStatus_Uhk_NoOp;
uhkModulePhase = UhkModulePhase_SetLedPwmBrightness;
break;
case UhkModulePhase_SetLedPwmBrightness:
txBuffer[0] = SlaveCommand_SetLedPwmBrightness;
txBuffer[1] = uhkModuleInternalState->ledPwmBrightness;
status = I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, txBuffer, 2);
uhkModulePhase = UhkModulePhase_SetTestLed;
break;
case UhkModulePhase_SetTestLed:
txBuffer[0] = SlaveCommand_SetTestLed;
txBuffer[1] = uhkModuleInternalState->isTestLedOn;
status = I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, txBuffer, 2);
txMessage.data[0] = SlaveCommand_SetTestLed;
txMessage.data[1] = uhkModuleInternalState->isTestLedOn;
txMessage.length = 2;
status = I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage);
uhkModulePhase = UhkModulePhase_SetLedPwmBrightness;
break;
case UhkModulePhase_SetLedPwmBrightness:
txMessage.data[0] = SlaveCommand_SetLedPwmBrightness;
txMessage.data[1] = uhkModuleInternalState->ledPwmBrightness;
txMessage.length = 2;
status = I2cAsyncWriteMessage(I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE, &txMessage);
uhkModulePhase = UhkModulePhase_RequestKeyStates;
break;
}