From fc300fff0c1da696a85d485ef72a0d191f193584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Thu, 16 May 2019 00:22:51 +0200 Subject: [PATCH] Add I2C_ADDRESS_MODULE_BOOTLOADER --- keycluster/src/main.c | 3 ++- keycluster/src/module.h | 1 + left/src/main.c | 3 ++- left/src/module.h | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/keycluster/src/main.c b/keycluster/src/main.c index 650f0d2..4b0bb71 100644 --- a/keycluster/src/main.c +++ b/keycluster/src/main.c @@ -4,8 +4,9 @@ #include "bootloader.h" #include #include "key_scanner.h" +#include "module.h" -DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_MODULE_BOOTLOADER) +DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_MODULE_BOOTLOADER) key_matrix_t keyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, diff --git a/keycluster/src/module.h b/keycluster/src/module.h index 931fb2e..0f8836b 100644 --- a/keycluster/src/module.h +++ b/keycluster/src/module.h @@ -4,6 +4,7 @@ // Macros: #define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_MODULE_FIRMWARE + #define I2C_ADDRESS_MODULE_BOOTLOADER I2C_ADDRESS_LEFT_MODULE_BOOTLOADER #define MODULE_PROTOCOL_VERSION 1 #define MODULE_ID ModuleId_KeyClusterLeft #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM) diff --git a/left/src/main.c b/left/src/main.c index 6d868ee..517d4c5 100644 --- a/left/src/main.c +++ b/left/src/main.c @@ -4,8 +4,9 @@ #include "bootloader.h" #include #include "key_scanner.h" +#include "modules.h" -DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER) +DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_MODULE_BOOTLOADER) key_matrix_t keyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, diff --git a/left/src/module.h b/left/src/module.h index 822318d..f39a935 100644 --- a/left/src/module.h +++ b/left/src/module.h @@ -4,6 +4,7 @@ // Macros: #define I2C_ADDRESS_MODULE_FIRMWARE I2C_ADDRESS_LEFT_KEYBOARD_HALF_FIRMWARE + #define I2C_ADDRESS_MODULE_BOOTLOADER I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER #define MODULE_PROTOCOL_VERSION 1 #define MODULE_ID ModuleId_LeftKeyboardHalf #define MODULE_KEY_COUNT (KEYBOARD_MATRIX_ROWS_NUM * KEYBOARD_MATRIX_COLS_NUM)