Mote bringup arpa e

src/apps/bridge/bridgePowerController.cpp

@@ -10,6 +10,7 @@
 #include "stm32_rtc.h"
 #include "task.h"
 #include "task_priorities.h"
+#include "uptime.h"
 #include <cinttypes>
 #include <stdio.h>
 #ifdef RAW_PRESSURE_ENABLE
@@ -67,6 +68,8 @@ BridgePowerController::BridgePowerController(
   BaseType_t rval = xTaskCreate(BridgePowerController::powerControllerRun, "Power Controller",
                                 128 * 4, this, BRIDGE_POWER_TASK_PRIORITY, &_task_handle);
   configASSERT(rval == pdTRUE);
+
+  configASSERT(power_info_service_init(powerInfoStatsCb, this) == BmOK);
 }
 
 /*!
@@ -304,6 +307,57 @@ void BridgePowerController::powerControllerRun(void *arg) {
   }
 }
 
+PowerInfoReplyData BridgePowerController::powerInfoStatsCb(void *arg) {
+  PowerInfoReplyData d = {};
+  BridgePowerController *power_controller = reinterpret_cast<BridgePowerController *>(arg);
+
+  if ((!power_controller->_initDone || !power_controller->_timebaseSet) &&
+      power_controller->isPowerControlEnabled()) {
+    static const uint64_t init_uptime_s = 0;
+    uint64_t current_uptime_s = uptimeGetMs() / 1000;
+
+    // Calculate how long the bus will be on before initialization is done
+    d.total_on_s = INIT_POWER_ON_TIMEOUT_MS / 1000;
+    d.remaining_on_s = timeRemainingGeneric(init_uptime_s, current_uptime_s, d.total_on_s);
+    d.upcoming_off_s = POWER_SERVICE_UNDEFINED;
+  } else if (power_controller->isSubsampleEnabled() &&
+             power_controller->isPowerControlEnabled()) {
+    uint32_t sample_duration_remain = timeRemainingGeneric(
+        power_controller->_sampleIntervalStartS, power_controller->getCurrentTimeS(),
+        power_controller->_sampleDurationS);
+
+    d.total_on_s = power_controller->_subsampleDurationS;
+    if (power_controller->isBridgePowerOn()) {
+      d.remaining_on_s = timeRemainingGeneric(power_controller->_subsampleIntervalStartS,
+                                              power_controller->getCurrentTimeS(),
+                                              power_controller->_subsampleDurationS);
+    }
+
+    // Account for sample interval off time after sample duration in subsampling
+    if (sample_duration_remain >= d.total_on_s) {
+      d.upcoming_off_s = power_controller->_subsampleIntervalS - d.total_on_s;
+    } else {
+      d.upcoming_off_s =
+          (power_controller->_sampleIntervalStartS + power_controller->_sampleIntervalS) -
+          (power_controller->_subsampleIntervalStartS + power_controller->_subsampleDurationS);
+    }
+  } else if (power_controller->isPowerControlEnabled()) {
+    d.total_on_s = power_controller->_sampleDurationS;
+    if (power_controller->isBridgePowerOn()) {
+      d.remaining_on_s = timeRemainingGeneric(power_controller->_sampleIntervalStartS,
+                                              power_controller->getCurrentTimeS(),
+                                              power_controller->_sampleDurationS);
+    }
+    d.upcoming_off_s = power_controller->_sampleIntervalS - d.total_on_s;
+  } else {
+    d.total_on_s = POWER_SERVICE_UNDEFINED;
+    d.remaining_on_s = POWER_SERVICE_UNDEFINED;
+    d.upcoming_off_s = 0;
+  }
+
+  return d;
+}
+
 void BridgePowerController::checkAndUpdateTimebase() {
   if ((isRTCSet() || _ticksSamplingEnabled) && !_timebaseSet) {
     printf("Bridge Power Controller timebase is set.\n");

src/apps/bridge/bridgePowerController.h

@@ -3,6 +3,7 @@
 #include "FreeRTOS.h"
 #include "event_groups.h"
 #include "io.h"
+#include "power_info_service.h"
 #include "task.h"
 #include <stdint.h>
 
@@ -32,6 +33,7 @@ class BridgePowerController {
 private:
   void powerBusAndSetSignal(bool on, bool notifyL2 = true);
   static void powerControllerRun(void *arg);
+  static PowerInfoReplyData powerInfoStatsCb(void *arg);
   void checkAndUpdateTimebase();
   uint32_t getCurrentTimeS();
   void stateLogPrintTarget(const char *state, uint32_t target);

src/apps/bridge/sensor_drivers/pmeDissolvedOxygenSensor.cpp

@@ -96,6 +96,23 @@ void PmeDissolvedOxygenSensor::aggregate(void) {
       dissolved_oxygen_aggs.quality_mean = quality.getMean();
       dissolved_oxygen_aggs.do_saturation_pct_mean = do_saturation_pct.getMean();
       dissolved_oxygen_aggs.reading_count = reading_count;
+
+      if (dissolved_oxygen_aggs.temperature_deg_c_mean < TEMP_SAMPLE_MEMBER_MIN ||
+          dissolved_oxygen_aggs.temperature_deg_c_mean > TEMP_SAMPLE_MEMBER_MAX) {
+        dissolved_oxygen_aggs.temperature_deg_c_mean = NAN;
+      }
+      if (dissolved_oxygen_aggs.do_mg_per_l_mean < DO_SAMPLE_MEMBER_MIN ||
+          dissolved_oxygen_aggs.do_mg_per_l_mean > DO_SAMPLE_MEMBER_MAX) {
+        dissolved_oxygen_aggs.do_mg_per_l_mean = NAN;
+      }
+      if (dissolved_oxygen_aggs.quality_mean < QUALITY_SAMPLE_MEMBER_MIN ||
+          dissolved_oxygen_aggs.quality_mean > QUALITY_SAMPLE_MEMBER_MAX) {
+        dissolved_oxygen_aggs.quality_mean = NAN;
+      }
+      if (dissolved_oxygen_aggs.do_saturation_pct_mean < DO_SATURATION_SAMPLE_MEMBER_MIN ||
+          dissolved_oxygen_aggs.do_saturation_pct_mean > DO_SATURATION_SAMPLE_MEMBER_MAX) {
+        dissolved_oxygen_aggs.do_saturation_pct_mean = NAN;
+      }
     }
 
     BmErr err = send_spotter_log_aggregate(

src/apps/bridge/sensor_drivers/pmeDissolvedOxygenSensor.h

@@ -29,6 +29,15 @@ typedef struct PmeDissolvedOxygenSensor : public AbstractSensor {
   static constexpr uint32_t DEFAULT_PME_DISSOLVED_READING_PERIOD_MS = 10 * 60 * 1000;
   static constexpr uint32_t N_SAMPLES_PAD = 2;
   static constexpr uint8_t MIN_READINGS_FOR_AGGREGATION = 1;
+  static constexpr double TEMP_SAMPLE_MEMBER_MIN = -0.414;
+  static constexpr double TEMP_SAMPLE_MEMBER_MAX = 35.6;
+  static constexpr double DO_SAMPLE_MEMBER_MIN = -1.0;
+  static constexpr double DO_SAMPLE_MEMBER_MAX = 100.0;
+  static constexpr double QUALITY_SAMPLE_MEMBER_MIN = 0.0;
+  static constexpr double QUALITY_SAMPLE_MEMBER_MAX = 1.0;
+  static constexpr double DO_SATURATION_SAMPLE_MEMBER_MIN = 0.0;
+  static constexpr double DO_SATURATION_SAMPLE_MEMBER_MAX = 150.0;
+
 
 public:
   bool subscribe() override;

src/apps/bridge/sensor_drivers/seapointTurbiditySensor.cpp

@@ -113,6 +113,17 @@ void SeapointTurbiditySensor::aggregate(void) {
       turbidity_aggs.turbidity_s_mean_ftu = turbidity_s_ftu.getMean();
       turbidity_aggs.turbidity_r_mean_ftu = turbidity_r_ftu.getMean();
       turbidity_aggs.reading_count = reading_count;
+
+      if (turbidity_aggs.turbidity_s_mean_ftu < S_SAMPLE_MEMBER_MIN) {
+        turbidity_aggs.turbidity_s_mean_ftu = -HUGE_VAL;
+      } else if (turbidity_aggs.turbidity_s_mean_ftu > S_SAMPLE_MEMBER_MAX) {
+        turbidity_aggs.turbidity_s_mean_ftu = HUGE_VAL;
+      }
+      if (turbidity_aggs.turbidity_r_mean_ftu < R_SAMPLE_MEMBER_MIN) {
+        turbidity_aggs.turbidity_r_mean_ftu = -HUGE_VAL;
+      } else if (turbidity_aggs.turbidity_r_mean_ftu > R_SAMPLE_MEMBER_MAX) {
+        turbidity_aggs.turbidity_r_mean_ftu = HUGE_VAL;
+      }
     }
     static constexpr uint8_t TIME_STR_BUFSIZE = 50;
     char time_str[TIME_STR_BUFSIZE];

src/apps/bridge/sensor_drivers/seapointTurbiditySensor.h

@@ -27,6 +27,10 @@ typedef struct SeapointTurbiditySensor : public AbstractSensor {
   // 2 minutes is the minimum bridge on period and the turbidity sensor by default is sampling at 1Hz. So 1*120 + 30 = 150.
   static constexpr uint32_t N_SAMPLES_PAD = 150;
   static constexpr uint8_t MIN_READINGS_FOR_AGGREGATION = 3;
+  static constexpr double S_SAMPLE_MEMBER_MIN = 0.0;
+  static constexpr double S_SAMPLE_MEMBER_MAX = 20971.48;
+  static constexpr double R_SAMPLE_MEMBER_MIN = 0.0;
+  static constexpr double R_SAMPLE_MEMBER_MAX = 163800.00;
 
 public:
   bool subscribe() override;

src/apps/bringup_mote/app_main.cpp

@@ -43,6 +43,7 @@
 #include "gpioISR.h"
 #include "htu21d.h"
 #include "ina232.h"
+#include "bq25820.h"
 #include "io.h"
 #include "l2.h"
 #include "lpm.h"
@@ -214,6 +215,8 @@ static INA::INA232 *debugIna[NUM_INA232_DEV] = {
     &debugIna2,
 };
 
+static BQ::BQ25820 Charger(&i2c1);
+
 static MS5803 debugPressure(&i2c1, MS5803_ADDR);
 static Bme280 debugPHTU(&i2c1, Bme280::I2C_ADDR);
 static HTU21D debugHTU(&i2c1);
@@ -372,7 +375,20 @@ static void defaultTask(void *parameters) {
   // Commenting out while we test usart1
   // lpmPeripheralInactive(LPM_BOOT);
 
+  bristlefin.enableVbus();
+  vTaskDelay(pdMS_TO_TICKS(1000)); // Complete SWAG on how long we need to wait before talking to the BQ25820
+
+  if(Charger.init()) {
+      printf("BQ25820 Initialized\n");
+      Charger.disablePfm();
+  }
+  else {
+      printf("Failed to init BQ25820.\n");
+  }
+
   while (1) {
     vTaskDelay(1000);
+    Charger.readSensors();
+    Charger.readFaults();
   }
 }

src/apps/bristleback_apps/bm_rbr/user_code/rbr_sensor_util.cpp

@@ -103,6 +103,7 @@ static bool validSpecialChar(char c) {
   switch (c) {
   case ',':
   case '.':
+  case '-':
     return true;
   default:
     return false;

src/apps/bristleback_apps/pme_do_sensor/user_code/pme_do_sensor.cpp

@@ -67,14 +67,14 @@ void ledAllOff() {
 }
 
 void saveLastWipeEpoch(uint32_t newLastWipeEpochS) {
-  set_config_uint(BM_CFG_PARTITION_SYSTEM, LAST_WIPE_EPOCH_KEY, strlen(LAST_WIPE_EPOCH_KEY),
+  set_config_uint(BM_CFG_PARTITION_HARDWARE, LAST_WIPE_EPOCH_KEY, strlen(LAST_WIPE_EPOCH_KEY),
                   newLastWipeEpochS);
-  save_config(BM_CFG_PARTITION_SYSTEM, false);
+  save_config(BM_CFG_PARTITION_HARDWARE, false);
   lastWipeEpochS = newLastWipeEpochS;
 }
 
 uint32_t loadLastWipeEpoch() {
-  bool success = get_config_uint(BM_CFG_PARTITION_SYSTEM, LAST_WIPE_EPOCH_KEY,
+  bool success = get_config_uint(BM_CFG_PARTITION_HARDWARE, LAST_WIPE_EPOCH_KEY,
                                  strlen(LAST_WIPE_EPOCH_KEY), &lastWipeEpochS);
   if (!success) {
     printf("LAST_WIPE_EPOCH_KEY not found. Initializing to 0.\n");

src/apps/rs232_expander_apps/bm_rbr/user_code/rbr_sensor_util.cpp

@@ -103,6 +103,7 @@ static bool validSpecialChar(char c) {
   switch (c) {
   case ',':
   case '.':
+  case '-':
     return true;
   default:
     return false;

src/apps/rs232_expander_apps/serial_payload_example/user_code/user_code.cpp

@@ -10,12 +10,18 @@
 #include "uptime.h"
 #include "usart.h"
 #include "app_util.h"
+#include "bq25820.h"
+#include "ina232.h"
+#include "string.h"
 
 #define LED_ON_TIME_MS 20
 #define LED_PERIOD_MS 1000
 
+static BQ::BQ25820 Charger(&i2c1);
+
 bool led_state = false;
 
+
 // A buffer to put data from out payload sensor into.
 char payload_buffer[2048];
 
@@ -33,37 +39,60 @@ void setup(void) {
   IOWrite(&VBUS_EN, 0);
   // ensure Vbus stable before enable Vout with a 5ms delay.
   vTaskDelay(pdMS_TO_TICKS(5));
-  // enable Vout, 12V by default.
-  IOWrite(&PL_BUCK_EN, 0);
+  // Try to initialize the charger IC
+  if(Charger.init()) {
+      printf("Charger IC Initialized\n");
+      Charger.disablePfm();
+  }
+  else {
+      printf("Failed to init the charger IC.\n");
+  }
+
 }
 
 void loop(void) {
   /* USER LOOP CODE GOES HERE */
 
-  // Read a byte if it is available
-  while (PLUART::byteAvailable()) {
-    uint8_t byte_read = PLUART::readByte();
-    printf("byte: %c\n", (char)byte_read);
-  }
+  char cdata[1024];
+  memset(cdata,0,sizeof(cdata));
+  char cfaults[512];
+  memset(cfaults,0,sizeof(cfaults));
 
-  // Read a line if it is available
-  if (PLUART::lineAvailable()) {
-    uint16_t read_len =
-        PLUART::readLine(payload_buffer, sizeof(payload_buffer));
-    printf("line: %s\n", payload_buffer);
+  // Get the RTC if available
+  RTCTimeAndDate_t time_and_date = {};
+  rtcGet(&time_and_date);
+  char rtcTimeBuffer[32];
+  rtcPrint(rtcTimeBuffer, &time_and_date);
+
+  // Read the BQ25820 ADCs and check for faults
+  Charger.readSensors(cdata, sizeof(cdata));
+  Charger.readFaults(cfaults, sizeof(cfaults));
+  strcat(cdata,cfaults);
 
-    // Get the RTC if available
-    RTCTimeAndDate_t time_and_date = {};
-    rtcGet(&time_and_date);
-    char rtcTimeBuffer[32];
-    rtcPrint(rtcTimeBuffer, &time_and_date);
+  spotter_log(0, "bq25820.log", USE_TIMESTAMP, "tick: %llu, rtc: %s, line: %.*s\n",
+             uptimeGetMs(), rtcTimeBuffer, strlen(cdata), cdata);
 
-    // Print the payload data to a file, to the spotter_log_console console, and to the printf console.
-    spotter_log(0, "payload_data.log", USE_TIMESTAMP, "tick: %llu, rtc: %s, line: %.*s\n",
-               uptimeGetMs(), rtcTimeBuffer, read_len, payload_buffer);
-    spotter_log_console(0, "[payload] | tick: %llu, rtc: %s, line: %.*s", uptimeGetMs(),
-              rtcTimeBuffer, read_len, payload_buffer);
-    printf("[payload] | tick: %llu, rtc: %s, line: %.*s\n", uptimeGetMs(),
-           rtcTimeBuffer, read_len, payload_buffer);
-  }
+  spotter_log_console(0, "[bq25820] | tick: %llu, rtc: %s, line: %.*s",
+            uptimeGetMs(), rtcTimeBuffer, strlen(cdata), cdata);
+
+  vTaskDelay(pdMS_TO_TICKS(1000));
+  /*
+  uint16_t read_len =
+      PLUART::readLine(payload_buffer, sizeof(payload_buffer));
+  printf("line: %s\n", payload_buffer);
+
+  // Get the RTC if available
+  RTCTimeAndDate_t time_and_date = {};
+  rtcGet(&time_and_date);
+  char rtcTimeBuffer[32];
+  rtcPrint(rtcTimeBuffer, &time_and_date);
+
+  // Print the payload data to a file, to the spotter_log_console console, and to the printf console.
+  spotter_log(0, "payload_data.log", USE_TIMESTAMP, "tick: %llu, rtc: %s, line: %.*s\n",
+             uptimeGetMs(), rtcTimeBuffer, read_len, payload_buffer);
+  spotter_log_console(0, "[payload] | tick: %llu, rtc: %s, line: %.*s", uptimeGetMs(),
+            rtcTimeBuffer, read_len, payload_buffer);
+  printf("[payload] | tick: %llu, rtc: %s, line: %.*s\n", uptimeGetMs(),
+         rtcTimeBuffer, read_len, payload_buffer);
+  */
 }

src/lib/CMakeLists.txt

@@ -73,6 +73,7 @@ set(LIB_FILES
     ${LIB_DIR}/drivers/bme280driver.cpp
     ${LIB_DIR}/drivers/htu21d.cpp
     ${LIB_DIR}/drivers/ina232.cpp
+    ${LIB_DIR}/drivers/bq25820.cpp
     ${LIB_DIR}/drivers/nau7802.cpp
     ${LIB_DIR}/drivers/ms5803.cpp
     ${LIB_DIR}/drivers/pca9535.c