From ae1240c103019ee08ddbf79843322bc2ef94d9fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sat, 6 Jan 2018 17:05:37 +0100 Subject: [PATCH] Rename isFirstIteration to isFirstCycle and kStatus_Uhk_NoTransfer to kStatus_Uhk_IdleCycle. --- right/src/slave_drivers/kboot_driver.c | 4 ++-- right/src/slave_drivers/uhk_module_driver.c | 18 +++++++++--------- right/src/slave_scheduler.c | 10 +++++----- right/src/slave_scheduler.h | 4 ++-- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/right/src/slave_drivers/kboot_driver.c b/right/src/slave_drivers/kboot_driver.c index f7f220a..7d832b2 100644 --- a/right/src/slave_drivers/kboot_driver.c +++ b/right/src/slave_drivers/kboot_driver.c @@ -39,7 +39,7 @@ status_t KbootSlaveDriver_Update(uint8_t kbootInstanceId) case 1: KbootDriverState.status = Slaves[SlaveId_KbootDriver].previousStatus; KbootDriverState.phase = KbootDriverState.status == kStatus_Success ? 2 : 0; - return kStatus_Uhk_NoTransfer; + return kStatus_Uhk_IdleCycle; case 2: status = rx(10); KbootDriverState.phase++; @@ -50,7 +50,7 @@ status_t KbootSlaveDriver_Update(uint8_t kbootInstanceId) KbootDriverState.commandType = KbootCommand_Idle; } else { KbootDriverState.phase = 0; - return kStatus_Uhk_NoTransfer; + return kStatus_Uhk_IdleCycle; } } break; diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c index 878aa2ae..bda1fc5 100644 --- a/right/src/slave_drivers/uhk_module_driver.c +++ b/right/src/slave_drivers/uhk_module_driver.c @@ -91,7 +91,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) case UhkModulePhase_ProcessSync: { bool isMessageValid = CRC16_IsMessageValid(rxMessage); bool isSyncValid = memcmp(rxMessage->data, SlaveSyncString, SLAVE_SYNC_STRING_LENGTH) == 0; - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isSyncValid && isMessageValid ? UhkModulePhase_RequestModuleProtocolVersion : UhkModulePhase_RequestSync; @@ -115,7 +115,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) if (isMessageValid) { memcpy(&uhkModuleState->moduleProtocolVersion, rxMessage->data, sizeof(version_t)); } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestFirmwareVersion : UhkModulePhase_RequestModuleProtocolVersion; break; } @@ -137,7 +137,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) if (isMessageValid) { memcpy(&uhkModuleState->firmwareVersion, rxMessage->data, sizeof(version_t)); } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestModuleId : UhkModulePhase_RequestFirmwareVersion; break; } @@ -159,7 +159,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) if (isMessageValid) { uhkModuleState->moduleId = rxMessage->data[0]; } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestModuleKeyCount : UhkModulePhase_RequestModuleId; break; } @@ -181,7 +181,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) if (isMessageValid) { uhkModuleState->keyCount = rxMessage->data[0]; } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestModulePointerCount : UhkModulePhase_RequestModuleKeyCount; break; } @@ -203,7 +203,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) if (isMessageValid) { uhkModuleState->pointerCount = rxMessage->data[0]; } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = isMessageValid ? UhkModulePhase_RequestKeyStates : UhkModulePhase_RequestModulePointerCount; break; } @@ -227,14 +227,14 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) KeyStates[slotId][keyId].current = keyStatesBuffer[keyId]; } } - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; *uhkModulePhase = UhkModulePhase_SetTestLed; break; // Set test LED case UhkModulePhase_SetTestLed: if (uhkModuleSourceVars->isTestLedOn == uhkModuleTargetVars->isTestLedOn) { - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; } else { txMessage.data[0] = SlaveCommand_SetTestLed; txMessage.data[1] = uhkModuleSourceVars->isTestLedOn; @@ -248,7 +248,7 @@ status_t UhkModuleSlaveDriver_Update(uint8_t uhkModuleDriverId) // Set PWM brightness case UhkModulePhase_SetLedPwmBrightness: if (uhkModuleSourceVars->ledPwmBrightness == uhkModuleTargetVars->ledPwmBrightness) { - status = kStatus_Uhk_NoTransfer; + status = kStatus_Uhk_IdleCycle; } else { txMessage.data[0] = SlaveCommand_SetLedPwmBrightness; txMessage.data[1] = uhkModuleSourceVars->ledPwmBrightness; diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c index 47d3a5c..509baa5 100644 --- a/right/src/slave_scheduler.c +++ b/right/src/slave_scheduler.c @@ -52,7 +52,7 @@ uhk_slave_t Slaves[] = { static void slaveSchedulerCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t previousStatus, void *userData) { - bool isFirstIteration = true; + bool isFirstCycle = true; bool isTransferScheduled = false; I2cSlaveScheduler_Counter++; @@ -60,7 +60,7 @@ static void slaveSchedulerCallback(I2C_Type *base, i2c_master_handle_t *handle, uhk_slave_t *previousSlave = Slaves + previousSlaveId; uhk_slave_t *currentSlave = Slaves + currentSlaveId; - if (isFirstIteration) { + if (isFirstCycle) { previousSlave->previousStatus = previousStatus; if (IS_STATUS_I2C_ERROR(previousStatus)) { LogI2cError(previousSlaveId, previousStatus); @@ -72,7 +72,7 @@ static void slaveSchedulerCallback(I2C_Type *base, i2c_master_handle_t *handle, previousSlave->disconnect(previousSlaveId); } - isFirstIteration = false; + isFirstCycle = false; } if (!currentSlave->isConnected) { @@ -83,12 +83,12 @@ static void slaveSchedulerCallback(I2C_Type *base, i2c_master_handle_t *handle, if (IS_STATUS_I2C_ERROR(currentStatus)) { LogI2cError(currentSlaveId, currentStatus); } - isTransferScheduled = currentStatus != kStatus_Uhk_IdleSlave && currentStatus != kStatus_Uhk_NoTransfer; + isTransferScheduled = currentStatus != kStatus_Uhk_IdleSlave && currentStatus != kStatus_Uhk_IdleCycle; if (isTransferScheduled) { currentSlave->isConnected = true; } - if (currentStatus != kStatus_Uhk_NoTransfer) { + if (currentStatus != kStatus_Uhk_IdleCycle) { previousSlaveId = currentSlaveId++; if (currentSlaveId >= SLAVE_COUNT) { currentSlaveId = 0; diff --git a/right/src/slave_scheduler.h b/right/src/slave_scheduler.h index 7a7fafd..e58b488 100644 --- a/right/src/slave_scheduler.h +++ b/right/src/slave_scheduler.h @@ -44,8 +44,8 @@ } uhk_status_group_t; typedef enum { - kStatus_Uhk_IdleSlave = MAKE_STATUS(kStatusGroup_Uhk, 0), // Another slave should be scheduled - kStatus_Uhk_NoTransfer = MAKE_STATUS(kStatusGroup_Uhk, 1), // The same slave should be rescheduled + kStatus_Uhk_IdleSlave = MAKE_STATUS(kStatusGroup_Uhk, 0), // Another slave should be scheduled + kStatus_Uhk_IdleCycle = MAKE_STATUS(kStatusGroup_Uhk, 1), // The same slave should be rescheduled } uhk_status_t; // Variables: