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

Rename UhkModuleDriverId_{Left,Right}Addon to UhkModuleDriverId_{Left,Right}Module

Browse Source
This commit is contained in:
László Monda
2019-06-10 23:02:12 +02:00
parent 3686b2a6ff
commit 0caf0144dc
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,11 @@ static uhk_module_i2c_addresses_t moduleIdsToI2cAddresses[] = {
.firmwareI2cAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE,
.bootloaderI2cAddress = I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER
},
{ // UhkModuleDriverId_LeftAddon
{ // UhkModuleDriverId_LeftModule
.firmwareI2cAddress = I2C_ADDRESS_LEFT_MODULE_FIRMWARE,
.bootloaderI2cAddress = I2C_ADDRESS_LEFT_MODULE_BOOTLOADER
},
{ // UhkModuleDriverId_RightAddon
{ // UhkModuleDriverId_RightModule
.firmwareI2cAddress = I2C_ADDRESS_RIGHT_MODULE_FIRMWARE,
.bootloaderI2cAddress = I2C_ADDRESS_RIGHT_MODULE_BOOTLOADER
},

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

@@ -18,8 +18,8 @@
typedef enum {
UhkModuleDriverId_LeftKeyboardHalf,
UhkModuleDriverId_LeftAddon,
UhkModuleDriverId_RightAddon,
UhkModuleDriverId_LeftModule,
UhkModuleDriverId_RightModule,
} uhk_module_id_t;
typedef enum {

4
right/src/slave_scheduler.c
View File

@@ -24,12 +24,12 @@ uhk_slave_t Slaves[] = {
{
.init = UhkModuleSlaveDriver_Init,
.update = UhkModuleSlaveDriver_Update,
.perDriverId = UhkModuleDriverId_LeftAddon,
.perDriverId = UhkModuleDriverId_LeftModule,
},
{
.init = UhkModuleSlaveDriver_Init,
.update = UhkModuleSlaveDriver_Update,
.perDriverId = UhkModuleDriverId_RightAddon,
.perDriverId = UhkModuleDriverId_RightModule,
},
{
.init = LedSlaveDriver_Init,

4
right/src/usb_commands/usb_command_get_device_state.c
View File

@@ -10,6 +10,6 @@ void UsbCommand_GetKeyboardState(void)
SetUsbTxBufferUint8(1, IsEepromBusy);
SetUsbTxBufferUint8(2, MERGE_SENSOR_IS_MERGED);
SetUsbTxBufferUint8(3, UhkModuleStates[UhkModuleDriverId_LeftKeyboardHalf].moduleId);
SetUsbTxBufferUint8(4, UhkModuleStates[UhkModuleDriverId_LeftAddon].moduleId);
SetUsbTxBufferUint8(5, UhkModuleStates[UhkModuleDriverId_RightAddon].moduleId);
SetUsbTxBufferUint8(4, UhkModuleStates[UhkModuleDriverId_LeftModule].moduleId);
SetUsbTxBufferUint8(5, UhkModuleStates[UhkModuleDriverId_RightModule].moduleId);
}