From d8761a95ba53997319f4b7fd985db6eb7737d533 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Sat, 21 Jan 2017 02:20:47 +0100 Subject: [PATCH] Use >= relations instead of == for comparing UHK_PCB_MAJOR_VERSION. --- left/src/main.c | 2 +- right/src/init_peripherials.c | 2 +- right/src/main.c | 2 +- right/src/merge_sensor.h | 2 +- right/src/usb_protocol_handler.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/left/src/main.c b/left/src/main.c index c71b00e..9462593 100644 --- a/left/src/main.c +++ b/left/src/main.c @@ -13,7 +13,7 @@ key_matrix_t keyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, .rowNum = KEYBOARD_MATRIX_ROWS_NUM, -#if UHK_PCB_MAJOR_VERSION == 7 +#if UHK_PCB_MAJOR_VERSION >= 7 .cols = (key_matrix_pin_t[]){ {PORTB, GPIOB, kCLOCK_PortB, 11}, {PORTA, GPIOA, kCLOCK_PortA, 6}, diff --git a/right/src/init_peripherials.c b/right/src/init_peripherials.c index 0e4ca0c..ccc7a73 100644 --- a/right/src/init_peripherials.c +++ b/right/src/init_peripherials.c @@ -49,7 +49,7 @@ void InitPeripherials(void) InitResetButton(); InitMergeSensor(); InitI2c(); -#if UHK_PCB_MAJOR_VERSION == 7 +#if UHK_PCB_MAJOR_VERSION >= 7 LedPwm_Init(); #endif InitTestLed(); // This function must not be called before LedPwm_Init() or else the UHK won't diff --git a/right/src/main.c b/right/src/main.c index 5fc73e9..97d01df 100644 --- a/right/src/main.c +++ b/right/src/main.c @@ -9,7 +9,7 @@ key_matrix_t KeyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, .rowNum = KEYBOARD_MATRIX_ROWS_NUM, -#if UHK_PCB_MAJOR_VERSION == 7 +#if UHK_PCB_MAJOR_VERSION >= 7 .cols = (key_matrix_pin_t[]){ {PORTA, GPIOA, kCLOCK_PortA, 5}, {PORTB, GPIOB, kCLOCK_PortB, 16}, diff --git a/right/src/merge_sensor.h b/right/src/merge_sensor.h index 12f75e5..c7195c7 100644 --- a/right/src/merge_sensor.h +++ b/right/src/merge_sensor.h @@ -7,7 +7,7 @@ // Macros: -#if UHK_PCB_MAJOR_VERSION == 7 +#if UHK_PCB_MAJOR_VERSION >= 7 #define MERGE_SENSOR_GPIO GPIOB #define MERGE_SENSOR_PORT PORTB #define MERGE_SENSOR_CLOCK kCLOCK_PortB diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 4940037..55c190e 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -207,7 +207,7 @@ void applyConfig() void setLedPwm() { -#if UHK_PCB_MAJOR_VERSION == 7 +#if UHK_PCB_MAJOR_VERSION >= 7 uint8_t isRightKeyboardHalf = GenericHidInBuffer[1]; uint8_t brightnessPercent = GenericHidInBuffer[2]; if (isRightKeyboardHalf) {