]> cloudbase.mooo.com Git - irmp.git/blobdiff - main.c
Changed irmp_protocol_names to PROGMEM types, added UART routines to main.c
[irmp.git] / main.c
diff --git a/main.c b/main.c
index 9c1cc24330efa2cacea584b5ab53ea3697c0eb58..538e2fab5e31db2c61b4cc4ce2a6eaf1e3e96a48 100644 (file)
--- a/main.c
+++ b/main.c
@@ -3,7 +3,7 @@
  *\r
  * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: main.c,v 1.19 2014/07/21 08:58:59 fm Exp $\r
+ * $Id: main.c,v 1.20 2014/09/15 10:27:38 fm Exp $\r
  *\r
  * This demo module is runnable on AVRs and LM4F120 Launchpad (ARM Cortex M4)\r
  *\r
  */\r
 #if defined (ATMEL_AVR)\r
 \r
-void\r
+#include "irmp.h"\r
+#define BAUD  9600L\r
+#include <util/setbaud.h>\r
+\r
+#ifdef UBRR0H\r
+\r
+#define UART0_UBRRH                             UBRR0H\r
+#define UART0_UBRRL                             UBRR0L\r
+#define UART0_UCSRA                             UCSR0A\r
+#define UART0_UCSRB                             UCSR0B\r
+#define UART0_UCSRC                             UCSR0C\r
+#define UART0_UDRE_BIT_VALUE                    (1<<UDRE0)\r
+#define UART0_UCSZ1_BIT_VALUE                   (1<<UCSZ01)\r
+#define UART0_UCSZ0_BIT_VALUE                   (1<<UCSZ00)\r
+#ifdef URSEL0\r
+#define UART0_URSEL_BIT_VALUE                   (1<<URSEL0)\r
+#else\r
+#define UART0_URSEL_BIT_VALUE                   (0)\r
+#endif\r
+#define UART0_TXEN_BIT_VALUE                    (1<<TXEN0)\r
+#define UART0_UDR                               UDR0\r
+#define UART0_U2X                               U2X0\r
+        \r
+#else\r
+\r
+#define UART0_UBRRH                             UBRRH\r
+#define UART0_UBRRL                             UBRRL\r
+#define UART0_UCSRA                             UCSRA\r
+#define UART0_UCSRB                             UCSRB\r
+#define UART0_UCSRC                             UCSRC\r
+#define UART0_UDRE_BIT_VALUE                    (1<<UDRE)\r
+#define UART0_UCSZ1_BIT_VALUE                   (1<<UCSZ1)\r
+#define UART0_UCSZ0_BIT_VALUE                   (1<<UCSZ0)\r
+#ifdef URSEL\r
+#define UART0_URSEL_BIT_VALUE                   (1<<URSEL)\r
+#else\r
+#define UART0_URSEL_BIT_VALUE                   (0)\r
+#endif\r
+#define UART0_TXEN_BIT_VALUE                    (1<<TXEN)\r
+#define UART0_UDR                               UDR\r
+#define UART0_U2X                               U2X\r
+\r
+#endif //UBRR0H\r
+\r
+static void\r
+uart_init (void)\r
+{\r
+    UART0_UBRRH = UBRRH_VALUE;                                                                      // set baud rate\r
+    UART0_UBRRL = UBRRL_VALUE;\r
+\r
+#if USE_2X\r
+    UART0_UCSRA |= (1<<UART0_U2X);\r
+#else\r
+    UART0_UCSRA &= ~(1<<UART0_U2X);\r
+#endif\r
+\r
+    UART0_UCSRC = UART0_UCSZ1_BIT_VALUE | UART0_UCSZ0_BIT_VALUE | UART0_URSEL_BIT_VALUE;\r
+    UART0_UCSRB |= UART0_TXEN_BIT_VALUE;                                                            // enable UART TX\r
+}\r
+\r
+static void\r
+uart_putc (unsigned char ch)\r
+{\r
+    while (!(UART0_UCSRA & UART0_UDRE_BIT_VALUE))\r
+    {\r
+        ;\r
+    }\r
+\r
+    UART0_UDR = ch;\r
+}\r
+\r
+static void\r
+uart_puts (char * s)\r
+{\r
+    while (*s)\r
+    {\r
+        uart_putc (*s);\r
+        s++;\r
+    }\r
+}\r
+\r
+static void\r
+uart_puts_P (PGM_P s)\r
+{\r
+    uint8_t ch;\r
+\r
+    while ((ch = pgm_read_byte(s)) != '\0')\r
+    {\r
+        uart_putc (ch);\r
+        s++;\r
+    }\r
+}\r
+\r
+static uint8_t\r
+itox (uint8_t val)\r
+{\r
+    uint8_t rtc;\r
+\r
+    val &= 0x0F;\r
+\r
+    if (val <= 9)\r
+    {\r
+        rtc = val + '0';\r
+    }\r
+    else\r
+    {\r
+        rtc = val - 10 + 'A';\r
+    }\r
+    return (rtc);\r
+}\r
+\r
+static void\r
+itoxx (char * xx, unsigned char i)\r
+{\r
+    *xx++ = itox (i >> 4);\r
+    *xx++ = itox (i & 0x0F);\r
+    *xx = '\0';\r
+}\r
+\r
+static void\r
 timer1_init (void)\r
 {\r
 #if defined (__AVR_ATtiny45__) || defined (__AVR_ATtiny85__)                // ATtiny45 / ATtiny85:\r
@@ -69,21 +188,45 @@ ISR(COMPA_VECT)                                                             // T
 int\r
 main (void)\r
 {\r
-    IRMP_DATA irmp_data;\r
+    IRMP_DATA   irmp_data;\r
+    char        buf[3];\r
 \r
     irmp_init();                                                            // initialize irmp\r
     timer1_init();                                                          // initialize timer1\r
+    uart_init();                                                            // initialize uart\r
+\r
     sei ();                                                                 // enable interrupts\r
 \r
     for (;;)\r
     {\r
         if (irmp_get_data (&irmp_data))\r
         {\r
-            // ir signal decoded, do something here...\r
-            // irmp_data.protocol is the protocol, see irmp.h\r
-            // irmp_data.address is the address/manufacturer code of ir sender\r
-            // irmp_data.command is the command code\r
-            // irmp_protocol_names[irmp_data.protocol] is the protocol name (if enabled, see irmpconfig.h)\r
+            uart_puts_P (PSTR("protocol: 0x"));\r
+            itoxx (buf, irmp_data.protocol);\r
+            uart_puts (buf);\r
+\r
+#if IRMP_PROTOCOL_NAMES == 1\r
+            uart_puts_P (PSTR("   "));\r
+            uart_puts_P (irmp_protocol_names[irmp_data.protocol]);\r
+#endif\r
+\r
+            uart_puts_P (PSTR("   address: 0x"));\r
+            itoxx (buf, irmp_data.address >> 8);\r
+            uart_puts (buf);\r
+            itoxx (buf, irmp_data.address & 0xFF);\r
+            uart_puts (buf);\r
+\r
+            uart_puts_P (PSTR("   command: 0x"));\r
+            itoxx (buf, irmp_data.command >> 8);\r
+            uart_puts (buf);\r
+            itoxx (buf, irmp_data.command & 0xFF);\r
+            uart_puts (buf);\r
+\r
+            uart_puts_P (PSTR("   flags: 0x"));\r
+            itoxx (buf, irmp_data.flags);\r
+            uart_puts (buf);\r
+\r
+            uart_puts_P (PSTR("\r\n"));\r
         }\r
     }\r
 }\r
@@ -189,4 +332,70 @@ void interrupt high_priority high_isr(void)
     }\r
 }\r
 \r
+/*---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ * STM32:\r
+ *---------------------------------------------------------------------------------------------------------------------------------------------------\r
+ */\r
+#elif defined(ARM_STM32)\r
+\r
+uint32_t\r
+SysCtlClockGet(void)\r
+{\r
+    RCC_ClocksTypeDef RCC_ClocksStatus;\r
+    RCC_GetClocksFreq(&RCC_ClocksStatus);\r
+    return RCC_ClocksStatus.SYSCLK_Frequency;\r
+}\r
+\r
+void\r
+timer2_init (void)\r
+{\r
+    TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure;\r
+    NVIC_InitTypeDef NVIC_InitStructure;\r
+    RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM2, ENABLE);\r
+\r
+    TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1;\r
+    TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;\r
+    TIM_TimeBaseStructure.TIM_Period = 7;\r
+    TIM_TimeBaseStructure.TIM_Prescaler = ((F_CPU / F_INTERRUPTS)/8) - 1;\r
+    TIM_TimeBaseInit(TIM2, &TIM_TimeBaseStructure);\r
+\r
+    TIM_ITConfig(TIM2, TIM_IT_Update, ENABLE);\r
+\r
+    NVIC_InitStructure.NVIC_IRQChannel = TIM2_IRQn;\r
+    NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;\r
+    NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0x0F;\r
+    NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0x0F;\r
+    NVIC_Init(&NVIC_InitStructure);\r
+\r
+    TIM_Cmd(TIM2, ENABLE);\r
+}\r
+\r
+void\r
+TIM2_IRQHandler(void)                                                  // Timer2 Interrupt Handler\r
+{\r
+  TIM_ClearITPendingBit(TIM2, TIM_IT_Update);\r
+  (void) irmp_ISR();                                                        // call irmp ISR\r
+  // call other timer interrupt routines...\r
+}\r
+\r
+int\r
+main (void)\r
+{\r
+    IRMP_DATA irmp_data;\r
+        \r
+    irmp_init();                                                            // initialize irmp\r
+    timer2_init();                                                          // initialize timer2\r
+\r
+    for (;;)\r
+    {\r
+        if (irmp_get_data (&irmp_data))\r
+        {\r
+            // ir signal decoded, do something here...\r
+            // irmp_data.protocol is the protocol, see irmp.h\r
+            // irmp_data.address is the address/manufacturer code of ir sender\r
+            // irmp_data.command is the command code\r
+            // irmp_protocol_names[irmp_data.protocol] is the protocol name (if enabled, see irmpconfig.h)\r
+        }\r
+    }\r
+}\r
 #endif\r