Fixed FeatherS3 ADC 3.0.0 errors

UnexpectedMaker · May 30, 2024 · ad89146 · ad89146
1 parent c4bb887
commit ad89146
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=UMS3 Helper
-version=1.1.0
+version=1.1.1
 author=UnexpectedMaker
 maintainer=UnexpectedMaker
 sentence=Helper library for UnexpectedMaker S3 boards

diff --git a/src/UMS3.h b/src/UMS3.h
@@ -1,5 +1,5 @@
 // Updated for ESP32 Arduino Core 3.0.0 support
-// May 30, 2024 - Seon Rozenblum (Unexpected Maker)
+// May 31, 2024 - Seon Rozenblum (Unexpected Maker)
 
 #ifndef _UMS3_H
 #define _UMS3_H
@@ -16,6 +16,7 @@
 #define ALS_ADC_CHANNEL ADC1_GPIO4_CHANNEL
 #define VBAT_ADC_PIN 2
 #define ALS_ADC_PIN 4
+#else
 #error                                                                         \
     "The board you have selected is not compatible with the UMS3 helper library"
 #endif
@@ -169,9 +170,16 @@ class UMS3 {
 
 #if defined(ARDUINO_FEATHERS3)
   float getLightSensorVoltage() {
+#if ESP_ARDUINO_VERSION_MAJOR < 3
     uint32_t raw = adc1_get_raw(ALS_ADC_CHANNEL);
     uint32_t millivolts = esp_adc_cal_raw_to_voltage(raw, &adc_cal);
-    return millivolts / 1000.0f;
+#else
+    uint32_t millivolts = analogReadMilliVolts(VBAT_ADC_PIN);
+#endif
+    const uint32_t upper_divider = 442;
+    const uint32_t lower_divider = 160;
+    return (float)(upper_divider + lower_divider) / lower_divider / 1000 *
+           millivolts;
   }
 #endif