Improved MeasureVoltageAndResistance with new pinout

Author: ArminJo

README.md

@@ -160,7 +160,7 @@ Battery mode                        0x6081 | 0b110000010000001
 Value1=3687, Value2=3667 - Non standard info is supported
 Manufacturer Name                   SANYO | 0x53 41 4E 59 4F 
 Chemistry                           LION | 0x4C 49 4F 4E
-Manufacturer Data                   W'4=5 | 0x57 7 27 3 34 E 3D E 1F E 35 E 
+Manufacturer Data                   W_'_4_=__5_ | 0x57 7 27 3 34 E 3D E 1F E 35 E 
 Device Name                         M10B1 | 0x4D 31 30 42 31 
 Serial number                       11444 | 0x2CB4
 Manufacture date (YYYY-MM-DD)       2008-5-25

SBMInfo/ADCUtils.h

@@ -31,6 +31,7 @@
 
 // External Reference Current is 150 uA for 5 V and 100 uA for 3.5 V
 #define READING_FOR_AREF 1024L // Datasheet 24.2: The minimum value represents GND and the maximum value represents the voltage on the AREF pin minus 1 LSB
+#define MAX_ADC_VALUE    1023L
 
 // PRESCALE4 => 13 * 4 = 52 microseconds per ADC conversion at 1 MHz Clock => 19,2 kHz
 #define ADC_PRESCALE2    1 // 26 microseconds per ADC conversion at 1 MHz
@@ -172,8 +173,10 @@
 extern long sLastVCCCheckMillis;
 extern uint8_t sVCCTooLowCounter;
 
+uint16_t readADCChannel();
 uint16_t readADCChannel(uint8_t aADCChannelNumber);
 uint16_t readADCChannelWithReference(uint8_t aADCChannelNumber, uint8_t aReference);
+uint16_t readADCChannelWithReferenceUsingInternalReference(uint8_t aADCChannelNumber);
 uint16_t waitAndReadADCChannelWithReference(uint8_t aADCChannelNumber, uint8_t aReference);
 uint16_t waitAndReadADCChannelWithReferenceAndRestoreADMUXAndReference(uint8_t aADCChannelNumber, uint8_t aReference);
 uint16_t readADCChannelWithOversample(uint8_t aADCChannelNumber, uint8_t aOversampleExponent);
@@ -188,6 +191,8 @@ uint16_t readADCChannelWithReferenceMaxMicros(uint8_t aADCChannelNumber, uint8_t
 uint16_t readUntil4ConsecutiveValuesAreEqual(uint8_t aADCChannelNumber, uint8_t aReference, uint8_t aDelay,
         uint8_t aAllowedDifference, uint8_t aMaxRetries);
 
+void setADCChannelForNextConversionAndWaitUsingInternalReference(uint8_t aADCChannelNumber);
+void setADCChannelForNextConversionAndWaitUsingDefaultReference(uint8_t aADCChannelNumber);
 uint8_t checkAndWaitForReferenceAndChannelToSwitch(uint8_t aADCChannelNumber, uint8_t aReference);
 
 /*

SBMInfo/ADCUtils.hpp

@@ -42,7 +42,7 @@
  * with INTERNAL you can calibrate your ADC readout. For my Nanos I measured e.g. 1060 mV and 1093 mV.
  */
 #if !defined(ADC_INTERNAL_REFERENCE_MILLIVOLT)
-#define ADC_INTERNAL_REFERENCE_MILLIVOLT    1100L // Change to value measured at the AREF pin. If value > real AREF voltage, measured values are > real values
+#define ADC_INTERNAL_REFERENCE_MILLIVOLT    1100UL // Change to value measured at the AREF pin. If value > real AREF voltage, measured values are > real values
 #endif
 
 // Union to speed up the combination of low and high bytes to a word
@@ -85,6 +85,27 @@ uint8_t sVCCTooLowCounter = 0;
 
 /*
  * Conversion time is defined as 0.104 milliseconds by ADC_PRESCALE in ADCUtils.h.
+ * Use previous settings
+ */
+uint16_t readADCChannel() {
+    WordUnionForADCUtils tUValue;
+
+    // ADCSRB = 0; // Only active if ADATE is set to 1.
+    // ADSC-StartConversion ADIF-Reset Interrupt Flag - NOT free running mode
+    ADCSRA = (_BV(ADEN) | _BV(ADSC) | _BV(ADIF) | ADC_PRESCALE);
+
+    // wait for single conversion to finish
+    loop_until_bit_is_clear(ADCSRA, ADSC);
+
+    // Get value
+    tUValue.UByte.LowByte = ADCL;
+    tUValue.UByte.HighByte = ADCH;
+    return tUValue.UWord;
+    //    return ADCL | (ADCH <<8); // needs 4 bytes more
+}
+
+/*
+ * Use new channel aADCChannelNumber, but do not wait for channel switching
  */
 uint16_t readADCChannel(uint8_t aADCChannelNumber) {
     WordUnionForADCUtils tUValue;
@@ -103,7 +124,6 @@ uint16_t readADCChannel(uint8_t aADCChannelNumber) {
     return tUValue.UWord;
     //    return ADCL | (ADCH <<8); // needs 4 bytes more
 }
-
 /*
  * Conversion time is defined as 0.104 milliseconds by ADC_PRESCALE in ADCUtils.h.
  */
@@ -124,6 +144,22 @@ uint16_t readADCChannelWithReference(uint8_t aADCChannelNumber, uint8_t aReferen
     return tUValue.UWord;
 }
 
+uint16_t readADCChannelWithReferenceUsingInternalReference(uint8_t aADCChannelNumber) {
+    WordUnionForADCUtils tUValue;
+    ADMUX = aADCChannelNumber | (INTERNAL << SHIFT_VALUE_FOR_REFERENCE);
+
+    // ADCSRB = 0; // Only active if ADATE is set to 1.
+    // ADSC-StartConversion ADIF-Reset Interrupt Flag - NOT free running mode
+    ADCSRA = (_BV(ADEN) | _BV(ADSC) | _BV(ADIF) | ADC_PRESCALE);
+
+    // wait for single conversion to finish
+    loop_until_bit_is_clear(ADCSRA, ADSC);
+
+    // Get value
+    tUValue.UByte.LowByte = ADCL;
+    tUValue.UByte.HighByte = ADCH;
+    return tUValue.UWord;
+}
 /*
  * Conversion time is defined as 0.104 milliseconds by ADC_PRESCALE in ADCUtils.h.
  * Does NOT restore ADMUX after reading
@@ -151,6 +187,19 @@ void setADCChannelAndReferenceForNextConversion(uint8_t aADCChannelNumber, uint8
     ADMUX = aADCChannelNumber | (aReference << SHIFT_VALUE_FOR_REFERENCE);
 }
 
+/*
+ * 100 kOhm requires < 100 us, 1 MOhm requires 120 us S&H switching time
+ */
+void setADCChannelForNextConversionAndWaitUsingInternalReference(uint8_t aADCChannelNumber) {
+    ADMUX = aADCChannelNumber | (INTERNAL << SHIFT_VALUE_FOR_REFERENCE);
+    delayMicroseconds(120); // experimental value is <= 1100 us for Nano board
+}
+
+void setADCChannelForNextConversionAndWaitUsingDefaultReference(uint8_t aADCChannelNumber) {
+    ADMUX = aADCChannelNumber | (DEFAULT << SHIFT_VALUE_FOR_REFERENCE);
+    delayMicroseconds(120); // experimental value is <= 1100 us for Nano board
+}
+
 /*
  * @return original ADMUX register content for optional later restoring values
  * All experimental values are acquired by using the ADCSwitchingTest example from this library