Update submodule irmp

3 files changed, 8 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index 3838d63..83cebf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.map
 *.bin
 generated.*.ld
+*.i
+*.s
diff --git a/irmp b/irmp
-Subproject 13c24737d1698d551d20baa74681021dc2c0c35
+Subproject 54cbcce61b31454cc76ad2a75d4d5e479d89634
diff --git a/irmp-main.c b/irmp-main.c
index 6c8fd53..e7e04dd 100644
--- a/irmp-main.c
+++ b/irmp-main.c
@@ -70,13 +70,16 @@ static void setup_clock_and_gpios(void)
 /* IRMP                                                                     */

 /*--------------------------------------------------------------------------*/

 

+#define IRMP_TIMER_NUMBER         3

+#define IRMP_TIMER                CONCAT(TIM, IRMP_TIMER_NUMBER)

+

 #define IRMP_TIMER_CR1            TIM_CR1(IRMP_TIMER)

 #define IRMP_TIMER_DIER           TIM_DIER(IRMP_TIMER)

 #define IRMP_TIMER_SR             TIM_SR(IRMP_TIMER)

 #define IRMP_TIMER_ARR            TIM_ARR(IRMP_TIMER)

-#define RCC_IRMP_TIMER            CONCAT(RCC_TIM, IRMP_TIMER_NUMBER)

+#define IRMP_TIMER_RCC            CONCAT(RCC_TIM, IRMP_TIMER_NUMBER)

 #define NVIC_IRMP_TIMER_IRQ       CONCAT(CONCAT(NVIC_TIM, IRMP_TIMER_NUMBER), _IRQ)

-#define IRMP_TIMER_ISR          CONCAT(CONCAT(tim, IRMP_TIMER_NUMBER), _isr)

+#define IRMP_TIMER_ISR            CONCAT(CONCAT(tim, IRMP_TIMER_NUMBER), _isr)

 

 

 /** Retrieve the actual input clock of a timer

@@ -115,7 +118,7 @@ void irmp_timer_init (void)
               GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);

 #endif

 	/* Enable timer clock. */

-    rcc_periph_clock_enable(RCC_IRMP_TIMER);

+    rcc_periph_clock_enable(IRMP_TIMER_RCC);

     nvic_set_priority(NVIC_IRMP_TIMER_IRQ, 4*16);

 	nvic_enable_irq(NVIC_IRMP_TIMER_IRQ);