From c23d3273842147d563b08a6dc6ca015df0df3af1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sat, 30 Sep 2017 00:40:13 +0200 Subject: [PATCH] Rename uhkModuleId to uhkModuleDriverId in UhkModuleSlaveDriver_Init() and UhkModuleSlaveDriver_Update() --- right/src/slave_drivers/uhk_module_driver.c | 16 ++++++++-------- right/src/slave_drivers/uhk_module_driver.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c index 32f1419..c5b20c0 100644 --- a/right/src/slave_drivers/uhk_module_driver.c +++ b/right/src/slave_drivers/uhk_module_driver.c @@ -38,10 +38,10 @@ static status_t rx(i2c_message_t *rxMessage, uint8_t i2cAddress) 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_state_t *uhkModuleState = uhkModuleStates + uhkModuleId; + uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleDriverId; + uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhkModuleSourceVars->isTestLedOn = true; @@ -53,16 +53,16 @@ void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId) uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; *uhkModulePhase = UhkModulePhase_RequestModuleFeatures; - uhk_module_i2c_addresses_t *uhkModuleI2cAddresses = moduleIdsToI2cAddresses + uhkModuleId; + uhk_module_i2c_addresses_t *uhkModuleI2cAddresses = moduleIdsToI2cAddresses + uhkModuleDriverId; uhkModuleState->firmwareI2cAddress = uhkModuleI2cAddresses->firmwareI2cAddress; uhkModuleState->bootloaderI2cAddress = uhkModuleI2cAddresses->bootloaderI2cAddress; } -status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) +status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) { status_t status = kStatus_Uhk_IdleSlave; - uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleId; - uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleId; + uhk_module_vars_t *uhkModuleSourceVars = UhkModuleVars + uhkModuleDriverId; + uhk_module_state_t *uhkModuleState = uhkModuleStates + uhkModuleDriverId; uhk_module_vars_t *uhkModuleTargetVars = &uhkModuleState->targetVars; uhk_module_phase_t *uhkModulePhase = &uhkModuleState->phase; uint8_t i2cAddress = uhkModuleState->firmwareI2cAddress; @@ -103,7 +103,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId) break; case UhkModulePhase_ProcessKeystates: if (CRC16_IsMessageValid(rxMessage)) { - uint8_t slotId = uhkModuleId + 1; + uint8_t slotId = uhkModuleDriverId + 1; BoolBitsToBytes(rxMessage->data, CurrentKeyStates[slotId], uhkModuleState->features.keyCount); } status = kStatus_Uhk_NoTransfer; diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h index 64e18e5..8816cb4 100644 --- a/right/src/slave_drivers/uhk_module_driver.h +++ b/right/src/slave_drivers/uhk_module_driver.h @@ -56,7 +56,7 @@ // Functions: - void UhkModuleSlaveDriver_Init(uint8_t uhkModuleId); - status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleId); + void UhkModuleSlaveDriver_Init(uint8_t uhkModuleDriverId); + status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId); #endif