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

Rename UhkModulePhase_*ProtocolVersion to UhkModulePhase_*ModuleProtocolVersion.

Browse Source
This commit is contained in:
László Monda
2017-12-15 01:16:27 +01:00
parent bd53b73685
commit c1b887cea8
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
left/src/slave_protocol_handler.c
View File

@@ -56,7 +56,7 @@ void SlaveTxHandler(void)
TxMessage.length = 1;
break;
}
case SlaveProperty_ProtocolVersion: {
case SlaveProperty_ModuleProtocolVersion: {
TxMessage.data[0] = MODULE_PROTOCOL_VERSION;
TxMessage.length = 1;
break;

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

@@ -93,30 +93,30 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
bool isSyncValid = memcmp(rxMessage->data, SlaveSyncString, SLAVE_SYNC_STRING_LENGTH) == 0;
status = kStatus_Uhk_NoTransfer;
*uhkModulePhase = isSyncValid && isMessageValid
? UhkModulePhase_RequestProtocolVersion
? UhkModulePhase_RequestModuleProtocolVersion
: UhkModulePhase_RequestSync;
break;
}
// Get protocol version
case UhkModulePhase_RequestProtocolVersion:
case UhkModulePhase_RequestModuleProtocolVersion:
txMessage.data[0] = SlaveCommand_RequestProperty;
txMessage.data[1] = SlaveProperty_ProtocolVersion;
txMessage.data[1] = SlaveProperty_ModuleProtocolVersion;
txMessage.length = 2;
status = tx(i2cAddress);
*uhkModulePhase = UhkModulePhase_ReceiveProtocolVersion;
*uhkModulePhase = UhkModulePhase_ReceiveModuleProtocolVersion;
break;
case UhkModulePhase_ReceiveProtocolVersion:
case UhkModulePhase_ReceiveModuleProtocolVersion:
status = rx(rxMessage, i2cAddress);
*uhkModulePhase = UhkModulePhase_ProcessProtocolVersion;
*uhkModulePhase = UhkModulePhase_ProcessModuleProtocolVersion;
break;
case UhkModulePhase_ProcessProtocolVersion: {
case UhkModulePhase_ProcessModuleProtocolVersion: {
bool isMessageValid = CRC16_IsMessageValid(rxMessage);
if (isMessageValid) {
uhkModuleState->protocolVersion = rxMessage->data[0];
}
status = kStatus_Uhk_NoTransfer;
*uhkModulePhase = isMessageValid ? UhkModulePhase_RequestModuleId : UhkModulePhase_RequestProtocolVersion;
*uhkModulePhase = isMessageValid ? UhkModulePhase_RequestModuleId : UhkModulePhase_RequestModuleProtocolVersion;
break;
}

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

@@ -29,9 +29,9 @@
UhkModulePhase_ProcessSync,
// Get protocol version
UhkModulePhase_RequestProtocolVersion,
UhkModulePhase_ReceiveProtocolVersion,
UhkModulePhase_ProcessProtocolVersion,
UhkModulePhase_RequestModuleProtocolVersion,
UhkModulePhase_ReceiveModuleProtocolVersion,
UhkModulePhase_ProcessModuleProtocolVersion,
// Get module id
UhkModulePhase_RequestModuleId,

2
shared/slave_protocol.h
View File

@@ -27,7 +27,7 @@
typedef enum {
SlaveProperty_Sync,
SlaveProperty_ProtocolVersion,
SlaveProperty_ModuleProtocolVersion,
SlaveProperty_ModuleId,
SlaveProperty_Features,
} slave_property_t;