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

Add uhk_module_id_t. Use UhkModuleId_LeftKeyboardHalf in the Slaves array. Set UHK_MODULE_MAX_COUNT to 3.

Browse Source
This commit is contained in:
László Monda
2017-08-09 00:02:44 +02:00
parent 670c6b6e82
commit 7a45fd7e6c
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,12 +8,18 @@
// Macros: // Macros:
#define UHK_MODULE_MAX_COUNT 1 #define UHK_MODULE_MAX_COUNT 3
#define KEY_STATE_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1) #define KEY_STATE_SIZE (LEFT_KEYBOARD_HALF_KEY_COUNT/8 + 1)
#define KEY_STATE_BUFFER_SIZE (KEY_STATE_SIZE + CRC16_HASH_LENGTH) #define KEY_STATE_BUFFER_SIZE (KEY_STATE_SIZE + CRC16_HASH_LENGTH)
// Typedefs: // Typedefs:
typedef enum {
UhkModuleId_LeftKeyboardHalf,
UhkModuleId_LeftAddon,
UhkModuleId_RightAddon,
} uhk_module_id_t;
typedef enum { typedef enum {
UhkModulePhase_SendKeystatesRequestCommand, UhkModulePhase_SendKeystatesRequestCommand,
UhkModulePhase_ReceiveKeystates, UhkModulePhase_ReceiveKeystates,

6
right/src/slave_scheduler.c
View File

@@ -12,9 +12,9 @@ uint8_t previousSlaveId = 0;
uint8_t currentSlaveId = 0; uint8_t currentSlaveId = 0;
uhk_slave_t Slaves[] = { uhk_slave_t Slaves[] = {
{ .initializer = UhkModuleSlaveDriver_Init, .updater = UhkModuleSlaveDriver_Update, .perDriverId = 0 }, { .initializer = UhkModuleSlaveDriver_Init, .updater = UhkModuleSlaveDriver_Update, .perDriverId = UhkModuleId_LeftKeyboardHalf },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Right }, { .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Right },
{ .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Left }, { .initializer = LedSlaveDriver_Init, .updater = LedSlaveDriver_Update, .perDriverId = LedDriverId_Left },
}; };
static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData) static void bridgeProtocolCallback(I2C_Type *base, i2c_master_handle_t *handle, status_t status, void *userData)