update fuel gauge to return proper battery alert flag now

Author: Eric Jennings

Scout.cpp

@@ -33,35 +33,34 @@ void PinoccioScout::setup(bool isForcedLeadScout) {
   forceLeadScout = isForcedLeadScout;
   PinoccioClass::setup();
 
-  RgbLed.turnOff();
-
   pinMode(CHG_STATUS, INPUT_PULLUP);
   pinMode(BATT_ALARM, INPUT_PULLUP);
   pinMode(VCC_ENABLE, OUTPUT);
-  enableBackpackVcc();
 
-  bp.begin(BACKPACK_BUS);
-    if (!bp.enumerate()) {
-      bp.printLastError(Serial);
-      Serial.println();
-    }
-    Serial.println("Backpacks found:");
-    for (uint8_t i = 0; i < bp.num_slaves; ++i) {
-      for (uint8_t j = 0; j < UNIQUE_ID_LENGTH; ++j) {
-        if (bp.slave_ids[i][j] < 0x10)
-          Serial.print('0');
-        Serial.print(bp.slave_ids[i][j]);
-      }
-      Serial.println();
-    }
+  RgbLed.turnOff();
 
   handler.setup();
   Shell.setup();
 
+  enableBackpackVcc();
+  bp.begin(BACKPACK_BUS);
+  if (!bp.enumerate()) {
+    bp.printLastError(Serial);
+    Serial.println();
+  }
+  //Serial.println("Backpacks found:");
+  for (uint8_t i = 0; i < bp.num_slaves; ++i) {
+    for (uint8_t j = 0; j < UNIQUE_ID_LENGTH; ++j) {
+      if (bp.slave_ids[i][j] < 0x10) {
+        Serial.print('0');
+      }
+      //Serial.print(bp.slave_ids[i][j]);
+    }
+    //Serial.println();
+  }
+
   Wire.begin();
-  delay(100);
   HAL_FuelGaugeConfig(20);   // Configure the MAX17048G's alert percentage to 20%
-  HAL_FuelGaugeQuickStart(); // Restart fuel-gauge calculations
 
   saveState();
   startDigitalStateChangeEvents();
@@ -175,7 +174,7 @@ void PinoccioScout::saveState() {
   batteryPercentage = constrain(HAL_FuelGaugePercent(), 0, 100);
   batteryVoltage = HAL_FuelGaugeVoltage();
   isBattCharging = (digitalRead(CHG_STATUS) == LOW);
-  isBattAlarmTriggered = (digitalRead(BATT_ALARM) == HIGH);
+  isBattAlarmTriggered = (digitalRead(BATT_ALARM) == LOW);
   temperature = this->getTemperature();
 }
 
@@ -262,7 +261,7 @@ static void scoutAnalogStateChangeTimerHandler(SYS_Timer_t *timer) {
   }
 
   if (Scout.batteryAlarmTriggeredEventHandler != 0) {
-    val = (digitalRead(BATT_ALARM) == HIGH);
+    val = (digitalRead(BATT_ALARM) == LOW);
     if (Scout.isBattAlarmTriggered != val) {
       if (Scout.eventVerboseOutput == true) {
         Serial.print("Running: batteryAlarmTriggeredEventHandler(");

Shell.cpp

@@ -192,7 +192,7 @@ static numvar goToSleep(void) {
 void powerReportHQ(void)
 {
   char report[100];
-  sprintf(report,"{\"_\":\"pwr\",\"p\":%d,\"v\":%d,\"c\":%s,\"vcc\":%s}",Scout.getBatteryPercentage(),(int)Scout.getBatteryVoltage(),Scout.isBatteryCharging()?"true":"false",Scout.isBackpackVccEnabled()?"true":"false");
+  sprintf(report,"{\"_\":\"pwr\",\"p\":%d,\"v\":%d,\"c\":%s,\"vcc\":%s,\"a\":%s}",Scout.getBatteryPercentage(),(int)Scout.getBatteryVoltage(),Scout.isBatteryCharging()?"true":"false",Scout.isBackpackVccEnabled()?"true":"false", Scout.isBatteryAlarmTriggered()?"true":"false");
   Scout.handler.fieldAnnounce(0xBEEF, report);
 }
 
@@ -206,8 +206,8 @@ static numvar powerReport(void) {
   sp(Scout.isBatteryCharging());
   sp("\nvcc: ");
   sp(Scout.isBackpackVccEnabled());
-//  sp("\nalarm:");
-//  sp(Scout.isBatteryAlarmTriggered());
+  sp("\nalarm: ");
+  sp(Scout.isBatteryAlarmTriggered());
   sp("\n");
   return true;
 }

utility/halFuelGauge.cpp

@@ -38,12 +38,23 @@ void HAL_FuelGaugeConfig(byte percent) {
     byte percentBits = 32 - percent;
     HAL_FuelGaugei2cWrite16((0x9700 | percentBits), 0x0C);
   }
+
+  // VALERT min and max voltage setting of 3.1V and 4.3V respectively (20mV per LSb)
+  HAL_FuelGaugei2cWrite16(0x9BD7, 0x14);
 }
 
 void HAL_FuelGaugeQuickStart() {
   HAL_FuelGaugei2cWrite16(0x4000, 0x06);  // Write a 0x4000 to the MODE register
 }
 
+byte HAL_FuelGaugeGetAlertReason() {
+  return HAL_FuelGaugei2cRead16(0x1A >> 8);
+}
+
+void HAL_FuelGaugeClearAlert() {
+  //TODO
+}
+
 unsigned int HAL_FuelGaugei2cRead16(unsigned char address) {
   int data = 0;
 

utility/halFuelGauge.h

@@ -39,7 +39,7 @@ int HAL_FuelGaugePercent();
 
 /*
 configMAX17048G(byte percent) configures the config register of
-the MAX170143, specifically the alert threshold therein. Pass a
+the MAX170148, specifically the alert threshold therein. Pass a
 value between 1 and 32 to set the alert threshold to a value between
 1 and 32%. Any other values will set the threshold to 32%.
 */
@@ -55,6 +55,23 @@ to reduce the error.
 */
 void HAL_FuelGaugeQuickStart();
 
+/*
+This lets you get the reason for the alert
+Masks:
+Low SOC -       0x10
+SOC 1% change - 0x20
+Reset -         0x08
+Overvoltage -   0x02
+Undervoltage -  0x04
+*/
+byte HAL_FuelGaugeGetAlertReason();
+
+/*
+Clear alerts that have been triggered
+TODO
+*/
+void HAL_FuelGaugeClearAlert();
+
 /*
 i2cRead16(unsigned char address) reads a 16-bit value beginning
 at the 8-bit address, and continuing to the next address. A 16-bit