summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeo C2017-04-21 15:45:05 +0200
committerLeo C2017-04-21 15:45:05 +0200
commit13c24737d1698d551d20baa74681021dc2c0c359 (patch)
treec1b16574bd27f185a357c64cc22aac40648cbf1a
parent85fbd0c57a5f553cb22cfdec2daaf8c70afdbe96 (diff)
downloadirmp-13c24737d1698d551d20baa74681021dc2c0c359.zip
Rename TIM_IRMP --> IRMP_TIMER
-rw-r--r--irmp.h2
-rw-r--r--irmpconfig.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/irmp.h b/irmp.h
index df05e57..3efc62c 100644
--- a/irmp.h
+++ b/irmp.h
@@ -73,7 +73,7 @@
# define IRMP_PIN IRMP_PORT // for use with input(x) below
# define input(x) ((GPIO_IDR(IRMP_PORT) & (1<<IRMP_BIT)) != 0)
//# define input(x) (BBIO_PERIPH(IRMP_PORT+IDR, IRMP_BIT))
-# define TIM_IRMP CONCAT(TIM, IRMP_TIMER)
+# define IRMP_TIMER CONCAT(TIM, IRMP_TIMER_NUMBER)
#elif defined (STELLARIS_ARM_CORTEX_M4)
# define _CONCAT(a,b) a##b
diff --git a/irmpconfig.h b/irmpconfig.h
index 6cc70f8..67c3638 100644
--- a/irmpconfig.h
+++ b/irmpconfig.h
@@ -143,7 +143,7 @@
#elif defined (ARM_OPENCM3) // use C13 as IR input on STM32
# define IRMP_PORT_LETTER B
# define IRMP_BIT_NUMBER 4
-# define IRMP_TIMER 3 // Timer to use
+# define IRMP_TIMER_NUMBER 3 // Timer to use
/*---------------------------------------------------------------------------------------------------------------------------------------------------
* Change hardware pin here for Stellaris ARM Cortex M4