Skip to content

fix analogReference() #643

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

Open
wke67 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −20
Open

fix analogReference() #643

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 7 additions & 20 deletions megaavr/cores/dxcore/wiring_analog.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
*/


#include "avr/io.h"
#include "wiring_private.h"
#include "pins_arduino.h"
#include "Arduino.h"
Expand Down Expand Up @@ -390,12 +391,8 @@ inline __attribute__((always_inline)) void check_valid_resolution(uint8_t res) {

/* Ex Version*/
void analogReference(uint8_t mode) {
check_valid_analog_ref(mode);
if (mode > 7)
mode &= 7;
if (mode != 1 && mode != 3) {
ADC0.CTRLC = mode;
}
check_valid_analog_ref(mode); // does all the checking
ADC0.CTRLC = (ADC0.CTRLC & ~(ADC_REFSEL_gm)) | (mode & (ADC_REFSEL_gm));
}
/* Ex Version*/
inline uint8_t getAnalogReference() {
Expand Down Expand Up @@ -699,16 +696,8 @@ inline __attribute__((always_inline)) void check_valid_resolution(uint8_t res) {
return _analog_options & 0x0F;
}
void analogReference(uint8_t mode) {
check_valid_analog_ref(mode);
#if defined(STRICT_ERROR_CHECKING)
if (mode > 7) return;
#else
mode &= 7;
#endif
if (mode != 1 && mode != 3) {
ADC0.CTRLC = mode;
}
// Uh? Is that it? That was, ah, a tiny bit simpler.
check_valid_analog_ref(mode); // does all the checking
ADC0.CTRLC = (ADC0.CTRLC & ~(ADC_REFSEL_gm)) | (mode & (ADC_REFSEL_gm));
}
inline uint8_t getAnalogReference() {
uint8_t r = ADC0.CTRLC & ADC_REFSEL_gm;
Expand Down Expand Up @@ -950,10 +939,8 @@ inline __attribute__((always_inline)) void check_valid_resolution(uint8_t res) {
######## ## ## ## ######## ######## ## ######## ######## */

void analogReference(uint8_t mode) {
check_valid_analog_ref(mode);
if (mode < 7 && mode != 4) {
VREF.ADC0REF = (VREF.ADC0REF & ~(VREF_REFSEL_gm))|(mode);
}
check_valid_analog_ref(mode); // does all the checking
VREF.ADC0REF = (VREF.ADC0REF & ~(VREF_REFSEL_gm))|(mode & (VREF_REFSEL_gm));
}

int16_t analogRead(uint8_t pin) {
Expand Down
Loading