From 04c5ac0d7cad0f7892ecd30d6dcd18925353ffb6 Mon Sep 17 00:00:00 2001
From: claes <claes@giljegard.com>
Date: Tue, 10 Aug 2021 09:23:26 +0200
Subject: [PATCH 1/2] Voltage and sleep fix for NRF52 Dont let the NRF52 go to
 SDS Super Deep Sleep Show bat percentage on NRF52 when above 4210 mV

---
 src/Power.cpp    | 5 ++++-
 src/PowerFSM.cpp | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Power.cpp b/src/Power.cpp
index ce9023a40..1fdefe296 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -82,10 +82,13 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (v < noBatVolt)
             return -1; // If voltage is super low assume no battery installed
 
+#ifndef NRF52_SERIES
+        // This does not work on a RAK4631 with battery connected
         if (v > chargingVolt)
             return 0; // While charging we can't report % full on the battery
+#endif
 
-        return 100 * (v - emptyVolt) / (fullVolt - emptyVolt);
+        return clamp((int)(100 * (v - emptyVolt) / (fullVolt - emptyVolt)), 0, 100);
     }
 
     /**
diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 53ba66aa2..6d6cf96f3 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -299,6 +299,8 @@ void PowerFSM_setup()
     // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK
     State *lowPowerState = &stateLS;
 
+    auto meshSds = 0;
+
 #ifndef NRF52_SERIES
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 
@@ -307,11 +309,12 @@ void PowerFSM_setup()
 
     powerFSM.add_timed_transition(&stateNB, &stateLS, getPref_min_wake_secs() * 1000, NULL, "Min wake timeout");
     powerFSM.add_timed_transition(&stateDARK, &stateLS, getPref_wait_bluetooth_secs() * 1000, NULL, "Bluetooth timeout");
+    meshSds = getPref_mesh_sds_timeout_secs();
 #else
     lowPowerState = &stateDARK;
+    meshSds = UINT32_MAX; //Workaround for now: Don't go into deep sleep on the RAK4631
 #endif
 
-    auto meshSds = getPref_mesh_sds_timeout_secs();
     if (meshSds != UINT32_MAX)
         powerFSM.add_timed_transition(lowPowerState, &stateSDS, meshSds * 1000, NULL, "mesh timeout");
     // removing for now, because some users don't even have phones

From 5110a6de82fa939f58fd3100f4acafd8d65b2e9f Mon Sep 17 00:00:00 2001
From: claes <claes@giljegard.com>
Date: Tue, 10 Aug 2021 10:07:40 +0200
Subject: [PATCH 2/2] Battery sense for T-Echo Copied battery stuff from
 RAK4631 to T-Echo I got the voltage divider figures for T_Echo from SoftRF at
 https://github.com/lyusupov/SoftRF/blob/master/software/firmware/source/SoftRF/src/platform/nRF52.h

I dont have a T-Echo so this code
HAS NOT BEEN TESTED
---
 src/PowerFSM.cpp          |  2 +-
 variants/t-echo/variant.h | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/PowerFSM.cpp b/src/PowerFSM.cpp
index 6d6cf96f3..92a7a693b 100644
--- a/src/PowerFSM.cpp
+++ b/src/PowerFSM.cpp
@@ -299,7 +299,7 @@ void PowerFSM_setup()
     // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK
     State *lowPowerState = &stateLS;
 
-    auto meshSds = 0;
+    uint32_t meshSds = 0;
 
 #ifndef NRF52_SERIES
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
diff --git a/variants/t-echo/variant.h b/variants/t-echo/variant.h
index 3e2317f73..400218912 100644
--- a/variants/t-echo/variant.h
+++ b/variants/t-echo/variant.h
@@ -251,6 +251,26 @@ External serial flash WP25R1635FZUIL0
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 
+// Battery
+// The battery sense is hooked to pin A0 (4)
+// it is defined in the anlaolgue pin section of this file
+// and has 12 bit resolution
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+// Definition of milliVolt per LSB => 3.0V ADC range and 12-bit ADC resolution = 3000mV/4096
+#define VBAT_MV_PER_LSB (0.73242188F)
+// Voltage divider value => 100K + 100K voltage divider on VBAT = (100K / (100K + 100K))
+#define VBAT_DIVIDER (0.5F)
+// Compensation factor for the VBAT divider
+#define VBAT_DIVIDER_COMP (2.0)
+// Fixed calculation of milliVolt from compensation value
+#define REAL_VBAT_MV_PER_LSB (VBAT_DIVIDER_COMP * VBAT_MV_PER_LSB)
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER VBAT_DIVIDER_COMP 
+#define VBAT_RAW_TO_SCALED(x) (REAL_VBAT_MV_PER_LSB * x)
+
 #ifdef __cplusplus
 }
 #endif