Update submodule irmp

diff --git a/.gitignore b/.gitignore
index 3838d63ec5732733ce46e0d487b3ebbc3a06a13f..83cebf821c92cfa2c0333ea7c2dcf32aed4dcfbf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
 *.map
 *.bin
 generated.*.ld
+*.i
+*.s

diff --git a/irmp b/irmp
index 13c24737d1698d551d20baa74681021dc2c0c359..54cbcce61b31454cc76ad2a75d4d5e479d896345 160000 (submodule)
--- a/irmp
+++ b/irmp
@@ -1 +1 @@
-Subproject commit 13c24737d1698d551d20baa74681021dc2c0c359
+Subproject commit 54cbcce61b31454cc76ad2a75d4d5e479d896345

diff --git a/irmp-main.c b/irmp-main.c
index 6c8fd53daa9e97fef82a34591b80ca37edbff9c7..e7e04ddccb94eda44e8f148fa24407efe0568259 100644 (file)
--- a/irmp-main.c
+++ b/irmp-main.c
@@ -70,13 +70,16 @@ static void setup_clock_and_gpios(void)
 /* IRMP                                                                     */\r
 /*--------------------------------------------------------------------------*/\r
 \r
+#define IRMP_TIMER_NUMBER         3\r
+#define IRMP_TIMER                CONCAT(TIM, IRMP_TIMER_NUMBER)\r
+\r
 #define IRMP_TIMER_CR1            TIM_CR1(IRMP_TIMER)\r
 #define IRMP_TIMER_DIER           TIM_DIER(IRMP_TIMER)\r
 #define IRMP_TIMER_SR             TIM_SR(IRMP_TIMER)\r
 #define IRMP_TIMER_ARR            TIM_ARR(IRMP_TIMER)\r
-#define RCC_IRMP_TIMER            CONCAT(RCC_TIM, IRMP_TIMER_NUMBER)\r
+#define IRMP_TIMER_RCC            CONCAT(RCC_TIM, IRMP_TIMER_NUMBER)\r
 #define NVIC_IRMP_TIMER_IRQ       CONCAT(CONCAT(NVIC_TIM, IRMP_TIMER_NUMBER), _IRQ)\r
-#define IRMP_TIMER_ISR          CONCAT(CONCAT(tim, IRMP_TIMER_NUMBER), _isr)\r
+#define IRMP_TIMER_ISR            CONCAT(CONCAT(tim, IRMP_TIMER_NUMBER), _isr)\r
 \r
 \r
 /** Retrieve the actual input clock of a timer\r
@@ -115,7 +118,7 @@ void irmp_timer_init (void)
               GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);\r
 #endif\r
        /* Enable timer clock. */\r
-    rcc_periph_clock_enable(RCC_IRMP_TIMER);\r
+    rcc_periph_clock_enable(IRMP_TIMER_RCC);\r
     nvic_set_priority(NVIC_IRMP_TIMER_IRQ, 4*16);\r
        nvic_enable_irq(NVIC_IRMP_TIMER_IRQ);\r
 \r