From 0caf0144dcf653c361af5648b14805a14d3b1e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 10 Jun 2019 23:02:12 +0200 Subject: [PATCH] Rename UhkModuleDriverId_{Left,Right}Addon to UhkModuleDriverId_{Left,Right}Module --- right/src/slave_drivers/uhk_module_driver.c | 4 ++-- right/src/slave_drivers/uhk_module_driver.h | 4 ++-- right/src/slave_scheduler.c | 4 ++-- right/src/usb_commands/usb_command_get_device_state.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/right/src/slave_drivers/uhk_module_driver.c b/right/src/slave_drivers/uhk_module_driver.c index b4bf61d..068c219 100644 --- a/right/src/slave_drivers/uhk_module_driver.c +++ b/right/src/slave_drivers/uhk_module_driver.c @@ -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 }, diff --git a/right/src/slave_drivers/uhk_module_driver.h b/right/src/slave_drivers/uhk_module_driver.h index 27b3be8..f158637 100644 --- a/right/src/slave_drivers/uhk_module_driver.h +++ b/right/src/slave_drivers/uhk_module_driver.h @@ -18,8 +18,8 @@ typedef enum { UhkModuleDriverId_LeftKeyboardHalf, - UhkModuleDriverId_LeftAddon, - UhkModuleDriverId_RightAddon, + UhkModuleDriverId_LeftModule, + UhkModuleDriverId_RightModule, } uhk_module_id_t; typedef enum { diff --git a/right/src/slave_scheduler.c b/right/src/slave_scheduler.c index 0042126..c439f40 100644 --- a/right/src/slave_scheduler.c +++ b/right/src/slave_scheduler.c @@ -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, diff --git a/right/src/usb_commands/usb_command_get_device_state.c b/right/src/usb_commands/usb_command_get_device_state.c index 1fc2171..c404e20 100644 --- a/right/src/usb_commands/usb_command_get_device_state.c +++ b/right/src/usb_commands/usb_command_get_device_state.c @@ -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); }