From 5c8138f12376880d00b3baeb2b9fcc2e71b48e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Wed, 20 Sep 2017 13:13:57 +0200 Subject: [PATCH] Be more specific by using IC names instead of generic names like LED driver or touchpad. --- right/src/slave_drivers/is31fl3731_driver.c | 4 ++-- shared/i2c_addresses.h | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/right/src/slave_drivers/is31fl3731_driver.c b/right/src/slave_drivers/is31fl3731_driver.c index 87a433c..1608d08 100644 --- a/right/src/slave_drivers/is31fl3731_driver.c +++ b/right/src/slave_drivers/is31fl3731_driver.c @@ -5,7 +5,7 @@ led_driver_state_t LedDriverStates[LED_DRIVER_MAX_COUNT] = { { - .i2cAddress = I2C_ADDRESS_LED_DRIVER_RIGHT, + .i2cAddress = I2C_ADDRESS_IS31FL3731_RIGHT, .setupLedControlRegistersCommand = { FRAME_REGISTER_LED_CONTROL_FIRST, 0b01111111, // key row 1 @@ -29,7 +29,7 @@ led_driver_state_t LedDriverStates[LED_DRIVER_MAX_COUNT] = { } }, { - .i2cAddress = I2C_ADDRESS_LED_DRIVER_LEFT, + .i2cAddress = I2C_ADDRESS_IS31FL3731_LEFT, .setupLedControlRegistersCommand = { FRAME_REGISTER_LED_CONTROL_FIRST, 0b01111111, // key row 1 diff --git a/shared/i2c_addresses.h b/shared/i2c_addresses.h index 9c2e0b1..f901319 100644 --- a/shared/i2c_addresses.h +++ b/shared/i2c_addresses.h @@ -26,18 +26,18 @@ // Reserved for high-speed mode master 0x07 #define I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE 0x08 #define I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER 0x10 - #define I2C_ADDRESS_RIGHT_TOUCHPAD_FIRMWARE 0x15 + #define I2C_ADDRESS_RIGHT_IQS5XX_FIRMWARE 0x15 // Touchpad #define I2C_ADDRESS_LEFT_ADDON_FIRMWARE 0x18 #define I2C_ADDRESS_LEFT_ADDON_BOOTLOADER 0x20 - #define I2C_ADDRESS_LEFT_TOUCHPAD_FIRMWARE 0x25 + #define I2C_ADDRESS_LEFT_IQS5XX_FIRMWARE 0x25 // Touchpad #define I2C_ADDRESS_RIGHT_ADDON_FIRMWARE 0x28 #define I2C_ADDRESS_RIGHT_ADDON_BOOTLOADER 0x30 - #define I2C_ADDRESS_RIGHT_TOUCHPAD_BOOTLOADER 0x55 - #define I2C_ADDRESS_LEFT_TOUCHPAD_BOOTLOADER 0x65 - #define I2C_ADDRESS_LED_DRIVER_LEFT 0x74 - // Let's reserve this for another LED driver 0x75 - // Let's reserve this for another LED driver 0x76 - #define I2C_ADDRESS_LED_DRIVER_RIGHT 0x77 + #define I2C_ADDRESS_RIGHT_IQS5XX_BOOTLOADER 0x55 // Touchpad + #define I2C_ADDRESS_LEFT_IQS5XX_BOOTLOADER 0x65 // Touchpad + #define I2C_ADDRESS_IS31FL3731_LEFT 0x74 // LED driver + // Let's reserve this for another IS31FL3731 0x75 // LED driver + // Let's reserve this for another IS31FL3731 0x76 // LED driver + #define I2C_ADDRESS_IS31FL3731_RIGHT 0x77 // LED driver // Reserved for 10-bit addressing 0x78 // Reserved for 10-bit addressing 0x79 // Reserved for 10-bit addressing 0x7A @@ -50,7 +50,7 @@ // The EEPROM is featured separately as it's not connected to the main I2C bus. #define I2C_ADDRESS_EEPROM 0b1010000 - #define IS_I2C_LED_DRIVER_ADDRESS(address) \ - (I2C_ADDRESS_LED_DRIVER_LEFT <= (address) && (address) <= I2C_ADDRESS_LED_DRIVER_RIGHT) + #define IS_IS31FL3731_I2C_ADDRESS(address) \ + (I2C_ADDRESS_IS31FL3731_LEFT <= (address) && (address) <= I2C_ADDRESS_IS31FL3731_RIGHT) #endif