Change port pin for debug led to enable logging on usart2.

diff --git a/.gitignore b/.gitignore
index 0048fe1ae6041ede429a450e92a22985e209e01b..d959ad0c962d4d854559686b2071f6584eee29ea 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.elf
 *.map
 *.bin
+*.list
 generated.*.ld
 *.i
 *.s

diff --git a/Makefile b/Makefile
index 038a6e8d0bb81748a5f2ef947394187f7f8a658c..498aa1b3dab6a36dec7c47deb2066252b7c4297f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -21,8 +21,8 @@ DEFS          += -DUSE_OPENCM3_API=0 #-DCON_BAUDRATE=38400
 DEFS           += -DDEBUG_IRMP_TIMER_INT=1
 CFLAGS         += -save-temps
 
-BINARY         = $(BINARY_irsnd)
-OBJS           =   $(OBJS_irsnd)
+BINARY         = $(BINARY_irmp)
+OBJS           =   $(OBJS_irmp)
 
 BINARY_irmp    = irmp-main
 BINARY_irsnd= irsnd-main

diff --git a/irmp b/irmp
index 9004ddf5192fdd2442dc2cbb0158f042c981702e..a5e9d0fec449df2e341cddb7f6055b14820d0bd8 160000 (submodule)
--- a/irmp
+++ b/irmp
@@ -1 +1 @@
-Subproject commit 9004ddf5192fdd2442dc2cbb0158f042c981702e
+Subproject commit a5e9d0fec449df2e341cddb7f6055b14820d0bd8

diff --git a/irmp-main.c b/irmp-main.c
index e7e04ddccb94eda44e8f148fa24407efe0568259..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
@@ -113,9 +119,9 @@ 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(IRMP_TIMER_RCC);\r
@@ -156,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
@@ -172,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

diff --git a/irsnd-main.c b/irsnd-main.c
index 903312cf0db3406f2988b326a6e07d3d85bd7c9c..38c0da642bdc0cc0b3f992d62baed1f826ea2503 100644 (file)
--- a/irsnd-main.c
+++ b/irsnd-main.c
@@ -42,9 +42,9 @@
 #define LED_PORT_RCC    RCC_GPIOC\r
 \r
 #if DEBUG_IRMP_TIMER_INT\r
-#define DEBUG_LED_PORT        GPIOA\r
-#define DEBUG_LED_PIN         GPIO2\r
-#define DEBUG_LED_PORT_RCC    RCC_GPIOA\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
@@ -88,7 +88,7 @@ static void debug_led_on(void)
 # if USE_OPENCM3_API    /* Using API functions: */\r
     gpio_clear(DEBUG_LED_PORT, DEBUG_LED_PIN);\r
 #else\r
-    GPIO_BRR(GPIOA) = GPIO2;\r
+    GPIO_BRR(DEBUG_LED_PORT) = DEBUG_LED_PIN;\r
 # endif\r
 #endif\r
 }\r
@@ -99,7 +99,7 @@ static void debug_led_off(void)
 # if USE_OPENCM3_API    /* Using API functions: */\r
     gpio_set(DEBUG_LED_PORT, DEBUG_LED_PIN);\r
 #else\r
-    GPIO_BSRR(GPIOA) = GPIO2;\r
+    GPIO_BSRR(DEBUG_LED_PORT) = DEBUG_LED_PIN;\r
 # endif\r
 #endif\r
 }\r