Merge branch 'dev' into main

src/MeshCore.h

@@ -40,6 +40,7 @@ public:
   virtual void onBeforeTransmit() { }
   virtual void onAfterTransmit() { }
   virtual void reboot() = 0;
+  virtual void powerOff() { /* no op */ }
   virtual uint8_t getStartupReason() const = 0;
   virtual bool startOTAUpdate() { return false; }   // not supported
 };

src/helpers/ArduinoSerialInterface.h

@@ -23,7 +23,12 @@ public:
 #ifdef LILYGO_T3S3
   void begin(HWCDC& serial) { _serial = &serial; }
 #elif defined(NRF52_PLATFORM)
-  void begin(Adafruit_USBD_CDC& serial) { _serial = &serial; }
+  void begin(Adafruit_USBD_CDC& serial) {
+    _serial = &serial;
+  #ifdef RAK_4631
+    pinMode(WB_IO2, OUTPUT);
+  #endif
+  }
 #else
   void begin(HardwareSerial& serial) { _serial = &serial; }
 #endif

src/helpers/HeltecV3Board.h

@@ -24,11 +24,20 @@
 #include <driver/rtc_io.h>
 
 class HeltecV3Board : public ESP32Board {
+private:
+  bool adc_active_state;
+
 public:
   void begin() {
     ESP32Board::begin();
 
+    // Auto-detect correct ADC_CTRL pin polarity (different for boards >3.2)
+    pinMode(PIN_ADC_CTRL, INPUT);
+    adc_active_state = !digitalRead(PIN_ADC_CTRL);
+    
     pinMode(PIN_ADC_CTRL, OUTPUT);
+    digitalWrite(PIN_ADC_CTRL, !adc_active_state); // Initially inactive
+
     pinMode(PIN_VEXT_EN, OUTPUT);
     digitalWrite(PIN_VEXT_EN, LOW);  // for V3.2 boards
 
@@ -67,9 +76,14 @@ public:
     esp_deep_sleep_start();   // CPU halts here and never returns!
   }
 
+  void powerOff() override {
+    // TODO: re-enable this when there is a definite wake-up source pin:
+    //  enterDeepSleep(0);
+  }
+
   uint16_t getBattMilliVolts() override {
     analogReadResolution(10);
-    digitalWrite(PIN_ADC_CTRL, PIN_ADC_CTRL_ACTIVE);
+    digitalWrite(PIN_ADC_CTRL, adc_active_state);
 
     uint32_t raw = 0;
     for (int i = 0; i < 8; i++) {
@@ -77,7 +91,7 @@ public:
     }
     raw = raw / 8;
 
-    digitalWrite(PIN_ADC_CTRL, PIN_ADC_CTRL_INACTIVE);
+    digitalWrite(PIN_ADC_CTRL, !adc_active_state);
 
     return (5.2 * (3.3 / 1024.0) * raw) * 1000;
   }

src/helpers/nrf52/T1000eBoard.h

@@ -3,8 +3,6 @@
 #include <MeshCore.h>
 #include <Arduino.h>
 
-#define HAS_T1000e_POWEROFF
-
 // LoRa and SPI pins
 #define  P_LORA_DIO_1   (32 + 1)  // P1.1
 #define  P_LORA_NSS     (0 + 12)  // P0.12
@@ -61,7 +59,7 @@ public:
     return 0;
   }
 
-  void powerOff() {
+  void powerOff() override {
     #ifdef HAS_GPS
         digitalWrite(GPS_VRTC_EN, LOW);
         digitalWrite(GPS_RESET, LOW);

src/helpers/nrf52/faketecBoard.cpp

@@ -0,0 +1,63 @@
+#include <Arduino.h>
+#include "faketecBoard.h"
+
+#include <bluefruit.h>
+#include <Wire.h>
+
+static BLEDfu bledfu;
+
+static void connect_callback(uint16_t conn_handle)
+{
+    (void)conn_handle;
+    MESH_DEBUG_PRINTLN("BLE client connected");
+}
+
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
+{
+    (void)conn_handle;
+    (void)reason;
+
+    MESH_DEBUG_PRINTLN("BLE client disconnected");
+}
+
+bool faketecBoard::startOTAUpdate() {
+    // Config the peripheral connection with maximum bandwidth
+    // more SRAM required by SoftDevice
+    // Note: All config***() function must be called before begin()
+    Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+    Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+
+    Bluefruit.begin(1, 0);
+    // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
+    Bluefruit.setTxPower(4);
+    // Set the BLE device name
+    Bluefruit.setName("Faketec_OTA");
+
+    Bluefruit.Periph.setConnectCallback(connect_callback);
+    Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+
+    // To be consistent OTA DFU should be added first if it exists
+    bledfu.begin();
+
+    // Set up and start advertising
+    // Advertising packet
+    Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+    Bluefruit.Advertising.addTxPower();
+    Bluefruit.Advertising.addName();
+
+    /* Start Advertising
+     - Enable auto advertising if disconnected
+     - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
+     - Timeout for fast mode is 30 seconds
+     - Start(timeout) with timeout = 0 will advertise forever (until connected)
+
+     For recommended advertising interval
+     https://developer.apple.com/library/content/qa/qa1931/_index.html
+    */
+    Bluefruit.Advertising.restartOnDisconnect(true);
+    Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
+    Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
+    Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
+
+  return true;
+}

src/helpers/nrf52/faketecBoard.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#include <MeshCore.h>
+#include <Arduino.h>
+#include <Wire.h>
+
+#define P_LORA_NSS 13 //P1.13 45
+#define P_LORA_DIO_1 11 //P0.10 10
+#define P_LORA_RESET 10 //P0.09 9
+#define P_LORA_BUSY  16 //P0.29 29
+#define P_LORA_MISO  15 //P0.02 2
+#define P_LORA_SCLK  12 //P1.11 43
+#define P_LORA_MOSI  14 //P1.15 47
+#define SX126X_POWER_EN 21 //P0.13 13
+#define SX126X_RXEN 2 //P0.17
+#define SX126X_TXEN RADIOLIB_NC
+#define SX126X_DIO2_AS_RF_SWITCH  true
+#define SX126X_DIO3_TCXO_VOLTAGE (1.8f)
+
+#define  PIN_VBAT_READ 17
+#define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
+
+class faketecBoard : public mesh::MainBoard {
+protected:
+  uint8_t startup_reason;
+
+public:
+  void begin() {
+    // for future use, sub-classes SHOULD call this from their begin()
+    startup_reason = BD_STARTUP_NORMAL;
+
+    pinMode(PIN_VBAT_READ, INPUT);
+
+    #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
+      Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
+    #else
+      Wire.begin();
+    #endif
+
+    pinMode(SX126X_POWER_EN, OUTPUT);
+    digitalWrite(SX126X_POWER_EN, HIGH);
+    delay(10);   // give sx1262 some time to power up
+  }
+
+  uint8_t getStartupReason() const override { return startup_reason; }
+
+  #define BATTERY_SAMPLES 8
+
+  uint16_t getBattMilliVolts() override {
+    analogReadResolution(12);
+
+    uint32_t raw = 0;
+    for (int i = 0; i < BATTERY_SAMPLES; i++) {
+      raw += analogRead(PIN_VBAT_READ);
+    }
+    raw = raw / BATTERY_SAMPLES;
+    return (ADC_MULTIPLIER * raw);
+  }
+
+  const char* getManufacturerName() const override {
+    return "Faketec DIY";
+  }
+
+  void reboot() override {
+    NVIC_SystemReset();
+  }
+
+  bool startOTAUpdate() override;
+};