X-Git-Url: http://cloudbase.mooo.com/gitweb/irmp.git/blobdiff_plain/7fe8188d6871371baf83a08d1ab42c094525c04b..622f5f5988ba7b2cba507f65050ec09533535b12:/main.c

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