Bump version

* Delete callbacks on bleServer on destruct

* Trying things

.github/workflows/main_matrix.yml

@@ -38,6 +38,7 @@ jobs:
           - board: rak4631_eink
           - board: t-echo
           - board: nano-g1
+          - board: station-g1
           - board: m5stack-core
           - board: m5stack-coreink
           
@@ -95,6 +96,7 @@ jobs:
           - board: tbeam0.7
           - board: meshtastic-diy-v1
           - board: nano-g1
+          - board: station-g1
           - board: m5stack-core
           - board: m5stack-coreink
 

bin/build-all.sh

@@ -5,7 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 m5stack-core m5stack-coreink"
+BOARDS_ESP32="rak11200 tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v1 heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1 nano-g1 station-g1 m5stack-core m5stack-coreink"
 #BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine

bin/platformio-custom.py

@@ -17,7 +17,7 @@ Import("projenv")
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print("Using meshtastic platformio-custom.py, firmare version " + verObj['long'])
+print("Using meshtastic platformio-custom.py, firmware version " + verObj['long'])
 # print("path is" + ','.join(sys.path))
 
 # General options that are passed to the C and C++ compilers

bin/readprops.py

@@ -32,6 +32,6 @@ def readProps(prefsLoc):
         # traceback.print_exc()
         verObj['long'] = verObj['short']
 
-    # print("firmare version " + verStr)
+    # print("firmware version " + verStr)
     return verObj
 # print("path is" + ','.join(sys.path))

platformio.ini

@@ -65,7 +65,7 @@ lib_deps =
 
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
-build_src_filter = ${env.build_src_filter} -<portduino/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT 
 [networking_base]
@@ -78,10 +78,10 @@ lib_deps =
 [environmental_base]
 lib_deps =
   adafruit/Adafruit BusIO@^1.11.4
-  adafruit/DHT sensor library@^1.4.1
   adafruit/Adafruit Unified Sensor@^1.1.4
   paulstoffregen/OneWire@^2.3.5
   robtillaart/DS18B20@^0.1.11
+  adafruit/Adafruit BMP280 Library@^2.6.3
   adafruit/Adafruit BME280 Library@^2.2.2
   adafruit/Adafruit BME680 Library@^2.0.1
   adafruit/Adafruit MCP9808 Library@^2.0.0
@@ -92,7 +92,7 @@ lib_deps =
 extends = arduino_base
 platform = espressif32@3.5.0
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<nrf52/>
+  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2040>
 upload_speed = 115200
 debug_init_break = tbreak setup
 
@@ -101,15 +101,15 @@ debug_init_break = tbreak setup
 # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
 # -DUSE_NEW_ESP32_BLUETOOTH will enable the new NimBLE C++ api
 build_flags =
-  ${arduino_base.build_flags} -Wall -Wextra -Isrc/esp32 -Isrc/esp32-mfix-esp32-psram-cache-issue -lnimble -std=c++11 
+  ${arduino_base.build_flags} -Wall -Wextra -Isrc/platform/esp32 -lnimble -std=c++11 
   -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
-  -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH
+  -DAXP_DEBUG_PORT=Serial -DUSE_NEW_ESP32_BLUETOOTH -DCONFIG_BT_NIMBLE_ENABLED -DCONFIG_NIMBLE_CPP_LOG_LEVEL=1
 lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
   ${environmental_base.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git
-  h2zero/NimBLE-Arduino@1.3.7
+  h2zero/NimBLE-Arduino@1.4.0
   arduino-libraries/NTPClient@^3.1.0
   lorol/LittleFS_esp32@^1.0.6
   https://github.com/meshtastic/AXP202X_Library.git#8404abb6d4b486748636bc6ad72d2a47baaf5460
@@ -142,9 +142,9 @@ build_type = debug ; I'm debugging with ICE a lot now
 ; note: liboberon provides the AES256 implementation for NRF52 (though not using the hardware acceleration of the NRF52840 - FIXME)
 build_flags = 
   ${arduino_base.build_flags} -Wno-unused-variable 
-  -Isrc/nrf52
+  -Isrc/platform/nrf52
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/rp2040>
 lib_ignore =
   BluetoothOTA
 
@@ -165,3 +165,23 @@ board = nrf52840_dk
 [env:feather_nrf52832]
 extends = nrf52_base
 board = adafruit_feather_nrf52832
+
+; Common settings for rp2040 Processor based targets
+[rp2040_base]
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git
+extends = arduino_base
+board_build.core = earlephilhower
+board_build.filesystem_size = 0.5m
+build_flags = 
+  ${arduino_base.build_flags} -Wno-unused-variable 
+  -Isrc/platform/rp2040
+  -D__PLAT_RP2040__
+#  -D _POSIX_THREADS
+build_src_filter = 
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mqtt/> -<platform/nrf52/> -<platform/stm32wl>
+lib_ignore =
+  BluetoothOTA
+lib_deps =
+  ${arduino_base.lib_deps}
+  ${environmental_base.lib_deps}
+  https://github.com/kokke/tiny-AES-c.git

src/ButtonThread.h

@@ -7,7 +7,7 @@
 #include "power.h"
 #include <OneButton.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "nimble/BluetoothUtil.h"
 #endif
 
@@ -127,25 +127,32 @@ class ButtonThread : public concurrency::OSThread
     static void userButtonPressedLong()
     {
         // DEBUG_MSG("Long press!\n");
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
         screen->adjustBrightness();
 #endif
         // If user button is held down for 5 seconds, shutdown the device.
         if ((millis() - longPressTime > 5 * 1000) && (longPressTime > 0)) {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
             if (axp192_found == true) {
                 setLed(false);
                 power->shutdown();
             }
-#elif NRF52_SERIES
+#elif defined(ARCH_NRF52)
             // Do actual shutdown when button released, otherwise the button release
             // may wake the board immediatedly.
             if ((!shutdown_on_long_stop) && (millis() > 30 * 1000)) {
                 screen->startShutdownScreen();
                 DEBUG_MSG("Shutdown from long press");
                 playBeep();
+#ifdef PIN_LED1
                 ledOff(PIN_LED1);
+#endif
+#ifdef PIN_LED2        
                 ledOff(PIN_LED2);
+#endif
+#ifdef PIN_LED3        
+                ledOff(PIN_LED3);
+#endif
                 shutdown_on_long_stop = true;
             }
 #endif
@@ -156,19 +163,19 @@ class ButtonThread : public concurrency::OSThread
 
     static void userButtonDoublePressed()
     {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         disablePin();
-#elif defined(HAS_EINK)
+#elif defined(USE_EINK)
         digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
 #endif
     }
 
     static void userButtonMultiPressed()
     {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         clearNVS();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
         clearBonds();
 #endif
     }

src/DebugConfiguration.h

@@ -17,29 +17,6 @@
 
 #define DEBUG_PORT (*console) // Serial debug port
 
-// What platforms should use SEGGER?
-#ifdef NRF52_SERIES
-
-// Always include the SEGGER code on NRF52 - because useful for debugging
-#include "SEGGER_RTT.h"
-
-// The channel we send stdout data to
-#define SEGGER_STDOUT_CH 0
-
-// Debug printing to segger console
-#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
-
-// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
-// use SEGGER for debug output
-#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
-// No serial ports on this board - ONLY use segger in memory console
-#define USE_SEGGER
-#endif
-
-#else
-#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
-#endif
-
 #ifdef USE_SEGGER
 #define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else

src/FSCommon.cpp

@@ -1,10 +1,50 @@
 #include "configuration.h"
 #include "FSCommon.h"
 
+
+bool copyFile(const char* from, const char* to)
+{
+#ifdef FSCom
+    unsigned char cbuffer[16];
+   
+    File f1 = FSCom.open(from, FILE_O_READ);
+    if (!f1){
+        DEBUG_MSG("Failed to open file");
+        return false;
+    }
+
+    File f2 = FSCom.open(to, FILE_O_WRITE);
+    if (!f2) {
+        DEBUG_MSG("Failed to open file");
+        return false;
+    }
+   
+    while (f1.available() > 0) {
+        byte i = f1.read(cbuffer, 16);
+        f2.write(cbuffer, i);
+    }
+   
+    f2.close();
+    f1.close();
+    return true;
+#endif
+}
+
+bool renameFile(const char* pathFrom, const char* pathTo)
+{
+#ifdef FSCom
+    if (copyFile(pathFrom, pathTo) && FSCom.remove(pathFrom) ) {
+        return true;
+    } else{
+        return false;
+    }
+#endif
+}
+
 void listDir(const char * dirname, uint8_t levels)
 {
 #ifdef FSCom
-    File root = FSCom.open(dirname);
+    File root = FSCom.open(dirname, FILE_O_READ);
     if(!root){
         return;
     }
@@ -31,7 +71,7 @@ void listDir(const char * dirname, uint8_t levels)
 void rmDir(const char * dirname)
 {
 #ifdef FSCom
-    File file = FSCom.open(dirname);
+    File file = FSCom.open(dirname, FILE_O_READ);
     if(!file){
         return;
     }

src/FSCommon.h

@@ -4,21 +4,34 @@
 
 // Cross platform filesystem API
 
-#ifdef PORTDUINO
+#if defined(ARCH_PORTDUINO)
 // Portduino version
 #include "PortduinoFS.h"
 #define FSCom PortduinoFS
 #define FSBegin() true
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
-#elif !defined(NO_ESP32)
+#endif
+
+#if defined(ARCH_RP2040)
+// RP2040
+#include "LittleFS.h"
+#define FSCom LittleFS
+#define FSBegin() FSCom.begin()
+#define FILE_O_WRITE "w"
+#define FILE_O_READ "r"
+#endif
+
+#if defined(ARCH_ESP32)
 // ESP32 version
 #include "LITTLEFS.h"
 #define FSCom LITTLEFS
 #define FSBegin() FSCom.begin(true)
 #define FILE_O_WRITE "w"
 #define FILE_O_READ "r"
-#else
+#endif
+
+#if defined(ARCH_NRF52)
 // NRF52 version
 #include "InternalFileSystem.h"
 #define FSCom InternalFS
@@ -27,5 +40,6 @@ using namespace Adafruit_LittleFS_Namespace;
 #endif
 
 void fsInit();
+bool renameFile(const char* pathFrom, const char* pathTo);
 void listDir(const char * dirname, uint8_t levels);
 void rmDir(const char * dirname);

src/OSTimer.cpp

@@ -15,7 +15,7 @@ bool scheduleOSCallback(PendableFunction callback, void *param1, uint32_t param2
     return xTimerPendFunctionCall(callback, param1, param2, pdMS_TO_TICKS(delayMsec));
 } */
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
 // Super skanky quick hack to use hardware timers of the ESP32
 static hw_timer_t *timer;

src/Power.cpp

@@ -7,9 +7,7 @@
 #include "utils.h"
 #include "buzz/buzz.h"
 
-#ifdef TBEAM_V10
-// FIXME. nasty hack cleanup how we load axp192
-#undef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
 #include "axp20x.h"
 
 AXP20X_Class axp;
@@ -46,7 +44,7 @@ Power *power;
 using namespace meshtastic;
 
 #ifndef AREF_VOLTAGE
-#if defined(NRF52_SERIES)
+#if defined(ARCH_NRF52)
 /*
  * Internal Reference is +/-0.6V, with an adjustable gain of 1/6, 1/5, 1/4,
  * 1/3, 1/2 or 1, meaning 3.6, 3.0, 2.4, 1.8, 1.2 or 0.6V for the ADC levels.
@@ -84,7 +82,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
         if (v < noBatVolt)
             return -1; // If voltage is super low assume no battery installed
 
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
         // This does not work on a RAK4631 with battery connected
         if (v > chargingVolt)
             return 0; // While charging we can't report % full on the battery
@@ -112,7 +110,18 @@ class AnalogBatteryLevel : public HasBatteryLevel
         const uint32_t min_read_interval = 5000;
         if (millis() - last_read_time_ms > min_read_interval) {
             last_read_time_ms = millis();
+
+#ifdef BATTERY_SENSE_SAMPLES
+//Set the number of samples, it has an effect of increasing sensitivity, especially in complex electromagnetic environment.
+            uint32_t raw = 0;
+            for(uint32_t i=0; i<BATTERY_SENSE_SAMPLES;i++){
+                raw += analogRead(BATTERY_PIN);
+            }
+            raw = raw/BATTERY_SENSE_SAMPLES;
+#else
             uint32_t raw = analogRead(BATTERY_PIN);
+#endif
+
             float scaled;
 #ifndef VBAT_RAW_TO_SCALED
             scaled = 1000.0 * operativeAdcMultiplier * (AREF_VOLTAGE / 1024.0) * raw;
@@ -147,8 +156,21 @@ class AnalogBatteryLevel : public HasBatteryLevel
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
 
+#ifndef BAT_FULLVOLT
+#define BAT_FULLVOLT 4200
+#endif 
+#ifndef BAT_EMPTYVOLT
+#define BAT_EMPTYVOLT 3270
+#endif 
+#ifndef BAT_CHARGINGVOLT
+#define BAT_CHARGINGVOLT 4210
+#endif 
+#ifndef BAT_NOBATVOLT
+#define BAT_NOBATVOLT 2230
+#endif 
+
     /// For heltecs with no battery connected, the measured voltage is 2204, so raising to 2230 from 2100
-    const float fullVolt = 4200, emptyVolt = 3270, chargingVolt = 4210, noBatVolt = 2230;
+    const float fullVolt = BAT_FULLVOLT, emptyVolt = BAT_EMPTYVOLT, chargingVolt = BAT_CHARGINGVOLT, noBatVolt = BAT_NOBATVOLT;
     float last_read_value = 0.0;
     uint32_t last_read_time_ms = 0;
 };
@@ -169,11 +191,11 @@ bool Power::analogInit()
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // ESP32 needs special analog stuff
     adcAttachPin(BATTERY_PIN);
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
 #ifdef VBAT_AR_INTERNAL
     analogReference(VBAT_AR_INTERNAL);
 #else
@@ -210,11 +232,11 @@ bool Power::setup()
 
 void Power::shutdown()
 {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     DEBUG_MSG("Shutting down\n");
     axp.setChgLEDMode(AXP20X_LED_OFF);
     axp.shutdown();
-#elif NRF52_SERIES
+#elif defined(ARCH_NRF52)
     playBeep();
     ledOff(PIN_LED1);
     ledOff(PIN_LED2);
@@ -256,7 +278,7 @@ void Power::readPowerStatus()
 
 // If we have a battery at all and it is less than 10% full, force deep sleep if we have more than 3 low readings in a row
 // Supect fluctuating voltage on the RAK4631 to force it to deep sleep even if battery is at 85% after only a few days
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
         if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
             if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
                 low_voltage_counter++;
@@ -282,7 +304,7 @@ int32_t Power::runOnce()
 {
     readPowerStatus();
 
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     // WE no longer use the IRQ line to wake the CPU (due to false wakes from sleep), but we do poll
     // the IRQ status by reading the registers over I2C
     axp.readIRQ();
@@ -332,7 +354,7 @@ int32_t Power::runOnce()
  */
 bool Power::axp192Init()
 {
-#ifdef TBEAM_V10
+#ifdef HAS_AXP192
     if (axp192_found) {
         if (!axp.begin(Wire, AXP192_SLAVE_ADDRESS)) {
             batteryLevel = &axp;

src/PowerFSM.cpp

@@ -12,7 +12,7 @@
 static bool isPowered()
 {
     // Circumvent the battery sensing logic and assumes constant power if no battery pin or power mgmt IC
-    #if !defined(BATTERY_PIN) && !defined(AXP192_SLAVE_ADDRESS)
+    #if !defined(BATTERY_PIN) && !defined(HAS_AXP192)
         return true;
     #endif
 
@@ -63,7 +63,7 @@ static void lsIdle()
 {
     // DEBUG_MSG("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     // Do we have more sleeping to do?
     if (secsSlept < config.power.ls_secs ? config.power.ls_secs : default_ls_secs * 1000) {
@@ -343,7 +343,7 @@ void PowerFSM_setup()
 
     uint32_t meshSds = 0;
 
-#ifndef NRF52_SERIES
+#ifdef ARCH_ESP32
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 
     // See: https://github.com/meshtastic/Meshtastic-device/issues/1071

src/SerialConsole.cpp

@@ -30,7 +30,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {

src/configuration.h

@@ -62,79 +62,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /// Convert a preprocessor name into a quoted string and if that string is empty use "unset"
 #define optstr(s) (xstr(s)[0] ? xstr(s) : "unset")
 
-#ifdef PORTDUINO
-
-#define NO_ESP32 // Don't use ESP32 libs (mainly bluetooth)
-
-#elif defined(NRF52_SERIES) // All of the NRF52 targets are configured using variant.h, so this section shouldn't need to be
-// board specific
-
-//
-// Standard definitions for NRF52 targets
-//
-
-#define NO_ESP32 // Don't use ESP32 libs (mainly bluetooth)
-
-// We bind to the GPS using variant.h instead for this platform (Serial1)
-
-#define LED_PIN PIN_LED1 // LED1 on nrf52840-DK
-
-// If the variant filed defines as standard button
-#ifdef PIN_BUTTON1
-#define BUTTON_PIN PIN_BUTTON1
+// Nop definition for these attributes that are specific to ESP32
+#ifndef EXT_RAM_ATTR
+    #define EXT_RAM_ATTR
 #endif
-
-#ifdef PIN_BUTTON2
-#define BUTTON_PIN_ALT PIN_BUTTON2
+#ifndef IRAM_ATTR
+    #define IRAM_ATTR
 #endif
-
-#ifdef PIN_BUTTON_TOUCH
-#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
-#endif
-
-#else
-
-//
-// Standard definitions for ESP32 targets
-//
-
-#define HAS_WIFI
-
-#define GPS_SERIAL_NUM 1
-#define GPS_RX_PIN 34
-#ifdef USE_JTAG
-#define GPS_TX_PIN -1
-#else
-#define GPS_TX_PIN 12
-#endif
-
-// -----------------------------------------------------------------------------
-// LoRa SPI
-// -----------------------------------------------------------------------------
-
-// NRF52 boards will define this in variant.h
-#ifndef RF95_SCK
-#define RF95_SCK 5
-#define RF95_MISO 19
-#define RF95_MOSI 27
-#define RF95_NSS 18
-#endif
-
-#endif
-
-#ifndef TTGO_T_ECHO
-#define GPS_UBLOX
-#endif
-
-//
-// Standard definitions for !ESP32 targets
-//
-
-#ifdef NO_ESP32
-// Nop definition for these attributes - not used on NRF52
-#define EXT_RAM_ATTR
-#define IRAM_ATTR
-#define RTC_DATA_ATTR
+#ifndef RTC_DATA_ATTR
+    #define RTC_DATA_ATTR
 #endif
 
 // -----------------------------------------------------------------------------
@@ -190,109 +126,43 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_THREAD_INTERVAL 100
 #endif
 
-#if defined(TBEAM_V10)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TBEAM
-
-#elif defined(TBEAM_V07)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TBEAM0p7
-
-#elif defined(DIY_V1)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_DIY_V1
-
-#elif defined(RAK_11200)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_RAK11200
-
-#elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
-
-#ifdef HELTEC_V2_0
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_HELTEC_V2_0
-
-#endif
-
-#ifdef HELTEC_V2_1
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_HELTEC_V2_1
-
-#endif
-
-#elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
-
-#define HW_VENDOR HardwareModel_HELTEC_V1
-
-#elif defined(TLORA_V1)
-
-#define HW_VENDOR HardwareModel_TLORA_V1
-
-#elif defined(TLORA_V2)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V2
-
-#elif defined(TLORA_V1_3)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V1_1p3
-
-#elif defined(TLORA_V2_1_16)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
-
-#elif defined(GENIEBLOCKS)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_GENIEBLOCKS
-
-#elif defined(PRIVATE_HW)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_PRIVATE_HW
-
-#endif
-
-#ifdef ARDUINO_NRF52840_PCA10056
-
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_NRF52840DK
-
-// This board uses 0 to be mean LED on
-#undef LED_INVERTED
-#define LED_INVERTED 1
-
-#elif defined(ARDUINO_NRF52840_PPR)
-
-#define HW_VENDOR HardwareModel_PPR
-
-#elif defined(RAK4630)
-
-#define HW_VENDOR HardwareModel_RAK4631
-
-#elif defined(TTGO_T_ECHO)
-
-#define HW_VENDOR HardwareModel_T_ECHO
-
-#elif defined(NANO_G1)
-
-#define HW_VENDOR HardwareModel_NANO_G1
-
-#elif defined(NORDIC_PCA10059)
-
-#define HW_VENDOR HardwareModel_NRF52840_PCA10059
-
-#elif defined(M5STACK)
-
-#define HW_VENDOR HardwareModel_M5STACK
-
-#elif NRF52_SERIES
-
-#define HW_VENDOR HardwareModel_NRF52_UNKNOWN
-
-#elif PORTDUINO
-
-#define HW_VENDOR HardwareModel_PORTDUINO
-
-#endif
-
+/* Step #1: offer chance for variant-specific defines */
 #include "variant.h"
+
+/* Step #2: follow with defines common to the architecture; 
+   also enable HAS_ option not specifically disabled by variant.h */
+#include "architecture.h"
+
+/* Step #3: mop up with disabled values for HAS_ options not handled by the above two */
+
+#ifndef HAS_WIFI
+    #define HAS_WIFI 0
+#endif
+#ifndef HAS_SCREEN
+    #define HAS_SCREEN 0
+#endif
+#ifndef HAS_WIRE
+    #define HAS_WIRE 0
+#endif
+#ifndef HAS_GPS
+    #define HAS_GPS 0
+#endif
+#ifndef HAS_BUTTON
+    #define HAS_BUTTON 0
+#endif
+#ifndef HAS_TELEMETRY
+    #define HAS_TELEMETRY 0
+#endif
+#ifndef HAS_RADIO
+    #define HAS_RADIO 0
+#endif
+#ifndef HAS_RTC
+    #define HAS_RTC 0
+#endif
+
 #include "RF95Configuration.h"
 #include "DebugConfiguration.h"
+
+#ifndef HW_VENDOR
+    #error HW_VENDOR must be defined
+#endif

src/cubecell/FS.h

@@ -1 +0,0 @@
-// Placeholder FIXME

src/detect/i2cScan.h

@@ -3,7 +3,11 @@
 #include <Wire.h>
 #include "mesh/generated/telemetry.pb.h"
 
-#ifndef NO_WIRE
+#ifdef HAS_AXP192
+#include "axp20x.h"
+#endif
+
+#if HAS_WIRE
 uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
     uint16_t value = 0x00;
     Wire.beginTransmission(address);
@@ -110,7 +114,7 @@ void scanI2Cdevice(void)
                 screen_found = addr;
                 DEBUG_MSG("st7567 display found\n");
             }
-#ifdef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
             if (addr == AXP192_SLAVE_ADDRESS) {
                 axp192_found = true;
                 DEBUG_MSG("axp192 PMU found\n");
@@ -124,6 +128,9 @@ void scanI2Cdevice(void)
             } else if (registerValue == 0x60) {
                 DEBUG_MSG("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
                 nodeTelemetrySensorsMap[TelemetrySensorType_BME280] = addr;
+            } else {
+                DEBUG_MSG("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                nodeTelemetrySensorsMap[TelemetrySensorType_BMP280] = addr;
             }
         }
         if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {

src/gps/GPS.cpp

@@ -65,12 +65,12 @@ bool GPS::setupGPS()
         didSerialInit = true;
 
 // ESP32 has a special set of parameters vs other arduino ports
-#if defined(GPS_RX_PIN) && !defined(NO_ESP32)
+#if defined(GPS_RX_PIN) && defined(ARCH_ESP32)
         _serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, GPS_RX_PIN, GPS_TX_PIN);
 #else
         _serial_gps->begin(GPS_BAUDRATE);
 #endif
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         _serial_gps->setRxBufferSize(2048); // the default is 256
 #endif
 #ifdef TTGO_T_ECHO
@@ -330,7 +330,7 @@ int32_t GPS::runOnce()
         if(devicestate.did_gps_reset && (millis() > 60000) && !hasFlow()) {
             DEBUG_MSG("GPS is not communicating, trying factory reset on next bootup.\n");
             devicestate.did_gps_reset = false;
-            nodeDB.saveToDisk();
+            nodeDB.saveDeviceStateToDisk();
         }
 #endif
     }
@@ -432,14 +432,14 @@ int GPS::prepareDeepSleep(void *unused)
     return 0;
 }
 
-#ifndef NO_GPS
+#if HAS_GPS
 #include "NMEAGPS.h"
 #endif
 
 GPS *createGps()
 {
 
-#ifdef NO_GPS
+#if !HAS_GPS
     return nullptr;
 #else
     if (!config.position.gps_disabled) {

src/gps/RTC.cpp

@@ -115,12 +115,12 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
             rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_hour, t->tm_min, t->tm_sec);
             DEBUG_MSG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
         }
-#elif !defined(NO_ESP32)
+#elif defined(ARCH_ESP32)
         settimeofday(tv, NULL);
 #endif
 
         // nrf52 doesn't have a readable RTC (yet - software not written)
-#if defined(PORTDUINO) || !defined(NO_ESP32) || defined(RV3028_RTC) || defined(PCF8563_RTC)
+#ifdef HAS_RTC
         readFromRTC();
 #endif
 

src/graphics/EInkDisplay2.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 
-#ifdef HAS_EINK
+#ifdef USE_EINK
 #include "main.h"
 #include "EInkDisplay2.h"
 #include "SPILock.h"

src/graphics/Screen.cpp

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 #include "configuration.h"
-#ifndef NO_SCREEN
+#if HAS_SCREEN
 #include <OLEDDisplay.h>
 
 #include "GPS.h"
@@ -39,7 +39,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "target_specific.h"
 #include "utils.h"
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #include "mesh/http/WiFiAPClient.h"
 #endif
@@ -64,7 +64,7 @@ namespace graphics
 static FrameCallback normalFrames[MAX_NUM_NODES + NUM_EXTRA_FRAMES];
 static uint32_t targetFramerate = IDLE_FRAMERATE;
 static char btPIN[16] = "888888";
-
+    
 // This image definition is here instead of images.h because it's modified dynamically by the drawBattery function
 uint8_t imgBattery[16] = {0xFF, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0xE7, 0x3C};
 
@@ -94,7 +94,7 @@ static uint16_t displayWidth, displayHeight;
 #define SCREEN_WIDTH displayWidth
 #define SCREEN_HEIGHT displayHeight
 
-#if defined(HAS_EINK) || defined(ILI9341_DRIVER)
+#if defined(USE_EINK) || defined(ILI9341_DRIVER)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -212,7 +212,7 @@ static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     display->setFont(FONT_SMALL);
     display->drawString(64 + x, y, "Creating SSL certificate");
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     yield();
     esp_task_wdt_reset();
 #endif
@@ -253,13 +253,13 @@ static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, i
         display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "");
     }
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     yield();
     esp_task_wdt_reset();
 #endif
 }
 
-#ifdef HAS_EINK
+#ifdef USE_EINK
 /// Used on eink displays while in deep sleep
 static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -595,7 +595,7 @@ class Point
     void rotate(float radian)
     {
         float cos = cosf(radian), sin = sinf(radian);
-        float rx = x * cos - y * sin, ry = x * sin + y * cos;
+        float rx = x * cos + y * sin, ry = -x * sin + y * cos;
 
         x = rx;
         y = ry;
@@ -609,8 +609,10 @@ class Point
 
     void scale(float f)
     {
+        //We use -f here to counter the flip that happens
+        //on the y axis when drawing and rotating on screen
         x *= f;
-        y *= f;
+        y *= -f;
     }
 };
 
@@ -682,16 +684,21 @@ static void drawNodeHeading(OLEDDisplay *display, int16_t compassX, int16_t comp
     drawLine(display, rightArrow, tip);
 }
 
-// Draw the compass heading
-static void drawCompassHeading(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
+// Draw north
+static void drawCompassNorth(OLEDDisplay *display, int16_t compassX, int16_t compassY, float myHeading)
 {
-    Point N1(-0.04f, -0.65f), N2(0.04f, -0.65f);
-    Point N3(-0.04f, -0.55f), N4(0.04f, -0.55f);
+    //If north is supposed to be at the top of the compass we want rotation to be +0
+    if(config.display.compass_north_top)
+        myHeading = -0;
+    
+    Point N1(-0.04f, 0.65f), N2(0.04f, 0.65f);
+    Point N3(-0.04f, 0.55f), N4(0.04f, 0.55f);
     Point *rosePoints[] = {&N1, &N2, &N3, &N4};
 
     for (int i = 0; i < 4; i++) {
-        rosePoints[i]->rotate(myHeading);
-        rosePoints[i]->scale(-1 * COMPASS_DIAM);
+        // North on compass will be negative of heading
+        rosePoints[i]->rotate(-myHeading);
+        rosePoints[i]->scale(COMPASS_DIAM);
         rosePoints[i]->translate(compassX, compassY);
     }
     drawLine(display, N1, N3);
@@ -762,7 +769,7 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     if (ourNode && hasPosition(ourNode)) {
         Position &op = ourNode->position;
         float myHeading = estimatedHeading(DegD(op.latitude_i), DegD(op.longitude_i));
-        drawCompassHeading(display, compassX, compassY, myHeading);
+        drawCompassNorth(display, compassX, compassY, myHeading);
 
         if (hasPosition(node)) {
             // display direction toward node
@@ -775,12 +782,13 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             else
                 snprintf(distStr, sizeof(distStr), "%.1f km", d / 1000);
 
-            // FIXME, also keep the guess at the operators heading and add/substract
-            // it.  currently we don't do this and instead draw north up only.
             float bearingToOther =
-                GeoCoord::bearing(DegD(p.latitude_i), DegD(p.longitude_i), DegD(op.latitude_i), DegD(op.longitude_i));
-            float headingRadian = bearingToOther - myHeading;
-            drawNodeHeading(display, compassX, compassY, headingRadian);
+                GeoCoord::bearing(DegD(op.latitude_i), DegD(op.longitude_i), DegD(p.latitude_i), DegD(p.longitude_i));
+            // If the top of the compass is a static north then bearingToOther can be drawn on the compass directly
+            // If the top of the compass is not a static north we need adjust bearingToOther based on heading
+            if(!config.display.compass_north_top)
+                bearingToOther -= myHeading;
+            drawNodeHeading(display, compassX, compassY, bearingToOther);
         }
     }
     if (!hasNodeHeading)
@@ -843,7 +851,7 @@ Screen::Screen(uint8_t address, int sda, int scl) : OSThread("Screen"), cmdQueue
  */
 void Screen::doDeepSleep()
 {
-#ifdef HAS_EINK
+#ifdef USE_EINK
     static FrameCallback sleepFrames[] = {drawSleepScreen};
     static const int sleepFrameCount = sizeof(sleepFrames) / sizeof(sleepFrames[0]);
     ui.setFrames(sleepFrames, sleepFrameCount);
@@ -935,9 +943,11 @@ void Screen::setup()
     handleSetOn(true);
 
     // On some ssd1306 clones, the first draw command is discarded, so draw it
-    // twice initially.
+    // twice initially. Skip this for EINK Displays to save a few seconds during boot
     ui.update();
+#ifndef USE_EINK
     ui.update();
+#endif
     serialSinceMsec = millis();
 
     // Subscribe to status updates
@@ -954,7 +964,7 @@ void Screen::setup()
 void Screen::forceDisplay()
 {
     // Nasty hack to force epaper updates for 'key' frames.  FIXME, cleanup.
-#ifdef HAS_EINK
+#ifdef USE_EINK
     dispdev.forceDisplay();
 #endif
 }
@@ -1055,7 +1065,7 @@ int32_t Screen::runOnce()
         DEBUG_MSG("Setting idle framerate\n");
         targetFramerate = IDLE_FRAMERATE;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
         setCPUFast(false); // Turn up the CPU to improve screen animations
 #endif
 
@@ -1180,7 +1190,7 @@ void Screen::setFrames()
     // call a method on debugInfoScreen object (for more details)
     normalFrames[numframes++] = &Screen::drawDebugInfoSettingsTrampoline;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     if (isWifiAvailable()) {
         // call a method on debugInfoScreen object (for more details)
         normalFrames[numframes++] = &Screen::drawDebugInfoWiFiTrampoline;
@@ -1287,7 +1297,7 @@ void Screen::setFastFramerate()
     // We are about to start a transition so speed up fps
     targetFramerate = SCREEN_TRANSITION_FRAMERATE;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     setCPUFast(true); // Turn up the CPU to improve screen animations
 #endif
 
@@ -1342,7 +1352,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 // Jm
 void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
-#ifdef HAS_WIFI
+#if HAS_WIFI
     const char *wifiName = config.wifi.ssid;
     const char *wifiPsw = config.wifi.psk;
 
@@ -1355,7 +1365,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
 
     if (isSoftAPForced()) {
         display->drawString(x, y, String("WiFi: Software AP (Admin)"));
-    } else if (config.wifi.ap_mode) {
+    } else if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden) {
         display->drawString(x, y, String("WiFi: Software AP"));
     } else if (WiFi.status() != WL_CONNECTED) {
         display->drawString(x, y, String("WiFi: Not Connected"));
@@ -1378,8 +1388,8 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
     - WL_NO_SHIELD: assigned when no WiFi shield is present;
 
     */
-    if (WiFi.status() == WL_CONNECTED || isSoftAPForced() || config.wifi.ap_mode) {
-        if (config.wifi.ap_mode || isSoftAPForced()) {
+    if (WiFi.status() == WL_CONNECTED || isSoftAPForced() || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden) {
+        if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden || isSoftAPForced()) {
             display->drawString(x, y + FONT_HEIGHT_SMALL * 1, "IP: " + String(WiFi.softAPIP().toString().c_str()));
 
             // Number of connections to the AP. Default max for the esp32 is 4
@@ -1471,7 +1481,7 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
         }
 
     } else {
-        if (config.wifi.ap_mode) {
+        if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden) {
             if ((millis() / 10000) % 2) {
                 display->drawString(x, y + FONT_HEIGHT_SMALL * 2, "SSID: " + String(wifiName));
             } else {
@@ -1665,4 +1675,5 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
 }
 
 } // namespace graphics
-#endif // NO_SCREEN
+
+#endif // HAS_SCREEN

src/graphics/Screen.h

@@ -1,6 +1,8 @@
 #pragma once
 
-#ifdef NO_SCREEN
+#include "configuration.h"
+
+#if !HAS_SCREEN
 #include "power.h"
 namespace graphics
 {
@@ -315,7 +317,7 @@ class Screen : public concurrency::OSThread
     SSD1306Wire dispdev;
 #elif defined(ST7735_CS) || defined(ILI9341_DRIVER)
     TFTDisplay dispdev;
-#elif defined(HAS_EINK)
+#elif defined(USE_EINK)
     EInkDisplay dispdev;
 #elif defined(USE_ST7567)
     ST7567Wire dispdev;

src/main.cpp

@@ -17,9 +17,9 @@
 #include "SPILock.h"
 #include "concurrency/OSThread.h"
 #include "concurrency/Periodic.h"
-#include "debug/axpDebug.h"
-#include "debug/einkScan.h"
-#include "debug/i2cScan.h"
+#include "detect/axpDebug.h"
+#include "detect/einkScan.h"
+#include "detect/i2cScan.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "modules/Modules.h"
@@ -31,18 +31,18 @@
 
 #include "mesh/http/WiFiAPClient.h"
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "mesh/http/WebServer.h"
 
 #ifdef USE_NEW_ESP32_BLUETOOTH
-#include "esp32/ESP32Bluetooth.h"
+#include "platform/esp32/ESP32Bluetooth.h"
 #else
 #include "nimble/BluetoothUtil.h"
 #endif
 
 #endif
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
 #include "mesh/wifi/WiFiServerAPI.h"
 #include "mqtt/MQTT.h"
 #endif
@@ -52,7 +52,9 @@
 #include "SX1262Interface.h"
 #include "SX1268Interface.h"
 
+#if HAS_BUTTON
 #include "ButtonThread.h"
+#endif
 #include "PowerFSMThread.h"
 
 using namespace concurrency;
@@ -91,7 +93,7 @@ uint32_t serialSinceMsec;
 bool axp192_found;
 
 // Array map of sensor types (as array index) and i2c address as value we'll find in the i2c scan
-uint8_t nodeTelemetrySensorsMap[12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+uint8_t nodeTelemetrySensorsMap[7] = { 0, 0, 0, 0, 0, 0, 0 };
 
 Router *router = NULL; // Users of router don't care what sort of subclass implements that API
 
@@ -126,11 +128,15 @@ static int32_t ledBlinker()
 
 uint32_t timeLastPowered = 0;
 
+#if HAS_BUTTON
 bool ButtonThread::shutdown_on_long_stop = false;
+#endif
 
 static Periodic *ledPeriodic;
 static OSThread *powerFSMthread, *buttonThread;
+#if HAS_BUTTON
 uint32_t ButtonThread::longPressTime = 0;
+#endif
 
 RadioInterface *rIf = NULL;
 
@@ -187,7 +193,7 @@ void setup()
     bool forceSoftAP = 0;
 
 #ifdef BUTTON_PIN
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     // If the button is connected to GPIO 12, don't enable the ability to use
     // meshtasticAdmin on the device.
@@ -218,7 +224,7 @@ void setup()
 
 #ifdef I2C_SDA
     Wire.begin(I2C_SDA, I2C_SCL);
-#elif !defined(NO_WIRE)
+#elif HAS_WIRE
     Wire.begin();
 #endif
 
@@ -236,8 +242,10 @@ void setup()
     // scanEInkDevice();
 #endif
 
+#if HAS_BUTTON
     // Buttons & LED
     buttonThread = new ButtonThread();
+#endif
 
 #ifdef LED_PIN
     pinMode(LED_PIN, OUTPUT);
@@ -247,7 +255,7 @@ void setup()
     // Hello
     DEBUG_MSG("Meshtastic hwvendor=%d, swver=%s\n", HW_VENDOR, optstr(APP_VERSION));
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // Don't init display if we don't have one or we are waking headless due to a timer event
     if (wakeCause == ESP_SLEEP_WAKEUP_TIMER)
         screen_found = 0; // forget we even have the hardware
@@ -255,7 +263,7 @@ void setup()
     esp32Setup();
 #endif
 
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     nrf52Setup();
 #endif
     playStartMelody();
@@ -271,7 +279,7 @@ void setup()
 
     // Init our SPI controller (must be before screen and lora)
     initSPI();
-#ifdef NO_ESP32
+#ifndef ARCH_ESP32
     SPI.begin();
 #else
     // ESP32
@@ -299,14 +307,14 @@ void setup()
     setupModules();
 
     // Do this after service.init (because that clears error_code)
-#ifdef AXP192_SLAVE_ADDRESS
+#ifdef HAS_AXP192
     if (!axp192_found)
         RECORD_CRITICALERROR(CriticalErrorCode_NoAXP192); // Record a hardware fault for missing hardware
 #endif
 
         // Don't call screen setup until after nodedb is setup (because we need
         // the current region name)
-#if defined(ST7735_CS) || defined(HAS_EINK) || defined(ILI9341_DRIVER)
+#if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER)
     screen->setup();
 #else
     if (screen_found)
@@ -386,7 +394,7 @@ void setup()
     }
 #endif
 
-#ifdef USE_SIM_RADIO
+#if !HAS_RADIO
     if (!rIf) {
         rIf = new SimRadio;
         if (!rIf->init()) {
@@ -399,19 +407,19 @@ void setup()
     }
 #endif
 
-#if defined(PORTDUINO) || defined(HAS_WIFI)
+#if HAS_WIFI
     mqttInit();
 #endif
 
     // Initialize Wifi
     initWifi(forceSoftAP);
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // Start web server thread.
     webServerThread = new WebServerThread();
 #endif
 
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     initApiServer();
 #endif
 
@@ -452,10 +460,10 @@ void loop()
 
     // heap_caps_check_integrity_all(true); // FIXME - disable this expensive check
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     esp32Loop();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     nrf52Loop();
 #endif
     powerCommandsCheck();

src/main.h

@@ -19,7 +19,7 @@ extern bool axp192_found;
 extern bool isCharging;
 extern bool isUSBPowered;
 
-extern uint8_t nodeTelemetrySensorsMap[12];
+extern uint8_t nodeTelemetrySensorsMap[7];
 
 // Global Screen singleton.
 extern graphics::Screen *screen;

src/mesh/FloodingRouter.cpp

@@ -29,8 +29,12 @@ bool FloodingRouter::shouldFilterReceived(MeshPacket *p)
 
 void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
 {
-
-    if ((p->to == NODENUM_BROADCAST) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
+    PacketId ackId = ((c && c->error_reason == Routing_Error_NONE) || !c) ? p->decoded.request_id : 0;
+    if (ackId && p->to != getNodeNum()) {
+        // do not flood direct message that is ACKed 
+        DEBUG_MSG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
+        Router::cancelSending(p->to, p->decoded.request_id);   // cancel rebroadcast for this DM
+    } else if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
         if (p->id != 0) {
             if (config.device.role != Config_DeviceConfig_Role_ClientMute) {
                 MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it

src/mesh/MeshModule.h

@@ -4,7 +4,7 @@
 #include "mesh/MeshTypes.h"
 #include <vector>
 
-#ifndef NO_SCREEN
+#if HAS_SCREEN
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
 #endif
@@ -72,7 +72,7 @@ class MeshModule
     static void observeUIEvents(Observer<const UIFrameEvent *> *observer);
     static AdminMessageHandleResult handleAdminMessageForAllPlugins(
         const MeshPacket &mp, AdminMessage *request, AdminMessage *response);
-#ifndef NO_SCREEN
+#if HAS_SCREEN
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) { return; }
 #endif
   protected:

src/mesh/MeshService.cpp

@@ -168,7 +168,7 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
     NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
     assert(node);
 
-    if (node->has_position) {
+    if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
         if (positionModule) {
             DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
             positionModule->sendOurPosition(dest, wantReplies);

src/mesh/NodeDB.cpp

@@ -17,14 +17,14 @@
 #include <pb_decode.h>
 #include <pb_encode.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "mesh/http/WiFiAPClient.h"
 #include "modules/esp32/StoreForwardModule.h"
 #include <Preferences.h>
 #include <nvs_flash.h>
 #endif
 
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
 #include <bluefruit.h>
 #include <utility/bonding.h>
 #endif
@@ -43,14 +43,6 @@ ChannelFile channelFile;
  */
 uint32_t radioGeneration;
 
-/*
-DeviceState versions used to be defined in the .proto file but really only this function cares.  So changed to a
-#define here.
-*/
-
-#define DEVICESTATE_CUR_VER 13
-#define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
-
 // FIXME - move this somewhere else
 extern void getMacAddr(uint8_t *dmac);
 
@@ -132,11 +124,11 @@ bool NodeDB::factoryReset()
     installDefaultDeviceState();
     // third, write to disk
     saveToDisk();
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
     nvs_flash_erase();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
     Bluefruit.begin();
     DEBUG_MSG("Clearing bluetooth bonds!\n");
     bond_print_list(BLE_GAP_ROLE_PERIPH);
@@ -248,7 +240,7 @@ void NodeDB::init()
 
     strncpy(myNodeInfo.firmware_version, optstr(APP_VERSION), sizeof(myNodeInfo.firmware_version));
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     Preferences preferences;
     preferences.begin("meshtastic", false);
     myNodeInfo.reboot_count = preferences.getUInt("rebootCounter", 0);
@@ -305,7 +297,7 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 #ifdef FSCom
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
 
-    auto f = FSCom.open(filename);
+    auto f = FSCom.open(filename, FILE_O_READ);
 
     if (f) {
         DEBUG_MSG("Loading %s\n", filename);
@@ -339,11 +331,11 @@ void NodeDB::loadFromDisk()
         if (devicestate.version < DEVICESTATE_MIN_VER) {
             DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
             installDefaultDeviceState();
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
             // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
             nvs_flash_erase();
 #endif
-#ifdef NRF52_SERIES
+#ifdef ARCH_NRF52
             Bluefruit.begin();
             DEBUG_MSG("Clearing bluetooth bonds!\n");
             bond_print_list(BLE_GAP_ROLE_PERIPH);
@@ -414,7 +406,7 @@ bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_
         // brief window of risk here ;-)
         if (FSCom.exists(filename) && !FSCom.remove(filename))
             DEBUG_MSG("Warning: Can't remove old pref file\n");
-        if (!FSCom.rename(filenameTmp.c_str(), filename))
+        if (!renameFile(filenameTmp.c_str(), filename))
             DEBUG_MSG("Error: can't rename new pref file\n");
     } else {
         DEBUG_MSG("Can't write prefs\n");
@@ -435,6 +427,16 @@ void NodeDB::saveChannelsToDisk()
     }
 }
 
+void NodeDB::saveDeviceStateToDisk() 
+{
+    if (!devicestate.no_save) {
+#ifdef FSCom
+        FSCom.mkdir("/prefs");
+#endif
+        saveProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
+    }
+}
+
 void NodeDB::saveToDisk()
 {
     if (!devicestate.no_save) {
@@ -669,7 +671,7 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
     myNodeInfo.error_count++;
 
     // Currently portuino is mostly used for simulation.  Make sue the user notices something really bad happend
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     DEBUG_MSG("A critical failure occurred, portduino is exiting...");
     exit(2);
 #endif

src/mesh/NodeDB.h

@@ -8,6 +8,14 @@
 #include "NodeStatus.h"
 #include "mesh-pb-constants.h"
 
+/*
+DeviceState versions used to be defined in the .proto file but really only this function cares.  So changed to a
+#define here.
+*/
+
+#define DEVICESTATE_CUR_VER 14
+#define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
+
 extern DeviceState devicestate;
 extern ChannelFile channelFile;
 extern MyNodeInfo &myNodeInfo;
@@ -44,7 +52,7 @@ class NodeDB
     void init();
 
     /// write to flash
-    void saveToDisk(), saveChannelsToDisk();
+    void saveToDisk(), saveChannelsToDisk(), saveDeviceStateToDisk();
 
     /** Reinit radio config if needed, because either:
      * a) sometimes a buggy android app might send us bogus settings or

src/mesh/PhoneAPI.cpp

@@ -79,20 +79,17 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
     memset(&toRadioScratch, 0, sizeof(toRadioScratch));
     if (pb_decode_from_bytes(buf, bufLength, ToRadio_fields, &toRadioScratch)) {
         switch (toRadioScratch.which_payloadVariant) {
-        case ToRadio_packet_tag:
-            return handleToRadioPacket(toRadioScratch.packet);
-
-        case ToRadio_want_config_id_tag:
-            config_nonce = toRadioScratch.want_config_id;
-            DEBUG_MSG("Client wants config, nonce=%u\n", config_nonce);
-
-            handleStartConfig();
-            break;
-
-        case ToRadio_disconnect_tag:
-            close();
-            break;
+            case ToRadio_packet_tag:
+                return handleToRadioPacket(toRadioScratch.packet);
+            case ToRadio_want_config_id_tag:
+                config_nonce = toRadioScratch.want_config_id;
+                DEBUG_MSG("Client wants config, nonce=%u\n", config_nonce);
 
+                handleStartConfig();
+                break;
+            case ToRadio_disconnect_tag:
+                close();
+                break;
         default:
             // Ignore nop messages
             // DEBUG_MSG("Error: unexpected ToRadio variant\n");
@@ -112,9 +109,8 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
  *
  * Our sending states progress in the following sequence (the client app ASSUMES THIS SEQUENCE, DO NOT CHANGE IT):
  *      STATE_SEND_MY_INFO, // send our my info record
- *      STATE_SEND_GROUPS
+ *      STATE_SEND_NODEINFO, // states progress in this order as the device sends to the client
         STATE_SEND_CONFIG,
-        STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings
  */
@@ -141,11 +137,30 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         myNodeInfo.has_gps = gps && gps->isConnected(); // Update with latest GPS connect info
         fromRadioScratch.which_payloadVariant = FromRadio_my_info_tag;
         fromRadioScratch.my_info = myNodeInfo;
-        state = STATE_SEND_CONFIG;
+        state = STATE_SEND_NODEINFO;
 
         service.refreshMyNodeInfo(); // Update my NodeInfo because the client will be asking for it soon.
         break;
 
+    case STATE_SEND_NODEINFO: {
+        const NodeInfo *info = nodeInfoForPhone;
+        nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time
+
+        if (info) {
+            DEBUG_MSG("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->last_heard, info->user.id,
+                      info->user.long_name);
+            fromRadioScratch.which_payloadVariant = FromRadio_node_info_tag;
+            fromRadioScratch.node_info = *info;
+            // Stay in current state until done sending nodeinfos
+        } else {
+            DEBUG_MSG("Done sending nodeinfos\n");
+            state = STATE_SEND_CONFIG;
+            // Go ahead and send that ID right now
+            return getFromRadio(buf);
+        }
+        break;
+    }
+
     case STATE_SEND_CONFIG:
         fromRadioScratch.which_payloadVariant = FromRadio_config_tag;
         switch (config_state) {
@@ -220,28 +235,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         config_state++;
         // Advance when we have sent all of our ModuleConfig objects
         if (config_state > ModuleConfig_canned_message_tag) {
-            state = STATE_SEND_NODEINFO;
+            state = STATE_SEND_COMPLETE_ID;
             config_state = Config_device_tag;
         }
         break;
-    case STATE_SEND_NODEINFO: {
-        const NodeInfo *info = nodeInfoForPhone;
-        nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time
-
-        if (info) {
-            DEBUG_MSG("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->last_heard, info->user.id,
-                      info->user.long_name);
-            fromRadioScratch.which_payloadVariant = FromRadio_node_info_tag;
-            fromRadioScratch.node_info = *info;
-            // Stay in current state until done sending nodeinfos
-        } else {
-            DEBUG_MSG("Done sending nodeinfos\n");
-            state = STATE_SEND_COMPLETE_ID;
-            // Go ahead and send that ID right now
-            return getFromRadio(buf);
-        }
-        break;
-    }
 
     case STATE_SEND_COMPLETE_ID:
         fromRadioScratch.which_payloadVariant = FromRadio_config_complete_id_tag;

src/mesh/PhoneAPI.h

@@ -22,10 +22,9 @@ class PhoneAPI
     enum State {
         STATE_SEND_NOTHING, // Initial state, don't send anything until the client starts asking for config
         STATE_SEND_MY_INFO, // send our my info record
-        STATE_SEND_GROUPS, // new in 1.3?
+        STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_CONFIG, // Replacement for the old Radioconfig
         STATE_SEND_MODULECONFIG, // Send Module specific config
-        STATE_SEND_NODEINFO, // states progress in this order as the device sends to to the client
         STATE_SEND_COMPLETE_ID,
         STATE_SEND_PACKETS // send packets or debug strings
     };

src/mesh/RadioLibInterface.cpp

@@ -11,7 +11,7 @@
 // FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
 static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
 
 void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes)
 {
@@ -45,7 +45,7 @@ RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq
     instance = this;
 }
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 // ESP32 doesn't use that flag
 #define YIELD_FROM_ISR(x) portYIELD_FROM_ISR()
 #else
@@ -96,7 +96,7 @@ bool RadioLibInterface::canSendImmediately()
         if (busyTx && (millis() - lastTxStart > 60000)) {
             DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
             RECORD_CRITICALERROR(CriticalErrorCode_TransmitFailed);
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
             if (busyTx && (millis() - lastTxStart > 65000)) // After 5s more, reboot
                 ESP.restart();
 #endif

src/mesh/RadioLibInterface.h

@@ -41,7 +41,7 @@ class LockingModule : public Module
     {
     }
     
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
 #else
     void SPIbeginTransaction() override;

src/mesh/ReliableRouter.cpp

@@ -16,7 +16,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
         // If someone asks for acks on broadcast, we need the hop limit to be at least one, so that first node that receives our
         // message will rebroadcast.  But asking for hop_limit 0 in that context means the client app has no preference on hop
         // counts and we want this message to get through the whole mesh, so use the default.
-        if (p->to == NODENUM_BROADCAST && p->hop_limit == 0) {
+        if (p->hop_limit == 0) {
             if (config.lora.hop_limit && config.lora.hop_limit <= HOP_MAX) {
                 p->hop_limit = (config.lora.hop_limit >= HOP_MAX) ? HOP_MAX : config.lora.hop_limit;
             } else {
@@ -34,7 +34,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
 bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
 {
     // Note: do not use getFrom() here, because we want to ignore messages sent from phone
-    if (p->to == NODENUM_BROADCAST && p->from == getNodeNum()) {
+    if (p->from == getNodeNum()) {
         printPacket("Rx someone rebroadcasting for us", p);
 
         // We are seeing someone rebroadcast one of our broadcast attempts.
@@ -231,4 +231,4 @@ void ReliableRouter::setNextTx(PendingPacket *pending)
     DEBUG_MSG("Setting next retransmission in %u msecs: ", d);
     printPacket("", pending->packet);
     setReceivedMessage(); // Run ASAP, so we can figure out our correct sleep time
-}
+}

src/mesh/Router.cpp

@@ -11,7 +11,7 @@ extern "C" {
 #include "mesh/compression/unishox2.h"
 }
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
 #include "mqtt/MQTT.h"
 #endif
 
@@ -213,7 +213,7 @@ ErrorCode Router::send(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
         // check if we should send decrypted packets to mqtt
 
         // truth table:
@@ -244,7 +244,7 @@ ErrorCode Router::send(MeshPacket *p)
             return encodeResult; // FIXME - this isn't a valid ErrorCode
         }
 
-#if defined(HAS_WIFI) || defined(PORTDUINO)
+#if HAS_WIFI
         // the packet is now encrypted.
         // check if we should send encrypted packets to mqtt
         if (mqtt && shouldActuallyEncrypt)

src/mesh/generated/admin.pb.h

@@ -6,6 +6,7 @@
 #include <pb.h>
 #include "channel.pb.h"
 #include "config.pb.h"
+#include "device_metadata.pb.h"
 #include "mesh.pb.h"
 #include "module_config.pb.h"
 
@@ -73,6 +74,8 @@ typedef struct _AdminMessage {
         ModuleConfig set_module_config;
         /* Sent immediatly after a config change has been sent to ensure comms, if this is not recieved, the config will be reverted after 10 mins */
         bool confirm_set_module_config;
+        /* Send all channels in the response to this message */
+        bool get_all_channel_request;
         /* Setting channels/radio config remotely carries the risk that you might send an invalid config and the radio never talks to your mesh again.
      Therefore if setting either of these properties remotely, you must send a confirm_xxx message within 10 minutes.
      If you fail to do so, the radio will assume loss of comms and revert your changes.
@@ -111,6 +114,10 @@ typedef struct _AdminMessage {
         char set_canned_message_module_part4[201];
         /* Tell the node to shutdown in this many seconds (or <0 to cancel shutdown) */
         int32_t shutdown_seconds;
+        /* Request the node to send device metadata (firmware, protobuf version, etc) */
+        uint32_t get_device_metadata_request;
+        /* Device metadata response */
+        DeviceMetadata get_device_metadata_response;
     };
 } AdminMessage;
 
@@ -148,6 +155,7 @@ extern "C" {
 #define AdminMessage_get_module_config_response_tag 15
 #define AdminMessage_set_module_config_tag       16
 #define AdminMessage_confirm_set_module_config_tag 17
+#define AdminMessage_get_all_channel_request_tag 18
 #define AdminMessage_confirm_set_channel_tag     32
 #define AdminMessage_confirm_set_radio_tag       33
 #define AdminMessage_exit_simulator_tag          34
@@ -165,6 +173,8 @@ extern "C" {
 #define AdminMessage_set_canned_message_module_part3_tag 46
 #define AdminMessage_set_canned_message_module_part4_tag 47
 #define AdminMessage_shutdown_seconds_tag        51
+#define AdminMessage_get_device_metadata_request_tag 52
+#define AdminMessage_get_device_metadata_response_tag 53
 
 /* Struct field encoding specification for nanopb */
 #define AdminMessage_FIELDLIST(X, a) \
@@ -182,6 +192,7 @@ X(a, STATIC,   ONEOF,    UENUM,    (variant,get_module_config_request,get_module
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_module_config_response,get_module_config_response),  15) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,set_module_config,set_module_config),  16) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_module_config,confirm_set_module_config),  17) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_all_channel_request,get_all_channel_request),  18) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_channel,confirm_set_channel),  32) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_radio,confirm_set_radio),  33) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,exit_simulator,exit_simulator),  34) \
@@ -198,7 +209,9 @@ X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_module_part1,set_
 X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_module_part2,set_canned_message_module_part2),  45) \
 X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_module_part3,set_canned_message_module_part3),  46) \
 X(a, STATIC,   ONEOF,    STRING,   (variant,set_canned_message_module_part4,set_canned_message_module_part4),  47) \
-X(a, STATIC,   ONEOF,    INT32,    (variant,shutdown_seconds,shutdown_seconds),  51)
+X(a, STATIC,   ONEOF,    INT32,    (variant,shutdown_seconds,shutdown_seconds),  51) \
+X(a, STATIC,   ONEOF,    UINT32,   (variant,get_device_metadata_request,get_device_metadata_request),  52) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_device_metadata_response,get_device_metadata_response),  53)
 #define AdminMessage_CALLBACK NULL
 #define AdminMessage_DEFAULT NULL
 #define AdminMessage_variant_set_owner_MSGTYPE User
@@ -209,6 +222,7 @@ X(a, STATIC,   ONEOF,    INT32,    (variant,shutdown_seconds,shutdown_seconds),
 #define AdminMessage_variant_set_config_MSGTYPE Config
 #define AdminMessage_variant_get_module_config_response_MSGTYPE ModuleConfig
 #define AdminMessage_variant_set_module_config_MSGTYPE ModuleConfig
+#define AdminMessage_variant_get_device_metadata_response_MSGTYPE DeviceMetadata
 
 extern const pb_msgdesc_t AdminMessage_msg;
 

src/mesh/generated/config.pb.c

@@ -34,3 +34,4 @@ PB_BIND(Config_LoRaConfig, Config_LoRaConfig, 2)
 
 
 
+

src/mesh/generated/config.pb.h

@@ -51,6 +51,12 @@ typedef enum _Config_PowerConfig_ChargeCurrent {
     Config_PowerConfig_ChargeCurrent_MA1320 = 16 
 } Config_PowerConfig_ChargeCurrent;
 
+typedef enum _Config_WiFiConfig_WiFiMode { 
+    Config_WiFiConfig_WiFiMode_Client = 0, 
+    Config_WiFiConfig_WiFiMode_AccessPoint = 1, 
+    Config_WiFiConfig_WiFiMode_AccessPointHidden = 2 
+} Config_WiFiConfig_WiFiMode;
+
 typedef enum _Config_DisplayConfig_GpsCoordinateFormat { 
     Config_DisplayConfig_GpsCoordinateFormat_GpsFormatDec = 0, 
     Config_DisplayConfig_GpsCoordinateFormat_GpsFormatDMS = 1, 
@@ -99,6 +105,7 @@ typedef struct _Config_DisplayConfig {
     uint32_t screen_on_secs;
     Config_DisplayConfig_GpsCoordinateFormat gps_format;
     uint32_t auto_screen_carousel_secs;
+    bool compass_north_top;
 } Config_DisplayConfig;
 
 typedef struct _Config_LoRaConfig { 
@@ -138,10 +145,10 @@ typedef struct _Config_PowerConfig {
 } Config_PowerConfig;
 
 typedef struct _Config_WiFiConfig { 
+    bool enabled;
+    Config_WiFiConfig_WiFiMode mode;
     char ssid[33];
     char psk[64];
-    bool ap_mode;
-    bool ap_hidden;
 } Config_WiFiConfig;
 
 typedef struct _Config { 
@@ -170,6 +177,10 @@ typedef struct _Config {
 #define _Config_PowerConfig_ChargeCurrent_MAX Config_PowerConfig_ChargeCurrent_MA1320
 #define _Config_PowerConfig_ChargeCurrent_ARRAYSIZE ((Config_PowerConfig_ChargeCurrent)(Config_PowerConfig_ChargeCurrent_MA1320+1))
 
+#define _Config_WiFiConfig_WiFiMode_MIN Config_WiFiConfig_WiFiMode_Client
+#define _Config_WiFiConfig_WiFiMode_MAX Config_WiFiConfig_WiFiMode_AccessPointHidden
+#define _Config_WiFiConfig_WiFiMode_ARRAYSIZE ((Config_WiFiConfig_WiFiMode)(Config_WiFiConfig_WiFiMode_AccessPointHidden+1))
+
 #define _Config_DisplayConfig_GpsCoordinateFormat_MIN Config_DisplayConfig_GpsCoordinateFormat_GpsFormatDec
 #define _Config_DisplayConfig_GpsCoordinateFormat_MAX Config_DisplayConfig_GpsCoordinateFormat_GpsFormatOSGR
 #define _Config_DisplayConfig_GpsCoordinateFormat_ARRAYSIZE ((Config_DisplayConfig_GpsCoordinateFormat)(Config_DisplayConfig_GpsCoordinateFormat_GpsFormatOSGR+1))
@@ -192,15 +203,15 @@ extern "C" {
 #define Config_DeviceConfig_init_default         {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
 #define Config_PositionConfig_init_default       {0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_default          {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_WiFiConfig_init_default           {"", "", 0, 0}
-#define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0}
+#define Config_WiFiConfig_init_default           {0, _Config_WiFiConfig_WiFiMode_MIN, "", ""}
+#define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
 #define Config_LoRaConfig_init_default           {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}}
 #define Config_init_zero                         {0, {Config_DeviceConfig_init_zero}}
 #define Config_DeviceConfig_init_zero            {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
 #define Config_PositionConfig_init_zero          {0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_zero             {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_WiFiConfig_init_zero              {"", "", 0, 0}
-#define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0}
+#define Config_WiFiConfig_init_zero              {0, _Config_WiFiConfig_WiFiMode_MIN, "", ""}
+#define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0}
 #define Config_LoRaConfig_init_zero              {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, {0, 0, 0}}
 
 /* Field tags (for use in manual encoding/decoding) */
@@ -212,6 +223,7 @@ extern "C" {
 #define Config_DisplayConfig_screen_on_secs_tag  1
 #define Config_DisplayConfig_gps_format_tag      2
 #define Config_DisplayConfig_auto_screen_carousel_secs_tag 3
+#define Config_DisplayConfig_compass_north_top_tag 4
 #define Config_LoRaConfig_tx_power_tag           1
 #define Config_LoRaConfig_modem_preset_tag       2
 #define Config_LoRaConfig_bandwidth_tag          3
@@ -238,10 +250,10 @@ extern "C" {
 #define Config_PowerConfig_sds_secs_tag          10
 #define Config_PowerConfig_ls_secs_tag           11
 #define Config_PowerConfig_min_wake_secs_tag     12
-#define Config_WiFiConfig_ssid_tag               1
-#define Config_WiFiConfig_psk_tag                2
-#define Config_WiFiConfig_ap_mode_tag            3
-#define Config_WiFiConfig_ap_hidden_tag          4
+#define Config_WiFiConfig_enabled_tag            1
+#define Config_WiFiConfig_mode_tag               2
+#define Config_WiFiConfig_ssid_tag               3
+#define Config_WiFiConfig_psk_tag                4
 #define Config_device_tag                        1
 #define Config_position_tag                      2
 #define Config_power_tag                         3
@@ -300,17 +312,18 @@ X(a, STATIC,   SINGULAR, UINT32,   min_wake_secs,    12)
 #define Config_PowerConfig_DEFAULT NULL
 
 #define Config_WiFiConfig_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, STRING,   ssid,              1) \
-X(a, STATIC,   SINGULAR, STRING,   psk,               2) \
-X(a, STATIC,   SINGULAR, BOOL,     ap_mode,           3) \
-X(a, STATIC,   SINGULAR, BOOL,     ap_hidden,         4)
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           1) \
+X(a, STATIC,   SINGULAR, UENUM,    mode,              2) \
+X(a, STATIC,   SINGULAR, STRING,   ssid,              3) \
+X(a, STATIC,   SINGULAR, STRING,   psk,               4)
 #define Config_WiFiConfig_CALLBACK NULL
 #define Config_WiFiConfig_DEFAULT NULL
 
 #define Config_DisplayConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   screen_on_secs,    1) \
 X(a, STATIC,   SINGULAR, UENUM,    gps_format,        2) \
-X(a, STATIC,   SINGULAR, UINT32,   auto_screen_carousel_secs,   3)
+X(a, STATIC,   SINGULAR, UINT32,   auto_screen_carousel_secs,   3) \
+X(a, STATIC,   SINGULAR, BOOL,     compass_north_top,   4)
 #define Config_DisplayConfig_CALLBACK NULL
 #define Config_DisplayConfig_DEFAULT NULL
 
@@ -347,7 +360,7 @@ extern const pb_msgdesc_t Config_LoRaConfig_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define Config_DeviceConfig_size                 42
-#define Config_DisplayConfig_size                14
+#define Config_DisplayConfig_size                16
 #define Config_LoRaConfig_size                   67
 #define Config_PositionConfig_size               30
 #define Config_PowerConfig_size                  45

src/mesh/generated/device_metadata.pb.c

@@ -0,0 +1,12 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.6 */
+
+#include "device_metadata.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(DeviceMetadata, DeviceMetadata, AUTO)
+
+
+

src/mesh/generated/device_metadata.pb.h

@@ -0,0 +1,53 @@
+/* Automatically generated nanopb header */
+/* Generated by nanopb-0.4.6 */
+
+#ifndef PB_DEVICE_METADATA_PB_H_INCLUDED
+#define PB_DEVICE_METADATA_PB_H_INCLUDED
+#include <pb.h>
+
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+/* Struct definitions */
+/* Device metadata response */
+typedef struct _DeviceMetadata { 
+    /* Device firmware version string */
+    char firmware_version[18];
+    /* Device state version */
+    uint32_t device_state_version;
+} DeviceMetadata;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* Initializer values for message structs */
+#define DeviceMetadata_init_default              {"", 0}
+#define DeviceMetadata_init_zero                 {"", 0}
+
+/* Field tags (for use in manual encoding/decoding) */
+#define DeviceMetadata_firmware_version_tag      1
+#define DeviceMetadata_device_state_version_tag  2
+
+/* Struct field encoding specification for nanopb */
+#define DeviceMetadata_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, STRING,   firmware_version,   1) \
+X(a, STATIC,   SINGULAR, UINT32,   device_state_version,   2)
+#define DeviceMetadata_CALLBACK NULL
+#define DeviceMetadata_DEFAULT NULL
+
+extern const pb_msgdesc_t DeviceMetadata_msg;
+
+/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
+#define DeviceMetadata_fields &DeviceMetadata_msg
+
+/* Maximum encoded size of messages (where known) */
+#define DeviceMetadata_size                      25
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif

src/mesh/generated/deviceonly.pb.h

@@ -165,7 +165,7 @@ extern const pb_msgdesc_t OEMStore_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define ChannelFile_size                         630
-#define DeviceState_size                         23728
+#define DeviceState_size                         23994
 #define OEMStore_size                            2106
 
 #ifdef __cplusplus

src/mesh/generated/localonly.pb.h

@@ -138,8 +138,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         319
-#define LocalModuleConfig_size                   288
+#define LocalConfig_size                         321
+#define LocalModuleConfig_size                   268
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/mesh.pb.h

@@ -71,6 +71,8 @@ typedef enum _HardwareModel {
     HardwareModel_DR_DEV = 43, 
     /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
     HardwareModel_M5STACK = 44, 
+    /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
+    HardwareModel_STATION_G1 = 45, 
     /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */
     HardwareModel_PRIVATE_HW = 255 
 } HardwareModel;
@@ -255,6 +257,11 @@ typedef struct _Location {
     uint32_t expire;
     /* If true, only allow the original sender to update the location. */
     bool locked;
+    /* Name of the location - max 30 chars */
+    char name[30];
+    /* *
+ Description of the location - max 100 chars */
+    char description[100];
 } Location;
 
 /* Debug output from the device.
@@ -735,7 +742,7 @@ extern "C" {
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
 #define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_default}
-#define Location_init_default                    {0, 0, 0, 0, 0}
+#define Location_init_default                    {0, 0, 0, 0, 0, "", ""}
 #define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0, false, DeviceMetrics_init_default}
 #define MyNodeInfo_init_default                  {0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -749,7 +756,7 @@ extern "C" {
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
 #define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_zero}
-#define Location_init_zero                       {0, 0, 0, 0, 0}
+#define Location_init_zero                       {0, 0, 0, 0, 0, "", ""}
 #define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0, false, DeviceMetrics_init_zero}
 #define MyNodeInfo_init_zero                     {0, 0, "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0}, 0, 0, 0}
@@ -767,6 +774,8 @@ extern "C" {
 #define Location_longitude_i_tag                 3
 #define Location_expire_tag                      4
 #define Location_locked_tag                      5
+#define Location_name_tag                        6
+#define Location_description_tag                 7
 #define LogRecord_message_tag                    1
 #define LogRecord_time_tag                       2
 #define LogRecord_source_tag                     3
@@ -939,7 +948,9 @@ X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        2) \
 X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       3) \
 X(a, STATIC,   SINGULAR, UINT32,   expire,            4) \
-X(a, STATIC,   SINGULAR, BOOL,     locked,            5)
+X(a, STATIC,   SINGULAR, BOOL,     locked,            5) \
+X(a, STATIC,   SINGULAR, STRING,   name,              6) \
+X(a, STATIC,   SINGULAR, STRING,   description,       7)
 #define Location_CALLBACK NULL
 #define Location_DEFAULT NULL
 
@@ -1076,18 +1087,18 @@ extern const pb_msgdesc_t Compressed_msg;
 
 /* Maximum encoded size of messages (where known) */
 #define Compressed_size                          243
-#define Data_size                                296
-#define FromRadio_size                           356
-#define Location_size                            24
+#define Data_size                                429
+#define FromRadio_size                           489
+#define Location_size                            156
 #define LogRecord_size                           81
-#define MeshPacket_size                          347
+#define MeshPacket_size                          480
 #define MyNodeInfo_size                          197
 #define NodeInfo_size                            281
 #define Position_size                            142
 #define RouteDiscovery_size                      40
 #define Routing_size                             42
 #define ToRadio_PeerInfo_size                    8
-#define ToRadio_size                             350
+#define ToRadio_size                             483
 #define User_size                                95
 
 #ifdef __cplusplus

src/mesh/generated/module_config.pb.h

@@ -108,11 +108,7 @@ typedef struct _ModuleConfig_TelemetryConfig {
     uint32_t environment_update_interval;
     bool environment_measurement_enabled;
     bool environment_screen_enabled;
-    uint32_t environment_read_error_count_threshold;
-    uint32_t environment_recovery_interval;
     bool environment_display_fahrenheit;
-    TelemetrySensorType environment_sensor_type;
-    uint32_t environment_sensor_pin;
 } ModuleConfig_TelemetryConfig;
 
 /* Module Config */
@@ -162,7 +158,7 @@ extern "C" {
 #define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0}
 #define ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0}
 #define ModuleConfig_RangeTestConfig_init_default {0, 0, 0}
-#define ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0, 0, 0, _TelemetrySensorType_MIN, 0}
+#define ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0}
 #define ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define ModuleConfig_init_zero                   {0, {ModuleConfig_MQTTConfig_init_zero}}
 #define ModuleConfig_MQTTConfig_init_zero        {0, "", "", "", 0}
@@ -170,7 +166,7 @@ extern "C" {
 #define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0}
 #define ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0}
 #define ModuleConfig_RangeTestConfig_init_zero   {0, 0, 0}
-#define ModuleConfig_TelemetryConfig_init_zero   {0, 0, 0, 0, 0, 0, 0, _TelemetrySensorType_MIN, 0}
+#define ModuleConfig_TelemetryConfig_init_zero   {0, 0, 0, 0, 0}
 #define ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 
 /* Field tags (for use in manual encoding/decoding) */
@@ -215,11 +211,7 @@ extern "C" {
 #define ModuleConfig_TelemetryConfig_environment_update_interval_tag 2
 #define ModuleConfig_TelemetryConfig_environment_measurement_enabled_tag 3
 #define ModuleConfig_TelemetryConfig_environment_screen_enabled_tag 4
-#define ModuleConfig_TelemetryConfig_environment_read_error_count_threshold_tag 5
-#define ModuleConfig_TelemetryConfig_environment_recovery_interval_tag 6
 #define ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 7
-#define ModuleConfig_TelemetryConfig_environment_sensor_type_tag 8
-#define ModuleConfig_TelemetryConfig_environment_sensor_pin_tag 9
 #define ModuleConfig_mqtt_tag                    1
 #define ModuleConfig_serial_tag                  2
 #define ModuleConfig_external_notification_tag   3
@@ -298,11 +290,7 @@ X(a, STATIC,   SINGULAR, UINT32,   device_update_interval,   1) \
 X(a, STATIC,   SINGULAR, UINT32,   environment_update_interval,   2) \
 X(a, STATIC,   SINGULAR, BOOL,     environment_measurement_enabled,   3) \
 X(a, STATIC,   SINGULAR, BOOL,     environment_screen_enabled,   4) \
-X(a, STATIC,   SINGULAR, UINT32,   environment_read_error_count_threshold,   5) \
-X(a, STATIC,   SINGULAR, UINT32,   environment_recovery_interval,   6) \
-X(a, STATIC,   SINGULAR, BOOL,     environment_display_fahrenheit,   7) \
-X(a, STATIC,   SINGULAR, UENUM,    environment_sensor_type,   8) \
-X(a, STATIC,   SINGULAR, UINT32,   environment_sensor_pin,   9)
+X(a, STATIC,   SINGULAR, BOOL,     environment_display_fahrenheit,   7)
 #define ModuleConfig_TelemetryConfig_CALLBACK NULL
 #define ModuleConfig_TelemetryConfig_DEFAULT NULL
 
@@ -347,7 +335,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
 #define ModuleConfig_RangeTestConfig_size        10
 #define ModuleConfig_SerialConfig_size           26
 #define ModuleConfig_StoreForwardConfig_size     22
-#define ModuleConfig_TelemetryConfig_size        38
+#define ModuleConfig_TelemetryConfig_size        18
 #define ModuleConfig_size                        105
 
 #ifdef __cplusplus

src/mesh/generated/telemetry.pb.h

@@ -14,28 +14,18 @@
 typedef enum _TelemetrySensorType { 
     /* No external telemetry sensor explicitly set */
     TelemetrySensorType_NotSet = 0, 
-    /* Moderate accuracy temperature */
-    TelemetrySensorType_DHT11 = 1, 
-    /* High accuracy temperature */
-    TelemetrySensorType_DS18B20 = 2, 
-    /* Moderate accuracy temperature and humidity */
-    TelemetrySensorType_DHT12 = 3, 
-    /* Moderate accuracy temperature and humidity */
-    TelemetrySensorType_DHT21 = 4, 
-    /* Moderate accuracy temperature and humidity */
-    TelemetrySensorType_DHT22 = 5, 
     /* High accuracy temperature, pressure, humidity */
-    TelemetrySensorType_BME280 = 6, 
+    TelemetrySensorType_BME280 = 1, 
     /* High accuracy temperature, pressure, humidity, and air resistance */
-    TelemetrySensorType_BME680 = 7, 
+    TelemetrySensorType_BME680 = 2, 
     /* Very high accuracy temperature */
-    TelemetrySensorType_MCP9808 = 8, 
-    /* Moderate accuracy temperature and humidity */
-    TelemetrySensorType_SHTC3 = 9, 
+    TelemetrySensorType_MCP9808 = 3, 
     /* Moderate accuracy current and voltage */
-    TelemetrySensorType_INA260 = 10, 
+    TelemetrySensorType_INA260 = 4, 
     /* Moderate accuracy current and voltage */
-    TelemetrySensorType_INA219 = 11 
+    TelemetrySensorType_INA219 = 5, 
+    /* High accuracy temperature and pressure */
+    TelemetrySensorType_BMP280 = 6 
 } TelemetrySensorType;
 
 /* Struct definitions */
@@ -87,8 +77,8 @@ typedef struct _Telemetry {
 
 /* Helper constants for enums */
 #define _TelemetrySensorType_MIN TelemetrySensorType_NotSet
-#define _TelemetrySensorType_MAX TelemetrySensorType_INA219
-#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_INA219+1))
+#define _TelemetrySensorType_MAX TelemetrySensorType_BMP280
+#define _TelemetrySensorType_ARRAYSIZE ((TelemetrySensorType)(TelemetrySensorType_BMP280+1))
 
 
 #ifdef __cplusplus

src/mesh/http/ContentHandler.cpp

@@ -14,7 +14,7 @@
 #include <HTTPURLEncodedBodyParser.hpp>
 #include <json11.hpp>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #endif
 
@@ -610,7 +610,7 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
 
     // data->wifi
     String ipStr;
-    if (config.wifi.ap_mode || isSoftAPForced()) {
+    if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden || isSoftAPForced()) {
         ipStr = String(WiFi.softAPIP().toString());
     } else {
         ipStr = String(WiFi.localIP().toString());
@@ -787,7 +787,7 @@ void handleBlinkLED(HTTPRequest *req, HTTPResponse *res)
             count = count - 1;
         }
     } else {
-#ifndef NO_SCREEN
+#if HAS_SCREEN
         screen->blink();
 #endif
     }

src/mesh/http/WebServer.cpp

@@ -11,7 +11,7 @@
 #include <WebServer.h>
 #include <WiFi.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
 #endif
 
@@ -152,7 +152,7 @@ void createSSLCert()
 
                     yield();
                     esp_task_wdt_reset();
-#ifndef NO_SCREEN
+#if HAS_SCREEN
                     if (millis() / 1000 >= 3) {
                         screen->setSSLFrames();
                     }

src/mesh/http/WiFiAPClient.cpp

@@ -191,10 +191,14 @@ bool initWifi(bool forceSoftAP)
 
         if (forceSoftAP) {
             DEBUG_MSG("WiFi ... Forced AP Mode\n");
-        } else if (config.wifi.ap_mode) {
+        } else if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint) {
             DEBUG_MSG("WiFi ... AP Mode\n");
-        } else {
+        } else if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden) {
+            DEBUG_MSG("WiFi ... Hidden AP Mode\n");
+        } else if (config.wifi.mode == Config_WiFiConfig_WiFiMode_Client) {
             DEBUG_MSG("WiFi ... Client Mode\n");
+        } else {
+            DEBUG_MSG("WiFi ... WiFi Disabled\n");
         }
 
         createSSLCert();
@@ -203,7 +207,7 @@ bool initWifi(bool forceSoftAP)
             wifiPsw = NULL;
 
         if (*wifiName || forceSoftAP) {
-            if (config.wifi.ap_mode || forceSoftAP) {
+            if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden || forceSoftAP) {
 
                 IPAddress apIP(192, 168, 42, 1);
                 WiFi.onEvent(WiFiEvent);
@@ -218,7 +222,7 @@ bool initWifi(bool forceSoftAP)
                 } else {
 
                     // If AP is configured to be hidden hidden
-                    if (config.wifi.ap_hidden) {
+                    if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden) {
 
                         // The configurations on softAP are from the espresif library
                         int ok = WiFi.softAP(wifiName, wifiPsw, 1, 1, 4);
@@ -373,7 +377,7 @@ static void WiFiEvent(WiFiEvent_t event)
 
 void handleDNSResponse()
 {
-    if (config.wifi.ap_mode || isSoftAPForced()) {
+    if (config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPoint || config.wifi.mode == Config_WiFiConfig_WiFiMode_AccessPointHidden || isSoftAPForced()) {
         dnsServer.processNextRequest();
     }
 }

src/mesh/http/WiFiAPClient.h

@@ -4,7 +4,7 @@
 #include <Arduino.h>
 #include <functional>
 
-#ifdef HAS_WIFI
+#ifdef ARCH_ESP32
 #include <DNSServer.h>
 #include <WiFi.h>
 #endif

src/mesh/mesh-pb-constants.cpp

@@ -32,6 +32,7 @@ bool pb_decode_from_bytes(const uint8_t *srcbuf, size_t srcbufsize, const pb_msg
     }
 }
 
+#ifdef FSCom
 /// Read from an Arduino File
 bool readcb(pb_istream_t *stream, uint8_t *buf, size_t count)
 {
@@ -59,6 +60,7 @@ bool writecb(pb_ostream_t *stream, const uint8_t *buf, size_t count)
     // DEBUG_MSG("writing %d bytes to protobuf file\n", count);
     return file->write(buf, count) == count;
 }
+#endif
 
 bool is_in_helper(uint32_t n, const uint32_t *array, pb_size_t count)
 {

src/modules/AdminModule.cpp

@@ -6,7 +6,7 @@
 #include "configuration.h"
 #include "main.h"
 
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
 #include "unistd.h"
 #endif
 
@@ -109,8 +109,13 @@ bool AdminModule::handleReceivedProtobuf(const MeshPacket &mp, AdminMessage *r)
         shutdownAtMsec = (s < 0) ? 0 : (millis() + s * 1000);
         break;
     }
+    case AdminMessage_get_device_metadata_request_tag: {
+        DEBUG_MSG("Client is getting device metadata\n");
+        handleGetDeviceMetadata(mp);
+        break;
+    }
 
-#ifdef PORTDUINO
+#ifdef ARCH_PORTDUINO
     case AdminMessage_exit_simulator_tag:
         DEBUG_MSG("Exiting simulator\n");
         _exit(0);
@@ -374,6 +379,18 @@ void AdminModule::handleGetModuleConfig(const MeshPacket &req, const uint32_t co
     }
 }
 
+void AdminModule::handleGetDeviceMetadata(const MeshPacket &req) {
+    AdminMessage r = AdminMessage_init_default;
+    
+    DeviceMetadata deviceMetadata;
+    strncpy(deviceMetadata.firmware_version, myNodeInfo.firmware_version, 18);
+    deviceMetadata.device_state_version = DEVICESTATE_CUR_VER;
+
+    r.get_device_metadata_response = deviceMetadata;
+    r.which_variant = AdminMessage_get_device_metadata_response_tag;
+    myReply = allocDataProtobuf(r);
+}
+
 void AdminModule::handleGetChannel(const MeshPacket &req, uint32_t channelIndex)
 {
     if (req.decoded.want_response) {

src/modules/AdminModule.h

@@ -27,6 +27,7 @@ class AdminModule : public ProtobufModule<AdminMessage>
     void handleGetConfig(const MeshPacket &req, uint32_t configType);
     void handleGetModuleConfig(const MeshPacket &req, uint32_t configType);
     void handleGetChannel(const MeshPacket &req, uint32_t channelIndex);
+    void handleGetDeviceMetadata(const MeshPacket &req);
 
     /**
      * Setters

src/modules/CannedMessageModule.cpp

@@ -1,5 +1,5 @@
 #include "configuration.h"
-#ifndef NO_SCREEN
+#if HAS_SCREEN
 #include "CannedMessageModule.h"
 #include "FSCommon.h"
 #include "MeshService.h"

src/modules/CannedMessageModule.h

@@ -1,6 +1,5 @@
 #pragma once
-#ifdef NO_SCREEN
-#else
+#if HAS_SCREEN
 #include "ProtobufModule.h"
 #include "input/InputBroker.h"
 

src/modules/ExternalNotificationModule.cpp

@@ -116,7 +116,7 @@ ExternalNotificationModule::ExternalNotificationModule()
     // restrict to the admin channel for rx
     boundChannel = Channels::gpioChannel;
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #ifdef EXT_NOTIFY_OUT
 
     /*
@@ -154,7 +154,7 @@ ExternalNotificationModule::ExternalNotificationModule()
 
 ProcessMessage ExternalNotificationModule::handleReceived(const MeshPacket &mp)
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #ifdef EXT_NOTIFY_OUT
 
     if (moduleConfig.external_notification.enabled) {

src/modules/Modules.cpp

@@ -14,10 +14,10 @@
 #include "modules/RoutingModule.h"
 #include "modules/TextMessageModule.h"
 #include "modules/Telemetry/DeviceTelemetry.h"
-#ifndef PORTDUINO
+#if HAS_TELEMETRY
 #include "modules/Telemetry/EnvironmentTelemetry.h"
 #endif
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "modules/esp32/RangeTestModule.h"
 #include "modules/esp32/SerialModule.h"
 #include "modules/esp32/StoreForwardModule.h"
@@ -28,7 +28,9 @@
  */
 void setupModules()
 {
+#if HAS_BUTTON
     inputBroker = new InputBroker();
+#endif
     adminModule = new AdminModule();
     nodeInfoModule = new NodeInfoModule();
     positionModule = new PositionModule();
@@ -39,6 +41,7 @@ void setupModules()
 
     new RemoteHardwareModule();
     new ReplyModule();
+#if HAS_BUTTON
     rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
     rotaryEncoderInterruptImpl1->init();
     upDownInterruptImpl1 = new UpDownInterruptImpl1();
@@ -47,14 +50,15 @@ void setupModules()
     cardKbI2cImpl->init();
     facesKbI2cImpl = new FacesKbI2cImpl();
     facesKbI2cImpl->init();
-#ifndef NO_SCREEN    
+#endif
+#if HAS_SCREEN
     cannedMessageModule = new CannedMessageModule();
 #endif
-#ifndef PORTDUINO
+#if HAS_TELEMETRY
     new DeviceTelemetryModule();
     new EnvironmentTelemetryModule();
 #endif
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     // Only run on an esp32 based device.
 
     /*

src/modules/PositionModule.cpp

@@ -103,6 +103,8 @@ MeshPacket *PositionModule::allocReply()
     } else
         DEBUG_MSG("Providing time to mesh %u\n", p.time);
 
+    DEBUG_MSG("Position reply: time=%i, latI=%i, lonI=-%i\n", p.time, p.latitude_i, p.longitude_i);
+
     return allocDataProtobuf(p);
 }
 
@@ -133,22 +135,21 @@ int32_t PositionModule::runOnce()
 
         // Only send packets if the channel is less than 40% utilized.
         if (airTime->channelUtilizationPercent() < 40) {
+            if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
+                lastGpsSend = now;
 
-            lastGpsSend = now;
+                lastGpsLatitude = node->position.latitude_i;
+                lastGpsLongitude = node->position.longitude_i;
 
-            lastGpsLatitude = node->position.latitude_i;
-            lastGpsLongitude = node->position.longitude_i;
-
-            // If we changed channels, ask everyone else for their latest info
-            bool requestReplies = currentGeneration != radioGeneration;
-            currentGeneration = radioGeneration;
-
-            DEBUG_MSG("Sending pos@%x:6 to mesh (wantReplies=%d)\n", node->position.pos_timestamp, requestReplies);
-
-            sendOurPosition(NODENUM_BROADCAST, requestReplies);
+                // If we changed channels, ask everyone else for their latest info
+                bool requestReplies = currentGeneration != radioGeneration;
+                currentGeneration = radioGeneration;
 
+                DEBUG_MSG("Sending pos@%x:6 to mesh (wantReplies=%d)\n", node->position.pos_timestamp, requestReplies);
+                sendOurPosition(NODENUM_BROADCAST, requestReplies);
+            }
         } else {
-            DEBUG_MSG("Channel utilization is >50 percent. Skipping this opportunity to send.\n");
+            DEBUG_MSG("Channel utilization is >40 percent. Skipping this opportunity to send.\n");
         }
 
     } else if (!config.position.position_broadcast_smart_disabled) {

src/modules/RoutingModule.cpp

@@ -44,4 +44,5 @@ void RoutingModule::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, C
 RoutingModule::RoutingModule() : ProtobufModule("routing", PortNum_ROUTING_APP, Routing_fields)
 {
     isPromiscuous = true;
+    encryptedOk = true;
 }

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -12,7 +12,7 @@
 
 int32_t DeviceTelemetryModule::runOnce()
 {
-#ifndef PORTDUINO
+#ifndef ARCH_PORTDUINO
     if (firstTime) {
         // This is the first time the OSThread library has called this function, so do some setup
         firstTime = 0;
@@ -72,7 +72,7 @@ bool DeviceTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies)
 
     lastMeasurementPacket = packetPool.allocCopy(*p);
     DEBUG_MSG("Device Telemetry: Sending packet to mesh\n");
-    service.sendToMesh(p);
+    service.sendToMesh(p, RX_SRC_LOCAL, true);
     nodeDB.updateTelemetry(nodeDB.getNodeNum(), t, RX_SRC_LOCAL);
     return true;
 }

src/modules/Telemetry/EnvironmentTelemetry.cpp

@@ -11,19 +11,16 @@
 #include <OLEDDisplayUi.h>
 
 // Sensors
+#include "Sensor/BMP280Sensor.h"
 #include "Sensor/BME280Sensor.h"
 #include "Sensor/BME680Sensor.h"
-#include "Sensor/DHTSensor.h"
-#include "Sensor/DallasSensor.h"
 #include "Sensor/MCP9808Sensor.h"
 #include "Sensor/INA260Sensor.h"
 #include "Sensor/INA219Sensor.h"
 
-
+BMP280Sensor bmp280Sensor;
 BME280Sensor bme280Sensor;
 BME680Sensor bme680Sensor;
-DHTSensor dhtSensor;
-DallasSensor dallasSensor;
 MCP9808Sensor mcp9808Sensor;
 INA260Sensor ina260Sensor;
 INA219Sensor ina219Sensor;
@@ -31,7 +28,7 @@ INA219Sensor ina219Sensor;
 #define FAILED_STATE_SENSOR_READ_MULTIPLIER 10
 #define DISPLAY_RECEIVEID_MEASUREMENTS_ON_SCREEN true
 
-#ifdef HAS_EINK
+#ifdef USE_EINK
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL ArialMT_Plain_16
 #define FONT_MEDIUM ArialMT_Plain_24
@@ -49,22 +46,16 @@ INA219Sensor ina219Sensor;
 
 int32_t EnvironmentTelemetryModule::runOnce()
 {
-#ifndef PORTDUINO
+#ifndef ARCH_PORTDUINO
     int32_t result = INT32_MAX;
     /*
         Uncomment the preferences below if you want to use the module
         without having to configure it from the PythonAPI or WebUI.
     */
    
-    /*
-    moduleConfig.telemetry.environment_measurement_enabled = 1;
-    moduleConfig.telemetry.environment_screen_enabled = 1;
-    moduleConfig.telemetry.environment_read_error_count_threshold = 5;
-    moduleConfig.telemetry.environment_update_interval = 600;
-    moduleConfig.telemetry.environment_recovery_interval = 60;
-    moduleConfig.telemetry.environment_sensor_pin = 13; // If one-wire
-    moduleConfig.telemetry.environment_sensor_type = TelemetrySensorType::TelemetrySensorType_BME280;
-    */
+    // moduleConfig.telemetry.environment_measurement_enabled = 1;
+    // moduleConfig.telemetry.environment_screen_enabled = 1;
+    // moduleConfig.telemetry.environment_update_interval = 45;
 
     if (!(moduleConfig.telemetry.environment_measurement_enabled ||
           moduleConfig.telemetry.environment_screen_enabled)) {
@@ -80,25 +71,12 @@ int32_t EnvironmentTelemetryModule::runOnce()
             DEBUG_MSG("Environment Telemetry: Initializing\n");
             // it's possible to have this module enabled, only for displaying values on the screen.
             // therefore, we should only enable the sensor loop if measurement is also enabled
-            
-            switch (moduleConfig.telemetry.environment_sensor_type) {
-                case TelemetrySensorType_DHT11:
-                case TelemetrySensorType_DHT12:
-                case TelemetrySensorType_DHT21:
-                case TelemetrySensorType_DHT22:
-                    result = dhtSensor.runOnce();
-                break;
-                case TelemetrySensorType_DS18B20:
-                    result = dallasSensor.runOnce();
-                break;
-                default:
-                    DEBUG_MSG("Environment Telemetry: No sensor type specified; Checking for detected i2c sensors\n");
-                break;
-            }
-            if (bme680Sensor.hasSensor()) 
-                result = bme680Sensor.runOnce();
+            if (bmp280Sensor.hasSensor()) 
+                result = bmp280Sensor.runOnce();
             if (bme280Sensor.hasSensor()) 
                 result = bme280Sensor.runOnce();
+            if (bme680Sensor.hasSensor()) 
+                result = bme680Sensor.runOnce();
             if (mcp9808Sensor.hasSensor()) 
                 result = mcp9808Sensor.runOnce();
             if (ina260Sensor.hasSensor()) 
@@ -113,26 +91,6 @@ int32_t EnvironmentTelemetryModule::runOnce()
             return result;
         // this is not the first time OSThread library has called this function
         // so just do what we intend to do on the interval
-        if (sensor_read_error_count > moduleConfig.telemetry.environment_read_error_count_threshold) {
-            if (moduleConfig.telemetry.environment_recovery_interval > 0) {
-                DEBUG_MSG("Environment Telemetry: TEMPORARILY DISABLED; The "
-                          "telemetry_module_environment_read_error_count_threshold has been exceed: %d. Will retry reads in "
-                          "%d seconds\n",
-                          moduleConfig.telemetry.environment_read_error_count_threshold,
-                          moduleConfig.telemetry.environment_recovery_interval);
-                sensor_read_error_count = 0;
-                return (moduleConfig.telemetry.environment_recovery_interval * 1000);
-            }
-            DEBUG_MSG("Environment Telemetry: DISABLED; The telemetry_module_environment_read_error_count_threshold has "
-                      "been exceed: %d. Reads will not be retried until after device reset\n",
-                      moduleConfig.telemetry.environment_read_error_count_threshold);
-            return result;
-
-        } else if (sensor_read_error_count > 0) {
-            DEBUG_MSG("Environment Telemetry: There have been %d sensor read failures. Will retry %d more times\n",
-                      sensor_read_error_count, sensor_read_error_count, sensor_read_error_count,
-                      moduleConfig.telemetry.environment_read_error_count_threshold - sensor_read_error_count);
-        }
         if (!sendOurTelemetry()) {
             // if we failed to read the sensor, then try again
             // as soon as we can according to the maximum polling frequency
@@ -242,21 +200,8 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
     DEBUG_MSG("-----------------------------------------\n");
     DEBUG_MSG("Environment Telemetry: Read data\n");
 
-    switch (moduleConfig.telemetry.environment_sensor_type) {
-        case TelemetrySensorType_DS18B20:
-            if (!dallasSensor.getMetrics(&m))
-                sensor_read_error_count++;
-            break;
-        case TelemetrySensorType_DHT11:
-        case TelemetrySensorType_DHT12:
-        case TelemetrySensorType_DHT21:
-        case TelemetrySensorType_DHT22:
-            if (!dhtSensor.getMetrics(&m))
-                sensor_read_error_count++;
-            break;
-        default:
-            DEBUG_MSG("Environment Telemetry: No specified sensor type; Trying any detected i2c sensors\n");
-    }
+    if (bmp280Sensor.hasSensor())
+        bmp280Sensor.getMetrics(&m);
     if (bme280Sensor.hasSensor())
         bme280Sensor.getMetrics(&m);
     if (bme680Sensor.hasSensor())
@@ -284,6 +229,6 @@ bool EnvironmentTelemetryModule::sendOurTelemetry(NodeNum dest, bool wantReplies
 
     lastMeasurementPacket = packetPool.allocCopy(*p);
     DEBUG_MSG("Environment Telemetry: Sending packet to mesh");
-    service.sendToMesh(p);
+    service.sendToMesh(p, RX_SRC_LOCAL, true);
     return true;
 }

src/modules/Telemetry/EnvironmentTelemetry.h

@@ -15,7 +15,7 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
         lastMeasurementPacket = nullptr;
     }
     virtual bool wantUIFrame() override;
-#ifdef NO_SCREEN
+#if !HAS_SCREEN
     void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 #else
     virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;

src/modules/Telemetry/Sensor/BMP280Sensor.cpp

@@ -0,0 +1,30 @@
+#include "../mesh/generated/telemetry.pb.h"
+#include "configuration.h"
+#include "TelemetrySensor.h"
+#include "BMP280Sensor.h"
+#include <Adafruit_BMP280.h>
+#include <typeinfo>
+
+BMP280Sensor::BMP280Sensor() : 
+    TelemetrySensor(TelemetrySensorType_BME280, "BMP280")
+{
+}
+
+int32_t BMP280Sensor::runOnce() {
+    DEBUG_MSG("Init sensor: %s\n", sensorName);
+    if (!hasSensor()) {
+        return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
+    }
+    status = bmp280.begin(nodeTelemetrySensorsMap[sensorType]); 
+    return initI2CSensor();
+}
+
+void BMP280Sensor::setup() { }
+
+bool BMP280Sensor::getMetrics(Telemetry *measurement) {
+    DEBUG_MSG("BMP280Sensor::getMetrics\n");
+    measurement->variant.environment_metrics.temperature = bmp280.readTemperature();
+    measurement->variant.environment_metrics.barometric_pressure = bmp280.readPressure() / 100.0F;
+
+    return true;
+}    

src/modules/Telemetry/Sensor/BMP280Sensor.h

@@ -1,16 +1,16 @@
 #include "../mesh/generated/telemetry.pb.h"
 #include "TelemetrySensor.h"
-#include <DHT.h>
+#include <Adafruit_BMP280.h>
 
-class DHTSensor : virtual public TelemetrySensor {
+class BMP280Sensor : virtual public TelemetrySensor {
 private:
-    DHT *dht = NULL;
+    Adafruit_BMP280 bmp280;
 
 protected:
     virtual void setup() override;
 
 public:
-    DHTSensor();
+    BMP280Sensor();
     virtual int32_t runOnce() override;
     virtual bool getMetrics(Telemetry *measurement) override;
 };    

src/modules/Telemetry/Sensor/DHTSensor.cpp

@@ -1,39 +0,0 @@
-#include "DHTSensor.h"
-#include "./mesh/generated/telemetry.pb.h"
-#include "MeshService.h"
-#include "TelemetrySensor.h"
-#include "configuration.h"
-#include <DHT.h>
-
-DHTSensor::DHTSensor() : 
-    TelemetrySensor(TelemetrySensorType_NotSet, "DHT") 
-{
-}
-
-int32_t DHTSensor::runOnce() {
-    if (moduleConfig.telemetry.environment_sensor_type == TelemetrySensorType_DHT11 || 
-        moduleConfig.telemetry.environment_sensor_type == TelemetrySensorType_DHT12) {
-        dht = new DHT(moduleConfig.telemetry.environment_sensor_pin, DHT11);
-    } else {
-        dht = new DHT(moduleConfig.telemetry.environment_sensor_pin, DHT22);
-    }
-
-    dht->begin();
-    dht->read();
-    DEBUG_MSG("Opened DHT11/DHT12 on pin: %d\n", moduleConfig.telemetry.environment_sensor_pin);
-
-    return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
-}
-
-void DHTSensor::setup() { }
-
-bool DHTSensor::getMetrics(Telemetry *measurement) {
-    DEBUG_MSG("DHTSensor::getMetrics\n");
-    if (!dht->read(true)) {
-        DEBUG_MSG("Telemetry: FAILED TO READ DATA\n");
-        return false;
-    }
-    measurement->variant.environment_metrics.relative_humidity = dht->readHumidity();
-    measurement->variant.environment_metrics.temperature = dht->readTemperature();
-    return true;
-}

src/modules/Telemetry/Sensor/DallasSensor.cpp

@@ -1,35 +0,0 @@
-#include "DallasSensor.h"
-#include "../mesh/generated/telemetry.pb.h"
-#include "MeshService.h"
-#include "TelemetrySensor.h"
-#include "configuration.h"
-#include <DS18B20.h>
-#include <OneWire.h>
-
-DallasSensor::DallasSensor() : 
-    TelemetrySensor(TelemetrySensorType_DS18B20, "DS18B20") 
-{
-}
-
-int32_t DallasSensor::runOnce() {
-    oneWire = new OneWire(moduleConfig.telemetry.environment_sensor_pin);
-    ds18b20 = new DS18B20(oneWire);
-    ds18b20->begin();
-    ds18b20->setResolution(12);
-    ds18b20->requestTemperatures();
-    DEBUG_MSG("Opened DS18B20 on pin: %d\n", moduleConfig.telemetry.environment_sensor_pin);
-    return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
-}
-
-void DallasSensor::setup() {}
-
-bool DallasSensor::getMetrics(Telemetry *measurement){
-    DEBUG_MSG("DallasSensor::getMetrics\n");
-    if (ds18b20->isConversionComplete()) {
-        measurement->variant.environment_metrics.temperature = ds18b20->getTempC();
-        measurement->variant.environment_metrics.relative_humidity = 0;
-        ds18b20->requestTemperatures();
-        return true;
-    }
-    return false;
-}

src/modules/Telemetry/Sensor/DallasSensor.h

@@ -1,18 +0,0 @@
-#include "../mesh/generated/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <DS18B20.h>
-#include <OneWire.h>
-
-class DallasSensor : virtual public TelemetrySensor {
-private:
-    OneWire *oneWire = NULL;
-    DS18B20 *ds18b20 = NULL;
-
-protected:
-    virtual void setup() override;
-
-public:
-    DallasSensor();
-    virtual int32_t runOnce() override;
-    virtual bool getMetrics(Telemetry *measurement) override;
-};    

src/modules/esp32/RangeTestModule.cpp

@@ -29,7 +29,7 @@ uint32_t packetSequence = 0;
 
 int32_t RangeTestModule::runOnce()
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     /*
         Uncomment the preferences below if you want to use the module
@@ -129,7 +129,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage RangeTestModuleRadio::handleReceived(const MeshPacket &mp)
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     if (moduleConfig.range_test.enabled) {
 

src/modules/esp32/SerialModule.cpp

@@ -69,7 +69,7 @@ SerialModuleRadio::SerialModuleRadio() : SinglePortModule("SerialModuleRadio", P
 
 int32_t SerialModule::runOnce()
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     /*
         Uncomment the preferences below if you want to use the module
@@ -209,7 +209,7 @@ void SerialModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
 
 ProcessMessage SerialModuleRadio::handleReceived(const MeshPacket &mp)
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     if (moduleConfig.serial.enabled) {
 

src/modules/esp32/StoreForwardModule.cpp

@@ -17,7 +17,7 @@ StoreForwardModule *storeForwardModule;
 int32_t StoreForwardModule::runOnce()
 {
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     if (moduleConfig.store_forward.enabled) {
 
@@ -241,7 +241,7 @@ void StoreForwardModule::sendMessage(NodeNum dest, char *str)
 
 ProcessMessage StoreForwardModule::handleReceived(const MeshPacket &mp)
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
     if (moduleConfig.store_forward.enabled) {
 
         DEBUG_MSG("--- S&F Received something\n");
@@ -381,7 +381,7 @@ StoreForwardModule::StoreForwardModule()
     : SinglePortModule("StoreForwardModule", PortNum_TEXT_MESSAGE_APP), concurrency::OSThread("StoreForwardModule")
 {
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     isPromiscuous = true; // Brown chicken brown cow
 

src/nimble/BluetoothUtil.cpp

@@ -15,7 +15,7 @@
 #include "sleep.h"
 #include <WiFi.h>
 
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 #include "mesh/http/WiFiAPClient.h"
 #include <nvs_flash.h>
 #endif
@@ -508,7 +508,7 @@ void disablePin()
 // This should go somewhere else.
 void clearNVS()
 {
-#ifndef NO_ESP32
+#ifdef ARCH_ESP32
 
     // As soon as the LED flashing from double click is done, immediately do a tripple click to
     // erase nvs memory.

src/platform/esp32/ESP32Bluetooth.cpp

@@ -62,9 +62,9 @@ PhoneAPI *bluetoothPhoneAPI;
 class ESP32BluetoothToRadioCallback : public NimBLECharacteristicCallbacks {
     virtual void onWrite(NimBLECharacteristic *pCharacteristic) {
         DEBUG_MSG("To Radio onwrite\n");
-        auto valueString = pCharacteristic->getValue();
+        auto val = pCharacteristic->getValue();
         
-        bluetoothPhoneAPI->handleToRadio(reinterpret_cast<const uint8_t*>(&valueString[0]), pCharacteristic->getDataLength());
+        bluetoothPhoneAPI->handleToRadio(val.data(), val.length());
     }
 };
 
@@ -109,9 +109,11 @@ class ESP32BluetoothServerCallback : public NimBLEServerCallbacks {
             screen->stopBluetoothPinScreen();
         }
     }
+    virtual void onDisconnect(NimBLEServer* pServer, ble_gap_conn_desc *desc) {
+        DEBUG_MSG("BLE disconnect\n");
+    }
 };
 
-
 static ESP32BluetoothToRadioCallback *toRadioCallbacks;
 static ESP32BluetoothFromRadioCallback *fromRadioCallbacks;
 
@@ -120,6 +122,9 @@ void ESP32Bluetooth::shutdown()
     // Shutdown bluetooth for minimum power draw
     DEBUG_MSG("Disable bluetooth\n");
     //Bluefruit.Advertising.stop();
+    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->reset();
+    pAdvertising->stop();
 }
 
 void ESP32Bluetooth::setup()
@@ -175,7 +180,7 @@ void ESP32Bluetooth::setup()
     bleServer = NimBLEDevice::createServer();
     
     ESP32BluetoothServerCallback *serverCallbacks = new ESP32BluetoothServerCallback();
-    bleServer->setCallbacks(serverCallbacks);
+    bleServer->setCallbacks(serverCallbacks, true);
 
     NimBLEService *bleService = bleServer->createService(MESH_SERVICE_UUID);
     //NimBLECharacteristic *pNonSecureCharacteristic = bleService->createCharacteristic("1234", NIMBLE_PROPERTY::READ );
@@ -208,9 +213,9 @@ void ESP32Bluetooth::setup()
     //ToRadioCharacteristic->setCallbacks()
 
     NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->reset();
     pAdvertising->addServiceUUID(MESH_SERVICE_UUID);
-    pAdvertising->start();
-
+    pAdvertising->start(0);
 }
 
 
@@ -228,7 +233,7 @@ void ESP32Bluetooth::clearBonds()
 
     //Bluefruit.Periph.clearBonds();
     //Bluefruit.Central.clearBonds();
-    
+    NimBLEDevice::deleteAllBonds();
 }
 
 void clearNVS() {

src/platform/esp32/architecture.h

@@ -0,0 +1,106 @@
+#pragma once
+
+#define ARCH_ESP32
+
+//
+// defaults for ESP32 architecture
+//
+
+#ifndef HAS_WIFI
+    #define HAS_WIFI 1
+#endif
+#ifndef HAS_SCREEN
+    #define HAS_SCREEN 1
+#endif
+#ifndef HAS_WIRE
+    #define HAS_WIRE 1
+#endif
+#ifndef HAS_GPS
+    #define HAS_GPS 1
+#endif
+#ifndef HAS_BUTTON
+    #define HAS_BUTTON 1
+#endif
+#ifndef HAS_TELEMETRY
+    #define HAS_TELEMETRY 1
+#endif
+#ifndef HAS_RADIO
+    #define HAS_RADIO 1
+#endif
+#ifndef HAS_RTC
+    #define HAS_RTC 1
+#endif
+
+//
+// set HW_VENDOR
+//
+
+// This string must exactly match the case used in release file names or the android updater won't work
+
+#if defined(TBEAM_V10)
+    #define HW_VENDOR HardwareModel_TBEAM
+#elif defined(TBEAM_V07)
+    #define HW_VENDOR HardwareModel_TBEAM0p7
+#elif defined(DIY_V1)
+    #define HW_VENDOR HardwareModel_DIY_V1
+#elif defined(RAK_11200)
+    #define HW_VENDOR HardwareModel_RAK11200
+#elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
+    #ifdef HELTEC_V2_0
+        #define HW_VENDOR HardwareModel_HELTEC_V2_0
+    #endif
+    #ifdef HELTEC_V2_1
+        #define HW_VENDOR HardwareModel_HELTEC_V2_1
+    #endif
+#elif defined(ARDUINO_HELTEC_WIFI_LORA_32)
+    #define HW_VENDOR HardwareModel_HELTEC_V1
+#elif defined(TLORA_V1)
+    #define HW_VENDOR HardwareModel_TLORA_V1
+#elif defined(TLORA_V2)
+    #define HW_VENDOR HardwareModel_TLORA_V2
+#elif defined(TLORA_V1_3)
+    #define HW_VENDOR HardwareModel_TLORA_V1_1p3
+#elif defined(TLORA_V2_1_16)
+    #define HW_VENDOR HardwareModel_TLORA_V2_1_1p6
+#elif defined(GENIEBLOCKS)
+    #define HW_VENDOR HardwareModel_GENIEBLOCKS
+#elif defined(PRIVATE_HW)
+    #define HW_VENDOR HardwareModel_PRIVATE_HW
+#elif defined(NANO_G1)
+    #define HW_VENDOR HardwareModel_NANO_G1
+#elif defined(M5STACK)
+    #define HW_VENDOR HardwareModel_M5STACK
+#elif defined(STATION_G1)
+    #define HW_VENDOR HardwareModel_STATION_G1
+#endif
+
+//
+// Standard definitions for ESP32 targets
+//
+
+#define GPS_SERIAL_NUM 1
+#ifndef GPS_RX_PIN
+#define GPS_RX_PIN 34
+#endif
+#ifndef GPS_TX_PIN
+#ifdef USE_JTAG
+#define GPS_TX_PIN -1
+#else
+#define GPS_TX_PIN 12
+#endif
+#endif
+
+// -----------------------------------------------------------------------------
+// LoRa SPI
+// -----------------------------------------------------------------------------
+
+// NRF52 boards will define this in variant.h
+#ifndef RF95_SCK
+#define RF95_SCK 5
+#define RF95_MISO 19
+#define RF95_MOSI 27
+#define RF95_NSS 18
+#endif
+
+#define SERIAL0_RX_GPIO 3 // Always GPIO3 on ESP32
+

src/platform/nrf52/JLINK_MONITOR.c

@@ -1,120 +1,120 @@
-/*********************************************************************
-*                SEGGER Microcontroller GmbH & Co. KG                *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
- 
-----------------------------------------------------------------------
-File    : JLINK_MONITOR.c
-Purpose : Implementation of debug monitor for J-Link monitor mode debug on Cortex-M devices.
---------  END-OF-HEADER  ---------------------------------------------
-*/
-
-#include "JLINK_MONITOR.h"
-
-/*********************************************************************
-*
-*       Configuration
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Defines
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Types
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Static data
-*
-**********************************************************************
-*/
-
-volatile int MAIN_MonCnt;   // Incremented in JLINK_MONITOR_OnPoll() while CPU is in debug mode
-
-/*********************************************************************
-*
-*       Local functions
-*
-**********************************************************************
-*/
-
-/*********************************************************************
-*
-*       Global functions
-*
-**********************************************************************
-*/
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnExit()
-* 
-*  Function description 
-*    Called from DebugMon_Handler(), once per debug exit.
-*    May perform some target specific operations to be done on debug mode exit.
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/ 
-void JLINK_MONITOR_OnExit(void) {
-  //
-  // Add custom code here
-  //
-//  BSP_ClrLED(0);
-}
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnEnter()
-* 
-*  Function description 
-*    Called from DebugMon_Handler(), once per debug entry.
-*    May perform some target specific operations to be done on debug mode entry
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/ 
-void JLINK_MONITOR_OnEnter(void) {
-  //
-  // Add custom code here
-  //
-//  BSP_SetLED(0);
-//  BSP_ClrLED(1);
-}
-
-/********************************************************************* 
-* 
-*       JLINK_MONITOR_OnPoll()
-* 
-*  Function description 
-*    Called periodically from DebugMon_Handler(), to perform some actions that need to be performed periodically during debug mode.
-* 
-*  Notes 
-*    (1) Must not keep the CPU busy for more than 100 ms
-*/
-void JLINK_MONITOR_OnPoll(void) {
-  //
-  // Add custom code here
-  //
-  MAIN_MonCnt++;
-//  BSP_ToggleLED(0);
-//  _Delay(500000);
-}
-
-/****** End Of File *************************************************/
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+ 
+----------------------------------------------------------------------
+File    : JLINK_MONITOR.c
+Purpose : Implementation of debug monitor for J-Link monitor mode debug on Cortex-M devices.
+--------  END-OF-HEADER  ---------------------------------------------
+*/
+
+#include "JLINK_MONITOR.h"
+
+/*********************************************************************
+*
+*       Configuration
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Defines
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Types
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Static data
+*
+**********************************************************************
+*/
+
+volatile int MAIN_MonCnt;   // Incremented in JLINK_MONITOR_OnPoll() while CPU is in debug mode
+
+/*********************************************************************
+*
+*       Local functions
+*
+**********************************************************************
+*/
+
+/*********************************************************************
+*
+*       Global functions
+*
+**********************************************************************
+*/
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnExit()
+* 
+*  Function description 
+*    Called from DebugMon_Handler(), once per debug exit.
+*    May perform some target specific operations to be done on debug mode exit.
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/ 
+void JLINK_MONITOR_OnExit(void) {
+  //
+  // Add custom code here
+  //
+//  BSP_ClrLED(0);
+}
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnEnter()
+* 
+*  Function description 
+*    Called from DebugMon_Handler(), once per debug entry.
+*    May perform some target specific operations to be done on debug mode entry
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/ 
+void JLINK_MONITOR_OnEnter(void) {
+  //
+  // Add custom code here
+  //
+//  BSP_SetLED(0);
+//  BSP_ClrLED(1);
+}
+
+/********************************************************************* 
+* 
+*       JLINK_MONITOR_OnPoll()
+* 
+*  Function description 
+*    Called periodically from DebugMon_Handler(), to perform some actions that need to be performed periodically during debug mode.
+* 
+*  Notes 
+*    (1) Must not keep the CPU busy for more than 100 ms
+*/
+void JLINK_MONITOR_OnPoll(void) {
+  //
+  // Add custom code here
+  //
+  MAIN_MonCnt++;
+//  BSP_ToggleLED(0);
+//  _Delay(500000);
+}
+
+/****** End Of File *************************************************/

src/platform/nrf52/JLINK_MONITOR.h

@@ -1,27 +1,27 @@
-/*********************************************************************
-*                SEGGER Microcontroller GmbH & Co. KG                *
-*                        The Embedded Experts                        *
-**********************************************************************
-*                                                                    *
-*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
-*                                                                    *
-*       www.segger.com     Support: support@segger.com               *
-*                                                                    *
-**********************************************************************
- 
-----------------------------------------------------------------------
-File    : JLINK_MONITOR.h
-Purpose : Header file of debug monitor for J-Link monitor mode debug on Cortex-M devices.
---------  END-OF-HEADER  ---------------------------------------------
-*/
-
-#ifndef JLINK_MONITOR_H
-#define JLINK_MONITOR_H
-
-void JLINK_MONITOR_OnExit  (void);
-void JLINK_MONITOR_OnEnter (void);
-void JLINK_MONITOR_OnPoll  (void);
-
-#endif
-
-/****** End Of File *************************************************/
+/*********************************************************************
+*                SEGGER Microcontroller GmbH & Co. KG                *
+*                        The Embedded Experts                        *
+**********************************************************************
+*                                                                    *
+*       (c) 1995 - 2015  SEGGER Microcontroller GmbH & Co. KG        *
+*                                                                    *
+*       www.segger.com     Support: support@segger.com               *
+*                                                                    *
+**********************************************************************
+ 
+----------------------------------------------------------------------
+File    : JLINK_MONITOR.h
+Purpose : Header file of debug monitor for J-Link monitor mode debug on Cortex-M devices.
+--------  END-OF-HEADER  ---------------------------------------------
+*/
+
+#ifndef JLINK_MONITOR_H
+#define JLINK_MONITOR_H
+
+void JLINK_MONITOR_OnExit  (void);
+void JLINK_MONITOR_OnEnter (void);
+void JLINK_MONITOR_OnPoll  (void);
+
+#endif
+
+/****** End Of File *************************************************/

src/platform/nrf52/architecture.h

@@ -0,0 +1,93 @@
+#pragma once
+
+#define ARCH_NRF52
+
+//
+// defaults for NRF52 architecture
+//
+
+#ifndef HAS_SCREEN
+    #define HAS_SCREEN 1
+#endif
+#ifndef HAS_WIRE
+    #define HAS_WIRE 1
+#endif
+#ifndef HAS_GPS
+    #define HAS_GPS 1
+#endif
+#ifndef HAS_BUTTON
+    #define HAS_BUTTON 1
+#endif
+#ifndef HAS_TELEMETRY
+    #define HAS_TELEMETRY 1
+#endif
+#ifndef HAS_RADIO
+    #define HAS_RADIO 1
+#endif
+
+//
+// set HW_VENDOR
+//
+
+// This string must exactly match the case used in release file names or the android updater won't work
+#ifdef ARDUINO_NRF52840_PCA10056
+    #define HW_VENDOR HardwareModel_NRF52840DK
+#elif defined(ARDUINO_NRF52840_PPR)
+    #define HW_VENDOR HardwareModel_PPR
+#elif defined(RAK4630)
+    #define HW_VENDOR HardwareModel_RAK4631
+#elif defined(TTGO_T_ECHO)
+    #define HW_VENDOR HardwareModel_T_ECHO
+#elif defined(NORDIC_PCA10059)
+    #define HW_VENDOR HardwareModel_NRF52840_PCA10059
+#elif defined(PRIVATE_HW)
+    #define HW_VENDOR HardwareModel_PRIVATE_HW
+#else
+    #define HW_VENDOR HardwareModel_NRF52_UNKNOWN
+#endif
+
+//
+// Standard definitions for NRF52 targets
+//
+
+#ifdef ARDUINO_NRF52840_PCA10056
+
+// This board uses 0 to be mean LED on
+#undef LED_INVERTED
+#define LED_INVERTED 1
+
+#endif
+
+#ifndef TTGO_T_ECHO
+#define GPS_UBLOX
+#endif
+
+#define LED_PIN PIN_LED1 // LED1 on nrf52840-DK
+
+#ifdef PIN_BUTTON1
+#define BUTTON_PIN PIN_BUTTON1
+#endif
+
+#ifdef PIN_BUTTON2
+#define BUTTON_PIN_ALT PIN_BUTTON2
+#endif
+
+#ifdef PIN_BUTTON_TOUCH
+#define BUTTON_PIN_TOUCH PIN_BUTTON_TOUCH
+#endif
+
+// Always include the SEGGER code on NRF52 - because useful for debugging
+#include "SEGGER_RTT.h"
+
+// The channel we send stdout data to
+#define SEGGER_STDOUT_CH 0
+
+// Debug printing to segger console
+#define SEGGER_MSG(...) SEGGER_RTT_printf(SEGGER_STDOUT_CH, __VA_ARGS__)
+
+// If we are not on a NRF52840 (which has built in USB-ACM serial support) and we don't have serial pins hooked up, then we MUST
+// use SEGGER for debug output
+#if !defined(PIN_SERIAL_RX) && !defined(NRF52840_XXAA)
+// No serial ports on this board - ONLY use segger in memory console
+#define USE_SEGGER
+#endif

src/platform/nrf52/main-nrf52.cpp

@@ -161,7 +161,7 @@ void cpuDeepSleep(uint64_t msecToWake)
 {
     // FIXME, configure RTC or button press to wake us
     // FIXME, power down SPI, I2C, RAMs
-#ifndef NO_WIRE
+#if HAS_WIRE
     Wire.end();
 #endif
     SPI.end();

src/platform/portduino/architecture.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#define ARCH_PORTDUINO
+
+//
+// defaults for NRF52 architecture
+//
+
+//
+// set HW_VENDOR
+//
+
+#define HW_VENDOR HardwareModel_PORTDUINO
+
+#define HAS_RTC 1
+#define HAS_WIFI 1