Bugfix submodule irmp url: cu.loc:git/irmp --> http://cloudbase.mooo.com/git/irmp

[irmp-demo.git] / irmp-main.c

diff --git a/irmp-main.c b/irmp-main.c
index 6c8fd53daa9e97fef82a34591b80ca37edbff9c7..bc6623b267026b80835d69e86bd79b6e0be74046 100644 (file)
--- a/irmp-main.c
+++ b/irmp-main.c
@@ -41,6 +41,12 @@
 #define DEBUG_IRMP_TIMER_INT 0\r
 #endif\r
 \r
+#if DEBUG_IRMP_TIMER_INT\r
+#define DEBUG_LED_PORT        GPIOB\r
+#define DEBUG_LED_PIN         GPIO0\r
+#define DEBUG_LED_PORT_RCC    RCC_GPIOB\r
+#endif\r
+\r
 /**\r
  * Do all initialisations, that are not done by a specific module here.\r
  */\r
@@ -70,13 +76,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
@@ -110,12 +119,12 @@ void irmp_timer_init (void)
 {\r
 #if DEBUG_IRMP_TIMER_INT\r
     /* Output pin for debugging */\r
-    rcc_periph_clock_enable(RCC_GPIOA);\r
-    gpio_set_mode(GPIOA, GPIO_MODE_OUTPUT_2_MHZ,\r
-              GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);\r
+    rcc_periph_clock_enable(DEBUG_LED_PORT_RCC);\r
+    gpio_set_mode(DEBUG_LED_PORT, GPIO_MODE_OUTPUT_2_MHZ,\r
+              GPIO_CNF_OUTPUT_PUSHPULL, DEBUG_LED_PIN);\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
@@ -153,11 +162,11 @@ void IRMP_TIMER_ISR(void)
 #if DEBUG_IRMP_TIMER_INT\r
 # if USE_OPENCM3_API   /* Using API functions: */\r
 \r
-    gpio_clear(GPIOA, GPIO2);\r
+    gpio_clear(DEBUG_LED_PORT, DEBUG_LED_PIN);\r
     /* Clear update interrupt flag. */\r
     timer_clear_flag(IRMP_TIMER, TIM_SR_UIF);\r
 # else /* Manually */\r
-    GPIO_BRR(GPIOA) = GPIO2;\r
+    GPIO_BRR(DEBUG_LED_PORT) = DEBUG_LED_PIN;\r
 # endif\r
 #endif\r
     /* Clear update interrupt flag. */\r
@@ -169,9 +178,9 @@ void IRMP_TIMER_ISR(void)
 \r
 #if DEBUG_IRMP_TIMER_INT\r
 # if USE_OPENCM3_API   /* Using API functions: */\r
-    gpio_set(GPIOA, GPIO2);\r
+    gpio_set(DEBUG_LED_PORT, DEBUG_LED_PIN);\r
 # else /* Manually */\r
-    GPIO_BSRR(GPIOA) = GPIO2;\r
+    GPIO_BSRR(DEBUG_LED_PORT) = DEBUG_LED_PIN;\r
 # endif\r
 #endif\r
 }\r