Merge branch 'master' into development

README.md

@@ -118,16 +118,16 @@ Use <A HREF="https://platformio.org/">PlatformIO</A> with your preferred IDE for
 
 # Uploading
 
-- **Initially, using USB/UART cable:**
+- **by cable, via USB/UART interface:**
 To upload the code via cable to your ESP32 board this needs to be switched from run to bootloader mode. Boards with USB bridge like Heltec and TTGO usually have an onboard logic which allows soft switching by the upload tool. In PlatformIO this happenes automatically.<p>
 The LoPy/LoPy4/FiPy board needs to be set manually. See these 
 <A HREF="https://www.thethingsnetwork.org/labs/story/program-your-lopy-from-the-arduino-ide-using-lmic">instructions</A> how to do it. Don't forget to press on board reset button after switching between run and bootloader mode.<p>
 The original Pycom firmware is not needed, so there is no need to update it before flashing Paxcounter. Just flash the compiled paxcounter binary (.elf file) on your LoPy/LoPy4/FiPy. If you later want to go back to the Pycom firmware, download the firmware from Pycom and flash it over.
 	
-- **During runtime, automated using OTA via WIFI:**
+- **over the air (OTA), download via WiFi:**
 After the ESP32 board is initially flashed and has joined a LoRaWAN network, the firmware can update itself by OTA. This process is kicked off by sending a remote control command (see below) via LoRaWAN to the board. The board then tries to connect via WiFi to a cloud service (JFrog Bintray), checks for update, and if available downloads the binary and reboots with it. If something goes wrong during this process, the board reboots back to the current version. Prerequisites for OTA are: 1. You own a Bintray repository, 2. you pushed the update binary to the Bintray repository, 3. internet access via encrypted (WPA2) WiFi is present at the board's site, 4. WiFi credentials were set in ota.conf and initially flashed to the board. Step 2 runs automated, just enter the credentials in ota.conf and set `upload_protocol = custom` in platformio.ini. Then press build and lean back watching platformio doing build and upload.
 
-- **During runtime, manually using OTA via WIFI:**
+- **over the air (OTA), upload via WiFi:**
 If option *BOOTMENU* is defined in `paxcounter.conf`, the ESP32 board will try to connect to a known WiFi access point each time cold starting (after a power cycle or a reset), using the WiFi credentials given in `ota.conf`. Once connected to the WiFi it will fire up a simple webserver, providing a bootstrap menu waiting for a user interaction (pressing "START" button in menu). This process will be aborted by ESP32 hardware watchdog after *BOOTDELAY* seconds, ensuring booting the device to runmode. Once a user interaction in bootstrap menu was detected, the watchdog time will be extended to *BOOTTIMEOUT* seconds. During this time a firmware upload can be performed manually by user, e.g. using a smartphone in tethering mode providing the firmware upload file.
 
 # Legal note

include/globals.h

@@ -150,4 +150,4 @@ extern TimerHandle_t WifiChanTimer;
 extern Timezone myTZ;
 extern RTC_NOINIT_ATTR runmode_t RTC_runmode;
 
-#endif
+#endif

platformio_orig.ini

@@ -57,7 +57,8 @@ extra_scripts = pre:build.py
 otakeyfile = ota.conf
 lorakeyfile = loraconf.h
 lmicconfigfile = lmic_config.h
-platform_espressif32 = espressif32@3.1.0
+;platform_espressif32 = espressif32@3.0.0
+platform_espressif32 = https://github.com/platformio/platform-espressif32.git#abc2bb9
 monitor_speed = 115200
 upload_speed = 115200 ; set by build.py and taken from hal file
 display_library = ; set by build.py and taken from hal file

src/boot.cpp

@@ -115,7 +115,7 @@ void start_boot_menu(void) {
   WiFi.mode(WIFI_STA);
 
   // Connect to WiFi network
-  // workaround applied here to avoid WIFI_AUTH failure
+  // workaround applied here to bypass WIFI_AUTH failure
   // see https://github.com/espressif/arduino-esp32/issues/2501
 
   // 1st try

src/configmanager.cpp

@@ -129,7 +129,8 @@ bool loadConfig() {
   switch (version_compare(PROGVERSION, cfg.version)) {
   case -1: // device configuration belongs to newer than current firmware
     ESP_LOGE(TAG, "Incompatible device configuration");
-    return false;
+    eraseConfig();
+    return true;
   case 1: // device configuration belongs to older than current firmware
     ESP_LOGW(TAG, "Device was updated, attempt to migrate configuration");
     migrateConfig();