1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-24 16:46:13 +01:00

Compare commits

..

2 Commits

Author SHA1 Message Date
Travis Farmer
236d39dc16
Merge 83a22dfae5 into d46a6f092a 2023-11-12 09:45:34 +00:00
travis-farmer
83a22dfae5
12-bit analog, vs just 10-bit 2023-11-12 04:44:59 -05:00

View File

@ -145,7 +145,7 @@ int * ADCee::analogvals = NULL;
int16_t ADCee::ADCmax() int16_t ADCee::ADCmax()
{ {
return 1023; return 4095;
} }
AdvancedADC adc; AdvancedADC adc;
@ -155,8 +155,8 @@ int num_active_pins = 4;
const int samples_per_round = 512; const int samples_per_round = 512;
int ADCee::init(uint8_t pin) { int ADCee::init(uint8_t pin) {
adc.stop(); adc.stop();
if (pin >= A0 && pin <= A3) adc.begin(AN_RESOLUTION_10, 16000, 1, samples_per_round, num_active_pins, active_pins); if (pin >= A0 && pin <= A3) adc.begin(AN_RESOLUTION_12, 16000, 1, samples_per_round, num_active_pins, active_pins);
else if (pin >= A4 && pin <= A7) adc.begin(AN_RESOLUTION_10, 16000, 1, samples_per_round, num_active_pins, active_pinsB); else if (pin >= A4 && pin <= A7) adc.begin(AN_RESOLUTION_12, 16000, 1, samples_per_round, num_active_pins, active_pinsB);
return 123; return 123;
} }