nicla-system: Remove battery status function.

Author: sebromero

libraries/Nicla_System/src/Nicla_System.cpp

@@ -265,58 +265,53 @@ int8_t nicla::getBatteryPercentage(bool useLatchedValue) {
 }
 
 uint8_t nicla::getBatteryChargeLevel() {
-  return getBatteryStatus() & BATTERY_CHARGE_MASK;
-}
-
-uint8_t nicla::getBatteryStatus() {
   auto percent = getBatteryPercentage();
-  int res = BATTERY_UNKNOWN;
 
   if (percent >= 98) {
-    res = BATTERY_FULL;
+    return BATTERY_FULL;
   } else if (percent >= 94){
-    res = BATTERY_ALMOST_FULL;
+    return BATTERY_ALMOST_FULL;
   } else if (percent >= 90){
-    res = BATTERY_HALF;
+    return BATTERY_HALF;
   } else if (percent >= 86){
-    res = BATTERY_ALMOST_EMPTY;
+    return BATTERY_ALMOST_EMPTY;
   } else if(percent < 86 && percent > 0)  {
     // < 84% is considered empty
-    res = BATTERY_EMPTY;
-  }
-
-  if (_ntcEnabled) {
-    // Extract bits 5 and 6 (TS_FAULT0 and TS_FAULT1)
-    uint8_t temperatureSenseFault = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_TS_CONTROL) >> 5 & 0b11;
-
-    /*
-    +------+-------------------------------------------------------------+
-    | Bits |                         Description                         |
-    +------+-------------------------------------------------------------+
-    |   00 | Normal, No TS fault                                         |
-    |   01 | TS temp < TCOLD or TS temp > THOT (Charging suspended)      |
-    |   10 | TCOOL > TS temp > TCOLD (Charging current reduced by half)  |
-    |   11 | TWARM < TS temp < THOT (Charging voltage reduced by 140 mV) |
-    +------+-------------------------------------------------------------+
-    */
-
-    if(temperatureSenseFault == 0){
-      res |= BATTERY_TEMPERATURE_NORMAL;
-    } else if (temperatureSenseFault == 1) {
-      res |= BATTERY_TEMPERATURE_EXTREME;
-    } else if (temperatureSenseFault == 2) {
-      res |= BATTERY_TEMPERTURE_COOL;
-    } else if (temperatureSenseFault == 3) {
-      res |= BATTERY_TEMPERTURE_WARM;
-    }
+    return BATTERY_EMPTY;
+  } else {
+    // Battery status could not be read
+    return BATTERY_UNKNOWN;
   }
-
-  return res;
 }
 
 uint8_t nicla::getBatteryTemperature() {
   if(!_ntcEnabled) return BATTERY_TEMPERATURE_NORMAL;
-  return getBatteryStatus() & BATTERY_TEMPERATURE_MASK;
+  
+  // Extract bits 5 and 6 (TS_FAULT0 and TS_FAULT1)
+  uint8_t temperatureSenseFault = _pmic.readByte(BQ25120A_ADDRESS, BQ25120A_TS_CONTROL) >> 5 & 0b11;
+
+  /*
+  +------+-------------------------------------------------------------+
+  | Bits |                         Description                         |
+  +------+-------------------------------------------------------------+
+  |   00 | Normal, No TS fault                                         |
+  |   01 | TS temp < TCOLD or TS temp > THOT (Charging suspended)      |
+  |   10 | TCOOL > TS temp > TCOLD (Charging current reduced by half)  |
+  |   11 | TWARM < TS temp < THOT (Charging voltage reduced by 140 mV) |
+  +------+-------------------------------------------------------------+
+  */
+
+  if(temperatureSenseFault == 0){
+    return BATTERY_TEMPERATURE_NORMAL;
+  } else if (temperatureSenseFault == 1) {
+    return BATTERY_TEMPERATURE_EXTREME;
+  } else if (temperatureSenseFault == 2) {
+    return BATTERY_TEMPERTURE_COOL;
+  } else if (temperatureSenseFault == 3) {
+    return BATTERY_TEMPERTURE_WARM;
+  }    
+
+  return BATTERY_TEMPERATURE_NORMAL;
 }
 
 

libraries/Nicla_System/src/Nicla_System.h

@@ -26,6 +26,15 @@ enum class OperatingStatus {
 #define BATTERY_EMPTY           1 // Bit pattern: 001
 #define BATTERY_UNKNOWN         0 // Bit pattern: 000
 
+enum class BatteryChargeLevel {
+  Unknown = 0b000,
+  Empty = 0b001,
+  AlmostEmpty = 0b010,
+  HalfFull = 0b011,
+  AlmostFull = 0b100,
+  Full = 0b101
+};
+
 // 2 bits are used to indicate the battery temperature
 #define BATTERY_TEMPERATURE_MASK    0b00011000
 #define BATTERY_TEMPERATURE_NORMAL  (0 << 4)
@@ -114,16 +123,6 @@ class nicla {
    */
   static uint8_t getBatteryTemperature();
 
-  /**
-   * @brief Get the Battery Status (charge level and temperature).
-   * The first 3 bits indicate the battery charge level. They can be retrieved using the BATTERY_CHARGE_MASK. 
-   * The 4th and 5th bit indicate the battery temperature. They can be retrieved using the BATTERY_TEMPERATURE_MASK.
-   * @see getBatteryChargeLevel()
-   * @see getBatteryTemperature()
-   * @return uint8_t The battery status containing the charge level and temperature. 
-   */
-  static uint8_t getBatteryStatus();
-
   /**
    * @brief Returns potential battery faults retrieved from the fault register.
    *