From cf89fe2a72826c3a4dd4d058712e19fb61944613 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Wed, 12 Oct 2022 23:45:10 +0200
Subject: [PATCH] make max ADC value a per platform ADC function

---
 DCCTimer.h       | 2 ++
 DCCTimerAVR.cpp  | 3 +++
 DCCTimerESP.cpp  | 3 +++
 DCCTimerSAMD.cpp | 3 +++
 MotorDriver.cpp  | 9 +++------
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/DCCTimer.h b/DCCTimer.h
index 4733dbe..ed87e1f 100644
--- a/DCCTimer.h
+++ b/DCCTimer.h
@@ -111,6 +111,8 @@ public:
   // it was called from ISR because for some implementations that
   // makes a difference.
   static int read(uint8_t pin, bool fromISR=false);
+  // returns possible max value that the ADC can return
+  static int16_t ADCmax();
 private:
   // On platforms that scan, it is called from waveform ISR
   // only on a regular basis.
diff --git a/DCCTimerAVR.cpp b/DCCTimerAVR.cpp
index 6759ac9..f29d1f3 100644
--- a/DCCTimerAVR.cpp
+++ b/DCCTimerAVR.cpp
@@ -144,6 +144,9 @@ int ADCee::init(uint8_t pin) {
   usedpins |= (1<<id);
   return value;
 }
+inline int16_t ADCee::ADCmax() {
+  return 1023;
+}
 /*
  * Read function ADCee::read(pin) to get value instead of analogRead(pin)
  */
diff --git a/DCCTimerESP.cpp b/DCCTimerESP.cpp
index 2b10f18..caaae9d 100644
--- a/DCCTimerESP.cpp
+++ b/DCCTimerESP.cpp
@@ -156,6 +156,9 @@ int ADCee::init(uint8_t pin) {
   adc1_config_channel_atten(pinToADC1Channel(pin),ADC_ATTEN_DB_11);
   return adc1_get_raw(pinToADC1Channel(pin));
 }
+int16_t ADCee::ADCmax() {
+  return 4095;
+}
 /*
  * Read function ADCee::read(pin) to get value instead of analogRead(pin)
  */
diff --git a/DCCTimerSAMD.cpp b/DCCTimerSAMD.cpp
index 32e977f..802c7e7 100644
--- a/DCCTimerSAMD.cpp
+++ b/DCCTimerSAMD.cpp
@@ -177,6 +177,9 @@ int ADCee::init(uint8_t pin) {
   
   return value;
 }
+int16_t ADCee::ADCmax() {
+  return 4095;
+}
 /*
  * Read function ADCee::read(pin) to get value instead of analogRead(pin)
  */
diff --git a/MotorDriver.cpp b/MotorDriver.cpp
index 0fbc140..990424a 100644
--- a/MotorDriver.cpp
+++ b/MotorDriver.cpp
@@ -29,9 +29,6 @@
 
 #if defined(ARDUINO_ARCH_ESP32)
 #include "ESP32-fixes.h"
-#define ADC_INPUT_MAX_VALUE 4095 // 12 bit ADC (should be moved to ADCee as well)
-#else
-#define ADC_INPUT_MAX_VALUE 1023 // 10 bit ADC
 #endif
 
 bool MotorDriver::commonFaultPin=false;
@@ -109,7 +106,7 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
   tripMilliamps=trip_milliamps;
   rawCurrentTripValue=mA2raw(trip_milliamps);
 
-  if (rawCurrentTripValue + senseOffset > ADC_INPUT_MAX_VALUE) {
+  if (rawCurrentTripValue + senseOffset > ADCee::ADCmax()) {
     // This would mean that the values obtained from the ADC never
     // can reach the trip value. So independent of the current, the
     // short circuit protection would never trip. So we adjust the
@@ -117,8 +114,8 @@ MotorDriver::MotorDriver(int16_t power_pin, byte signal_pin, byte signal_pin2, i
     // maximum value instead.
 
     //    DIAG(F("Changing short detection value from %d to %d mA"),
-    // raw2mA(rawCurrentTripValue), raw2mA(ADC_INPUT_MAX_VALUE-senseOffset));
-    rawCurrentTripValue=ADC_INPUT_MAX_VALUE-senseOffset;
+    // raw2mA(rawCurrentTripValue), raw2mA(ADCee::ADCmax()-senseOffset));
+    rawCurrentTripValue=ADCee::ADCmax()-senseOffset;
   }
 
   if (currentPin==UNUSED_PIN)