diff options
| author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
|---|---|---|
| committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
| commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
| tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /drivers/avr/analog.h | |
| parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
| parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/avr/analog.h')
| -rw-r--r-- | drivers/avr/analog.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/drivers/avr/analog.h b/drivers/avr/analog.h index 8d93de7dc2..1b773d82ce 100644 --- a/drivers/avr/analog.h +++ b/drivers/avr/analog.h @@ -19,34 +19,40 @@ #include <stdint.h> -void analogReference(uint8_t mode); +#ifdef __cplusplus +extern "C" { +#endif +void analogReference(uint8_t mode); int16_t analogRead(uint8_t pin); int16_t adc_read(uint8_t mux); +#ifdef __cplusplus +} +#endif -#define ADC_REF_POWER (1<<REFS0) -#define ADC_REF_INTERNAL ((1<<REFS1) | (1<<REFS0)) -#define ADC_REF_EXTERNAL (0) +#define ADC_REF_POWER (1 << REFS0) +#define ADC_REF_INTERNAL ((1 << REFS1) | (1 << REFS0)) +#define ADC_REF_EXTERNAL (0) // These prescaler values are for high speed mode, ADHSM = 1 #if F_CPU == 16000000L -#define ADC_PRESCALER ((1<<ADPS2) | (1<<ADPS1)) +# define ADC_PRESCALER ((1 << ADPS2) | (1 << ADPS1)) #elif F_CPU == 8000000L -#define ADC_PRESCALER ((1<<ADPS2) | (1<<ADPS0)) +# define ADC_PRESCALER ((1 << ADPS2) | (1 << ADPS0)) #elif F_CPU == 4000000L -#define ADC_PRESCALER ((1<<ADPS2)) +# define ADC_PRESCALER ((1 << ADPS2)) #elif F_CPU == 2000000L -#define ADC_PRESCALER ((1<<ADPS1) | (1<<ADPS0)) +# define ADC_PRESCALER ((1 << ADPS1) | (1 << ADPS0)) #elif F_CPU == 1000000L -#define ADC_PRESCALER ((1<<ADPS1)) +# define ADC_PRESCALER ((1 << ADPS1)) #else -#define ADC_PRESCALER ((1<<ADPS0)) +# define ADC_PRESCALER ((1 << ADPS0)) #endif // some avr-libc versions do not properly define ADHSM #if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__) -#if !defined(ADHSM) -#define ADHSM (7) -#endif +# if !defined(ADHSM) +# define ADHSM (7) +# endif #endif #endif |