rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity

Requested changes to not change code for non ATtinyX5s

Browse Source
This commit is contained in:
Niklas Mischkulnig 2016-09-07 19:02:48 +02:00
parent 5d15f091a8
commit a2a17a0c83
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/arduino/avr/cores/arduino/Arduino.h
View File

@ -68,11 +68,11 @@ void yield(void);
#define INTERNAL INTERNAL1V1 #define INTERNAL INTERNAL1V1
#elif defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__) #elif defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
#define DEFAULT 0 #define DEFAULT 0
#define EXTERNAL 1 #define EXTERNAL 4
#define INTERNAL1V1 2 #define INTERNAL1V1 8
#define INTERNAL INTERNAL1V1 #define INTERNAL INTERNAL1V1
#define INTERNAL2V56 6 #define INTERNAL2V56 9
#define INTERNAL2V56_EXTCAP 7 #define INTERNAL2V56_EXTCAP 13
#else #else
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__)
#define INTERNAL1V1 2 #define INTERNAL1V1 2

6
hardware/arduino/avr/cores/arduino/wiring_analog.c
View File

@ -64,7 +64,11 @@ int analogRead(uint8_t pin)
// channel (low 4 bits). this also sets ADLAR (left-adjust result) // channel (low 4 bits). this also sets ADLAR (left-adjust result)
// to 0 (the default). // to 0 (the default).
#if defined(ADMUX) #if defined(ADMUX)
ADMUX = ((analog_reference & 0x3) << 6) | ((analog_reference & 0x4) ? 0x10 : 0) | (pin & 0x07); #if defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)
ADMUX = (analog_reference << 4) | (pin & 0x07);
#else
ADMUX = (analog_reference << 6) | (pin & 0x07);
#endif
#endif #endif
// without a delay, we seem to read from the wrong channel // without a delay, we seem to read from the wrong channel