From 92647b36a92b912daeb30131c5eca5daa724d4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 22 Sep 2017 02:02:23 +0200 Subject: [PATCH] Move DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER) from bootloader_config.c to main.c and delete bootloader_config.c --- left/src/bootloader_config.c | 4 ---- left/src/main.c | 3 +++ shared/bootloader.h | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 left/src/bootloader_config.c diff --git a/left/src/bootloader_config.c b/left/src/bootloader_config.c deleted file mode 100644 index 83bc15c..0000000 --- a/left/src/bootloader_config.c +++ /dev/null @@ -1,4 +0,0 @@ -#include "bootloader.h" -#include "i2c_addresses.h" - -DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER) diff --git a/left/src/main.c b/left/src/main.c index 31208f9..5ef25b6 100644 --- a/left/src/main.c +++ b/left/src/main.c @@ -1,6 +1,9 @@ #include "main.h" #include "init_clock.h" #include "init_peripherals.h" +#include "bootloader.h" + +DEFINE_BOOTLOADER_CONFIG_AREA(I2C_ADDRESS_LEFT_KEYBOARD_HALF_BOOTLOADER) key_matrix_t keyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, diff --git a/shared/bootloader.h b/shared/bootloader.h index fd66a5f..047e681 100644 --- a/shared/bootloader.h +++ b/shared/bootloader.h @@ -5,6 +5,7 @@ #include #include + #include "i2c_addresses.h" // Macros: