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

Be more specific by using IC names instead of generic names like LED driver or touchpad.

Browse Source
This commit is contained in:
László Monda
2017-09-20 13:13:57 +02:00
parent 4d5214fdc9
commit 5c8138f123
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
led_driver_state_t LedDriverStates[LED_DRIVER_MAX_COUNT] = { led_driver_state_t LedDriverStates[LED_DRIVER_MAX_COUNT] = {
{ {
.i2cAddress = I2C_ADDRESS_LED_DRIVER_RIGHT, .i2cAddress = I2C_ADDRESS_IS31FL3731_RIGHT,
.setupLedControlRegistersCommand = { .setupLedControlRegistersCommand = {
FRAME_REGISTER_LED_CONTROL_FIRST, FRAME_REGISTER_LED_CONTROL_FIRST,
0b01111111, // key row 1 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 = { .setupLedControlRegistersCommand = {
FRAME_REGISTER_LED_CONTROL_FIRST, FRAME_REGISTER_LED_CONTROL_FIRST,
0b01111111, // key row 1 0b01111111, // key row 1

20
shared/i2c_addresses.h
View File

@@ -26,18 +26,18 @@
// Reserved for high-speed mode master 0x07 // Reserved for high-speed mode master 0x07
#define I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE 0x08 #define I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE 0x08
#define I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER 0x10 #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_FIRMWARE 0x18
#define I2C_ADDRESS_LEFT_ADDON_BOOTLOADER 0x20 #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_FIRMWARE 0x28
#define I2C_ADDRESS_RIGHT_ADDON_BOOTLOADER 0x30 #define I2C_ADDRESS_RIGHT_ADDON_BOOTLOADER 0x30
#define I2C_ADDRESS_RIGHT_TOUCHPAD_BOOTLOADER 0x55 #define I2C_ADDRESS_RIGHT_IQS5XX_BOOTLOADER 0x55 // Touchpad
#define I2C_ADDRESS_LEFT_TOUCHPAD_BOOTLOADER 0x65 #define I2C_ADDRESS_LEFT_IQS5XX_BOOTLOADER 0x65 // Touchpad
#define I2C_ADDRESS_LED_DRIVER_LEFT 0x74 #define I2C_ADDRESS_IS31FL3731_LEFT 0x74 // LED driver
// Let's reserve this for another LED driver 0x75 // Let's reserve this for another IS31FL3731 0x75 // LED driver
// Let's reserve this for another LED driver 0x76 // Let's reserve this for another IS31FL3731 0x76 // LED driver
#define I2C_ADDRESS_LED_DRIVER_RIGHT 0x77 #define I2C_ADDRESS_IS31FL3731_RIGHT 0x77 // LED driver
// Reserved for 10-bit addressing 0x78 // Reserved for 10-bit addressing 0x78
// Reserved for 10-bit addressing 0x79 // Reserved for 10-bit addressing 0x79
// Reserved for 10-bit addressing 0x7A // 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. // The EEPROM is featured separately as it's not connected to the main I2C bus.
#define I2C_ADDRESS_EEPROM 0b1010000 #define I2C_ADDRESS_EEPROM 0b1010000
#define IS_I2C_LED_DRIVER_ADDRESS(address) \ #define IS_IS31FL3731_I2C_ADDRESS(address) \
(I2C_ADDRESS_LED_DRIVER_LEFT <= (address) && (address) <= I2C_ADDRESS_LED_DRIVER_RIGHT) (I2C_ADDRESS_IS31FL3731_LEFT <= (address) && (address) <= I2C_ADDRESS_IS31FL3731_RIGHT)
#endif #endif