Merge branch 'ripplebiz:dev' into dev

src/helpers/CommonCLI.cpp

@@ -74,8 +74,8 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
 
 void CommonCLI::savePrefs(FILESYSTEM* fs) {
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  fs->remove("/com_prefs");
   File file = fs->open("/com_prefs", FILE_O_WRITE);
-  if (file) { file.seek(0); file.truncate(); }
 #elif defined(RP2040_PLATFORM)
   File file = fs->open("/com_prefs", "w");
 #else

src/helpers/IdentityStore.cpp

@@ -47,8 +47,8 @@ bool IdentityStore::save(const char *name, const mesh::LocalIdentity& id) {
   sprintf(filename, "%s/%s.id", _dir, name);
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  _fs->remove(filename);
   File file = _fs->open(filename, FILE_O_WRITE);
-  if (file) { file.seek(0); file.truncate(); }
 #elif defined(RP2040_PLATFORM)
   File file = _fs->open(filename, "w");
 #else
@@ -69,8 +69,8 @@ bool IdentityStore::save(const char *name, const mesh::LocalIdentity& id, const
   sprintf(filename, "%s/%s.id", _dir, name);
 
 #if defined(NRF52_PLATFORM) || defined(STM32_PLATFORM)
+  _fs->remove(filename);
   File file = _fs->open(filename, FILE_O_WRITE);
-  if (file) { file.seek(0); file.truncate(); }
 #elif defined(RP2040_PLATFORM)
   File file = _fs->open(filename, "w");
 #else

src/helpers/sensors/EnvironmentSensorManager.cpp

@@ -0,0 +1,90 @@
+#include "EnvironmentSensorManager.h"
+
+static Adafruit_AHTX0 AHTX0;
+static Adafruit_BME280 BME280;
+static Adafruit_INA3221 INA3221;
+static Adafruit_INA219 INA219(TELEM_INA219_ADDRESS);
+
+bool EnvironmentSensorManager::begin() {
+
+  if (INA3221.begin(TELEM_INA3221_ADDRESS, &Wire)) {
+      MESH_DEBUG_PRINTLN("Found INA3221 at address: %02X", TELEM_INA3221_ADDRESS);
+      MESH_DEBUG_PRINTLN("%04X %04X", INA3221.getDieID(), INA3221.getManufacturerID());
+
+      for(int i = 0; i < 3; i++) {
+        INA3221.setShuntResistance(i, TELEM_INA3221_SHUNT_VALUE);
+      }
+      INA3221_initialized = true;
+  } else {
+      INA3221_initialized = false;
+      MESH_DEBUG_PRINTLN("INA3221 was not found at I2C address %02X", TELEM_INA3221_ADDRESS);
+  }
+
+  if (INA219.begin(&Wire)) {
+      MESH_DEBUG_PRINTLN("Found INA219 at address: %02X", TELEM_INA219_ADDRESS);
+      INA219_initialized = true;
+  } else {
+      INA219_initialized = false;
+      MESH_DEBUG_PRINTLN("INA219 was not found at I2C address %02X", TELEM_INA219_ADDRESS);
+  }
+
+  if (AHTX0.begin(&Wire, 0, TELEM_AHTX_ADDRESS)) {
+      MESH_DEBUG_PRINTLN("Found AHT10/AHT20 at address: %02X", TELEM_AHTX_ADDRESS);
+      AHTX0_initialized = true;
+  } else {
+      AHTX0_initialized = false;
+      MESH_DEBUG_PRINTLN("AHT10/AHT20 was not found at I2C address %02X", TELEM_AHTX_ADDRESS);
+  }
+
+  if (BME280.begin(TELEM_BME280_ADDRESS, &Wire)) {
+      MESH_DEBUG_PRINTLN("Found BME280 at address: %02X", TELEM_BME280_ADDRESS);
+      MESH_DEBUG_PRINTLN("BME sensor ID: %02X", BME280.sensorID);
+      BME280_initialized = true;
+  } else {
+      BME280_initialized = false;
+      MESH_DEBUG_PRINTLN("BME280 was not found at I2C address %02X", TELEM_BME280_ADDRESS);
+  }
+
+  return true;
+}
+
+bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) {
+  next_available_channel = TELEM_CHANNEL_SELF + 1;
+  if (requester_permissions & TELEM_PERM_ENVIRONMENT) {
+    if (INA3221_initialized) {
+      for(int i = 0; i < TELEM_INA3221_NUM_CHANNELS; i++) {
+        // add only enabled INA3221 channels to telemetry
+        if (INA3221.isChannelEnabled(i)) {
+          float voltage = INA3221.getBusVoltage(i);
+          float current = INA3221.getCurrentAmps(i);
+          telemetry.addVoltage(next_available_channel, voltage);
+          telemetry.addCurrent(next_available_channel, current);
+          telemetry.addPower(next_available_channel, voltage * current);
+          next_available_channel++;
+        }
+      }
+    }
+    if (INA219_initialized) {
+        telemetry.addVoltage(next_available_channel, INA219.getBusVoltage_V());
+        telemetry.addCurrent(next_available_channel, INA219.getCurrent_mA() / 1000);
+        telemetry.addPower(next_available_channel, INA219.getPower_mW() / 1000);
+        next_available_channel++;
+    }
+    if (AHTX0_initialized) {
+      sensors_event_t humidity, temp;
+      AHTX0.getEvent(&humidity, &temp);
+
+      telemetry.addTemperature(TELEM_CHANNEL_SELF, temp.temperature);
+      telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, humidity.relative_humidity);      
+    }
+
+    if (BME280_initialized) {
+        telemetry.addTemperature(TELEM_CHANNEL_SELF, BME280.readTemperature());
+        telemetry.addRelativeHumidity(TELEM_CHANNEL_SELF, BME280.readHumidity());
+        telemetry.addBarometricPressure(TELEM_CHANNEL_SELF, BME280.readPressure());
+        telemetry.addAltitude(TELEM_CHANNEL_SELF, BME280.readAltitude(TELEM_BME280_SEALEVELPRESSURE_HPA));
+    }
+  }
+
+  return true;
+}

src/helpers/sensors/EnvironmentSensorManager.h

@@ -0,0 +1,32 @@
+#pragma once
+
+#include <helpers/SensorManager.h>
+#include <Mesh.h>
+#include <Adafruit_INA3221.h>
+#include <Adafruit_INA219.h>
+#include <Adafruit_AHTX0.h>
+#include <Adafruit_BME280.h>
+
+#define TELEM_AHTX_ADDRESS      0x38      // AHT10, AHT20 temperature and humidity sensor I2C address
+#define TELEM_BME280_ADDRESS    0x76      // BME280 environmental sensor I2C address
+#define TELEM_INA3221_ADDRESS   0x42      // INA3221 3 channel current sensor I2C address
+#define TELEM_INA219_ADDRESS    0x40      // INA219 single channel current sensor I2C address
+
+#define TELEM_INA3221_SHUNT_VALUE 0.100 // most variants will have a 0.1 ohm shunts
+#define TELEM_INA3221_NUM_CHANNELS 3
+
+#define TELEM_BME280_SEALEVELPRESSURE_HPA (1013.25)    // Athmospheric pressure at sea level
+
+class EnvironmentSensorManager : public SensorManager {
+protected:
+  int next_available_channel = TELEM_CHANNEL_SELF + 1;
+
+  bool INA3221_initialized = false;
+  bool INA219_initialized = false;
+  bool BME280_initialized = false;
+  bool AHTX0_initialized = false;
+public:
+  EnvironmentSensorManager(){};
+  bool begin() override;
+  bool querySensors(uint8_t requester_permissions, CayenneLPP& telemetry) override;
+};

src/helpers/ui/buzzer.cpp

@@ -0,0 +1,54 @@
+#ifdef PIN_BUZZER
+#include "buzzer.h"
+
+void genericBuzzer::begin() {
+//    Serial.print("DBG: Setting up buzzer on pin ");
+//    Serial.println(PIN_BUZZER);
+    #ifdef PIN_BUZZER_EN
+      pinMode(PIN_BUZZER_EN, OUTPUT);
+      digitalWrite(PIN_BUZZER_EN, HIGH);
+    #endif
+
+    quiet(false);
+    pinMode(PIN_BUZZER, OUTPUT);
+    startup();
+}
+
+void genericBuzzer::play(const char *melody) {
+    if (isPlaying())   // interrupt existing
+    {
+        rtttl::stop();
+    }
+
+    if (_is_quiet) return;
+
+    rtttl::begin(PIN_BUZZER,melody);
+//    Serial.print("DBG: Playing melody - isQuiet: ");
+//    Serial.println(isQuiet());
+}
+
+bool genericBuzzer::isPlaying() {
+    return rtttl::isPlaying();
+}
+
+void genericBuzzer::loop() {
+    if (!rtttl::done()) rtttl::play();
+}
+
+void genericBuzzer::startup() {
+    play(startup_song);
+}
+
+void genericBuzzer::shutdown() {
+    play(shutdown_song);
+}
+
+void genericBuzzer::quiet(bool buzzer_state) {
+    _is_quiet = buzzer_state;
+}
+
+bool genericBuzzer::isQuiet() {
+    return _is_quiet;
+}
+
+#endif  // ifdef PIN_BUZZER

src/helpers/ui/buzzer.h

@@ -0,0 +1,37 @@
+#pragma once
+
+#include <Arduino.h>
+#include <NonBlockingRtttl.h>
+
+/* class abstracts underlying RTTTL library 
+
+    Just a simple imlementation to start.  At the moment use same
+    melody for message and discovery
+    Suggest enum type for different sounds
+    - on message
+    - on discovery
+
+    TODO
+    - make message ring tone configurable
+
+*/
+
+class genericBuzzer
+{
+    public:
+        void begin();  // set up buzzer port
+        void play(const char *melody); // Generic play function
+        void loop();  // loop driven-nonblocking
+        void startup();  // play startup sound
+        void shutdown();  // play shutdown sound
+        bool isPlaying();  // returns true if a sound is still playing else false
+        void quiet(bool buzzer_state);  // enables or disables the buzzer
+        bool isQuiet();  // get buzzer state on/off
+
+    private:
+        // gemini's picks:
+        const char *startup_song = "Startup:d=4,o=5,b=160:16c6,16e6,8g6";
+        const char *shutdown_song = "Shutdown:d=4,o=5,b=100:8g5,16e5,16c5";
+
+        bool _is_quiet = true;
+};