Meshtastic unified OTA (#9231)

* Initial commit of combined BLE and WiFi OTA

* Incorporate ota_hash in AdminMessage protobuf

* OTA protobuf changes

* Trunk fmt

---------

Co-authored-by: Jake-B <jake-b@users.noreply.github.com>

src/modules/Telemetry/Sensor/AddI2CSensorTemplate.h

@@ -1,10 +1,10 @@
 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR || !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
 
-#include <forward_list>
 #include "TelemetrySensor.h"
 #include "detect/ScanI2C.h"
 #include "detect/ScanI2CTwoWire.h"
 #include <Wire.h>
+#include <forward_list>
 
 static std::forward_list<TelemetrySensor *> sensors;
 

src/modules/Telemetry/Sensor/PMSA003ISensor.cpp

@@ -2,17 +2,14 @@
 
 #if !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
 
+#include "../detect/reClockI2C.h"
 #include "../mesh/generated/meshtastic/telemetry.pb.h"
 #include "PMSA003ISensor.h"
 #include "TelemetrySensor.h"
-#include "../detect/reClockI2C.h"
 
 #include <Wire.h>
 
-PMSA003ISensor::PMSA003ISensor()
-    : TelemetrySensor(meshtastic_TelemetrySensorType_PMSA003I, "PMSA003I")
-{
-}
+PMSA003ISensor::PMSA003ISensor() : TelemetrySensor(meshtastic_TelemetrySensorType_PMSA003I, "PMSA003I") {}
 
 bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 {
@@ -26,7 +23,7 @@ bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 
 #if defined(PMSA003I_I2C_CLOCK_SPEED) && defined(CAN_RECLOCK_I2C)
     uint32_t currentClock = reClockI2C(PMSA003I_I2C_CLOCK_SPEED, _bus);
-    if (!currentClock){
+    if (!currentClock) {
         LOG_WARN("PMSA003I can't be used at this clock speed");
         return false;
     }
@@ -51,7 +48,7 @@ bool PMSA003ISensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
 
 bool PMSA003ISensor::getMetrics(meshtastic_Telemetry *measurement)
 {
-    if(!isActive()){
+    if (!isActive()) {
         LOG_WARN("PMSA003I is not active");
         return false;
     }
@@ -79,9 +76,7 @@ bool PMSA003ISensor::getMetrics(meshtastic_Telemetry *measurement)
         return false;
     }
 
-    auto read16 = [](uint8_t *data, uint8_t idx) -> uint16_t {
-        return (data[idx] << 8) | data[idx + 1];
-    };
+    auto read16 = [](uint8_t *data, uint8_t idx) -> uint16_t { return (data[idx] << 8) | data[idx + 1]; };
 
     computedChecksum = 0;
 
@@ -141,7 +136,6 @@ bool PMSA003ISensor::isActive()
     return state == State::ACTIVE;
 }
 
-
 void PMSA003ISensor::sleep()
 {
 #ifdef PMSA003I_ENABLE_PIN

src/modules/Telemetry/Sensor/PMSA003ISensor.h

@@ -6,12 +6,12 @@
 #include "TelemetrySensor.h"
 
 #define PMSA003I_I2C_CLOCK_SPEED 100000
-#define PMSA003I_FRAME_LENGTH  32
+#define PMSA003I_FRAME_LENGTH 32
 #define PMSA003I_WARMUP_MS 30000
 
 class PMSA003ISensor : public TelemetrySensor
 {
-public:
+  public:
     PMSA003ISensor();
     virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
     virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
@@ -20,7 +20,7 @@ public:
     virtual void sleep() override;
     virtual uint32_t wakeUp() override;
 
-private:
+  private:
     enum class State { IDLE, ACTIVE };
     State state = State::ACTIVE;
 
@@ -28,7 +28,7 @@ private:
     uint16_t receivedChecksum = 0;
 
     uint8_t buffer[PMSA003I_FRAME_LENGTH]{};
-    TwoWire * _bus{};
+    TwoWire *_bus{};
     uint8_t _address{};
 };
 

src/modules/Telemetry/Sensor/TelemetrySensor.h

@@ -59,7 +59,7 @@ class TelemetrySensor
     // TODO: delete after migration
     bool hasSensor() { return nodeTelemetrySensorsMap[sensorType].first > 0; }
     // Functions to sleep / wakeup sensors that support it
-    virtual void sleep() {};
+    virtual void sleep(){};
     virtual uint32_t wakeUp() { return 0; }
     // Return active by default, override per sensor
     virtual bool isActive() { return true; }