diff --git a/right/src/init_peripherials.c b/right/src/init_peripherials.c index e11d8b2..bcc2267 100644 --- a/right/src/init_peripherials.c +++ b/right/src/init_peripherials.c @@ -56,8 +56,6 @@ void InitPeripherials(void) ADC_Init(); InitI2c(); InitTestLed(); -#if UHK_PCB_MAJOR_VERSION >= 7 LedPwm_Init(); -#endif InitI2cWatchdog(); } diff --git a/right/src/main.c b/right/src/main.c index 07801b7..e4662e0 100644 --- a/right/src/main.c +++ b/right/src/main.c @@ -18,7 +18,6 @@ key_matrix_t KeyMatrix = { .colNum = KEYBOARD_MATRIX_COLS_NUM, .rowNum = KEYBOARD_MATRIX_ROWS_NUM, -#if UHK_PCB_MAJOR_VERSION >= 7 .cols = (key_matrix_pin_t[]){ {PORTA, GPIOA, kCLOCK_PortA, 5}, {PORTB, GPIOB, kCLOCK_PortB, 16}, @@ -35,24 +34,6 @@ key_matrix_t KeyMatrix = { {PORTC, GPIOC, kCLOCK_PortC, 0}, {PORTD, GPIOD, kCLOCK_PortD, 5} } -#else - .cols = (key_matrix_pin_t[]){ - {PORTA, GPIOA, kCLOCK_PortA, 5}, - {PORTB, GPIOB, kCLOCK_PortB, 3}, - {PORTB, GPIOB, kCLOCK_PortB, 16}, - {PORTB, GPIOB, kCLOCK_PortB, 17}, - {PORTB, GPIOB, kCLOCK_PortB, 18}, - {PORTA, GPIOA, kCLOCK_PortA, 1}, - {PORTB, GPIOB, kCLOCK_PortB, 0} - }, - .rows = (key_matrix_pin_t[]){ - {PORTA, GPIOA, kCLOCK_PortA, 12}, - {PORTA, GPIOA, kCLOCK_PortA, 13}, - {PORTC, GPIOC, kCLOCK_PortC, 0}, - {PORTB, GPIOB, kCLOCK_PortB, 19}, - {PORTD, GPIOD, kCLOCK_PortD, 6} - } -#endif }; uint8_t CurrentKeyStates[SLOT_COUNT][MAX_KEY_COUNT_PER_MODULE]; diff --git a/right/src/peripherals/merge_sensor.h b/right/src/peripherals/merge_sensor.h index c7195c7..5d66a92 100644 --- a/right/src/peripherals/merge_sensor.h +++ b/right/src/peripherals/merge_sensor.h @@ -7,21 +7,12 @@ // Macros: -#if UHK_PCB_MAJOR_VERSION >= 7 #define MERGE_SENSOR_GPIO GPIOB #define MERGE_SENSOR_PORT PORTB #define MERGE_SENSOR_CLOCK kCLOCK_PortB #define MERGE_SENSOR_PIN 3 #define MERGE_SENSOR_IRQ PORTB_IRQn #define MERGE_SENSOR_IRQ_HANDLER PORTB_IRQHandler -#else - #define MERGE_SENSOR_GPIO GPIOB - #define MERGE_SENSOR_PORT PORTB - #define MERGE_SENSOR_CLOCK kCLOCK_PortB - #define MERGE_SENSOR_PIN 2 - #define MERGE_SENSOR_IRQ PORTB_IRQn - #define MERGE_SENSOR_IRQ_HANDLER PORTB_IRQHandler -#endif #define MERGE_SENSOR_IS_MERGED !GPIO_ReadPinInput(MERGE_SENSOR_GPIO, MERGE_SENSOR_PIN) diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 2366f31..9eabd9f 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -197,11 +197,9 @@ void applyConfig() void setLedPwm() { -#if UHK_PCB_MAJOR_VERSION >= 7 uint8_t brightnessPercent = GenericHidInBuffer[1]; LedPwm_SetBrightness(brightnessPercent); UhkModuleStates[0].ledPwmBrightness = brightnessPercent; -#endif } void getAdcValue(void)