diff --git a/right/src/merge_sensor.h b/right/src/merge_sensor.h index 4f8858f..12f75e5 100644 --- a/right/src/merge_sensor.h +++ b/right/src/merge_sensor.h @@ -7,12 +7,21 @@ // 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)