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

Rename uhkModuleId to uhkModuleDriverId in UhkModuleSlaveDriver_Init() and UhkModuleSlaveDriver_Update()

Browse Source
This commit is contained in:
László Monda
2017-09-30 00:40:13 +02:00
parent a7b0dfef1d
commit c23d327384
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,10 +38,10 @@ static status_t rx(i2c_message_t *rxMessage, uint8_t i2cAddress)
return I2cAsyncReadMessage(i2cAddress, rxMessage); return I2cAsyncReadMessage(i2cAddress, rxMessage);
} }
void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId) void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId)
{ {
uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleId; uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleDriverId;
uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleId; uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId;
uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars;
uhkModuleSourceVars->isTestLedOn = true; uhkModuleSourceVars->isTestLedOn = true;
@@ -53,16 +53,16 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId)
uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase;
*uhkModulePhase = UhkModulePhase_RequestModuleFeatures; *uhkModulePhase = UhkModulePhase_RequestModuleFeatures;
uhk_module_i2c_addresses_t *uhkModuleI2cAddresses = moduleIdsToI2cAddresses + uhkModuleId; uhk_module_i2c_addresses_t *uhkModuleI2cAddresses = moduleIdsToI2cAddresses + uhkModuleDriverId;
uhkModuleState->firmwareI2cAddress = uhkModuleI2cAddresses->firmwareI2cAddress; uhkModuleState->firmwareI2cAddress = uhkModuleI2cAddresses->firmwareI2cAddress;
uhkModuleState->bootloaderI2cAddress = uhkModuleI2cAddresses->bootloaderI2cAddress; uhkModuleState->bootloaderI2cAddress = uhkModuleI2cAddresses->bootloaderI2cAddress;
} }
status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId)
{ {
status_t status = kStatus_Uhk_IdleSlave; status_t status = kStatus_Uhk_IdleSlave;
uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleId; uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleDriverId;
uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleId; uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId;
uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars;
uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase;
uint8_t i2cAddress = uhkModuleState->firmwareI2cAddress; uint8_t i2cAddress = uhkModuleState->firmwareI2cAddress;
@@ -103,7 +103,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
break; break;
case UhkModulePhase_ProcessKeystates: case UhkModulePhase_ProcessKeystates:
if (CRC16_IsMessageValid(rxMessage)) { if (CRC16_IsMessageValid(rxMessage)) {
uint8_t slotId = uhkModuleId + 1; uint8_t slotId = uhkModuleDriverId + 1;
BoolBitsToBytes(rxMessage->data, CurrentKeyStates[slotId], uhkModuleState->features.keyCount); BoolBitsToBytes(rxMessage->data, CurrentKeyStates[slotId], uhkModuleState->features.keyCount);
} }
status = kStatus_Uhk_NoTransfer; status = kStatus_Uhk_NoTransfer;

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

@@ -56,7 +56,7 @@
// Functions: // Functions:
void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId); void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId);
status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId); status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId);
#endif #endif