Added a fix for issue #39

Author: PaulZC

Binaries/OpenLog_Artemis-V10-v17_BETA.bin

@@ -1,6 +1,11 @@
 Change Log
 ======================
 
+v1.7
+---------
+
+* Corrected the readVin after sleep bug [39](https://github.com/sparkfun/OpenLog_Artemis/issues/39)
+
 v1.6
 ---------
 

CHANGELOG.md

@@ -65,10 +65,12 @@
   (done) Correct the measurement count misbehaviour (Issue #31)
   (done) Use the corrected IMU temperature calculation (Issue #28)
   (done) Add individual power-on delays for each sensor type. Add an extended delay for the SCD30. (Issue #5)
+
+  (done) v1.7: Fix readVin after sleep bug: https://github.com/sparkfun/OpenLog_Artemis/issues/39
 */
 
 const int FIRMWARE_VERSION_MAJOR = 1;
-const int FIRMWARE_VERSION_MINOR = 6;
+const int FIRMWARE_VERSION_MINOR = 7;
 
 //Define the OLA board identifier:
 //  This is an int which is unique to this variant of the OLA and which allows us
@@ -78,7 +80,7 @@ const int FIRMWARE_VERSION_MINOR = 6;
 //    the variant * 0x100 (OLA = 1; GNSS_LOGGER = 2; GEOPHONE_LOGGER = 3)
 //    the major firmware version * 0x10
 //    the minor firmware version
-#define OLA_IDENTIFIER 0x116
+#define OLA_IDENTIFIER 0x117
 
 #include "settings.h"
 

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -321,7 +321,14 @@ void wakeFromSleep()
   am_hal_stimer_config(AM_HAL_STIMER_HFRC_3MHZ);
 
   //Turn on ADC
-  ap3_adc_setup();
+  uint32_t adcError = (uint32_t)ap3_adc_setup();
+  if (settings.logA11 == true) adcError += (uint32_t)ap3_set_pin_to_analog(11); // Set _pad_ 11 to analog if enabled for logging
+  if (settings.logA12 == true) adcError += (uint32_t)ap3_set_pin_to_analog(12); // Set _pad_ 12 to analog if enabled for logging
+  if (settings.logA13 == true) adcError += (uint32_t)ap3_set_pin_to_analog(13); // Set _pad_ 13 to analog if enabled for logging
+  if (settings.logA32 == true) adcError += (uint32_t)ap3_set_pin_to_analog(32); // Set _pad_ 32 to analog if enabled for logging
+#if(HARDWARE_VERSION_MAJOR >= 1)
+  adcError += (uint32_t)ap3_set_pin_to_analog(PIN_VIN_MONITOR); // Set _pad_ PIN_VIN_MONITOR to analog
+#endif
 
   //Run setup again
 
@@ -361,6 +368,10 @@ void wakeFromSleep()
   Serial.begin(settings.serialTerminalBaudRate);
 
   printDebug("wakeFromSleep: I'm awake!\r\n");
+  printDebug("wakeFromSleep: adcError is " + (String)adcError + ".");
+  if (adcError > 0)
+    printDebug(" This indicates an error was returned by ap3_adc_setup or one of the calls to ap3_set_pin_to_analog.");
+  printDebug("\r\n");
 
   beginQwiic(); //Power up Qwiic bus as early as possible