summaryrefslogtreecommitdiff
path: root/irmpsystem.h
diff options
context:
space:
mode:
authorukw2014-09-15 10:46:02 +0000
committerukw2014-09-15 10:46:02 +0000
commit622f5f5988ba7b2cba507f65050ec09533535b12 (patch)
treeefa10e79c856a3f1109b9a026729582d22dd5a4c /irmpsystem.h
parent7fe8188d6871371baf83a08d1ab42c094525c04b (diff)
downloadirmp-622f5f5988ba7b2cba507f65050ec09533535b12.zip
Changed irmp_protocol_names to PROGMEM types, added UART routines to main.c
git-svn-id: svn://mikrocontroller.net/irmp@144 aeb2e35e-bfc4-4214-b83c-9e8de998ed28
Diffstat (limited to 'irmpsystem.h')
-rw-r--r--irmpsystem.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/irmpsystem.h b/irmpsystem.h
index 575bfda..d19a0a7 100644
--- a/irmpsystem.h
+++ b/irmpsystem.h
@@ -3,7 +3,7 @@
*
* Copyright (c) 2009-2014 Frank Meyer - frank(at)fli4l.de
*
- * $Id: irmpsystem.h,v 1.13 2014/07/21 08:58:58 fm Exp $
+ * $Id: irmpsystem.h,v 1.14 2014/09/15 10:27:38 fm Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@
# include <stm32f10x.h>
# define ARM_STM32
# define ARM_STM32F10X
+# define F_CPU (SysCtlClockGet())
#elif defined(STM32F4XX) // ARM STM32
# include <stm32f4xx.h>
# define ARM_STM32
@@ -95,6 +96,13 @@ typedef unsigned short uint16_t;
# define PROGMEM volatile
# define memcpy_P memcpy
# define APP_SYSTICKS_PER_SEC 32
+#elif defined(ARM_STM32F10X)
+# include "stm32f10x_gpio.h"
+# include "stm32f10x_rcc.h"
+# include "stm32f10x_tim.h"
+# include "misc.h"
+# define PROGMEM
+# define memcpy_P memcpy
#else
# define PROGMEM
# define memcpy_P memcpy