1.2.42

Eink

.github/workflows/main.yml

@@ -59,14 +59,14 @@ jobs:
         pio upgrade
 
     # We now run integration test before other build steps (to quickly see runtime failures)
-    #- name: Build for native
-    #  run: platformio run -e native
-    #- name: Integration test
-    #  run: |
-    #    .pio/build/native/program &
-    #    sleep 20 # 5 seconds was not enough
-    #    echo "Simulator started, launching python test..."
-    #    python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+    - name: Build for native
+      run: platformio run -e native
+    - name: Integration test
+      run: |
+        .pio/build/native/program &
+        sleep 20 # 5 seconds was not enough
+        echo "Simulator started, launching python test..."
+        python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
 
     # - name: Build for tbeam
     #   run: platformio run -e tbeam
@@ -78,9 +78,16 @@ jobs:
     - name: Build everything
       run: bin/build-all.sh
 
-    - name: Store release zip as an artifact
+    - name: Store binaries as an artifact
       uses: actions/upload-artifact@v2
       with:
         name: built
         path: release/archive/firmware-*.zip
         retention-days: 30
+
+    - name: Store debugging elf files as an artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: debug-elfs
+        path: release/archive/elfs-*.zip
+        retention-days: 7

.github/workflows/release.yml

@@ -49,7 +49,7 @@ jobs:
 
     # Will be available in steps.version.outputs.version
     - name: Get version string
-      run: echo "::set-output name=version::$(./bin/buildinfo.py)"
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
       id: version
 
     - name: Build everything
@@ -69,7 +69,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ github.token }}
 
-    - name: Add artifact to release
+    - name: Add bins to release
       uses: actions/upload-release-asset@v1
       env:
         GITHUB_TOKEN: ${{ github.token }}
@@ -77,4 +77,14 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: release/archive/firmware-${{ steps.version.outputs.version }}.zip
         asset_name: firmware-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip
+        asset_content_type: application/zip
+
+    - name: Add debug elfs to release
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
+        asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
+        asset_content_type: application/zip        

README.md

@@ -187,7 +187,7 @@ Hard resetting via RTS pin...
 
 # Meshtastic Android app
 
-The companion (optional) Meshtastic Android app is [here](https://play.google.com/store/apps/details?id=com.geeksville.mesh&referrer=utm_source%3Dgithub-dev-readme). You can also download it on Google Play.
+The companion (optional, free, open-source) Meshtastic Android app is available on various appstores [see this page for details](https://github.com/meshtastic/Meshtastic-Android/blob/master/README.md).
 
 # Python API
 

bin/build-all.sh

@@ -2,13 +2,15 @@
 
 set -e
 
-VERSION=`bin/buildinfo.py`
+VERSION=`bin/buildinfo.py long`
+SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec tbeam0.7"
+BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7"
 #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
 BOARDS_NRF52="rak4631 t-echo"
+#BOARDS_NRF52=""
 
 OUTDIR=release/latest
 
@@ -91,11 +93,15 @@ Generated by bin/buildall.sh -->
 
 <resources>
     <string name="cur_firmware_version" translatable="false">$VERSION</string>
+    <string name="short_firmware_version" translatable="false">$SHORT_VERSION</string>
 </resources>
 XML
 
 echo Generating $ARCHIVEDIR/firmware-$VERSION.zip
 rm -f $ARCHIVEDIR/firmware-$VERSION.zip
-zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/spiffs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* images/system-info.bin bin/device-install.sh bin/device-update.sh
+zip --junk-paths $ARCHIVEDIR/firmware-$VERSION.zip $ARCHIVEDIR/spiffs-$VERSION.bin $OUTDIR/bins/universal/firmware-*-$VERSION.* images/system-info.bin bin/device-install.* bin/device-update.*
+echo Generating $ARCHIVEDIR/elfs-$VERSION.zip
+rm -f $ARCHIVEDIR/elfs-$VERSION.zip
+zip --junk-paths $ARCHIVEDIR/elfs-$VERSION.zip $OUTDIR/elfs/universal/firmware-*-$VERSION.* 
 
 echo BUILT ALL

bin/buildinfo.py

@@ -1,7 +1,9 @@
 #!/usr/bin/env python3
 import configparser
+import sys
 from readprops import readProps
 
 
 verObj = readProps('version.properties')
-print(f"{verObj['long']}")
+propName = sys.argv[1]
+print(f"{verObj[propName]}")

bin/device-install.bat

@@ -0,0 +1,42 @@
+@ECHO OFF
+
+set PYTHON=python
+
+goto GETOPTS
+:HELP
+echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME]
+echo Flash image file to device, but first erasing and writing system information
+echo.
+echo     -h               Display this help and exit
+echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
+echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+goto EOF
+
+:GETOPTS
+if /I "%1"=="-h" goto HELP
+if /I "%1"=="--help" goto HELP
+if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
+if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
+if /I "%1"=="-P" set PYTHON=%2 & SHIFT
+SHIFT
+IF NOT "__%1__"=="____" goto GETOPTS
+
+IF "__%FILENAME%__" == "____" (
+    echo "Missing FILENAME"
+	goto HELP
+)
+IF EXIST %FILENAME% (
+    echo Trying to flash update %FILENAME%, but first erasing and writing system information"
+	%PYTHON% -m esptool --baud 921600 erase_flash
+	%PYTHON% -m esptool --baud 921600 write_flash 0x1000 system-info.bin
+    for %%f in (spiffs-*.bin) do (
+        %PYTHON% -m esptool --baud 921600 write_flash 0x00390000 %%f
+    )
+	%PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+) else (
+    echo "Invalid file: %FILENAME%"
+	goto HELP
+)
+
+:EOF

bin/device-update.bat

@@ -0,0 +1,39 @@
+@ECHO OFF
+
+set PYTHON=python
+
+goto GETOPTS
+:HELP
+echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME]
+echo Flash image file to device, leave existing system intact.
+echo.
+echo     -h               Display this help and exit
+echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
+echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+goto EOF
+
+:GETOPTS
+if /I "%1"=="-h" goto HELP
+if /I "%1"=="--help" goto HELP
+if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
+if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
+if /I "%1"=="-P" set PYTHON=%2 & SHIFT
+SHIFT
+IF NOT "__%1__"=="____" goto GETOPTS
+
+IF "__%FILENAME%__" == "____" (
+    echo "Missing FILENAME"
+	goto HELP
+)
+IF EXIST %FILENAME% (
+    echo Trying to flash update %FILENAME%
+    %PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+    echo Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used
+    %PYTHON% -m esptool --baud 921600 erase_region 0xe000 0x2000
+) else (
+    echo "Invalid file: %FILENAME%"
+	goto HELP
+)
+
+:EOF

bin/promote-release.sh

@@ -1,6 +1,8 @@
+set -e 
+
 echo "This script is only for developers who are publishing new builds on github.  Most users don't need it"
 
-VERSION=`bin/buildinfo.py`
+VERSION=`bin/buildinfo.py long`
 
 # Must have a V prefix to trigger github
 git tag "v${VERSION}"

bin/test-simulator.sh

@@ -0,0 +1,9 @@
+set -e
+
+echo "Starting simulator"
+.pio/build/native/program &
+sleep 20 # 5 seconds was not enough
+
+echo "Simulator started, launching python test..."
+python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+

bin/upload-to-bootloader.sh

@@ -1,5 +1,8 @@
 set -e
 
-echo "Converting to uf2 for NRF52 Adafruit bootloader"
+echo "building for t-echo"
+pio run --environment t-echo
+
+echo "Converting to uf2 for NRF52 Adafruit bootloader - double tap on the reset button to force bootloader entry"
 bin/uf2conv.py .pio/build/t-echo/firmware.hex -f 0xADA52840
 cp flash.uf2 /media/kevinh/FTH*BOOT/

geeksville-private/TODO.md

@@ -2,23 +2,22 @@
 
 You probably don't care about this section - skip to the next one.
 
-## before next release
-
-* turn on setTx(timeout) and   state = setDioIrqParams(SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT, SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT); in sx1262 code
+* list portduino on platformio
+* router mode dropping messages? https://meshtastic.discourse.group/t/router-mode-missing-messages/3329/3
+* fix ttgo eink screen
+* figure our wss for mqtt.meshtastic - use cloudflare? 2052 ws, 2053 crypt
+* measure rak4630 power draw and turn off power for GPS most of the time.  We should be able to run on the small solar panel.
 * pine64 lora module
-* nrf52 USB is unreliable while sleeping?
 * @havealoha fixedposition not working
-* merge https://meshtastic.discourse.group/t/spanish-translation-update/2986/5
-* @luxonn reports that after a while the android app stops showing new messages
-* nrf52 shows as "sleeping" in android app? (but led is blinking)
 * ask for vercel access
-* fix heltec battery scaling
-* check android 1.2.20 usage, possibly release to general
-* release android APK
-
+* finish plan for riot.im
+* turn on setTx(timeout) and   state = setDioIrqParams(SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT, SX126X_IRQ_TX_DONE | SX126X_IRQ_TIMEOUT); in sx1262 code
 * add rak4600 support (with rf95 radio and limited ram)
-
+* store esp32 crashes to flash (and 64KB coredump partition) - https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/core_dump.html
+* 
 * Switch to use https://github.com/adafruit/Adafruit_nRF52_Arduino.git when available (see arduino code for examples)
+* DONE @luxonn reports that after a while the android app stops showing new messages
+* DONE release android APK - fix recent 1.2.28 crash report
 * DONE remote admin busted? 
 * DONE check android code - @havealoha comments about odd sleep behavior
 * ABANDONED test github actions locally on linux

geeksville-private/windows-build-instructions.md

@@ -0,0 +1,7 @@
+
+
+* install python
+* install git (including git-bash)
+* install platformio
+* install vscode
+* install https://sourceforge.net/projects/mingw-w64/ (for windows gcc/g++) - you'll need to add the bin directory to your PATH

platformio.ini

@@ -11,7 +11,7 @@
 [platformio]
 default_envs = tbeam
 ;default_envs = tbeam0.7
-;default_envs = heltec
+;default_envs = heltec-v2.0
 ;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
@@ -151,10 +151,19 @@ board = ttgo-t-beam
 build_flags = 
   ${esp32_base.build_flags} -D TBEAM_V07
 
-[env:heltec]
+[env:heltec-v2.0]
 ;build_type = debug ; to make it possible to step through our jtag debugger 
 extends = esp32_base
 board = heltec_wifi_lora_32_V2
+build_flags = 
+  ${esp32_base.build_flags} -D HELTEC_V2_0
+
+[env:heltec-v2.1]
+;build_type = debug ; to make it possible to step through our jtag debugger 
+extends = esp32_base
+board = heltec_wifi_lora_32_V2
+build_flags = 
+  ${esp32_base.build_flags} -D HELTEC_V2_1
 
 [env:tlora-v1]
 extends = esp32_base
@@ -184,13 +193,13 @@ build_flags =
 ; The Heltec Cubecell plus 
 ; IMPORTANT NOTE: This target doesn't yet work and probably won't ever work.  I'm keeping it around for now.
 ; For more details see my post in the forum.
-[env:cubecellplus]
-platform = https://github.com/HelTecAutomation/platform-asrmicro650x.git ; we use top-of-tree because stable version has too many bugs - asrmicro650x
-board = cubecell_board_plus
+;[env:cubecellplus]
+;platform = https://github.com/HelTecAutomation/platform-asrmicro650x.git ; we use top-of-tree because stable version has too many bugs - asrmicro650x
+;board = cubecell_board_plus
 ; FIXME, bug in cubecell arduino - they are supposed to set ARDUINO
-build_flags = ${arduino_base.build_flags} -DARDUINO=100 -Isrc/cubecell
-src_filter = 
-  ${arduino_base.src_filter} -<esp32/> -<nrf52/>
+;build_flags = ${arduino_base.build_flags} -DARDUINO=100 -Isrc/cubecell
+;src_filter = 
+;  ${arduino_base.src_filter} -<esp32/> -<nrf52/>
   
 ; Common settings for NRF52 based targets
 [nrf52_base]
@@ -312,6 +321,7 @@ debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ;upload_protocol = jlink
 
+; Note, this board is not yet supported!  It will not work without futher development.
 ; THIS IS UNTESTED (I don't have this board), but other developers can use it as a starting point
 [env:rak4600]
 extends = nrf52_base
@@ -345,14 +355,14 @@ lib_deps =
 extends = nrf52840_base
 board = t-echo
 # add our variants files to the include and src paths
-# define build flags for the TFT_eSPI library
-build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo
-  -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
+# define build flags for the TFT_eSPI library - NOTE: WE NOT LONGER USE TFT_eSPI, it was for an earlier version of the TTGO eink screens
+# -DBUSY_PIN=3 -DRST_PIN=2 -DDC_PIN=28 -DCS_PIN=30
+build_flags = ${nrf52_base.build_flags} -Ivariants/t-echo 
 src_filter = ${nrf52_base.src_filter} +<../variants/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  https://github.com/geeksville/EPD_Libraries.git
-  TFT_eSPI
+  https://github.com/geeksville/GxEPD2.git
+  adafruit/Adafruit BusIO
 ;upload_protocol = fs
 
 ; First prototype eink/nrf52840/sx1262 device (removed from build because didn't ship in quantity)
@@ -415,13 +425,24 @@ lib_deps =
   SparkFun BQ27441 LiPo Fuel Gauge Arduino Library
   TFT_eSPI
 
-; The Portduino based sim environment on top of linux
+; The Portduino based sim environment on top of any host OS, all hardware will be simulated
 [env:native]
 platform = https://github.com/geeksville/platform-native.git 
 src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<mesh/http/> -<plugins/esp32>
-build_flags = ${arduino_base.build_flags} -O0 -lgpiod
+build_flags = ${arduino_base.build_flags} -O0 
 framework = arduino
-board = native
+board = cross_platform
+lib_deps =
+  ${arduino_base.lib_deps}
+  rweather/Crypto
+
+; The Portduino based sim environment on top of a linux OS and touching linux hardware devices
+[env:linux]
+platform = https://github.com/geeksville/platform-native.git 
+src_filter = ${env.src_filter} -<esp32/> -<nimble/> -<nrf52/> -<mesh/http/> -<plugins/esp32>
+build_flags = ${arduino_base.build_flags} -O0 -lgpiod 
+framework = arduino
+board = linux_hardware
 lib_deps =
   ${arduino_base.lib_deps}
   rweather/Crypto

src/BluetoothCommon.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "BluetoothCommon.h"
 
 // NRF52 wants these constants as byte arrays

src/FSCommon.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "FSCommon.h"
 
 void fsInit()

src/OSTimer.cpp

@@ -1,5 +1,5 @@
-#include "OSTimer.h"
 #include "configuration.h"
+#include "OSTimer.h"
 
 /**
  * Schedule a callback to run.  The callback must _not_ block, though it is called from regular thread level (not ISR)

src/Observer.cpp

@@ -1,2 +1,3 @@
+#include "configuration.h"
 #include "Observer.h"
 

src/Power.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "power.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
@@ -102,7 +103,8 @@ class AnalogBatteryLevel : public HasBatteryLevel
             last_read_time_ms = millis();
             uint32_t raw = analogRead(BATTERY_PIN);
             float scaled = 1000.0 * ADC_MULTIPLIER * (AREF_VOLTAGE / 1024.0) * raw;
-            // DEBUG_MSG("raw val=%u scaled=%u\n", raw, (uint32_t)(scaled));
+            
+            // DEBUG_MSG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
             last_read_value = scaled;
             return scaled;
         } else {
@@ -129,7 +131,9 @@ class AnalogBatteryLevel : public HasBatteryLevel
   private:
     /// If we see a battery voltage higher than physics allows - assume charger is pumping
     /// in power
-    const float fullVolt = 4200, emptyVolt = 3270, chargingVolt = 4210, noBatVolt = 2100;
+
+    /// 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;
     float last_read_value = 0.0;
     uint32_t last_read_time_ms = 0;
 } analogLevel;
@@ -139,7 +143,7 @@ Power::Power() : OSThread("Power") {}
 bool Power::analogInit()
 {
 #ifdef BATTERY_PIN
-    DEBUG_MSG("Using analog input for battery level\n");
+    DEBUG_MSG("Using analog input %d for battery level\n", BATTERY_PIN);
 
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);

src/PowerFSM.cpp

@@ -1,9 +1,8 @@
-
+#include "configuration.h"
 #include "PowerFSM.h"
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "configuration.h"
 #include "graphics/Screen.h"
 #include "main.h"
 #include "sleep.h"

src/RedirectablePrint.cpp

@@ -1,10 +1,11 @@
+#include "configuration.h"
 #include "RedirectablePrint.h"
 #include "RTC.h"
 #include "concurrency/OSThread.h"
-#include "configuration.h"
 #include <assert.h>
 #include <sys/time.h>
 #include <time.h>
+#include <cstring>
 
 /**
  * A printer that doesn't go anywhere

src/SPILock.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "SPILock.h"
 #include <Arduino.h>
 #include <assert.h>

src/SerialConsole.cpp

@@ -1,8 +1,7 @@
+#include "configuration.h"
 #include "SerialConsole.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
-#include "configuration.h"
-#include <Arduino.h>
 
 #define Port Serial
 

src/airtime.cpp

@@ -1,5 +1,5 @@
+#include "configuration.h"
 #include "airtime.h"
-#include <Arduino.h>
 
 #define periodsToLog 48
 

src/concurrency/BinarySemaphoreFreeRTOS.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/BinarySemaphoreFreeRTOS.h"
 #include "configuration.h"
+#include "concurrency/BinarySemaphoreFreeRTOS.h"
 #include <assert.h>
 
 #ifdef HAS_FREE_RTOS

src/concurrency/BinarySemaphorePosix.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/BinarySemaphorePosix.h"
 #include "configuration.h"
+#include "concurrency/BinarySemaphorePosix.h"
 
 #ifndef HAS_FREE_RTOS
 

src/concurrency/InterruptableDelay.cpp

@@ -1,5 +1,5 @@
-#include "concurrency/InterruptableDelay.h"
 #include "configuration.h"
+#include "concurrency/InterruptableDelay.h"
 
 namespace concurrency
 {

src/concurrency/Lock.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Lock.h"
 #include <cassert>
 

src/concurrency/LockGuard.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "LockGuard.h"
 
 namespace concurrency {

src/concurrency/NotifiedWorkerThread.cpp

@@ -1,5 +1,5 @@
-#include "NotifiedWorkerThread.h"
 #include "configuration.h"
+#include "NotifiedWorkerThread.h"
 #include "main.h"
 #include <assert.h>
 

src/concurrency/OSThread.cpp

@@ -1,5 +1,5 @@
-#include "OSThread.h"
 #include "configuration.h"
+#include "OSThread.h"
 #include <assert.h>
 
 namespace concurrency

src/configuration.h

@@ -227,8 +227,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_TX_PIN 15
 
 #elif defined(ARDUINO_HELTEC_WIFI_LORA_32_V2)
-// This string must exactly match the case used in release file names or the android updater won't work
-#define HW_VENDOR HardwareModel_HELTEC
 
 // the default ESP32 Pin of 15 is the Oled SCL, set to 36 and 37 and works fine.
 // Tested on Neo6m module.
@@ -256,6 +254,25 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LORA_DIO1 35 // Not really used
 #define LORA_DIO2 34 // Not really used
 
+// ratio of voltage divider = 3.20 (R1=100k, R2=220k)
+#define ADC_MULTIPLIER 3.2
+
+#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
+
+#define BATTERY_PIN 13 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+
+#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
+
+#define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+
+#endif
+
 #elif defined(TLORA_V1)
 // 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

src/gps/Air530GPS.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Air530GPS.h"
 #include <assert.h>
 

src/gps/GPS.cpp

@@ -1,8 +1,7 @@
-
+#include "configuration.h"
 #include "GPS.h"
 #include "NodeDB.h"
 #include "RTC.h"
-#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 

src/gps/NMEAGPS.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "NMEAGPS.h"
 #include "RTC.h"
-#include "configuration.h"
 
 static int32_t toDegInt(RawDegrees d)
 {

src/gps/UBloxGPS.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "UBloxGPS.h"
 #include "RTC.h"
 #include "error.h"

src/graphics/EInkDisplay.cpp

@@ -1,152 +0,0 @@
-#include "configuration.h"
-
-#ifdef HAS_EINK
-#include "EInkDisplay.h"
-#include "SPILock.h"
-#include "epd1in54.h" // Screen specific library
-#include <SPI.h>
-#include <TFT_eSPI.h> // Graphics library and Sprite class
-
-Epd ePaper; // Create an instance ePaper
-
-TFT_eSPI glc = TFT_eSPI();             // Invoke the graphics library class
-TFT_eSprite frame = TFT_eSprite(&glc); // Invoke the Sprite class for the image frame buffer
-uint8_t *framePtr;                     // Pointer for the black frame buffer
-
-#define COLORED 0
-#define UNCOLORED 1
-
-#define INK COLORED     // Black ink
-#define PAPER UNCOLORED // 'paper' background colour
-
-//------------------------------------------------------------------------------------
-// Update display - different displays have different function names in the default
-// Waveshare libraries  :-(
-//------------------------------------------------------------------------------------
-#if defined(EPD1IN54B_H) || defined(EPD1IN54C_H) || defined(EPD2IN13B_H) || defined(EPD2IN7B_H) || defined(EPD2IN9B_H) ||        \
-    defined(EPD4IN2_H)
-void updateDisplay(uint8_t *blackFrame = blackFramePtr, uint8_t *redFrame = redFramePtr)
-{
-    ePaper.DisplayFrame(blackFrame, redFrame); // Update 3 colour display
-#else
-void updateDisplay(uint8_t *blackFrame = framePtr)
-{
-#if defined(EPD2IN7_H) || defined(EPD4IN2_H)
-    ePaper.DisplayFrame(blackFrame); // Update 2 color display
-
-#elif defined(EPD1IN54_H) || defined(EPD2IN13_H) || defined(EPD2IN9_H)
-    ePaper.SetFrameMemory(blackFrame); // Update 2 colour display
-    ePaper.DisplayFrame();
-#else
-#error "Selected ePaper library is not supported"
-#endif
-#endif
-}
-
-EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
-{
-    setGeometry(GEOMETRY_RAWMODE, EPD_WIDTH, EPD_HEIGHT);
-    // setGeometry(GEOMETRY_RAWMODE, 128, 64); // old resolution
-    // setGeometry(GEOMETRY_128_64); // We originally used this because I wasn't sure if rawmode worked - it does
-}
-
-// FIXME quick hack to limit drawing to a very slow rate
-uint32_t lastDrawMsec;
-
-/**
- * Force a display update if we haven't drawn within the specified msecLimit
- */
-bool EInkDisplay::forceDisplay(uint32_t msecLimit)
-{
-    // No need to grab this lock because we are on our own SPI bus
-    // concurrency::LockGuard g(spiLock);
-
-    uint32_t now = millis();
-    uint32_t sinceLast = now - lastDrawMsec;
-
-    if (framePtr && (sinceLast > msecLimit || lastDrawMsec == 0)) {
-        lastDrawMsec = now;
-
-        // FIXME - only draw bits have changed (use backbuf similar to the other displays)
-        // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
-        for (uint8_t y = 0; y < displayHeight; y++) {
-            for (uint8_t x = 0; x < displayWidth; x++) {
-
-                // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficent
-                auto b = buffer[x + (y / 8) * displayWidth];
-                auto isset = b & (1 << (y & 7));
-                frame.drawPixel(x, y, isset ? INK : PAPER);
-            }
-        }
-
-        ePaper.Reset(); // wake the screen from sleep
-
-        DEBUG_MSG("Updating eink... ");
-        updateDisplay(); // Send image to display and refresh
-        DEBUG_MSG("done\n");
-
-        // Put screen to sleep to save power
-        ePaper.Sleep();
-        return true;
-    } else {
-        // DEBUG_MSG("Skipping eink display\n");
-        return false;
-    }
-}
-
-// Write the buffer to the display memory
-void EInkDisplay::display(void)
-{
-    // We don't allow regular 'dumb' display() calls to draw on eink until we've shown
-    // at least one forceDisplay() keyframe.  This prevents flashing when we should the critical
-    // bootscreen (that we want to look nice)
-    if (lastDrawMsec)
-        forceDisplay(slowUpdateMsec); // Show the first screen a few seconds after boot, then slower
-}
-
-// Send a command to the display (low level function)
-void EInkDisplay::sendCommand(uint8_t com)
-{
-    (void)com;
-    // Drop all commands to device (we just update the buffer)
-}
-
-// Connect to the display
-bool EInkDisplay::connect()
-{
-    DEBUG_MSG("Doing EInk init\n");
-
-#ifdef PIN_EINK_PWR_ON
-    digitalWrite(PIN_EINK_PWR_ON, HIGH); // If we need to assert a pin to power external peripherals
-    pinMode(PIN_EINK_PWR_ON, OUTPUT);
-#endif
-
-#ifdef PIN_EINK_EN
-    // backlight power, HIGH is backlight on, LOW is off
-    digitalWrite(PIN_EINK_EN, LOW);
-    pinMode(PIN_EINK_EN, OUTPUT);
-#endif
-
-    // Initialise the ePaper library
-    // FIXME - figure out how to use lut_partial_update
-    if (ePaper.Init(lut_full_update) != 0) {
-        DEBUG_MSG("ePaper init failed\n");
-        return false;
-    } else {
-        frame.setColorDepth(1); // Must set the bits per pixel to 1 for ePaper displays
-                                // Set bit depth BEFORE creating Sprite, default is 16!
-
-        // Create a frame buffer in RAM of defined size and save the pointer to it
-        // RAM needed is about (EPD_WIDTH * EPD_HEIGHT)/8 , ~5000 bytes for 200 x 200 pixels
-        // Note: always create the Sprite before setting the Sprite rotation
-        framePtr = (uint8_t *)frame.createSprite(EPD_WIDTH, EPD_HEIGHT);
-
-        frame.fillSprite(PAPER); // Fill frame with white
-        /* frame.drawLine(0, 0, frame.width() - 1, frame.height() - 1, INK);
-        frame.drawLine(0, frame.height() - 1, frame.width() - 1, 0, INK);
-        updateDisplay(); */
-        return true;
-    }
-}
-
-#endif

src/graphics/EInkDisplay2.cpp

@@ -0,0 +1,116 @@
+#include "configuration.h"
+
+#ifdef HAS_EINK
+#include "EInkDisplay2.h"
+#include "SPILock.h"
+#include <SPI.h>
+#include "GxEPD2_BW.h"
+
+#define COLORED GxEPD_BLACK
+#define UNCOLORED GxEPD_WHITE
+
+
+#define TECHO_DISPLAY_MODEL GxEPD2_154_D67
+
+GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT> *adafruitDisplay;
+
+EInkDisplay::EInkDisplay(uint8_t address, int sda, int scl)
+{
+    setGeometry(GEOMETRY_RAWMODE, TECHO_DISPLAY_MODEL::WIDTH, TECHO_DISPLAY_MODEL::HEIGHT);
+    // setGeometry(GEOMETRY_RAWMODE, 128, 64); // old resolution
+    // setGeometry(GEOMETRY_128_64); // We originally used this because I wasn't sure if rawmode worked - it does
+}
+
+// FIXME quick hack to limit drawing to a very slow rate
+uint32_t lastDrawMsec;
+
+/**
+ * Force a display update if we haven't drawn within the specified msecLimit
+ */
+bool EInkDisplay::forceDisplay(uint32_t msecLimit)
+{
+    // No need to grab this lock because we are on our own SPI bus
+    // concurrency::LockGuard g(spiLock);
+
+    uint32_t now = millis();
+    uint32_t sinceLast = now - lastDrawMsec;
+
+    if (adafruitDisplay && (sinceLast > msecLimit || lastDrawMsec == 0)) {
+        lastDrawMsec = now;
+
+        // FIXME - only draw bits have changed (use backbuf similar to the other displays)
+        // tft.drawBitmap(0, 0, buffer, 128, 64, TFT_YELLOW, TFT_BLACK);
+        for (uint8_t y = 0; y < displayHeight; y++) {
+            for (uint8_t x = 0; x < displayWidth; x++) {
+
+                // get src pixel in the page based ordering the OLED lib uses FIXME, super inefficent
+                auto b = buffer[x + (y / 8) * displayWidth];
+                auto isset = b & (1 << (y & 7));
+                adafruitDisplay->drawPixel(x, y, isset ? COLORED : UNCOLORED);
+            }
+        }
+
+        DEBUG_MSG("Updating eink... ");
+        // ePaper.Reset(); // wake the screen from sleep
+        adafruitDisplay->display(false); // FIXME, use partial update mode
+        // Put screen to sleep to save power (possibly not necessary because we already did poweroff inside of display)
+        adafruitDisplay->hibernate();
+        DEBUG_MSG("done\n");
+
+        return true;
+    } else {
+        // DEBUG_MSG("Skipping eink display\n");
+        return false;
+    }
+}
+
+// Write the buffer to the display memory
+void EInkDisplay::display(void)
+{
+    // We don't allow regular 'dumb' display() calls to draw on eink until we've shown
+    // at least one forceDisplay() keyframe.  This prevents flashing when we should the critical
+    // bootscreen (that we want to look nice)
+    if (lastDrawMsec)
+        forceDisplay(slowUpdateMsec); // Show the first screen a few seconds after boot, then slower
+}
+
+// Send a command to the display (low level function)
+void EInkDisplay::sendCommand(uint8_t com)
+{
+    (void)com;
+    // Drop all commands to device (we just update the buffer)
+}
+
+// Connect to the display
+bool EInkDisplay::connect()
+{
+    DEBUG_MSG("Doing EInk init\n");
+
+#ifdef PIN_EINK_PWR_ON
+    digitalWrite(PIN_EINK_PWR_ON, HIGH); // If we need to assert a pin to power external peripherals
+    pinMode(PIN_EINK_PWR_ON, OUTPUT);
+#endif
+
+#ifdef PIN_EINK_EN
+    // backlight power, HIGH is backlight on, LOW is off
+    digitalWrite(PIN_EINK_EN, LOW);
+    pinMode(PIN_EINK_EN, OUTPUT);
+#endif
+
+    auto lowLevel = new TECHO_DISPLAY_MODEL(PIN_EINK_CS,
+                                                            PIN_EINK_DC,
+                                                            PIN_EINK_RES,
+                                                            PIN_EINK_BUSY, SPI1);
+
+    adafruitDisplay = new GxEPD2_BW<TECHO_DISPLAY_MODEL, TECHO_DISPLAY_MODEL::HEIGHT>(*lowLevel);
+    adafruitDisplay->init();
+    adafruitDisplay->setRotation(3);
+    //adafruitDisplay->setFullWindow();
+    //adafruitDisplay->fillScreen(UNCOLORED);
+    //adafruitDisplay->drawCircle(100, 100, 20, COLORED);
+    //adafruitDisplay->display(false);
+
+    return true;
+}
+
+#endif

src/graphics/Screen.cpp

@@ -19,14 +19,13 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-
+#include "configuration.h"
 #include <OLEDDisplay.h>
 
 #include "GPS.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Screen.h"
-#include "configuration.h"
 #include "fonts.h"
 #include "gps/RTC.h"
 #include "graphics/images.h"

src/graphics/Screen.h

@@ -30,7 +30,7 @@ class Screen
 #include <SSD1306Wire.h>
 #endif
 
-#include "EInkDisplay.h"
+#include "EInkDisplay2.h"
 #include "TFTDisplay.h"
 #include "TypedQueue.h"
 #include "commands.h"

src/main.cpp

@@ -1,4 +1,4 @@
-
+#include "configuration.h"
 #include "GPS.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
@@ -6,7 +6,6 @@
 #include "PowerFSM.h"
 #include "airtime.h"
 #include "buzz.h"
-#include "configuration.h"
 #include "error.h"
 #include "power.h"
 // #include "rom/rtc.h"

src/mesh/Channels.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"

src/mesh/CryptoEngine.cpp

@@ -1,5 +1,5 @@
-#include "CryptoEngine.h"
 #include "configuration.h"
+#include "CryptoEngine.h"
 
 void CryptoEngine::setKey(const CryptoKey &k)
 {

src/mesh/DSRRouter.cpp

@@ -1,5 +1,5 @@
-#include "DSRRouter.h"
 #include "configuration.h"
+#include "DSRRouter.h"
 
 /* when we receive any packet
 

src/mesh/FloodingRouter.cpp

@@ -1,5 +1,5 @@
-#include "FloodingRouter.h"
 #include "configuration.h"
+#include "FloodingRouter.h"
 #include "mesh-pb-constants.h"
 
 FloodingRouter::FloodingRouter() {}

src/mesh/MeshPacketQueue.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "MeshPacketQueue.h"
 
 #include <algorithm>

src/mesh/MeshPlugin.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "MeshPlugin.h"
 #include "Channels.h"
 #include "MeshService.h"

src/mesh/MeshService.cpp

@@ -1,5 +1,4 @@
-
-#include <Arduino.h>
+#include "configuration.h"
 #include <assert.h>
 #include <string>
 

src/mesh/NodeDB.cpp

@@ -1,5 +1,4 @@
-
-#include <Arduino.h>
+#include "configuration.h"
 #include <assert.h>
 
 #include "FS.h"
@@ -14,7 +13,6 @@
 #include "PowerFSM.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "error.h"
 #include "main.h"
 #include "mesh-pb-constants.h"

src/mesh/PacketHistory.cpp

@@ -1,5 +1,5 @@
-#include "PacketHistory.h"
 #include "configuration.h"
+#include "PacketHistory.h"
 #include "mesh-pb-constants.h"
 
 PacketHistory::PacketHistory()

src/mesh/PacketHistory.h

@@ -4,8 +4,6 @@
 #include <queue>
 #include <unordered_set>
 
-using namespace std;
-
 /// We clear our old flood record five minute after we see the last of it
 #define FLOOD_EXPIRE_TIME (5 * 60 * 1000L)
 
@@ -23,7 +21,7 @@ struct PacketRecord {
 class PacketRecordHashFunction
 {
   public:
-    size_t operator()(const PacketRecord &p) const { return (hash<NodeNum>()(p.sender)) ^ (hash<PacketId>()(p.id)); }
+    size_t operator()(const PacketRecord &p) const { return (std::hash<NodeNum>()(p.sender)) ^ (std::hash<PacketId>()(p.id)); }
 };
 
 /// Order packet records by arrival time, we want the oldest packets to be in the front of our heap
@@ -54,7 +52,7 @@ class PacketHistory
     /** FIXME: really should be a std::unordered_set with the key being sender,id.
      * This would make checking packets in wasSeenRecently faster.
      */
-    vector<PacketRecord> recentPackets;
+    std::vector<PacketRecord> recentPackets;
     // priority_queue<PacketRecord, vector<PacketRecord>, PacketRecordOrderFunction> arrivalTimes;
     // unordered_set<PacketRecord, PacketRecordHashFunction> recentPackets;
 

src/mesh/PhoneAPI.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "PhoneAPI.h"
 #include "Channels.h"
 #include "GPS.h"

src/mesh/ProtobufPlugin.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "ProtobufPlugin.h"
 
 

src/mesh/RF95Interface.cpp

@@ -1,8 +1,8 @@
+#include "configuration.h"
 #include "RF95Interface.h"
 #include "MeshRadio.h" // kinda yucky, but we need to know which region we are in
 #include "RadioLibRF95.h"
 #include "error.h"
-#include <configuration.h>
 
 #define MAX_POWER 20
 // if we use 20 we are limited to 1% duty cycle or hw might overheat.  For continuous operation set a limit of 17

src/mesh/RadioInterface.cpp

@@ -1,4 +1,4 @@
-
+#include "configuration.h"
 #include "RadioInterface.h"
 #include "Channels.h"
 #include "MeshRadio.h"
@@ -6,7 +6,6 @@
 #include "NodeDB.h"
 #include "Router.h"
 #include "assert.h"
-#include "configuration.h"
 #include "sleep.h"
 #include <assert.h>
 #include <pb_decode.h>

src/mesh/RadioLibInterface.cpp

@@ -1,10 +1,10 @@
+#include "configuration.h"
 #include "RadioLibInterface.h"
 #include "MeshTypes.h"
 #include "NodeDB.h"
 #include "SPILock.h"
 #include "error.h"
 #include "mesh-pb-constants.h"
-#include <configuration.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
 

src/mesh/RadioLibRF95.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "RadioLibRF95.h"
 
 #define RF95_CHIP_VERSION 0x12

src/mesh/ReliableRouter.cpp

@@ -1,7 +1,7 @@
+#include "configuration.h"
 #include "ReliableRouter.h"
 #include "MeshPlugin.h"
 #include "MeshTypes.h"
-#include "configuration.h"
 #include "mesh-pb-constants.h"
 
 // ReliableRouter::ReliableRouter() {}

src/mesh/ReliableRouter.h

@@ -51,7 +51,7 @@ struct PendingPacket {
 class GlobalPacketIdHashFunction
 {
   public:
-    size_t operator()(const GlobalPacketId &p) const { return (hash<NodeNum>()(p.node)) ^ (hash<PacketId>()(p.id)); }
+    size_t operator()(const GlobalPacketId &p) const { return (std::hash<NodeNum>()(p.node)) ^ (std::hash<PacketId>()(p.id)); }
 };
 
 /**
@@ -60,7 +60,7 @@ class GlobalPacketIdHashFunction
 class ReliableRouter : public FloodingRouter
 {
   private:
-    unordered_map<GlobalPacketId, PendingPacket, GlobalPacketIdHashFunction> pending;
+    std::unordered_map<GlobalPacketId, PendingPacket, GlobalPacketIdHashFunction> pending;
 
   public:
     /**

src/mesh/Router.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "Router.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"
 #include "RTC.h"
-#include "configuration.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "plugins/RoutingPlugin.h"

src/mesh/SX1262Interface.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "SX1262Interface.h"
 #include "error.h"
-#include <configuration.h>
 
 // Particular boards might define a different max power based on what their hardware can do
 #ifndef SX1262_MAX_POWER

src/mesh/StreamAPI.cpp

@@ -45,7 +45,7 @@ int32_t StreamAPI::readStream()
             } else if (ptr >= HEADER_LEN - 1) {            // we have at least read our 4 byte framing
                 uint32_t len = (rxBuf[2] << 8) + rxBuf[3]; // big endian 16 bit length follows framing
 
-                console->printf("len %d\n", len);
+                // console->printf("len %d\n", len);
 
                 if (ptr == HEADER_LEN - 1) {
                     // we _just_ finished our 4 byte header, validate length now (note: a length of zero is a valid

src/mesh/generated/mesh.pb.h

@@ -17,11 +17,12 @@ typedef enum _HardwareModel {
     HardwareModel_TLORA_V1 = 2,
     HardwareModel_TLORA_V2_1_1p6 = 3,
     HardwareModel_TBEAM = 4,
-    HardwareModel_HELTEC = 5,
+    HardwareModel_HELTEC_V2_0 = 5,
     HardwareModel_TBEAM0p7 = 6,
     HardwareModel_T_ECHO = 7,
     HardwareModel_TLORA_V1_1p3 = 8,
     HardwareModel_RAK4631 = 9,
+    HardwareModel_HELTEC_V2_1 = 10,
     HardwareModel_LORA_RELAY_V1 = 32,
     HardwareModel_NRF52840DK = 33,
     HardwareModel_PPR = 34,
@@ -33,7 +34,7 @@ typedef enum _HardwareModel {
 
 typedef enum _Constants {
     Constants_Unused = 0,
-    Constants_DATA_PAYLOAD_LEN = 240
+    Constants_DATA_PAYLOAD_LEN = 237
 } Constants;
 
 typedef enum _CriticalErrorCode {

src/mesh/http/WiFiAPClient.cpp

@@ -32,11 +32,10 @@ bool isWifiAvailable()
 {
     // If wifi status is connected, return true regardless of the radio configuration.
     if (isSoftAPForced()) {
-        return 1;
+        return true;
     }
 
     const char *wifiName = radioConfig.preferences.wifi_ssid;
-    const char *wifiPsw = radioConfig.preferences.wifi_password;
 
     // strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
     // strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
@@ -47,10 +46,10 @@ bool isWifiAvailable()
     // radioConfig.preferences.wifi_ap_mode = true;
     // radioConfig.preferences.wifi_ap_mode = false;
 
-    if (*wifiName && *wifiPsw) {
-        return 1;
+    if (*wifiName) {
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
@@ -96,7 +95,10 @@ void initWifi(bool forceSoftAP)
         const char *wifiName = radioConfig.preferences.wifi_ssid;
         const char *wifiPsw = radioConfig.preferences.wifi_password;
 
-        if ((*wifiName && *wifiPsw) || forceSoftAP) {
+        if (!*wifiPsw) // Treat empty password as no password
+            wifiPsw = NULL;
+
+        if (*wifiName || forceSoftAP) {
             if (forceSoftAP) {
 
                 DEBUG_MSG("Forcing SoftAP\n");
@@ -178,8 +180,6 @@ void initWifi(bool forceSoftAP)
         DEBUG_MSG("Not using WIFI\n");
 }
 
-
-
 // Called by the Espressif SDK to
 static void WiFiEvent(WiFiEvent_t event)
 {
@@ -304,12 +304,15 @@ void handleDNSResponse()
 
 void reconnectWiFi()
 {
-    const char *wifiName = radioConfig.preferences.wifi_ssid;
-    const char *wifiPsw = radioConfig.preferences.wifi_password;
-
     if (radioConfig.has_preferences) {
 
-        if (*wifiName && *wifiPsw) {
+        const char *wifiName = radioConfig.preferences.wifi_ssid;
+        const char *wifiPsw = radioConfig.preferences.wifi_password;
+
+        if (!*wifiPsw) // Treat empty password as no password
+            wifiPsw = NULL;
+
+        if (*wifiName) {
 
             DEBUG_MSG("... Reconnecting to WiFi access point");
 

src/mesh/mesh-pb-constants.cpp

@@ -18,7 +18,7 @@ size_t pb_encode_to_bytes(uint8_t *destbuf, size_t destbufsize, const pb_msgdesc
 
     pb_ostream_t stream = pb_ostream_from_buffer(destbuf, destbufsize);
     if (!pb_encode(&stream, fields, src_struct)) {
-        DEBUG_MSG("Panic: can't encode protobuf reason='%s', reason=%s\n", PB_GET_ERROR(&stream));
+        DEBUG_MSG("Panic: can't encode protobuf reason='%s'\n", PB_GET_ERROR(&stream));
         assert(0); // If this asser fails it probably means you made a field too large for the max limits specified in mesh.options
     } else {
         return stream.bytes_written;
@@ -30,7 +30,7 @@ bool pb_decode_from_bytes(const uint8_t *srcbuf, size_t srcbufsize, const pb_msg
 {
     pb_istream_t stream = pb_istream_from_buffer(srcbuf, srcbufsize);
     if (!pb_decode(&stream, fields, dest_struct)) {
-        DEBUG_MSG("Error: can't decode protobuf reason='%s', pb_msgdesc 0x%p, reason=%s\n", PB_GET_ERROR(&stream), fields);
+        DEBUG_MSG("Error: can't decode protobuf reason='%s', pb_msgdesc 0x%p\n", PB_GET_ERROR(&stream), fields);
         return false;
     } else {
         return true;

src/mesh/wifi/WiFiServerAPI.h

@@ -22,6 +22,9 @@ class WiFiServerAPI : public StreamAPI
 
   protected:
 
+    /// We override this method to prevent publishing EVENT_SERIAL_CONNECTED/DISCONNECTED for wifi links (we want the board to stay in the POWERED state to prevent disabling wifi)
+    virtual void onConnectionChanged(bool connected) {}
+
     virtual int32_t runOnce(); // Check for dropped client connections
 
     /// Check the current underlying physical link to see if the client is currently connected

src/nrf52/BQ25713.cpp

@@ -1,100 +0,0 @@
-#include "BQ25713.h"
-#include "configuration.h"
-
-#include <Wire.h>
-
-#ifdef BQ25703A_ADDR
-
-const uint8_t BQ25713::devAddr = BQ25703A_ADDR;
-
-bool BQ25713::setup()
-{
-    DEBUG_MSG("Init BQ25713\n");
-
-    //	if(!writeReg(0x34,0x9034)) return false;
-    //
-    //	if(!writeReg(0x34,0x8034)) return false;
-
-    if (!writeReg(0x00, 0x0F0A))
-        return false; // Config Charge Option 0
-
-    if (!writeReg(0x02, 0x0224)) // 512mA, FIXME, this seems to be setting a number of bits marked as reserved, why?
-        return false; // Config Charge Current
-
-    if (!writeReg(0x04, 0x1070)) // about 4.29V
-        return false; // Config Charge Voltage
-
-    if (!writeReg(0x06, 0x099C))
-        return false; // Config OTG Voltage
-
-    if (!writeReg(0x08, 0x5000))
-        return false; // Config OTG Current
-
-    //	if(!writeReg(0x0A,0x0100)) return false;//Config Input Voltage
-
-    if (!writeReg(0x0C, 0x1800)) // 4.2Vish FIXME, we could lower this?
-        return false; // Config Minimum System Voltage
-
-    if (!writeReg(0x0E, 0x4900))
-        return false; // Config Input Current
-
-    if (!writeReg(0x30, 0xE210))
-        return false; // Config Charge Option 1
-
-    if (!writeReg(0x32, 0x32BF))
-        return false; // Config Charge Option 2
-
-    if (!writeReg(0x34, 0x0834))
-        return false; // Config Charge Option 3
-
-    if (!writeReg(0x36, 0x4A65))
-        return false; // Config Prochot Option 0
-
-    if (!writeReg(0x38, 0x81FF))
-        return false; // Config Prochot Option 1
-
-    if (!writeReg(0x3A, 0xA0FF))
-        return false; // Config ADC Option
-
-    return true;
-}
-
-uint16_t BQ25713::readReg(uint8_t reg)
-{
-    Wire.beginTransmission(devAddr);
-    Wire.write(reg);
-    byte err = Wire.endTransmission();
-    if (!err) {
-        int readLen = 2;
-        Wire.requestFrom(devAddr, (int)(readLen + 1));
-        if (Wire.available() >= readLen) {
-            uint8_t lsb = Wire.read(), msb = Wire.read();
-
-            return (((uint16_t)msb) << 8) + lsb;
-        } else
-            return 0;
-    } else {
-        return 0;
-    }
-}
-
-bool BQ25713::writeReg(uint8_t reg, uint16_t v)
-{
-    Wire.beginTransmission(devAddr);
-    Wire.write(reg);
-    Wire.write(v & 0xff);
-    Wire.write((v >> 8) & 0xff);
-    byte err = Wire.endTransmission(); // 0 for success
-
-    if (!err) {
-        // Do a test readback for early debugging
-        uint16_t found = readReg(reg);
-        if (found != v) {
-            DEBUG_MSG("Readback reg=0x%0x test failed, expected 0x%0x, found 0x%0x!\n", reg, v, found);
-            return true; // claim success - FIXME
-        }
-    }
-    return !err;
-}
-
-#endif

src/nrf52/BQ25713.h

@@ -1,22 +0,0 @@
-#pragma once
-
-#include <Arduino.h>
-
-/**
- * Driver class to control/monitor BQ25713 charge controller
- */
-class BQ25713 {
-    static const uint8_t devAddr;
-
-public:
-
-    /// Return true for success
-    bool setup();
-
-private:
-    uint16_t readReg(uint8_t reg);
-
-    /// Return true for success
-    bool writeReg(uint8_t reg, uint16_t v);
-};
-

src/nrf52/NRF52Bluetooth.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "NRF52Bluetooth.h"
 #include "BluetoothCommon.h"
-#include "configuration.h"
 #include "main.h"
 #include "mesh/PhoneAPI.h"
 #include "mesh/mesh-pb-constants.h"

src/nrf52/NRF52CryptoEngine.cpp

@@ -1,6 +1,5 @@
-
-#include "CryptoEngine.h"
 #include "configuration.h"
+#include "CryptoEngine.h"
 #include "ocrypto_aes_ctr.h"
 
 class NRF52CryptoEngine : public CryptoEngine

src/nrf52/alloc.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "rtos.h"
 #include <assert.h>
 #include <stdlib.h>

src/nrf52/main-nrf52.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include <SPI.h>
 #include <Wire.h>
 #include <assert.h>
@@ -6,7 +7,6 @@
 #include <stdio.h>
 
 #include "NRF52Bluetooth.h"
-#include "configuration.h"
 #include "error.h"
 
 #ifdef BQ25703A_ADDR

src/plugins/AdminPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "AdminPlugin.h"
 #include "Channels.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 #ifdef PORTDUINO

src/plugins/ExternalNotificationPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "ExternalNotificationPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include <Arduino.h>
 
 //#include <assert.h>

src/plugins/NodeInfoPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "NodeInfoPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 NodeInfoPlugin *nodeInfoPlugin;

src/plugins/Plugins.cpp

@@ -1,3 +1,4 @@
+#include "configuration.h"
 #include "plugins/ExternalNotificationPlugin.h"
 #include "plugins/NodeInfoPlugin.h"
 #include "plugins/PositionPlugin.h"

src/plugins/PositionPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "PositionPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 
 PositionPlugin *positionPlugin;
 

src/plugins/RemoteHardwarePlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "RemoteHardwarePlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 #define NUM_GPIOS 64

src/plugins/ReplyPlugin.cpp

@@ -1,6 +1,6 @@
+#include "configuration.h"
 #include "ReplyPlugin.h"
 #include "MeshService.h"
-#include "configuration.h"
 #include "main.h"
 
 #include <assert.h>

src/plugins/RoutingPlugin.cpp

@@ -1,8 +1,8 @@
+#include "configuration.h"
 #include "RoutingPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "Router.h"
-#include "configuration.h"
 #include "main.h"
 
 RoutingPlugin *routingPlugin;

src/plugins/SerialPlugin.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "SerialPlugin.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
 #include "Router.h"
-#include "configuration.h"
 #include <Arduino.h>
 
 #include <assert.h>

src/portduino/PortduinoGlue.cpp

@@ -1,5 +1,6 @@
 #include "CryptoEngine.h"
 #include "PortduinoGPIO.h"
+#include "SPIChip.h"
 #include "mesh/RF95Interface.h"
 #include "sleep.h"
 #include "target_specific.h"
@@ -48,7 +49,7 @@ class PolledIrqPin : public GPIOPin
     }
 };
 
-GPIOPin *loraIrq;
+static GPIOPin *loraIrq;
 
 /** apps run under portduino can optionally define a portduinoSetup() to
  * use portduino specific init code (such as gpioBind) to setup portduino on their host machine,
@@ -58,26 +59,45 @@ void portduinoSetup()
 {
     printf("Setting up Meshtastic on Porduino...\n");
 
-    // FIXME: remove this hack once interrupts are confirmed to work on new pine64 board
-    // loraIrq = new PolledIrqPin();
-    loraIrq = new LinuxGPIOPin(LORA_DIO1, "ch341", "int", "loraIrq"); // or "err"?
-    loraIrq->setSilent();
-    gpioBind(loraIrq);
+#ifdef PORTDUINO_LINUX_HARDWARE
+    SPI.begin(); // We need to create SPI 
+    bool usePineLora = !spiChip->isSimulated();
+    if(usePineLora) {
+        printf("Connecting to PineLora board...\n");
 
-    // BUSY hw was busted on current board - just use the simulated pin (which will read low)
-    auto busy = new LinuxGPIOPin(SX1262_BUSY, "ch341", "slct", "loraBusy");
-    busy->setSilent();
-    gpioBind(busy);
-    //auto fakeBusy = new SimGPIOPin(SX1262_BUSY, "fakeBusy");
-    //fakeBusy->writePin(LOW);
-    //fakeBusy->setSilent(true);
-    //gpioBind(fakeBusy);
+        // FIXME: remove this hack once interrupts are confirmed to work on new pine64 board
+        // loraIrq = new PolledIrqPin();
+        loraIrq = new LinuxGPIOPin(LORA_DIO1, "ch341", "int", "loraIrq"); // or "err"?
+        loraIrq->setSilent();
+        gpioBind(loraIrq);
 
-    gpioBind(new LinuxGPIOPin(SX1262_RESET, "ch341", "ini", "loraReset"));    
+        // BUSY hw was busted on current board - just use the simulated pin (which will read low)
+        auto busy = new LinuxGPIOPin(SX1262_BUSY, "ch341", "slct", "loraBusy");
+        busy->setSilent();
+        gpioBind(busy);
 
-    auto loraCs = new LinuxGPIOPin(SX1262_CS, "ch341", "cs0", "loraCs");
-    loraCs->setSilent();
-    gpioBind(loraCs);
+        gpioBind(new LinuxGPIOPin(SX1262_RESET, "ch341", "ini", "loraReset"));    
+
+        auto loraCs = new LinuxGPIOPin(SX1262_CS, "ch341", "cs0", "loraCs");
+        loraCs->setSilent();
+        gpioBind(loraCs);
+    }
+    else 
+#endif
+
+    {
+        auto fakeBusy = new SimGPIOPin(SX1262_BUSY, "fakeBusy");
+        fakeBusy->writePin(LOW);
+        fakeBusy->setSilent(true);
+        gpioBind(fakeBusy);
+
+        auto cs = new SimGPIOPin(SX1262_CS, "fakeLoraCS");
+        cs->setSilent(true);
+        gpioBind(cs);
+
+        gpioBind(new SimGPIOPin(SX1262_RESET, "fakeLoraReset"));
+        gpioBind(new SimGPIOPin(LORA_DIO1, "fakeLoraIrq"));
+    }
 
     // gpioBind((new SimGPIOPin(LORA_RESET, "LORA_RESET")));
     // gpioBind((new SimGPIOPin(RF95_NSS, "RF95_NSS"))->setSilent());

src/portduino/wifi-stubs.cpp

@@ -1 +0,0 @@
-../nrf52/wifi-stubs.cpp

src/sleep.cpp

@@ -1,9 +1,9 @@
+#include "configuration.h"
 #include "sleep.h"
 #include "GPS.h"
 #include "MeshRadio.h"
 #include "MeshService.h"
 #include "NodeDB.h"
-#include "configuration.h"
 #include "error.h"
 #include "main.h"
 #include "target_specific.h"

src/wifi-stubs.cpp

@@ -1,7 +1,7 @@
 //#include "mesh/wifi/WebServer.h"
 #include "configuration.h"
 
-#ifndef NO_ESP32
+#ifdef NO_ESP32
 
 //#include "mesh/wifi/WiFiAPClient.h"
 

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 30
+build = 42