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

30
right/src/i2c.c
View File

@@ -1,4 +1,5 @@
#include "i2c.h"
#include "crc16.h"
i2c_master_handle_t I2cMasterHandle;
i2c_master_transfer_t masterTransfer;
@@ -9,8 +10,19 @@ status_t I2cAsyncWrite(uint8_t i2cAddress, uint8_t *data, size_t dataSize)
masterTransfer.direction = kI2C_Write;
masterTransfer.data = data;
masterTransfer.dataSize = dataSize;
status_t status = I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
return status;
I2cMasterHandle.userData = NULL;
return I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
}
status_t I2cAsyncWriteMessage(uint8_t i2cAddress, i2c_message_t *message)
{
masterTransfer.slaveAddress = i2cAddress;
masterTransfer.direction = kI2C_Write;
masterTransfer.data = (uint8_t*)message;
masterTransfer.dataSize = message->length+3;
I2cMasterHandle.userData = NULL;
CRC16_UpdateMessageChecksum(message);
return I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
}
status_t I2cAsyncRead(uint8_t i2cAddress, uint8_t *data, size_t dataSize)
@@ -19,6 +31,16 @@ status_t I2cAsyncRead(uint8_t i2cAddress, uint8_t *data, size_t dataSize)
masterTransfer.direction = kI2C_Read;
masterTransfer.data = data;
masterTransfer.dataSize = dataSize;
status_t status = I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
return status;
I2cMasterHandle.userData = NULL;
return I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
}
status_t I2cAsyncReadMessage(uint8_t i2cAddress, i2c_message_t *message)
{
masterTransfer.slaveAddress = i2cAddress;
masterTransfer.direction = kI2C_Read;
masterTransfer.data = (uint8_t*)message;
masterTransfer.dataSize = I2C_MESSAGE_MAX_LENGTH;
I2cMasterHandle.userData = (void*)1;
return I2C_MasterTransferNonBlocking(I2C_MAIN_BUS_BASEADDR, &I2cMasterHandle, &masterTransfer);
}

3
right/src/i2c.h
View File

@@ -4,6 +4,7 @@
// Includes:
#include "fsl_i2c.h"
#include "slave_protocol.h"
// Macros:
@@ -45,5 +46,7 @@
status_t I2cAsyncWrite(uint8_t i2cAddress, uint8_t *data, size_t dataSize);
status_t I2cAsyncRead(uint8_t i2cAddress, uint8_t *data, size_t dataSize);
status_t I2cAsyncWriteMessage(uint8_t i2cAddress, i2c_message_t *message);
status_t I2cAsyncReadMessage(uint8_t i2cAddress, i2c_message_t *message);
#endif

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;
}

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

@@ -10,7 +10,6 @@
#define UHK_MODULE_MAX_COUNT 3
#define KEY_STATE_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1)
#define KEY_STATE_BUFFER_SIZE (KEY_STATE_SIZE + CRC16_HASH_LENGTH)
// Typedefs: