Rename UHK module *state* identifiers to *phase*.
This commit is contained in:
@@ -15,6 +15,10 @@
|
|||||||
LedDriverPhase_Initialized,
|
LedDriverPhase_Initialized,
|
||||||
} led_driver_phase_t;
|
} led_driver_phase_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
|
||||||
|
} led_driver_state_t;
|
||||||
|
|
||||||
// Functions:
|
// Functions:
|
||||||
|
|
||||||
extern void LedSlaveDriver_Init();
|
extern void LedSlaveDriver_Init();
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
#include "crc16.h"
|
#include "crc16.h"
|
||||||
|
|
||||||
uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
|
uhk_module_state_t UhkModuleStates[UHK_MODULE_MAX_COUNT];
|
||||||
uhk_module_field_t currentUhkModuleField = UhkModuleField_SendKeystatesRequestCommand;
|
uhk_module_phase_t uhkModulePhase = UhkModulePhase_SendKeystatesRequestCommand;
|
||||||
uhk_module_state_t uhkModuleExternalStates[UHK_MODULE_MAX_COUNT];
|
uhk_module_state_t uhkModuleExternalStates[UHK_MODULE_MAX_COUNT];
|
||||||
uint8_t txBuffer[2];
|
uint8_t txBuffer[2];
|
||||||
uint8_t rxBuffer[KEY_STATE_BUFFER_SIZE];
|
uint8_t rxBuffer[KEY_STATE_BUFFER_SIZE];
|
||||||
@@ -28,48 +28,48 @@ void UhkModuleSlaveDriver_Update(uint8_t uhkModuleId)
|
|||||||
uhk_module_state_t *uhkModuleInternalState = UhkModuleStates + uhkModuleId;
|
uhk_module_state_t *uhkModuleInternalState = UhkModuleStates + uhkModuleId;
|
||||||
//uhk_module_state_t *uhkModuleExternalState = uhkModuleExternalStates + uhkModuleId;
|
//uhk_module_state_t *uhkModuleExternalState = uhkModuleExternalStates + uhkModuleId;
|
||||||
|
|
||||||
switch (currentUhkModuleField) {
|
switch (uhkModulePhase) {
|
||||||
case UhkModuleField_SendKeystatesRequestCommand:
|
case UhkModulePhase_SendKeystatesRequestCommand:
|
||||||
txBuffer[0] = SlaveCommand_GetKeyStates;
|
txBuffer[0] = SlaveCommand_GetKeyStates;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 1);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 1);
|
||||||
currentUhkModuleField = UhkModuleField_ReceiveKeystates;
|
uhkModulePhase = UhkModulePhase_ReceiveKeystates;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_ReceiveKeystates:
|
case UhkModulePhase_ReceiveKeystates:
|
||||||
I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, KEY_STATE_BUFFER_SIZE);
|
I2cAsyncRead(I2C_ADDRESS_LEFT_KEYBOARD_HALF, rxBuffer, KEY_STATE_BUFFER_SIZE);
|
||||||
currentUhkModuleField = UhkModuleField_SendPwmBrightnessCommand;
|
uhkModulePhase = UhkModulePhase_SendPwmBrightnessCommand;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_SendPwmBrightnessCommand:
|
case UhkModulePhase_SendPwmBrightnessCommand:
|
||||||
if (CRC16_IsMessageValid(rxBuffer, KEY_STATE_SIZE)) {
|
if (CRC16_IsMessageValid(rxBuffer, KEY_STATE_SIZE)) {
|
||||||
BoolBitsToBytes(rxBuffer, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
|
BoolBitsToBytes(rxBuffer, CurrentKeyStates[SLOT_ID_LEFT_KEYBOARD_HALF], LEFT_KEYBOARD_HALF_KEY_COUNT);
|
||||||
}
|
}
|
||||||
txBuffer[0] = SlaveCommand_SetLedPwmBrightness;
|
txBuffer[0] = SlaveCommand_SetLedPwmBrightness;
|
||||||
txBuffer[1] = uhkModuleInternalState->ledPwmBrightness;
|
txBuffer[1] = uhkModuleInternalState->ledPwmBrightness;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
||||||
currentUhkModuleField = UhkModuleField_SendTestLedCommand;
|
uhkModulePhase = UhkModulePhase_SendTestLedCommand;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_SendTestLedCommand:
|
case UhkModulePhase_SendTestLedCommand:
|
||||||
txBuffer[0] = SlaveCommand_SetTestLed;
|
txBuffer[0] = SlaveCommand_SetTestLed;
|
||||||
txBuffer[1] = uhkModuleInternalState->isTestLedOn;
|
txBuffer[1] = uhkModuleInternalState->isTestLedOn;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
||||||
currentUhkModuleField = UhkModuleField_SendDisableKeyMatrixScanState;
|
uhkModulePhase = UhkModulePhase_SendDisableKeyMatrixScanState;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_SendDisableKeyMatrixScanState:
|
case UhkModulePhase_SendDisableKeyMatrixScanState:
|
||||||
txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState;
|
txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState;
|
||||||
txBuffer[1] = TestStates.disableKeyMatrixScan;
|
txBuffer[1] = TestStates.disableKeyMatrixScan;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
||||||
currentUhkModuleField = UhkModuleField_SendLedPwmBrightness;
|
uhkModulePhase = UhkModulePhase_SendLedPwmBrightness;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_SendLedPwmBrightness:
|
case UhkModulePhase_SendLedPwmBrightness:
|
||||||
txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState;
|
txBuffer[0] = SlaveCommand_SetDisableKeyMatrixScanState;
|
||||||
txBuffer[1] = TestStates.disableKeyMatrixScan;
|
txBuffer[1] = TestStates.disableKeyMatrixScan;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
||||||
currentUhkModuleField = UhkModuleField_DisableLedSdb;
|
uhkModulePhase = UhkModulePhase_DisableLedSdb;
|
||||||
break;
|
break;
|
||||||
case UhkModuleField_DisableLedSdb:
|
case UhkModulePhase_DisableLedSdb:
|
||||||
txBuffer[0] = SlaveCommand_SetDisableLedSdb;
|
txBuffer[0] = SlaveCommand_SetDisableLedSdb;
|
||||||
txBuffer[1] = TestStates.disableLedSdb;
|
txBuffer[1] = TestStates.disableLedSdb;
|
||||||
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
I2cAsyncWrite(I2C_ADDRESS_LEFT_KEYBOARD_HALF, txBuffer, 2);
|
||||||
currentUhkModuleField = UhkModuleField_SendKeystatesRequestCommand;
|
uhkModulePhase = UhkModulePhase_SendKeystatesRequestCommand;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,14 +15,14 @@
|
|||||||
// Typedefs:
|
// Typedefs:
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
UhkModuleField_SendKeystatesRequestCommand,
|
UhkModulePhase_SendKeystatesRequestCommand,
|
||||||
UhkModuleField_ReceiveKeystates,
|
UhkModulePhase_ReceiveKeystates,
|
||||||
UhkModuleField_SendPwmBrightnessCommand,
|
UhkModulePhase_SendPwmBrightnessCommand,
|
||||||
UhkModuleField_SendTestLedCommand,
|
UhkModulePhase_SendTestLedCommand,
|
||||||
UhkModuleField_SendDisableKeyMatrixScanState,
|
UhkModulePhase_SendDisableKeyMatrixScanState,
|
||||||
UhkModuleField_SendLedPwmBrightness,
|
UhkModulePhase_SendLedPwmBrightness,
|
||||||
UhkModuleField_DisableLedSdb,
|
UhkModulePhase_DisableLedSdb,
|
||||||
} uhk_module_field_t;
|
} uhk_module_phase_t;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
uint8_t ledPwmBrightness;
|
uint8_t ledPwmBrightness;
|
||||||
|
|||||||
Reference in New Issue
Block a user