Changed irmp_protocol_names to PROGMEM types, added UART routines to main.c

[irmp.git] / irmpsystem.h

diff --git a/irmpsystem.h b/irmpsystem.h
index d4e5b134900b2b04854f89b8dc2edbe9ba7a0af4..d19a0a7656c22488695a439989d638b3596acf23 100644 (file)
--- a/irmpsystem.h
+++ b/irmpsystem.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------------------------------------------------------------------------\r
  * irmpsystem.h - system specific includes and defines\r
  *\r
- * Copyright (c) 2009-2013 Frank Meyer - frank(at)fli4l.de\r
+ * Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de\r
  *\r
- * $Id: irmpsystem.h,v 1.11 2014/07/01 07:50:33 fm Exp $\r
+ * $Id: irmpsystem.h,v 1.14 2014/09/15 10:27:38 fm Exp $\r
  *\r
  * This program is free software; you can redistribute it and/or modify\r
  * it under the terms of the GNU General Public License as published by\r
@@ -37,6 +37,7 @@
 #  include <stm32f10x.h>\r
 #  define ARM_STM32\r
 #  define ARM_STM32F10X\r
+#  define F_CPU (SysCtlClockGet())\r
 #elif defined(STM32F4XX)                                                            // ARM STM32\r
 #  include <stm32f4xx.h>\r
 #  define ARM_STM32\r
@@ -95,6 +96,13 @@ typedef unsigned short                  uint16_t;
 #  define PROGMEM volatile\r
 #  define memcpy_P memcpy\r
 #  define APP_SYSTICKS_PER_SEC          32\r
+#elif defined(ARM_STM32F10X)\r
+#  include "stm32f10x_gpio.h"\r
+#  include "stm32f10x_rcc.h"\r
+#  include "stm32f10x_tim.h"\r
+#  include "misc.h"\r
+#  define PROGMEM\r
+#  define memcpy_P                      memcpy\r
 #else\r
 #  define PROGMEM\r
 #  define memcpy_P                      memcpy\r
@@ -107,8 +115,10 @@ typedef unsigned short                  uint16_t;
 \r
 #if defined (PIC_C18)                                                               // PIC C18 or XC8 compiler\r
 #  include <p18cxxx.h>                                                              // main PIC18 h file\r
+#ifndef __XC8\r
 #  include <timers.h>                                                               // timer lib\r
 #  include <pwm.h>                                                                  // pwm lib\r
+#endif\r
 #  define IRSND_PIC_CCP1                1                                           // PIC C18 RC2 = PWM1 module\r
 #  define IRSND_PIC_CCP2                2                                           // PIC C18 RC1 = PWM2 module\r
 #endif\r