diff options
| author | joeycastillo <joeycastillo@utexas.edu> | 2022-01-25 17:57:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-25 17:57:25 -0500 |
| commit | bbda09e23f0048e42b815a200005df661337caf0 (patch) | |
| tree | 3ae5d6c0af28986d2c2743604c04777c939f31af /watch-library/shared | |
| parent | 71ea3b9de98de7034c081adaae2e1e1ff79390d4 (diff) | |
| parent | 84b65cb699ead52033844fb9355f426bdaef5e3e (diff) | |
| download | Sensor-Watch-bbda09e23f0048e42b815a200005df661337caf0.tar.gz Sensor-Watch-bbda09e23f0048e42b815a200005df661337caf0.tar.bz2 Sensor-Watch-bbda09e23f0048e42b815a200005df661337caf0.zip | |
Merge pull request #44 from a2/voltage-reference
Remove ADC_* defines in favor of hardware-specific mapping
Diffstat (limited to 'watch-library/shared')
| -rw-r--r-- | watch-library/shared/watch/watch_adc.h | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/watch-library/shared/watch/watch_adc.h b/watch-library/shared/watch/watch_adc.h index d4c8586d..ea4fa9e3 100644 --- a/watch-library/shared/watch/watch_adc.h +++ b/watch-library/shared/watch/watch_adc.h @@ -27,23 +27,6 @@ #include "watch.h" -// matches adc.h -#ifndef ADC_REFCTRL_REFSEL_INTREF_Val -#define ADC_REFCTRL_REFSEL_INTREF_Val 0x0 -#endif - -#ifndef ADC_REFCTRL_REFSEL_INTVCC0_Val -#define ADC_REFCTRL_REFSEL_INTVCC0_Val 0x1 -#endif - -#ifndef ADC_REFCTRL_REFSEL_INTVCC1_Val -#define ADC_REFCTRL_REFSEL_INTVCC1_Val 0x2 -#endif - -#ifndef ADC_REFCTRL_REFSEL_INTVCC2_Val -#define ADC_REFCTRL_REFSEL_INTVCC2_Val 0x5 -#endif - /** @addtogroup adc Analog Input * @brief This section covers functions related to the SAM L22's analog-to-digital converter, * as well as configuring and reading values from the five analog-capable pins on the @@ -112,10 +95,10 @@ void watch_set_analog_num_samples(uint16_t samples); void watch_set_analog_sampling_length(uint8_t cycles); typedef enum { - ADC_REFERENCE_INTREF = ADC_REFCTRL_REFSEL_INTREF_Val, - ADC_REFERENCE_VCC_DIV1POINT6 = ADC_REFCTRL_REFSEL_INTVCC0_Val, - ADC_REFERENCE_VCC_DIV2 = ADC_REFCTRL_REFSEL_INTVCC1_Val, - ADC_REFERENCE_VCC = ADC_REFCTRL_REFSEL_INTVCC2_Val, + ADC_REFERENCE_INTREF = 0, + ADC_REFERENCE_VCC_DIV1POINT6, + ADC_REFERENCE_VCC_DIV2, + ADC_REFERENCE_VCC, } watch_adc_reference_voltage; |