Barometric sensor data EPD infopage for Badge

software/firmware/source/SoftRF/Makefile

@@ -134,6 +134,7 @@ UI_CPPS       := $(UI_PATH)/Web.cpp        \
                  $(UI_PATH)/Radar_EPD.cpp  \
                  $(UI_PATH)/Status_EPD.cpp \
                  $(UI_PATH)/Text_EPD.cpp   \
+                 $(UI_PATH)/Baro_EPD.cpp   \
                  $(UI_PATH)/Time_EPD.cpp
 
 SYSTEM_CPPS   := $(SYSTEM_PATH)/SoC.cpp    \

software/firmware/source/SoftRF/src/driver/Baro.cpp

@@ -21,8 +21,11 @@
 #include "Baro.h"
 
 #if defined(EXCLUDE_BMP180) && defined(EXCLUDE_BMP280) && defined(EXCLUDE_MPL3115A2)
-byte Baro_setup()    {return BARO_MODULE_NONE;}
-void Baro_loop()     {}
+byte  Baro_setup()        {return BARO_MODULE_NONE;}
+void  Baro_loop()         {}
+float Baro_altitude()     {return 0;}
+float Baro_pressure()     {return 0;}
+float Baro_temperature()  {return 0;}
 #else
 
 #if !defined(EXCLUDE_BMP180)
@@ -49,16 +52,17 @@ Adafruit_BMP280 bmp280;
 Adafruit_MPL3115A2 mpl3115a2 = Adafruit_MPL3115A2();
 #endif /* EXCLUDE_MPL3115A2 */
 
-static unsigned long BaroTimeMarker = 0;
-static float prev_pressure_altitude = 0;
+static float Baro_altitude_cache            = 0;
+static float Baro_pressure_cache            = 0;
+static float Baro_temperature_cache         = 0;
+
+static unsigned long BaroAltitudeTimeMarker = 0;
+static unsigned long BaroPresTempTimeMarker = 0;
+static float prev_pressure_altitude         = 0;
 
-#define VS_AVERAGING_FACTOR   4
 static float Baro_VS[VS_AVERAGING_FACTOR];
 static int avg_ndx = 0;
 
-/* 4 baro sensor readings per second */
-#define isTimeToBaro() ((millis() - BaroTimeMarker) > (1000 / VS_AVERAGING_FACTOR))
-
 #if !defined(EXCLUDE_BMP180)
 static bool bmp180_probe()
 {
@@ -80,18 +84,6 @@ static void bmp180_setup()
   Serial.print(F("Altitude = "));
   Serial.print(bmp180.readAltitude());
   Serial.println(F(" meters"));
-
-  Serial.print(F("Pressure at sealevel (calculated) = "));
-  Serial.print(bmp180.readSealevelPressure());
-  Serial.println(F(" Pa"));
-
-// you can get a more precise measurement of altitude
-// if you know the current sea level pressure which will
-// vary with weather and such. If it is 1015 millibars
-// that is equal to 101500 Pascals.
-  Serial.print(F("Real altitude = "));
-  Serial.print(bmp180.readAltitude(101500));
-  Serial.println(F(" meters"));
 
   Serial.println();
   delay(500);
@@ -102,12 +94,24 @@ static float bmp180_altitude(float sealevelPressure)
   return bmp180.readAltitude(sealevelPressure * 100);
 }
 
+static float bmp180_pressure()
+{
+  return (float) bmp180.readPressure();
+}
+
+static float bmp180_temperature()
+{
+  return bmp180.readTemperature();
+}
+
 barochip_ops_t bmp180_ops = {
   BARO_MODULE_BMP180,
   "BMP180",
   bmp180_probe,
   bmp180_setup,
-  bmp180_altitude
+  bmp180_altitude,
+  bmp180_pressure,
+  bmp180_temperature
 };
 #endif /* EXCLUDE_BMP180 */
 
@@ -145,12 +149,24 @@ static float bmp280_altitude(float sealevelPressure)
     return bmp280.readAltitude(sealevelPressure);
 }
 
+static float bmp280_pressure()
+{
+    return bmp280.readPressure();
+}
+
+static float bmp280_temperature()
+{
+    return bmp280.readTemperature();
+}
+
 barochip_ops_t bmp280_ops = {
   BARO_MODULE_BMP280,
   "BMP280",
   bmp280_probe,
   bmp280_setup,
-  bmp280_altitude
+  bmp280_altitude,
+  bmp280_pressure,
+  bmp280_temperature
 };
 #endif /* EXCLUDE_BMP280 */
 
@@ -182,12 +198,24 @@ static float mpl3115a2_altitude(float sealevelPressure)
   return mpl3115a2.getAltitude();
 }
 
+static float mpl3115a2_pressure()
+{
+  return mpl3115a2.getPressure();
+}
+
+static float mpl3115a2_temperature()
+{
+  return mpl3115a2.getTemperature();
+}
+
 barochip_ops_t mpl3115a2_ops = {
   BARO_MODULE_MPL3115A2,
   "MPL3115A2",
   mpl3115a2_probe,
   mpl3115a2_setup,
-  mpl3115a2_altitude
+  mpl3115a2_altitude,
+  mpl3115a2_pressure,
+  mpl3115a2_temperature
 };
 #endif /* EXCLUDE_MPL3115A2 */
 
@@ -223,8 +251,13 @@ byte Baro_setup()
 
     baro_chip->setup();
 
-    prev_pressure_altitude = baro_chip->altitude(1013.25);
-    BaroTimeMarker = millis();
+    Baro_pressure_cache    = baro_chip->pressure();
+    Baro_temperature_cache = baro_chip->temperature();
+    BaroPresTempTimeMarker = millis();
+
+    Baro_altitude_cache    = baro_chip->altitude(1013.25);
+    ThisAircraft.pressure_altitude = prev_pressure_altitude = Baro_altitude_cache;
+    BaroAltitudeTimeMarker = millis();
 
     for (int i=0; i<VS_AVERAGING_FACTOR; i++) {
       Baro_VS[i] = 0;
@@ -242,13 +275,17 @@ byte Baro_setup()
 
 void Baro_loop()
 {
-  if (baro_chip && isTimeToBaro()) {
+  if (baro_chip == NULL) return;
+
+  if (isTimeToBaroAltitude()) {
 
     /* Draft of pressure altitude and vertical speed calculation */
-    ThisAircraft.pressure_altitude = baro_chip->altitude(1013.25);
+    Baro_altitude_cache = baro_chip->altitude(1013.25);
+
+    ThisAircraft.pressure_altitude = Baro_altitude_cache;
 
-    Baro_VS[avg_ndx] = (ThisAircraft.pressure_altitude - prev_pressure_altitude) /
-      (millis() - BaroTimeMarker) * 1000;  /* in m/s */
+    Baro_VS[avg_ndx] = (Baro_altitude_cache - prev_pressure_altitude) /
+                       (millis() - BaroAltitudeTimeMarker) * 1000;  /* in m/s */
 
     ThisAircraft.vs = 0;
     for (int i=0; i<VS_AVERAGING_FACTOR; i++) {
@@ -262,15 +299,36 @@ void Baro_loop()
 
     ThisAircraft.vs *= (_GPS_FEET_PER_METER * 60.0) ; /* feet per minute */
 
-    prev_pressure_altitude = ThisAircraft.pressure_altitude;
-    BaroTimeMarker = millis();
+    prev_pressure_altitude = Baro_altitude_cache;
+    BaroAltitudeTimeMarker = millis();
     avg_ndx = (avg_ndx + 1) % VS_AVERAGING_FACTOR;
 
 #if 0
     Serial.print(F("P.Alt. = ")); Serial.print(ThisAircraft.pressure_altitude);
     Serial.print(F(" , VS avg. = ")); Serial.println(ThisAircraft.vs);
 #endif
   }
+
+  if (isTimeToBaroPresTemp()) {
+    Baro_pressure_cache    = baro_chip->pressure();
+    Baro_temperature_cache = baro_chip->temperature();
+    BaroPresTempTimeMarker = millis();
+  }
+}
+
+float Baro_altitude()
+{
+  return Baro_altitude_cache;
+}
+
+float Baro_pressure()
+{
+  return Baro_pressure_cache;
+}
+
+float Baro_temperature()
+{
+  return Baro_temperature_cache;
 }
 
 #endif /* EXCLUDE_BMP180 && EXCLUDE_BMP280 EXCLUDE_MPL3115A2 */

software/firmware/source/SoftRF/src/driver/Baro.h

@@ -19,7 +19,14 @@
 #ifndef BAROHELPER_H
 #define BAROHELPER_H
 
-#define BMP280_ADDRESS_ALT  0x76 /* GY-91, SA0 is NC */
+#define BMP280_ADDRESS_ALT    0x76 /* GY-91, SA0 is NC */
+
+#define VS_AVERAGING_FACTOR   3
+
+/* 3 baro sensor altitude readings per second */
+#define isTimeToBaroAltitude() ((millis() - BaroAltitudeTimeMarker) > (1000 / VS_AVERAGING_FACTOR))
+/* read pressure and temperature every 3 seconds */
+#define isTimeToBaroPresTemp() ((millis() - BaroPresTempTimeMarker) > 3000)
 
 enum
 {
@@ -35,12 +42,17 @@ typedef struct barochip_ops_struct {
   bool (*probe)();
   void (*setup)();
   float (*altitude)(float);
+  float (*pressure)();
+  float (*temperature)();
 } barochip_ops_t;
 
 extern barochip_ops_t *baro_chip;
 
-bool Baro_probe(void);
-byte Baro_setup(void);
-void Baro_loop(void);
+bool  Baro_probe(void);
+byte  Baro_setup(void);
+void  Baro_loop(void);
+float Baro_altitude(void);
+float Baro_pressure(void);
+float Baro_temperature(void);
 
 #endif /* BAROHELPER_H */

software/firmware/source/SoftRF/src/driver/Battery.cpp

@@ -77,7 +77,7 @@ void Battery_loop()
         hw_info.model == SOFTRF_MODEL_BADGE                                 ||
         hw_info.model == SOFTRF_MODEL_UNI       ) {
 
-      if (voltage > 1.8 && voltage < Battery_cutoff()) {
+      if (voltage > BATTERY_THRESHOLD_INVALID && voltage < Battery_cutoff()) {
         if (Battery_cutoff_count > 2) {
           shutdown(SOFTRF_SHUTDOWN_LOWBAT);
         } else {

software/firmware/source/SoftRF/src/driver/Battery.h

@@ -21,6 +21,8 @@
 
 #define isTimeToBattery()         (millis() - Battery_TimeMarker > 5000)
 
+#define BATTERY_THRESHOLD_INVALID 1.8
+
 #define BATTERY_THRESHOLD_NIMHX2  2.3
 #define BATTERY_THRESHOLD_LIPO    3.5
 #define BATTERY_THRESHOLD_LIFE    3.0

software/firmware/source/SoftRF/src/driver/EPD.cpp

@@ -118,6 +118,7 @@ bool EPD_setup(bool splash_screen)
   EPD_status_setup();
   EPD_radar_setup();
   EPD_text_setup();
+  EPD_baro_setup();
   EPD_time_setup();
 
   EPDTimeMarker = millis();
@@ -211,6 +212,9 @@ void EPD_loop()
       case VIEW_MODE_TEXT:
         EPD_text_loop();
         break;
+      case VIEW_MODE_BARO:
+        EPD_baro_loop();
+        break;
       case VIEW_MODE_TIME:
         EPD_time_loop();
         break;
@@ -261,6 +265,9 @@ void EPD_Mode()
       EPD_view_mode = VIEW_MODE_TEXT;
       EPD_vmode_updated = true;
     }  else if (EPD_view_mode == VIEW_MODE_TEXT) {
+      EPD_view_mode = VIEW_MODE_BARO;
+      EPD_vmode_updated = true;
+    }  else if (EPD_view_mode == VIEW_MODE_BARO) {
       EPD_view_mode = VIEW_MODE_TIME;
       EPD_vmode_updated = true;
     }  else if (EPD_view_mode == VIEW_MODE_TIME) {
@@ -281,6 +288,9 @@ void EPD_Up()
     case VIEW_MODE_TEXT:
       EPD_text_prev();
       break;
+    case VIEW_MODE_BARO:
+      EPD_baro_prev();
+      break;
     case VIEW_MODE_TIME:
       EPD_time_prev();
       break;
@@ -303,6 +313,9 @@ void EPD_Down()
     case VIEW_MODE_TEXT:
       EPD_text_next();
       break;
+    case VIEW_MODE_BARO:
+      EPD_baro_next();
+      break;
     case VIEW_MODE_TIME:
       EPD_time_next();
       break;

software/firmware/source/SoftRF/src/driver/EPD.h

@@ -54,6 +54,7 @@ enum
 	VIEW_MODE_STATUS,
 	VIEW_MODE_RADAR,
 	VIEW_MODE_TEXT,
+	VIEW_MODE_BARO,
 	VIEW_MODE_TIME
 };
 
@@ -213,6 +214,11 @@ void EPD_text_loop();
 void EPD_text_next();
 void EPD_text_prev();
 
+void EPD_baro_setup();
+void EPD_baro_loop();
+void EPD_baro_next();
+void EPD_baro_prev();
+
 void EPD_time_setup();
 void EPD_time_loop();
 void EPD_time_next();

software/firmware/source/SoftRF/src/platform/nRF52.cpp

@@ -278,22 +278,22 @@ static void nRF52_setup()
   pinMode(SOC_GPIO_PIN_3V3_PWR, OUTPUT);
   delay(100);
 
-  if (SoC->Battery_voltage() > 2.0) {  /* VBUS is ON */
+  if (SoC->Battery_voltage() > BATTERY_THRESHOLD_INVALID) {  /* VBUS is ON */
     nRF52_board = NRF52_LILYGO_TECHO_REV_0;
     pinMode(SOC_GPIO_PIN_IO_PWR,  OUTPUT);  /* VDD_POWR is ON */
     pinMode(SOC_GPIO_PIN_3V3_PWR, INPUT);
   } else {
     pinMode(SOC_GPIO_PIN_IO_PWR, OUTPUT);  /* VDD_POWR is ON */
     delay(100);
 
-    if (SoC->Battery_voltage() > 2.0) {
+    if (SoC->Battery_voltage() > BATTERY_THRESHOLD_INVALID) {
       nRF52_board = NRF52_LILYGO_TECHO_REV_0;
       pinMode(SOC_GPIO_PIN_3V3_PWR, INPUT);
     } else {
       digitalWrite(SOC_GPIO_PIN_3V3_PWR, HIGH); /* PWR_EN is ON */
       delay(100);
 
-      if (SoC->Battery_voltage() > 2.0) {
+      if (SoC->Battery_voltage() > BATTERY_THRESHOLD_INVALID) {
         nRF52_board = NRF52_LILYGO_TECHO_REV_2;
       } else {
         pinMode(SOC_GPIO_PIN_3V3_PWR, INPUT);

software/firmware/source/SoftRF/src/protocol/data/JSON.cpp

@@ -612,6 +612,8 @@ void parseUISettings(JsonObject& root)
       ui_settings.vmode = VIEW_MODE_RADAR;
     } else if (!strcmp(vmode_s,"TEXT")) {
       ui_settings.vmode = VIEW_MODE_TEXT;
+    } else if (!strcmp(vmode_s,"BARO")) {
+      ui_settings.vmode = VIEW_MODE_BARO;
     } else if (!strcmp(vmode_s,"TIME")) {
       ui_settings.vmode = VIEW_MODE_TIME;
     }