Skip to content

disable adc channels while reconfiguring #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oclyke merged 5 commits into from
Mar 2, 2020
Merged

disable adc channels while reconfiguring #135

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d757bcc
disable adc channels while reconfiguring
Feb 27, 2020
6902d0e
get interrupt status before clearing interrupts in analogRead
Feb 27, 2020
e0aae55
undo VSC autoformatter whitespace changes
Mar 2, 2020
efb0bda
add intmask initialization
Mar 2, 2020
604e459
change method of clearing ADC interrupt
Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions cores/arduino/ard_sup/analog/ap3_analog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ uint16_t analogRead(uint8_t pinNumber)
ap3_change_channel(padNumber); //Point ADC channel at this pad

// Clear the ADC interrupt.
am_hal_adc_interrupt_status(g_ADCHandle, &ui32IntMask, false);
if (AM_HAL_STATUS_SUCCESS != am_hal_adc_interrupt_clear(g_ADCHandle, ui32IntMask))
{
//Serial.println("Error clearing ADC interrupt status");
Expand Down Expand Up @@ -297,13 +298,6 @@ ap3_err_t ap3_adc_setup()
return AP3_ERR;
}

// Enable the ADC.
if (AM_HAL_STATUS_SUCCESS != am_hal_adc_enable(g_ADCHandle))
{
//Serial.println("Error - enabling ADC failed.\n");
return AP3_ERR;
}

return AP3_OK;
}

Expand Down Expand Up @@ -350,6 +344,11 @@ ap3_err_t ap3_change_channel(uint8_t padNumber)
ADCSlotConfig.eMeasToAvg = AM_HAL_ADC_SLOT_AVG_1;
ADCSlotConfig.ePrecisionMode = AM_HAL_ADC_SLOT_14BIT;

if (AM_HAL_STATUS_SUCCESS != am_hal_adc_disable(g_ADCHandle))
{
return AP3_ERR;
}

//Look up adc channel based on pad number
uint8_t indi;
for (indi = 0; indi < AP3_ANALOG_CHANNELS; indi++)
Expand All @@ -375,6 +374,11 @@ ap3_err_t ap3_change_channel(uint8_t padNumber)
return AP3_ERR;
}

if (AM_HAL_STATUS_SUCCESS != am_hal_adc_enable(g_ADCHandle))
{
return AP3_ERR;
}

return AP3_OK;
}

Expand Down