Re-initialize ADC before every AnalogIn read. (#255)

`microcontroller.cpu.temperature` uses different ADC settings, and caused
AnalogIn to give wrong answers. AnalogIn can no longer assume it's the
only user of the ADC.
This commit is contained in:
Dan Halbert 2017-09-16 13:06:23 -04:00 committed by GitHub
parent 5aa8922038
commit 75c3be37ac
3 changed files with 45 additions and 17 deletions

View File

@ -40,7 +40,10 @@
// Number of active ADC channels. // Number of active ADC channels.
volatile uint8_t active_channel_count; volatile uint8_t active_channel_count;
// Shared between all the instances. Allocated only when needed.
struct adc_module *adc_instance = NULL; struct adc_module *adc_instance = NULL;
struct adc_config *config_adc = NULL;
void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self, void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
const mcu_pin_obj_t *pin) { const mcu_pin_obj_t *pin) {
@ -53,23 +56,24 @@ void common_hal_analogio_analogin_construct(analogio_analogin_obj_t* self,
self->pin = pin; self->pin = pin;
if (adc_instance == NULL) { if (adc_instance == NULL) {
struct adc_config config_adc; // Allocate strucs on the heap so we only use the memory when we
adc_get_config_defaults(&config_adc);
config_adc.reference = ADC_REFERENCE_INTVCC1;
config_adc.gain_factor = ADC_GAIN_FACTOR_DIV2;
config_adc.positive_input = self->pin->adc_input;
config_adc.resolution = ADC_RESOLUTION_16BIT;
config_adc.clock_prescaler = ADC_CLOCK_PRESCALER_DIV128;
// Allocate the instance on the heap so we only use the memory when we
// need it. // need it.
adc_instance = gc_alloc(sizeof(struct adc_module), false); adc_instance = gc_alloc(sizeof(struct adc_module), false);
config_adc = gc_alloc(sizeof(struct adc_config), false);
adc_init(adc_instance, ADC, &config_adc); adc_get_config_defaults(config_adc);
config_adc->reference = ADC_REFERENCE_INTVCC1;
config_adc->gain_factor = ADC_GAIN_FACTOR_DIV2;
config_adc->positive_input = self->pin->adc_input;
config_adc->resolution = ADC_RESOLUTION_16BIT;
config_adc->clock_prescaler = ADC_CLOCK_PRESCALER_DIV128;
adc_init(adc_instance, ADC, config_adc);
} }
self->adc_instance = adc_instance; self->adc_instance = adc_instance;
self->config_adc = config_adc;
active_channel_count++; active_channel_count++;
} }
@ -78,9 +82,11 @@ void common_hal_analogio_analogin_deinit(analogio_analogin_obj_t *self) {
if (active_channel_count == 0) { if (active_channel_count == 0) {
adc_reset(adc_instance); adc_reset(adc_instance);
gc_free(adc_instance); gc_free(adc_instance);
// Set our reference to NULL so the GC doesn't mistakenly see the gc_free(config_adc);
// pointer in memory. // Set our references to NULL so the GC doesn't mistakenly see the
// pointers in memory.
adc_instance = NULL; adc_instance = NULL;
config_adc = NULL;
} }
reset_pin(self->pin->pin); reset_pin(self->pin->pin);
} }
@ -94,16 +100,35 @@ void analogin_reset() {
} }
uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) { uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
adc_set_positive_input(adc_instance, self->pin->adc_input); // Something else might have used the ADC in a different way,
// so we have to completely re-initialize it.
// ADC must have been disabled before adc_init() is called.
adc_init(adc_instance, ADC, config_adc);
config_adc->positive_input = self->pin->adc_input;
adc_enable(adc_instance); adc_enable(adc_instance);
adc_start_conversion(adc_instance);
// Read twice and discard first result, as recommended in section 14 of
// http://www.atmel.com/images/Atmel-42645-ADC-Configurations-with-Examples_ApplicationNote_AT11481.pdf
// "Discard the first conversion result whenever there is a change in ADC configuration
// like voltage reference / ADC channel change"
// Empirical observation shows the first reading is quite different than subsequent ones.
uint16_t data; uint16_t data;
enum status_code status = adc_read(adc_instance, &data); enum status_code status;
while (status == STATUS_BUSY) {
adc_start_conversion(adc_instance);
do {
status = adc_read(adc_instance, &data); status = adc_read(adc_instance, &data);
} while (status == STATUS_BUSY);
if (status == STATUS_ERR_OVERFLOW) {
// TODO(tannewt): Throw an error.
} }
adc_start_conversion(adc_instance);
do {
status = adc_read(adc_instance, &data);
} while (status == STATUS_BUSY);
if (status == STATUS_ERR_OVERFLOW) { if (status == STATUS_ERR_OVERFLOW) {
// TODO(tannewt): Throw an error. // TODO(tannewt): Throw an error.
} }

View File

@ -42,6 +42,7 @@ typedef struct {
mp_obj_base_t base; mp_obj_base_t base;
const mcu_pin_obj_t * pin; const mcu_pin_obj_t * pin;
struct adc_module * adc_instance; struct adc_module * adc_instance;
struct adc_config * config_adc;
} analogio_analogin_obj_t; } analogio_analogin_obj_t;
void analogin_reset(void); void analogin_reset(void);

View File

@ -226,6 +226,8 @@ float common_hal_mcu_processor_get_temperature(void) {
status = adc_read(&adc_instance_struct, &data); status = adc_read(&adc_instance_struct, &data);
} while (status == STATUS_BUSY); } while (status == STATUS_BUSY);
// Disable so that someone else can use the adc with different settings.
adc_disable(&adc_instance_struct);
return calculate_temperature(data, &nvm_calibration_data); return calculate_temperature(data, &nvm_calibration_data);
} }