From 3a48c9240d33a32f7afdcb06ac345fa24d4aa46b Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Fri, 16 May 2014 18:53:17 +0200 Subject: Support TIMER1C Some devices, such as the atmega2560 or the atmega256rfr2 have a timer1c output. It seems this output is not connected to anything on the Arduino Mega, but this allows using it on third party hardware nonetheless. --- cores/arduino/Arduino.h | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'cores/arduino/Arduino.h') diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index ec1389e..6b923a4 100644 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -194,20 +194,21 @@ extern const uint8_t PROGMEM digital_pin_to_timer_PGM[]; #define TIMER0B 2 #define TIMER1A 3 #define TIMER1B 4 -#define TIMER2 5 -#define TIMER2A 6 -#define TIMER2B 7 - -#define TIMER3A 8 -#define TIMER3B 9 -#define TIMER3C 10 -#define TIMER4A 11 -#define TIMER4B 12 -#define TIMER4C 13 -#define TIMER4D 14 -#define TIMER5A 15 -#define TIMER5B 16 -#define TIMER5C 17 +#define TIMER1C 5 +#define TIMER2 6 +#define TIMER2A 7 +#define TIMER2B 8 + +#define TIMER3A 9 +#define TIMER3B 10 +#define TIMER3C 11 +#define TIMER4A 12 +#define TIMER4B 13 +#define TIMER4C 14 +#define TIMER4D 15 +#define TIMER5A 16 +#define TIMER5B 17 +#define TIMER5C 18 #ifdef __cplusplus } // extern "C" -- cgit v1.2.3-18-g5258 From 4fdf87c0e8a801093d5f0513e4aab122e20bfc2e Mon Sep 17 00:00:00 2001 From: Matthijs Kooijman Date: Wed, 25 Jun 2014 15:58:38 +0200 Subject: Allow variants to define an initVariant() function that is called at startup. See #2080 and #2139. --- cores/arduino/Arduino.h | 1 + 1 file changed, 1 insertion(+) (limited to 'cores/arduino/Arduino.h') diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index 6b923a4..630f0d6 100644 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -118,6 +118,7 @@ typedef uint8_t boolean; typedef uint8_t byte; void init(void); +void initVariant(void); void pinMode(uint8_t, uint8_t); void digitalWrite(uint8_t, uint8_t); -- cgit v1.2.3-18-g5258