From 4fce10b03ed28afe041a6f964c41d8f0aa754934 Mon Sep 17 00:00:00 2001
From: Florian Ludwig <f.ludwig@greyrook.com>
Date: Sun, 10 Jun 2018 21:38:01 +0200
Subject: [PATCH 01/15] always reset mac counters even if lora package could
 not been sent

fixes #76
---
 src/lorawan.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index a9260bc9..2406049f 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -153,6 +153,7 @@ void do_send(osjob_t *j) {
   }
 #endif
 
+end:
   // clear counter if not in cumulative counter mode
   if (cfg.countermode != 1) {
     reset_counters(); // clear macs container and reset all counters
@@ -161,7 +162,6 @@ void do_send(osjob_t *j) {
   }
 
 // Schedule next transmission
-end:
   os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
                       do_send);
 

From e9ab86eed00705604affb6ef346bd36c04c1d68c Mon Sep 17 00:00:00 2001
From: Florian Ludwig <f.ludwig@greyrook.com>
Date: Sun, 10 Jun 2018 21:44:39 +0200
Subject: [PATCH 02/15] prefer guard clause over goto

---
 src/lorawan.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index 2406049f..2ccdfdc8 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -106,12 +106,15 @@ void printKeys(void) {
 #endif // VERBOSE
 
 void do_send(osjob_t *j) {
+  // Schedule next transmission
+  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
+                      do_send);
 
   // Check if there is a pending TX/RX job running
   if (LMIC.opmode & OP_TXRXPEND) {
     ESP_LOGI(TAG, "LoRa busy, rescheduling");
     sprintf(display_lmic, "LORA BUSY");
-    goto end;
+    return;
   }
 
   // prepare payload with sum of unique WIFI MACs seen
@@ -153,18 +156,12 @@ void do_send(osjob_t *j) {
   }
 #endif
 
-end:
   // clear counter if not in cumulative counter mode
   if (cfg.countermode != 1) {
     reset_counters(); // clear macs container and reset all counters
     reset_salt();     // get new salt for salting hashes
     ESP_LOGI(TAG, "Counter cleared (countermode = %d)", cfg.countermode);
   }
-
-// Schedule next transmission
-  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
-                      do_send);
-
 } // do_send()
 
 void onEvent(ev_t ev) {

From 05ab177ee8711d044d8299cab9a3876f14b00bcc Mon Sep 17 00:00:00 2001
From: Florian Ludwig <f.ludwig@greyrook.com>
Date: Sun, 10 Jun 2018 22:09:16 +0200
Subject: [PATCH 03/15] fix build brak due to clang-format

---
 src/globals.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/globals.h b/src/globals.h
index 72b1c735..5620f4cf 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -17,8 +17,8 @@
 #endif
 
 // LMIC-Arduino LoRaWAN Stack
-#include <hal/hal.h>
 #include <lmic.h>
+#include <hal/hal.h>
 
 // LED controls
 #ifdef HAS_RGB_LED

From c5c772f51ae2590511d7c3944d174cc297c737fb Mon Sep 17 00:00:00 2001
From: Florian Ludwig <f.ludwig@greyrook.com>
Date: Sun, 10 Jun 2018 22:18:02 +0200
Subject: [PATCH 04/15] do not sort includes, breaks lmic

LMIC requires to be included before hal/hal.h
See 05ab177ee8711d044d8299cab9a3876f14b00bcc
---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index d368b346..68ffea25 100644
--- a/.clang-format
+++ b/.clang-format
@@ -88,7 +88,7 @@ PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
 PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    true
+SortIncludes:    false
 SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: true

From e972375bcd77d40abebbda3e5838ee51809e13a3 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Sun, 10 Jun 2018 22:46:13 +0200
Subject: [PATCH 05/15] Show GPS status on OLED display

---
 src/main.cpp | 1369 +++++++++++++++++++++++++-------------------------
 1 file changed, 691 insertions(+), 678 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index a83f9ca3..62b15b2c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,678 +1,691 @@
-/*
- 


-Copyright  2018 Oliver Brandmueller <ob@sysadm.in>
-Copyright  2018 Klaus Wilting <verkehrsrot@arcor.de>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-NOTICE:
-Parts of the source files in this repository are made available under different
-licenses. Refer to LICENSE.txt file in repository for more details.
-
-*/
-
-// Basic Config
-#include "globals.h"
-
-// Does nothing and avoid any compilation error with I2C
-#include <Wire.h>
-
-// LMIC-Arduino LoRaWAN Stack
-#include "loraconf.h"
-#include <hal/hal.h>
-#include <lmic.h>
-
-// ESP32 lib Functions
-#include <esp32-hal-log.h>  // needed for ESP_LOGx on arduino framework
-#include <esp_event_loop.h> // needed for Wifi event handler
-#include <esp_spi_flash.h>  // needed for reading ESP32 chip attributes
-
-// Initialize global variables
-configData_t cfg;           // struct holds current device configuration
-osjob_t sendjob, rcmdjob;   // LMIC job handler
-uint64_t uptimecounter = 0; // timer global for uptime counter
-uint8_t DisplayState = 0;   // globals for state machine
-uint16_t macs_total = 0, macs_wifi = 0,
-         macs_ble = 0; // MAC counters globals for display
-uint8_t channel = 0;   // wifi channel rotation counter global for display
-char display_lora[16], display_lmic[16]; // display buffers
-led_states LEDState = LED_OFF;           // LED state global for state machine
-led_states previousLEDState =
-    LED_ON; // This will force LED to be off at boot since State is OFF
-unsigned long LEDBlinkStarted = 0; // When (in millis() led blink started)
-uint16_t LEDBlinkDuration = 0;     // How long the blink need to be
-uint16_t LEDColor = COLOR_NONE; // state machine variable to set RGB LED color
-hw_timer_t *displaytimer =
-    NULL; // configure hardware timer used for cyclic display refresh
-hw_timer_t *channelSwitch =
-    NULL;            // configure hardware timer used for wifi channel switching
-xref2u1_t rcmd_data; // buffer for rcommand results size
-u1_t rcmd_data_size; // buffer for rcommand results size
-
-#ifdef HAS_GPS
-gpsStatus_t gps_status; // struct for storing gps data
-TinyGPSPlus gps;        // create TinyGPS++ instance
-#endif
-
-portMUX_TYPE timerMux =
-    portMUX_INITIALIZER_UNLOCKED; // sync main loop and ISR when modifying IRQ
-                                  // handler shared variables
-
-std::set<uint16_t> macs; // associative container holds total of unique MAC
-                         // adress hashes (Wifi + BLE)
-
-// this variables will be changed in the ISR, and read in main loop
-static volatile int ButtonPressedIRQ = 0, DisplayTimerIRQ = 0,
-                    ChannelTimerIRQ = 0;
-
-// local Tag for logging
-static const char TAG[] = "main";
-
-#ifndef VERBOSE
-int redirect_log(const char *fmt, va_list args) {
-  // do nothing
-  return 0;
-}
-#endif
-
-void reset_counters() {
-  macs.clear();   // clear all macs container
-  macs_total = 0; // reset all counters
-  macs_wifi = 0;
-  macs_ble = 0;
-}
-
-  /* begin LMIC specific parts
-   * ------------------------------------------------------------ */
-
-#ifdef VERBOSE
-void printKeys(void);
-#endif // VERBOSE
-
-// LMIC callback functions
-void os_getDevKey(u1_t *buf) { memcpy(buf, APPKEY, 16); }
-
-void os_getArtEui(u1_t *buf) {
-  memcpy(buf, APPEUI, 8);
-  RevBytes(buf, 8); // TTN requires it in LSB First order, so we swap bytes
-}
-
-void os_getDevEui(u1_t *buf) {
-  int i = 0, k = 0;
-  memcpy(buf, DEVEUI, 8); // get fixed DEVEUI from loraconf.h
-  for (i = 0; i < 8; i++) {
-    k += buf[i];
-  }
-  if (k) {
-    RevBytes(buf, 8); // use fixed DEVEUI and swap bytes to LSB format
-  } else {
-    gen_lora_deveui(buf); // generate DEVEUI from device's MAC
-  }
-
-// Get MCP 24AA02E64 hardware DEVEUI (override default settings if found)
-#ifdef MCP_24AA02E64_I2C_ADDRESS
-  get_hard_deveui(buf);
-  RevBytes(buf, 8); // swap bytes to LSB format
-#endif
-}
-
-// LMIC enhanced Pin mapping
-const lmic_pinmap lmic_pins = {.mosi = PIN_SPI_MOSI,
-                               .miso = PIN_SPI_MISO,
-                               .sck = PIN_SPI_SCK,
-                               .nss = PIN_SPI_SS,
-                               .rxtx = LMIC_UNUSED_PIN,
-                               .rst = RST,
-                               .dio = {DIO0, DIO1, DIO2}};
-
-// LMIC FreeRTos Task
-void lorawan_loop(void *pvParameters) {
-
-  configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
-
-  while (1) {
-    os_runloop_once();                  // execute LMIC jobs
-    vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
-  }
-}
-
-  /* end LMIC specific parts
-   * --------------------------------------------------------------- */
-
-  /* beginn hardware specific parts
-   * -------------------------------------------------------- */
-
-#ifdef HAS_DISPLAY
-HAS_DISPLAY u8x8(OLED_RST, OLED_SCL, OLED_SDA);
-// Display Refresh IRQ
-void IRAM_ATTR DisplayIRQ() {
-  portENTER_CRITICAL_ISR(&timerMux);
-  DisplayTimerIRQ++;
-  portEXIT_CRITICAL_ISR(&timerMux);
-}
-#endif
-
-#ifdef HAS_ANTENNA_SWITCH
-// defined in antenna.cpp
-void antenna_init();
-void antenna_select(const uint8_t _ant);
-#endif
-
-#ifndef BLECOUNTER
-bool btstop = btStop();
-#endif
-
-// Button IRQ Handler Routine, IRAM_ATTR necessary here, see
-// https://github.com/espressif/arduino-esp32/issues/855
-#ifdef HAS_BUTTON
-void IRAM_ATTR ButtonIRQ() { ButtonPressedIRQ++; }
-#endif
-
-// Wifi Channel Rotation Timer IRQ Handler Routine
-void IRAM_ATTR ChannelSwitchIRQ() {
-  portENTER_CRITICAL(&timerMux);
-  ChannelTimerIRQ++;
-  portEXIT_CRITICAL(&timerMux);
-}
-
-/* end hardware specific parts
- * -------------------------------------------------------- */
-
-/* begin wifi specific parts
- * ---------------------------------------------------------- */
-
-// Sniffer Task
-void sniffer_loop(void *pvParameters) {
-
-  configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
-
-  while (1) {
-
-    if (ChannelTimerIRQ) {
-      portENTER_CRITICAL(&timerMux);
-      ChannelTimerIRQ--;
-      portEXIT_CRITICAL(&timerMux);
-      // rotates variable channel 1..WIFI_CHANNEL_MAX
-      channel = (channel % WIFI_CHANNEL_MAX) + 1;
-      wifi_sniffer_set_channel(channel);
-      ESP_LOGD(TAG, "Wifi set channel %d", channel);
-
-      vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
-    }
-
-  } // end of infinite wifi channel rotation loop
-}
-
-/* end wifi specific parts
- * ------------------------------------------------------------ */
-
-// uptime counter 64bit to prevent millis() rollover after 49 days
-uint64_t uptime() {
-  static uint32_t low32, high32;
-  uint32_t new_low32 = millis();
-  if (new_low32 < low32)
-    high32++;
-  low32 = new_low32;
-  return (uint64_t)high32 << 32 | low32;
-}
-
-#ifdef HAS_DISPLAY
-
-// Print a key on display
-void DisplayKey(const uint8_t *key, uint8_t len, bool lsb) {
-  const uint8_t *p;
-  for (uint8_t i = 0; i < len; i++) {
-    p = lsb ? key + len - i - 1 : key + i;
-    u8x8.printf("%02X", *p);
-  }
-  u8x8.printf("\n");
-}
-
-void init_display(const char *Productname, const char *Version) {
-  uint8_t buf[32];
-  u8x8.begin();
-  u8x8.setFont(u8x8_font_chroma48medium8_r);
-  u8x8.clear();
-  u8x8.setFlipMode(0);
-  u8x8.setInverseFont(1);
-  u8x8.draw2x2String(0, 0, Productname);
-  u8x8.setInverseFont(0);
-  u8x8.draw2x2String(2, 2, Productname);
-  delay(1500);
-  u8x8.clear();
-  u8x8.setFlipMode(1);
-  u8x8.setInverseFont(1);
-  u8x8.draw2x2String(0, 0, Productname);
-  u8x8.setInverseFont(0);
-  u8x8.draw2x2String(2, 2, Productname);
-  delay(1500);
-
-  u8x8.setFlipMode(0);
-  u8x8.clear();
-
-#ifdef DISPLAY_FLIP
-  u8x8.setFlipMode(1);
-#endif
-
-// Display chip information
-#ifdef VERBOSE
-  esp_chip_info_t chip_info;
-  esp_chip_info(&chip_info);
-  u8x8.printf("ESP32 %d cores\nWiFi%s%s\n", chip_info.cores,
-              (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
-              (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
-  u8x8.printf("ESP Rev.%d\n", chip_info.revision);
-  u8x8.printf("%dMB %s Flash\n", spi_flash_get_chip_size() / (1024 * 1024),
-              (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext.");
-#endif // VERBOSE
-
-  u8x8.print(Productname);
-  u8x8.print(" v");
-  u8x8.println(PROGVERSION);
-  u8x8.println("DEVEUI:");
-  os_getDevEui((u1_t *)buf);
-  DisplayKey(buf, 8, true);
-  delay(5000);
-  u8x8.clear();
-}
-
-void refreshDisplay() {
-  // update counter display (lines 0-4)
-  char buff[16];
-  snprintf(
-      buff, sizeof(buff), "PAX:%-4d",
-      (int)macs.size()); // convert 16-bit MAC counter to decimal counter value
-  u8x8.draw2x2String(0, 0,
-                     buff); // display number on unique macs total Wifi + BLE
-  u8x8.setCursor(0, 4);
-  u8x8.printf("WIFI:%-4d", macs_wifi);
-
-#ifdef BLECOUNTER
-  u8x8.setCursor(0, 3);
-  if (cfg.blescan)
-    u8x8.printf("BLTH:%-4d", macs_ble);
-  else
-    u8x8.printf("%s", "BLTH:off");
-#endif
-
-  // update LoRa SF display (line 3)
-  u8x8.setCursor(11, 3);
-  u8x8.printf("SF:");
-  if (cfg.adrmode) // if ADR=on then display SF value inverse
-    u8x8.setInverseFont(1);
-  u8x8.printf("%c%c", lora_datarate[LMIC.datarate * 2],
-              lora_datarate[LMIC.datarate * 2 + 1]);
-  if (cfg.adrmode) // switch off inverse if it was turned on
-    u8x8.setInverseFont(0);
-
-  // update wifi channel display (line 4)
-  u8x8.setCursor(11, 4);
-  u8x8.printf("ch:%02d", channel);
-
-  // update RSSI limiter status & free memory display (line 5)
-  u8x8.setCursor(0, 5);
-  u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit);
-  u8x8.setCursor(10, 5);
-  u8x8.printf("%4dKB", ESP.getFreeHeap() / 1024);
-
-  // update LoRa status display (line 6)
-  u8x8.setCursor(0, 6);
-  u8x8.printf("%-16s", display_lora);
-
-  // update LMiC event display (line 7)
-  u8x8.setCursor(0, 7);
-  u8x8.printf("%-16s", display_lmic);
-}
-
-void updateDisplay() {
-  // refresh display according to refresh cycle setting
-  if (DisplayTimerIRQ) {
-    portENTER_CRITICAL(&timerMux);
-    DisplayTimerIRQ--;
-    portEXIT_CRITICAL(&timerMux);
-
-    refreshDisplay();
-
-    // set display on/off according to current device configuration
-    if (DisplayState != cfg.screenon) {
-      DisplayState = cfg.screenon;
-      u8x8.setPowerSave(!cfg.screenon);
-    }
-  }
-} // updateDisplay()
-#endif // HAS_DISPLAY
-
-#ifdef HAS_BUTTON
-void readButton() {
-  if (ButtonPressedIRQ) {
-    portENTER_CRITICAL(&timerMux);
-    ButtonPressedIRQ--;
-    portEXIT_CRITICAL(&timerMux);
-    ESP_LOGI(TAG, "Button pressed");
-    ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults");
-    eraseConfig();
-    esp_restart();
-  }
-}
-#endif
-
-#if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
-
-void blink_LED(uint16_t set_color, uint16_t set_blinkduration) {
-  LEDColor = set_color;                 // set color for RGB LED
-  LEDBlinkDuration = set_blinkduration; // duration
-  LEDBlinkStarted = millis();           // Time Start here
-  LEDState = LED_ON;                    // Let main set LED on
-}
-
-void led_loop() {
-  // Custom blink running always have priority other LoRaWAN led management
-  if (LEDBlinkStarted && LEDBlinkDuration) {
-
-    // ESP_LOGI(TAG, "Start=%ld for %g",LEDBlinkStarted, LEDBlinkDuration );
-
-    // Custom blink is finished, let this order, avoid millis() overflow
-    if ((millis() - LEDBlinkStarted) >= LEDBlinkDuration) {
-      // Led becomes off, and stop blink
-      LEDState = LED_OFF;
-      LEDBlinkStarted = 0;
-      LEDBlinkDuration = 0;
-      LEDColor = COLOR_NONE;
-    } else {
-      // In case of LoRaWAN led management blinked off
-      LEDState = LED_ON;
-    }
-
-    // No custom blink, check LoRaWAN state
-  } else {
-
-    // LED indicators for viusalizing LoRaWAN state
-    if (LMIC.opmode & (OP_JOINING | OP_REJOIN)) {
-      LEDColor = COLOR_YELLOW;
-      // quick blink 20ms on each 1/5 second
-      LEDState = ((millis() % 200) < 20) ? LED_ON : LED_OFF; // TX data pending
-    } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) {
-      LEDColor = COLOR_BLUE;
-      // small blink 10ms on each 1/2sec (not when joining)
-      LEDState = ((millis() % 500) < 20) ? LED_ON : LED_OFF;
-      // This should not happen so indicate a problem
-    } else if (LMIC.opmode &
-               ((OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0)) {
-      LEDColor = COLOR_RED;
-      // heartbeat long blink 200ms on each 2 seconds
-      LEDState = ((millis() % 2000) < 200) ? LED_ON : LED_OFF;
-    } else {
-      // led off
-      LEDColor = COLOR_NONE;
-      LEDState = LED_OFF;
-    }
-  }
-
-  // ESP_LOGI(TAG, "state=%d previous=%d Color=%d",LEDState, previousLEDState,
-  // LEDColor );
-  // led need to change state? avoid digitalWrite() for nothing
-  if (LEDState != previousLEDState) {
-    if (LEDState == LED_ON) {
-      rgb_set_color(LEDColor);
-#ifdef LED_ACTIVE_LOW
-      digitalWrite(HAS_LED, LOW);
-#else
-      digitalWrite(HAS_LED, HIGH);
-#endif
-    } else {
-      rgb_set_color(COLOR_NONE);
-#ifdef LED_ACTIVE_LOW
-      digitalWrite(HAS_LED, HIGH);
-#else
-      digitalWrite(HAS_LED, LOW);
-#endif
-    }
-    previousLEDState = LEDState;
-  }
-}; // led_loop()
-
-#endif
-
-/* begin Aruino SETUP
- * ------------------------------------------------------------ */
-
-void setup() {
-  char features[64] = "";
-
-  // disable brownout detection
-#ifdef DISABLE_BROWNOUT
-  // register with brownout is at address DR_REG_RTCCNTL_BASE + 0xd4
-  (*((volatile uint32_t *)ETS_UNCACHED_ADDR((DR_REG_RTCCNTL_BASE + 0xd4)))) = 0;
-#endif
-
-  // setup debug output or silence device
-#ifdef VERBOSE
-  Serial.begin(115200);
-  esp_log_level_set("*", ESP_LOG_VERBOSE);
-#else
-  // mute logs completely by redirecting them to silence function
-  esp_log_level_set("*", ESP_LOG_NONE);
-  esp_log_set_vprintf(redirect_log);
-#endif
-
-  ESP_LOGI(TAG, "Starting %s %s", PROGNAME, PROGVERSION);
-
-  // initialize system event handler for wifi task, needed for
-  // wifi_sniffer_init()
-  esp_event_loop_init(NULL, NULL);
-
-  // print chip information on startup if in verbose mode
-#ifdef VERBOSE
-  esp_chip_info_t chip_info;
-  esp_chip_info(&chip_info);
-  ESP_LOGI(TAG,
-           "This is ESP32 chip with %d CPU cores, WiFi%s%s, silicon revision "
-           "%d, %dMB %s Flash",
-           chip_info.cores, (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
-           (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "",
-           chip_info.revision, spi_flash_get_chip_size() / (1024 * 1024),
-           (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded"
-                                                         : "external");
-  ESP_LOGI(TAG, "ESP32 SDK: %s", ESP.getSdkVersion());
-#endif
-
-#ifdef HAS_GPS
-  ESP_LOGI(TAG, "TinyGPS+ version %s", TinyGPSPlus::libraryVersion());
-#endif
-
-  // read settings from NVRAM
-  loadConfig(); // includes initialize if necessary
-
-  // initialize led if needed
-#if (HAS_LED != NOT_A_PIN)
-  pinMode(HAS_LED, OUTPUT);
-  strcat(features, " LED");
-#endif
-
-#ifdef HAS_RGB_LED
-  rgb_set_color(COLOR_PINK);
-  strcat(features, " RGB");
-#endif
-
-  // initialize button handling if needed
-#ifdef HAS_BUTTON
-  strcat(features, " BTN_");
-#ifdef BUTTON_PULLUP
-  strcat(features, "PU");
-  // install button interrupt (pullup mode)
-  pinMode(HAS_BUTTON, INPUT_PULLUP);
-  attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), ButtonIRQ, RISING);
-#else
-  strcat(features, "PD");
-  // install button interrupt (pulldown mode)
-  pinMode(HAS_BUTTON, INPUT_PULLDOWN);
-  attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), ButtonIRQ, FALLING);
-#endif
-#endif
-
-  // initialize wifi antenna if needed
-#ifdef HAS_ANTENNA_SWITCH
-  strcat(features, " ANT");
-  antenna_init();
-#endif
-
-// initialize gps if present
-#ifdef HAS_GPS
-  strcat(features, " GPS");
-#endif
-
-#ifdef HAS_DISPLAY
-  strcat(features, " OLED");
-  // initialize display
-  init_display(PROGNAME, PROGVERSION);
-  DisplayState = cfg.screenon;
-  u8x8.setPowerSave(!cfg.screenon); // set display off if disabled
-  u8x8.draw2x2String(0, 0, "PAX:0");
-  u8x8.setCursor(0, 4);
-  u8x8.printf("WIFI:0");
-#ifdef BLECOUNTER
-  u8x8.setCursor(0, 3);
-  u8x8.printf("BLTH:0");
-#endif
-  u8x8.setCursor(0, 5);
-  u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%d", cfg.rssilimit);
-
-  sprintf(display_lora, "Join wait");
-
-  // setup display refresh trigger IRQ using esp32 hardware timer 0
-  // for explanation see
-  // https://techtutorialsx.com/2017/10/07/esp32-arduino-timer-interrupts/
-  displaytimer = timerBegin(0, 80, true); // prescaler 80 -> divides 80 MHz CPU
-                                          // freq to 1 MHz, timer 0, count up
-  timerAttachInterrupt(displaytimer, &DisplayIRQ,
-                       true); // interrupt handler DisplayIRQ, triggered by edge
-  timerAlarmWrite(
-      displaytimer, DISPLAYREFRESH_MS * 1000,
-      true); // reload interrupt after each trigger of display refresh cycle
-  timerAlarmEnable(displaytimer); // enable display interrupt
-#endif
-
-  // setup channel rotation trigger IRQ using esp32 hardware timer 1
-  channelSwitch = timerBegin(1, 80, true);
-  timerAttachInterrupt(channelSwitch, &ChannelSwitchIRQ, true);
-  timerAlarmWrite(channelSwitch, cfg.wifichancycle * 10000, true);
-  timerAlarmEnable(channelSwitch);
-
-  // show compiled features
-  ESP_LOGI(TAG, "Features %s", features);
-
-// output LoRaWAN keys to console
-#ifdef VERBOSE
-  printKeys();
-#endif
-
-  // initialize LoRaWAN LMIC run-time environment
-  os_init();
-  // reset LMIC MAC state
-  LMIC_reset();
-  // This tells LMIC to make the receive windows bigger, in case your clock is
-  // 1% faster or slower.
-  LMIC_setClockError(MAX_CLOCK_ERROR * 1 / 100);
-
-  // start lmic runloop in rtos task on core 1 (note: arduino main loop runs on
-  // core 1, too)
-  // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/
-
-  ESP_LOGI(TAG, "Starting Lora task on core 1");
-  xTaskCreatePinnedToCore(lorawan_loop, "loratask", 2048, (void *)1,
-                          (5 | portPRIVILEGE_BIT), NULL, 1);
-
-  // start wifi in monitor mode and start channel rotation task on core 0
-  ESP_LOGI(TAG, "Starting Wifi task on core 0");
-  wifi_sniffer_init();
-  // initialize salt value using esp_random() called by random() in
-  // arduino-esp32 core note: do this *after* wifi has started, since function
-  // gets it's seed from RF noise
-  reset_salt(); // get new 16bit for salting hashes
-  xTaskCreatePinnedToCore(sniffer_loop, "wifisniffer", 2048, (void *)1, 1, NULL,
-                          0);
-
-// start BLE scan callback if BLE function is enabled in NVRAM configuration
-#ifdef BLECOUNTER
-  if (cfg.blescan) {
-    start_BLEscan();
-  }
-#endif
-
-// if device has GPS and GPS function is enabled, start GPS reader task on core
-// 0
-#ifdef HAS_GPS
-  if (cfg.gpsmode) {
-    ESP_LOGI(TAG, "Starting GPS task on core 0");
-    xTaskCreatePinnedToCore(gps_loop, "gpsfeed", 2048, (void *)1, 1, NULL, 0);
-  }
-#endif
-
-  // kickoff sendjob -> joins network and rescedules sendjob for cyclic
-  // transmitting payload
-  do_send(&sendjob);
-}
-
-/* end Arduino SETUP
- * ------------------------------------------------------------ */
-
-/* begin Arduino main loop
- * ------------------------------------------------------ */
-
-void loop() {
-
-  while (1) {
-
-    // simple state machine for controlling uptime, display, LED, button,
-    // memory.
-
-    uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit)
-
-#if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
-    led_loop();
-#endif
-
-#ifdef HAS_BUTTON
-    readButton();
-#endif
-
-#ifdef HAS_DISPLAY
-    updateDisplay();
-#endif
-
-    // check free memory
-    if (esp_get_minimum_free_heap_size() <= MEM_LOW) {
-      ESP_LOGI(TAG,
-               "Memory full, counter cleared (heap low water mark = %d Bytes / "
-               "free heap = %d bytes)",
-               esp_get_minimum_free_heap_size(), ESP.getFreeHeap());
-      do_send(&sendjob); // send count
-      reset_counters();  // clear macs container and reset all counters
-      reset_salt();      // get new salt for salting hashes
-    }
-
-#ifdef HAS_GPS
-    // log NMEA status every 30 seconds, useful for debugging GPS connection
-    if ((uptime() % 30000) == 0)
-      ESP_LOGD(TAG, "GPS NMEA data: passed %d / failed: %d / with fix: %d",
-               gps.passedChecksum(), gps.failedChecksum(),
-               gps.sentencesWithFix());
-#endif
-
-    vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
-
-  } // end of infinite main loop
-}
-
-/* end Arduino main loop
- * ------------------------------------------------------------ */
+/*
+ 
+
+
+Copyright  2018 Oliver Brandmueller <ob@sysadm.in>
+Copyright  2018 Klaus Wilting <verkehrsrot@arcor.de>
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+NOTICE:
+Parts of the source files in this repository are made available under different
+licenses. Refer to LICENSE.txt file in repository for more details.
+
+*/
+
+// Basic Config
+#include "globals.h"
+
+// Does nothing and avoid any compilation error with I2C
+#include <Wire.h>
+
+// LMIC-Arduino LoRaWAN Stack
+#include "loraconf.h"
+#include <hal/hal.h>
+#include <lmic.h>
+
+// ESP32 lib Functions
+#include <esp32-hal-log.h>  // needed for ESP_LOGx on arduino framework
+#include <esp_event_loop.h> // needed for Wifi event handler
+#include <esp_spi_flash.h>  // needed for reading ESP32 chip attributes
+
+// Initialize global variables
+configData_t cfg;           // struct holds current device configuration
+osjob_t sendjob, rcmdjob;   // LMIC job handler
+uint64_t uptimecounter = 0; // timer global for uptime counter
+uint8_t DisplayState = 0;   // globals for state machine
+uint16_t macs_total = 0, macs_wifi = 0,
+         macs_ble = 0; // MAC counters globals for display
+uint8_t channel = 0;   // wifi channel rotation counter global for display
+char display_lora[16], display_lmic[16]; // display buffers
+led_states LEDState = LED_OFF;           // LED state global for state machine
+led_states previousLEDState =
+    LED_ON; // This will force LED to be off at boot since State is OFF
+unsigned long LEDBlinkStarted = 0; // When (in millis() led blink started)
+uint16_t LEDBlinkDuration = 0;     // How long the blink need to be
+uint16_t LEDColor = COLOR_NONE; // state machine variable to set RGB LED color
+hw_timer_t *displaytimer =
+    NULL; // configure hardware timer used for cyclic display refresh
+hw_timer_t *channelSwitch =
+    NULL;            // configure hardware timer used for wifi channel switching
+xref2u1_t rcmd_data; // buffer for rcommand results size
+u1_t rcmd_data_size; // buffer for rcommand results size
+
+#ifdef HAS_GPS
+gpsStatus_t gps_status; // struct for storing gps data
+TinyGPSPlus gps;        // create TinyGPS++ instance
+#endif
+
+portMUX_TYPE timerMux =
+    portMUX_INITIALIZER_UNLOCKED; // sync main loop and ISR when modifying IRQ
+                                  // handler shared variables
+
+std::set<uint16_t> macs; // associative container holds total of unique MAC
+                         // adress hashes (Wifi + BLE)
+
+// this variables will be changed in the ISR, and read in main loop
+static volatile int ButtonPressedIRQ = 0, DisplayTimerIRQ = 0,
+                    ChannelTimerIRQ = 0;
+
+// local Tag for logging
+static const char TAG[] = "main";
+
+#ifndef VERBOSE
+int redirect_log(const char *fmt, va_list args) {
+  // do nothing
+  return 0;
+}
+#endif
+
+void reset_counters() {
+  macs.clear();   // clear all macs container
+  macs_total = 0; // reset all counters
+  macs_wifi = 0;
+  macs_ble = 0;
+}
+
+/* begin LMIC specific parts
+ * ------------------------------------------------------------ */
+
+#ifdef VERBOSE
+void printKeys(void);
+#endif // VERBOSE
+
+// LMIC callback functions
+void os_getDevKey(u1_t *buf) { memcpy(buf, APPKEY, 16); }
+
+void os_getArtEui(u1_t *buf) {
+  memcpy(buf, APPEUI, 8);
+  RevBytes(buf, 8); // TTN requires it in LSB First order, so we swap bytes
+}
+
+void os_getDevEui(u1_t *buf) {
+  int i = 0, k = 0;
+  memcpy(buf, DEVEUI, 8); // get fixed DEVEUI from loraconf.h
+  for (i = 0; i < 8; i++) {
+    k += buf[i];
+  }
+  if (k) {
+    RevBytes(buf, 8); // use fixed DEVEUI and swap bytes to LSB format
+  } else {
+    gen_lora_deveui(buf); // generate DEVEUI from device's MAC
+  }
+
+// Get MCP 24AA02E64 hardware DEVEUI (override default settings if found)
+#ifdef MCP_24AA02E64_I2C_ADDRESS
+  get_hard_deveui(buf);
+  RevBytes(buf, 8); // swap bytes to LSB format
+#endif
+}
+
+// LMIC enhanced Pin mapping
+const lmic_pinmap lmic_pins = {.mosi = PIN_SPI_MOSI,
+                               .miso = PIN_SPI_MISO,
+                               .sck = PIN_SPI_SCK,
+                               .nss = PIN_SPI_SS,
+                               .rxtx = LMIC_UNUSED_PIN,
+                               .rst = RST,
+                               .dio = {DIO0, DIO1, DIO2}};
+
+// LMIC FreeRTos Task
+void lorawan_loop(void *pvParameters) {
+
+  configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
+
+  while (1) {
+    os_runloop_once();                  // execute LMIC jobs
+    vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
+  }
+}
+
+/* end LMIC specific parts
+ * --------------------------------------------------------------- */
+
+/* beginn hardware specific parts
+ * -------------------------------------------------------- */
+
+#ifdef HAS_DISPLAY
+HAS_DISPLAY u8x8(OLED_RST, OLED_SCL, OLED_SDA);
+// Display Refresh IRQ
+void IRAM_ATTR DisplayIRQ() {
+  portENTER_CRITICAL_ISR(&timerMux);
+  DisplayTimerIRQ++;
+  portEXIT_CRITICAL_ISR(&timerMux);
+}
+#endif
+
+#ifdef HAS_ANTENNA_SWITCH
+// defined in antenna.cpp
+void antenna_init();
+void antenna_select(const uint8_t _ant);
+#endif
+
+#ifndef BLECOUNTER
+bool btstop = btStop();
+#endif
+
+// Button IRQ Handler Routine, IRAM_ATTR necessary here, see
+// https://github.com/espressif/arduino-esp32/issues/855
+#ifdef HAS_BUTTON
+void IRAM_ATTR ButtonIRQ() { ButtonPressedIRQ++; }
+#endif
+
+// Wifi Channel Rotation Timer IRQ Handler Routine
+void IRAM_ATTR ChannelSwitchIRQ() {
+  portENTER_CRITICAL(&timerMux);
+  ChannelTimerIRQ++;
+  portEXIT_CRITICAL(&timerMux);
+}
+
+/* end hardware specific parts
+ * -------------------------------------------------------- */
+
+/* begin wifi specific parts
+ * ---------------------------------------------------------- */
+
+// Sniffer Task
+void sniffer_loop(void *pvParameters) {
+
+  configASSERT(((uint32_t)pvParameters) == 1); // FreeRTOS check
+
+  while (1) {
+
+    if (ChannelTimerIRQ) {
+      portENTER_CRITICAL(&timerMux);
+      ChannelTimerIRQ--;
+      portEXIT_CRITICAL(&timerMux);
+      // rotates variable channel 1..WIFI_CHANNEL_MAX
+      channel = (channel % WIFI_CHANNEL_MAX) + 1;
+      wifi_sniffer_set_channel(channel);
+      ESP_LOGD(TAG, "Wifi set channel %d", channel);
+
+      vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
+    }
+
+  } // end of infinite wifi channel rotation loop
+}
+
+/* end wifi specific parts
+ * ------------------------------------------------------------ */
+
+// uptime counter 64bit to prevent millis() rollover after 49 days
+uint64_t uptime() {
+  static uint32_t low32, high32;
+  uint32_t new_low32 = millis();
+  if (new_low32 < low32)
+    high32++;
+  low32 = new_low32;
+  return (uint64_t)high32 << 32 | low32;
+}
+
+#ifdef HAS_DISPLAY
+
+// Print a key on display
+void DisplayKey(const uint8_t *key, uint8_t len, bool lsb) {
+  const uint8_t *p;
+  for (uint8_t i = 0; i < len; i++) {
+    p = lsb ? key + len - i - 1 : key + i;
+    u8x8.printf("%02X", *p);
+  }
+  u8x8.printf("\n");
+}
+
+void init_display(const char *Productname, const char *Version) {
+  uint8_t buf[32];
+  u8x8.begin();
+  u8x8.setFont(u8x8_font_chroma48medium8_r);
+  u8x8.clear();
+  u8x8.setFlipMode(0);
+  u8x8.setInverseFont(1);
+  u8x8.draw2x2String(0, 0, Productname);
+  u8x8.setInverseFont(0);
+  u8x8.draw2x2String(2, 2, Productname);
+  delay(1500);
+  u8x8.clear();
+  u8x8.setFlipMode(1);
+  u8x8.setInverseFont(1);
+  u8x8.draw2x2String(0, 0, Productname);
+  u8x8.setInverseFont(0);
+  u8x8.draw2x2String(2, 2, Productname);
+  delay(1500);
+
+  u8x8.setFlipMode(0);
+  u8x8.clear();
+
+#ifdef DISPLAY_FLIP
+  u8x8.setFlipMode(1);
+#endif
+
+// Display chip information
+#ifdef VERBOSE
+  esp_chip_info_t chip_info;
+  esp_chip_info(&chip_info);
+  u8x8.printf("ESP32 %d cores\nWiFi%s%s\n", chip_info.cores,
+              (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
+              (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "");
+  u8x8.printf("ESP Rev.%d\n", chip_info.revision);
+  u8x8.printf("%dMB %s Flash\n", spi_flash_get_chip_size() / (1024 * 1024),
+              (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "int." : "ext.");
+#endif // VERBOSE
+
+  u8x8.print(Productname);
+  u8x8.print(" v");
+  u8x8.println(PROGVERSION);
+  u8x8.println("DEVEUI:");
+  os_getDevEui((u1_t *)buf);
+  DisplayKey(buf, 8, true);
+  delay(5000);
+  u8x8.clear();
+}
+
+void refreshDisplay() {
+  // update counter (lines 0-1)
+  char buff[16];
+  snprintf(
+      buff, sizeof(buff), "PAX:%-4d",
+      (int)macs.size()); // convert 16-bit MAC counter to decimal counter value
+  u8x8.draw2x2String(0, 0,
+                     buff); // display number on unique macs total Wifi + BLE
+
+  // update GPS status (line 2)
+#ifdef HAS_GPS
+  u8x8.setCursor(8, 2);
+  if (!gps.location.isvalid()) // if no fix then display Sats value inverse
+  {
+    u8x8.setInverseFont(1);
+    u8x8.printf("Sats: %.3d", gps.satellites.value());
+    u8x8.setInverseFont(0);
+  } else
+    u8x8.printf("Sats: %.3d", gps.satellites.value());
+#endif
+
+    // update bluetooth counter + LoRa SF (line 3)
+#ifdef BLECOUNTER
+  u8x8.setCursor(0, 3);
+  if (cfg.blescan)
+    u8x8.printf("BLTH:%-4d", macs_ble);
+  else
+    u8x8.printf("%s", "BLTH:off");
+#endif
+  u8x8.setCursor(11, 3);
+  u8x8.printf("SF:");
+  if (cfg.adrmode) // if ADR=on then display SF value inverse
+    u8x8.setInverseFont(1);
+  u8x8.printf("%c%c", lora_datarate[LMIC.datarate * 2],
+              lora_datarate[LMIC.datarate * 2 + 1]);
+  if (cfg.adrmode) // switch off inverse if it was turned on
+    u8x8.setInverseFont(0);
+
+  // update wifi counter + channel display (line 4)
+  u8x8.setCursor(0, 4);
+  u8x8.printf("WIFI:%-4d", macs_wifi);
+  u8x8.setCursor(11, 4);
+  u8x8.printf("ch:%02d", channel);
+
+  // update RSSI limiter status & free memory display (line 5)
+  u8x8.setCursor(0, 5);
+  u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%-4d", cfg.rssilimit);
+  u8x8.setCursor(10, 5);
+  u8x8.printf("%4dKB", ESP.getFreeHeap() / 1024);
+
+  // update LoRa status display (line 6)
+  u8x8.setCursor(0, 6);
+  u8x8.printf("%-16s", display_lora);
+
+  // update LMiC event display (line 7)
+  u8x8.setCursor(0, 7);
+  u8x8.printf("%-16s", display_lmic);
+}
+
+void updateDisplay() {
+  // refresh display according to refresh cycle setting
+  if (DisplayTimerIRQ) {
+    portENTER_CRITICAL(&timerMux);
+    DisplayTimerIRQ--;
+    portEXIT_CRITICAL(&timerMux);
+
+    refreshDisplay();
+
+    // set display on/off according to current device configuration
+    if (DisplayState != cfg.screenon) {
+      DisplayState = cfg.screenon;
+      u8x8.setPowerSave(!cfg.screenon);
+    }
+  }
+} // updateDisplay()
+#endif // HAS_DISPLAY
+
+#ifdef HAS_BUTTON
+void readButton() {
+  if (ButtonPressedIRQ) {
+    portENTER_CRITICAL(&timerMux);
+    ButtonPressedIRQ--;
+    portEXIT_CRITICAL(&timerMux);
+    ESP_LOGI(TAG, "Button pressed");
+    ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults");
+    eraseConfig();
+    esp_restart();
+  }
+}
+#endif
+
+#if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
+
+void blink_LED(uint16_t set_color, uint16_t set_blinkduration) {
+  LEDColor = set_color;                 // set color for RGB LED
+  LEDBlinkDuration = set_blinkduration; // duration
+  LEDBlinkStarted = millis();           // Time Start here
+  LEDState = LED_ON;                    // Let main set LED on
+}
+
+void led_loop() {
+  // Custom blink running always have priority other LoRaWAN led management
+  if (LEDBlinkStarted && LEDBlinkDuration) {
+
+    // ESP_LOGI(TAG, "Start=%ld for %g",LEDBlinkStarted, LEDBlinkDuration );
+
+    // Custom blink is finished, let this order, avoid millis() overflow
+    if ((millis() - LEDBlinkStarted) >= LEDBlinkDuration) {
+      // Led becomes off, and stop blink
+      LEDState = LED_OFF;
+      LEDBlinkStarted = 0;
+      LEDBlinkDuration = 0;
+      LEDColor = COLOR_NONE;
+    } else {
+      // In case of LoRaWAN led management blinked off
+      LEDState = LED_ON;
+    }
+
+    // No custom blink, check LoRaWAN state
+  } else {
+
+    // LED indicators for viusalizing LoRaWAN state
+    if (LMIC.opmode & (OP_JOINING | OP_REJOIN)) {
+      LEDColor = COLOR_YELLOW;
+      // quick blink 20ms on each 1/5 second
+      LEDState = ((millis() % 200) < 20) ? LED_ON : LED_OFF; // TX data pending
+    } else if (LMIC.opmode & (OP_TXDATA | OP_TXRXPEND)) {
+      LEDColor = COLOR_BLUE;
+      // small blink 10ms on each 1/2sec (not when joining)
+      LEDState = ((millis() % 500) < 20) ? LED_ON : LED_OFF;
+      // This should not happen so indicate a problem
+    } else if (LMIC.opmode &
+               ((OP_TXDATA | OP_TXRXPEND | OP_JOINING | OP_REJOIN) == 0)) {
+      LEDColor = COLOR_RED;
+      // heartbeat long blink 200ms on each 2 seconds
+      LEDState = ((millis() % 2000) < 200) ? LED_ON : LED_OFF;
+    } else {
+      // led off
+      LEDColor = COLOR_NONE;
+      LEDState = LED_OFF;
+    }
+  }
+
+  // ESP_LOGI(TAG, "state=%d previous=%d Color=%d",LEDState, previousLEDState,
+  // LEDColor );
+  // led need to change state? avoid digitalWrite() for nothing
+  if (LEDState != previousLEDState) {
+    if (LEDState == LED_ON) {
+      rgb_set_color(LEDColor);
+#ifdef LED_ACTIVE_LOW
+      digitalWrite(HAS_LED, LOW);
+#else
+      digitalWrite(HAS_LED, HIGH);
+#endif
+    } else {
+      rgb_set_color(COLOR_NONE);
+#ifdef LED_ACTIVE_LOW
+      digitalWrite(HAS_LED, HIGH);
+#else
+      digitalWrite(HAS_LED, LOW);
+#endif
+    }
+    previousLEDState = LEDState;
+  }
+}; // led_loop()
+
+#endif
+
+/* begin Aruino SETUP
+ * ------------------------------------------------------------ */
+
+void setup() {
+  char features[64] = "";
+
+  // disable brownout detection
+#ifdef DISABLE_BROWNOUT
+  // register with brownout is at address DR_REG_RTCCNTL_BASE + 0xd4
+  (*((volatile uint32_t *)ETS_UNCACHED_ADDR((DR_REG_RTCCNTL_BASE + 0xd4)))) = 0;
+#endif
+
+  // setup debug output or silence device
+#ifdef VERBOSE
+  Serial.begin(115200);
+  esp_log_level_set("*", ESP_LOG_VERBOSE);
+#else
+  // mute logs completely by redirecting them to silence function
+  esp_log_level_set("*", ESP_LOG_NONE);
+  esp_log_set_vprintf(redirect_log);
+#endif
+
+  ESP_LOGI(TAG, "Starting %s %s", PROGNAME, PROGVERSION);
+
+  // initialize system event handler for wifi task, needed for
+  // wifi_sniffer_init()
+  esp_event_loop_init(NULL, NULL);
+
+  // print chip information on startup if in verbose mode
+#ifdef VERBOSE
+  esp_chip_info_t chip_info;
+  esp_chip_info(&chip_info);
+  ESP_LOGI(TAG,
+           "This is ESP32 chip with %d CPU cores, WiFi%s%s, silicon revision "
+           "%d, %dMB %s Flash",
+           chip_info.cores, (chip_info.features & CHIP_FEATURE_BT) ? "/BT" : "",
+           (chip_info.features & CHIP_FEATURE_BLE) ? "/BLE" : "",
+           chip_info.revision, spi_flash_get_chip_size() / (1024 * 1024),
+           (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded"
+                                                         : "external");
+  ESP_LOGI(TAG, "ESP32 SDK: %s", ESP.getSdkVersion());
+#endif
+
+#ifdef HAS_GPS
+  ESP_LOGI(TAG, "TinyGPS+ version %s", TinyGPSPlus::libraryVersion());
+#endif
+
+  // read settings from NVRAM
+  loadConfig(); // includes initialize if necessary
+
+  // initialize led if needed
+#if (HAS_LED != NOT_A_PIN)
+  pinMode(HAS_LED, OUTPUT);
+  strcat(features, " LED");
+#endif
+
+#ifdef HAS_RGB_LED
+  rgb_set_color(COLOR_PINK);
+  strcat(features, " RGB");
+#endif
+
+  // initialize button handling if needed
+#ifdef HAS_BUTTON
+  strcat(features, " BTN_");
+#ifdef BUTTON_PULLUP
+  strcat(features, "PU");
+  // install button interrupt (pullup mode)
+  pinMode(HAS_BUTTON, INPUT_PULLUP);
+  attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), ButtonIRQ, RISING);
+#else
+  strcat(features, "PD");
+  // install button interrupt (pulldown mode)
+  pinMode(HAS_BUTTON, INPUT_PULLDOWN);
+  attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), ButtonIRQ, FALLING);
+#endif
+#endif
+
+  // initialize wifi antenna if needed
+#ifdef HAS_ANTENNA_SWITCH
+  strcat(features, " ANT");
+  antenna_init();
+#endif
+
+// initialize gps if present
+#ifdef HAS_GPS
+  strcat(features, " GPS");
+#endif
+
+#ifdef HAS_DISPLAY
+  strcat(features, " OLED");
+  // initialize display
+  init_display(PROGNAME, PROGVERSION);
+  DisplayState = cfg.screenon;
+  u8x8.setPowerSave(!cfg.screenon); // set display off if disabled
+  u8x8.draw2x2String(0, 0, "PAX:0")
+#ifdef BLECOUNTER
+      u8x8.setCursor(0, 3);
+  u8x8.printf("BLTH:0");
+#endif
+  u8x8.setCursor(0, 4);
+  u8x8.printf("WIFI:0");
+  u8x8.setCursor(0, 5);
+  u8x8.printf(!cfg.rssilimit ? "RLIM:off " : "RLIM:%d", cfg.rssilimit);
+
+  sprintf(display_lora, "Join wait");
+
+  // setup display refresh trigger IRQ using esp32 hardware timer 0
+  // for explanation see
+  // https://techtutorialsx.com/2017/10/07/esp32-arduino-timer-interrupts/
+  displaytimer = timerBegin(0, 80, true); // prescaler 80 -> divides 80 MHz CPU
+                                          // freq to 1 MHz, timer 0, count up
+  timerAttachInterrupt(displaytimer, &DisplayIRQ,
+                       true); // interrupt handler DisplayIRQ, triggered by edge
+  timerAlarmWrite(
+      displaytimer, DISPLAYREFRESH_MS * 1000,
+      true); // reload interrupt after each trigger of display refresh cycle
+  timerAlarmEnable(displaytimer); // enable display interrupt
+#endif
+
+  // setup channel rotation trigger IRQ using esp32 hardware timer 1
+  channelSwitch = timerBegin(1, 80, true);
+  timerAttachInterrupt(channelSwitch, &ChannelSwitchIRQ, true);
+  timerAlarmWrite(channelSwitch, cfg.wifichancycle * 10000, true);
+  timerAlarmEnable(channelSwitch);
+
+  // show compiled features
+  ESP_LOGI(TAG, "Features %s", features);
+
+// output LoRaWAN keys to console
+#ifdef VERBOSE
+  printKeys();
+#endif
+
+  // initialize LoRaWAN LMIC run-time environment
+  os_init();
+  // reset LMIC MAC state
+  LMIC_reset();
+  // This tells LMIC to make the receive windows bigger, in case your clock is
+  // 1% faster or slower.
+  LMIC_setClockError(MAX_CLOCK_ERROR * 1 / 100);
+
+  // start lmic runloop in rtos task on core 1 (note: arduino main loop runs on
+  // core 1, too)
+  // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/
+
+  ESP_LOGI(TAG, "Starting Lora task on core 1");
+  xTaskCreatePinnedToCore(lorawan_loop, "loratask", 2048, (void *)1,
+                          (5 | portPRIVILEGE_BIT), NULL, 1);
+
+  // start wifi in monitor mode and start channel rotation task on core 0
+  ESP_LOGI(TAG, "Starting Wifi task on core 0");
+  wifi_sniffer_init();
+  // initialize salt value using esp_random() called by random() in
+  // arduino-esp32 core note: do this *after* wifi has started, since function
+  // gets it's seed from RF noise
+  reset_salt(); // get new 16bit for salting hashes
+  xTaskCreatePinnedToCore(sniffer_loop, "wifisniffer", 2048, (void *)1, 1, NULL,
+                          0);
+
+// start BLE scan callback if BLE function is enabled in NVRAM configuration
+#ifdef BLECOUNTER
+  if (cfg.blescan) {
+    start_BLEscan();
+  }
+#endif
+
+// if device has GPS and GPS function is enabled, start GPS reader task on core
+// 0
+#ifdef HAS_GPS
+  if (cfg.gpsmode) {
+    ESP_LOGI(TAG, "Starting GPS task on core 0");
+    xTaskCreatePinnedToCore(gps_loop, "gpsfeed", 2048, (void *)1, 1, NULL, 0);
+  }
+#endif
+
+  // kickoff sendjob -> joins network and rescedules sendjob for cyclic
+  // transmitting payload
+  do_send(&sendjob);
+}
+
+/* end Arduino SETUP
+ * ------------------------------------------------------------ */
+
+/* begin Arduino main loop
+ * ------------------------------------------------------ */
+
+void loop() {
+
+  while (1) {
+
+    // simple state machine for controlling uptime, display, LED, button,
+    // memory.
+
+    uptimecounter = uptime() / 1000; // counts uptime in seconds (64bit)
+
+#if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
+    led_loop();
+#endif
+
+#ifdef HAS_BUTTON
+    readButton();
+#endif
+
+#ifdef HAS_DISPLAY
+    updateDisplay();
+#endif
+
+    // check free memory
+    if (esp_get_minimum_free_heap_size() <= MEM_LOW) {
+      ESP_LOGI(TAG,
+               "Memory full, counter cleared (heap low water mark = %d Bytes / "
+               "free heap = %d bytes)",
+               esp_get_minimum_free_heap_size(), ESP.getFreeHeap());
+      do_send(&sendjob); // send count
+      reset_counters();  // clear macs container and reset all counters
+      reset_salt();      // get new salt for salting hashes
+    }
+
+#ifdef HAS_GPS
+    // log NMEA status every 30 seconds, useful for debugging GPS connection
+    if ((uptime() % 30000) == 0)
+      ESP_LOGD(TAG, "GPS NMEA data: passed %d / failed: %d / with fix: %d",
+               gps.passedChecksum(), gps.failedChecksum(),
+               gps.sentencesWithFix());
+#endif
+
+    vTaskDelay(1 / portTICK_PERIOD_MS); // reset watchdog
+
+  } // end of infinite main loop
+}
+
+/* end Arduino main loop
+ * ------------------------------------------------------------ */

From a170e4c7ab27551399cf205d1deb48994e5442dd Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Sun, 10 Jun 2018 22:53:31 +0200
Subject: [PATCH 06/15] main.cpp: syntax error corrected

---
 src/main.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 62b15b2c..db410d2e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -550,9 +550,9 @@ void setup() {
   init_display(PROGNAME, PROGVERSION);
   DisplayState = cfg.screenon;
   u8x8.setPowerSave(!cfg.screenon); // set display off if disabled
-  u8x8.draw2x2String(0, 0, "PAX:0")
+  u8x8.draw2x2String(0, 0, "PAX:0");
 #ifdef BLECOUNTER
-      u8x8.setCursor(0, 3);
+  u8x8.setCursor(0, 3);
   u8x8.printf("BLTH:0");
 #endif
   u8x8.setCursor(0, 4);

From 170abbf53d3a9e3be699a64a263b5d3e77cc9d52 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 00:26:21 +0200
Subject: [PATCH 07/15] revert "goto" change

---
 src/lorawan.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index 2ccdfdc8..aff949cf 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -106,15 +106,12 @@ void printKeys(void) {
 #endif // VERBOSE
 
 void do_send(osjob_t *j) {
-  // Schedule next transmission
-  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
-                      do_send);
 
   // Check if there is a pending TX/RX job running
   if (LMIC.opmode & OP_TXRXPEND) {
     ESP_LOGI(TAG, "LoRa busy, rescheduling");
     sprintf(display_lmic, "LORA BUSY");
-    return;
+    goto end;
   }
 
   // prepare payload with sum of unique WIFI MACs seen
@@ -156,12 +153,17 @@ void do_send(osjob_t *j) {
   }
 #endif
 
+end:
   // clear counter if not in cumulative counter mode
   if (cfg.countermode != 1) {
     reset_counters(); // clear macs container and reset all counters
     reset_salt();     // get new salt for salting hashes
     ESP_LOGI(TAG, "Counter cleared (countermode = %d)", cfg.countermode);
   }
+
+  // Schedule next transmission
+  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
+                      do_send);
 } // do_send()
 
 void onEvent(ev_t ev) {

From 74f9101db71b6cf70fdf3a0a8688fe4f157ecc8d Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 07:20:57 +0200
Subject: [PATCH 08/15] rollback "goto" revert

---
 src/lorawan.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index aff949cf..176389a8 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -106,12 +106,15 @@ void printKeys(void) {
 #endif // VERBOSE
 
 void do_send(osjob_t *j) {
+  // Schedule next transmission
+  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
+                      do_send);
 
   // Check if there is a pending TX/RX job running
   if (LMIC.opmode & OP_TXRXPEND) {
     ESP_LOGI(TAG, "LoRa busy, rescheduling");
     sprintf(display_lmic, "LORA BUSY");
-    goto end;
+    return;
   }
 
   // prepare payload with sum of unique WIFI MACs seen
@@ -153,7 +156,6 @@ void do_send(osjob_t *j) {
   }
 #endif
 
-end:
   // clear counter if not in cumulative counter mode
   if (cfg.countermode != 1) {
     reset_counters(); // clear macs container and reset all counters
@@ -161,9 +163,6 @@ end:
     ESP_LOGI(TAG, "Counter cleared (countermode = %d)", cfg.countermode);
   }
 
-  // Schedule next transmission
-  os_setTimedCallback(&sendjob, os_getTime() + sec2osticks(cfg.sendcycle * 2),
-                      do_send);
 } // do_send()
 
 void onEvent(ev_t ev) {

From ba681f07f77d6c1d12119e29cf200f955ea66f25 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 08:02:37 +0200
Subject: [PATCH 09/15] lorawan.cpp: small bugfix sprintf PACKET QUEUED

---
 src/lorawan.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/lorawan.cpp b/src/lorawan.cpp
index 176389a8..5deba24e 100644
--- a/src/lorawan.cpp
+++ b/src/lorawan.cpp
@@ -150,11 +150,10 @@ void do_send(osjob_t *j) {
     LMIC_setTxData2(COUNTERPORT, mydata, sizeof(mydata),
                     (cfg.countermode & 0x02));
     ESP_LOGI(TAG, "%d bytes queued to send", sizeof(mydata));
-    sprintf(display_lmic, "PACKET QUEUED");
-
 #ifdef HAS_GPS
   }
 #endif
+  sprintf(display_lmic, "PACKET QUEUED");
 
   // clear counter if not in cumulative counter mode
   if (cfg.countermode != 1) {

From 2006fbb06619d676591471d53d9e7cc708e6b5d1 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 09:08:43 +0200
Subject: [PATCH 10/15] platformio.ini: ttgobeam Display Lib removed

---
 platformio.ini | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index be9dda45..1a9fae0e 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,11 +11,11 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-env_default = heltec
+;env_default = heltec
 ;env_default = ttgov1
 ;env_default = ttgov2
 ;env_default = ttgov21
-;env_default = ttgobeam
+env_default = ttgobeam
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy

From e78336c24054e7365a3414ed1ae3e09e82928e76 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 09:25:52 +0200
Subject: [PATCH 11/15] platformio.ini: removed display lib from env ttgobeam

---
 platformio.ini | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 1a9fae0e..9e5e47aa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -107,7 +107,6 @@ board_build.partitions = ${common_env_data.board_build.partitions}
 monitor_speed = 115200
 upload_speed = 921600
 lib_deps = 
-    ${common_env_data.lib_deps_display}
     ${common_env_data.lib_deps_gps}
 build_flags = 
     ${common_env_data.build_flags}

From 858eac8d3779d4857576a344431f0b584c774ec0 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 22:58:56 +0200
Subject: [PATCH 12/15] main.cpp: Loglevel for GPS NMEA changed from debug to
 info

---
 platformio.ini | 4 ++--
 src/main.cpp   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 9e5e47aa..b4c12689 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,11 +11,11 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-;env_default = heltec
+env_default = heltec
 ;env_default = ttgov1
 ;env_default = ttgov2
 ;env_default = ttgov21
-env_default = ttgobeam
+;env_default = ttgobeam
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy
diff --git a/src/main.cpp b/src/main.cpp
index db410d2e..5c57751a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -299,8 +299,8 @@ void refreshDisplay() {
 
   // update GPS status (line 2)
 #ifdef HAS_GPS
-  u8x8.setCursor(8, 2);
-  if (!gps.location.isvalid()) // if no fix then display Sats value inverse
+  u8x8.setCursor(7, 2);
+  if (!gps.location.isValid()) // if no fix then display Sats value inverse
   {
     u8x8.setInverseFont(1);
     u8x8.printf("Sats: %.3d", gps.satellites.value());
@@ -676,8 +676,8 @@ void loop() {
 
 #ifdef HAS_GPS
     // log NMEA status every 30 seconds, useful for debugging GPS connection
-    if ((uptime() % 30000) == 0)
-      ESP_LOGD(TAG, "GPS NMEA data: passed %d / failed: %d / with fix: %d",
+    if (uptimecounter %30 == 0)
+      ESP_LOGI(TAG, "GPS NMEA data: passed %d / failed: %d / with fix: %d",
                gps.passedChecksum(), gps.failedChecksum(),
                gps.sentencesWithFix());
 #endif

From 945ce1694da340d24c6dee40dda8f22b09deafe5 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Mon, 11 Jun 2018 23:06:14 +0200
Subject: [PATCH 13/15] main.cpp: bugfix NEMA logging

---
 src/main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.cpp b/src/main.cpp
index 5c57751a..519e175f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -676,7 +676,7 @@ void loop() {
 
 #ifdef HAS_GPS
     // log NMEA status every 30 seconds, useful for debugging GPS connection
-    if (uptimecounter %30 == 0)
+    if ((uptime() % 30000) == 0)
       ESP_LOGI(TAG, "GPS NMEA data: passed %d / failed: %d / with fix: %d",
                gps.passedChecksum(), gps.failedChecksum(),
                gps.sentencesWithFix());

From 81dd510eaa40dec34daa5050c26bcbb1487b0f79 Mon Sep 17 00:00:00 2001
From: Klaus K Wilting <Klaus.K.Wilting@deutschebahn.com>
Date: Tue, 12 Jun 2018 09:28:27 +0200
Subject: [PATCH 14/15] bugfix ttgobeam.h & update readme.md

---
 README.md          | 45 +++++++++++++++++++++++----------------------
 platformio.ini     |  4 ++--
 src/hal/ttgobeam.h |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/README.md b/README.md
index ed769384..e9213d65 100644
--- a/README.md
+++ b/README.md
@@ -264,41 +264,42 @@ Note: all settings are stored in NVRAM and will be reloaded when device starts.
 
 0x80 get device configuration
 
-device answers with it's current configuration. The configuration is a C structure declared in file [globals.h](src/globals.h#L27-L44) with the following definition:
+device answers with it's current configuration. The configuration is a C structure declared in file [globals.h](src/globals.h#L32-L50) with the following definition:
 
-	byte 1:			Lora SF (7..12)
-	byte 2:			Lora TXpower (2..15)
-	byte 3:			Lora ADR (1=on, 0=off)
-	byte 4:			Screensaver status (1=on, 0=off)
-	byte 5:			Display status (1=on, 0=off)
-	byte 6:			Counter mode (0=cyclic unconfirmed, 1=cumulative, 2=cyclic confirmed)
-	bytes 7-8:		RSSI limiter threshold value (negative)
-	byte 9:			Lora Payload send cycle in seconds/2 (0..255)
-	byte 10:		Wifi channel switch interval in seconds/100 (0..255)
-	byte 11:		Bluetooth channel switch interval in seconds/100 (0..255)
-	byte 12:		Bluetooth scanner status (1=on, 0=0ff)
-	byte 13:		Wifi antenna switch (0=internal, 1=external)
-	byte 14:		Vendorfilter mode (0=disabled, 1=enabled)
-	byte 15:		RGB LED luminosity (0..100 %)
-	bytes 16-26:		Software version (ASCII format, terminating with zero)
+	byte 1:			Lora SF (7..12) [default 9]
+	byte 2:			Lora TXpower (2..15) [default 15]
+	byte 3:			Lora ADR (1=on, 0=off) [default 1]
+	byte 4:			Screensaver status (1=on, 0=off) [default 0]
+	byte 5:			Display status (1=on, 0=off) [default 0]
+	byte 6:			Counter mode (0=cyclic unconfirmed, 1=cumulative, 2=cyclic confirmed) [default 0]
+	bytes 7-8:		RSSI limiter threshold value (negative) [default 0]
+	byte 9:			Lora Payload send cycle in seconds/2 (0..255) [default 120]
+	byte 10:		Wifi channel switch interval in seconds/100 (0..255) [default 50]
+	byte 11:		Bluetooth channel switch interval in seconds/100 (0..255) [efault 10]
+	byte 12:		Bluetooth scanner status (1=on, 0=0ff) [default 1]
+	byte 13:		Wifi antenna switch (0=internal, 1=external) [default 0]
+	byte 14:		Vendorfilter mode (0=disabled, 1=enabled) [default 0]
+	byte 15:		RGB LED luminosity (0..100 %) [default 30]
+	byte 16:		GPS send data mode (1=on, 0=ff) [default 1]
+	bytes 17-27:		Software version (ASCII format, terminating with zero)
 
 0x81 get device uptime
 
-	bytes 1-8:		uptime in seconds (little endian format)
+	bytes 1-8:		Uptime in seconds (little endian format)
 
 0x82 get device cpu temperature
 
-	bytes 1-4:		chip temperature in degrees celsius (little endian format)
+	bytes 1-4:		Chip temperature in degrees celsius (little endian format)
 
 0x83 get device battery voltage
 
-	bytes 1-2:		battery voltage in millivolt, 0 if unreadable (little endian format)
+	bytes 1-2:		Battery voltage in millivolt, 0 if unreadable (little endian format)
 
 0x84 get device GPS status
 
-	bytes 1-4:		latitude
-	bytes 5-8:		longitude
-	byte 9-10:		number of satellites
+	bytes 1-4:		Latitude
+	bytes 5-8:		Longitude
+	byte 9-10:		Number of satellites
 	byte 11-12:		HDOP
 	bytes 13-14:		altidute [meter]
 
diff --git a/platformio.ini b/platformio.ini
index b4c12689..9e5e47aa 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -11,11 +11,11 @@
 
 ; ---> SELECT TARGET PLATFORM HERE! <---
 [platformio]
-env_default = heltec
+;env_default = heltec
 ;env_default = ttgov1
 ;env_default = ttgov2
 ;env_default = ttgov21
-;env_default = ttgobeam
+env_default = ttgobeam
 ;env_default = lopy
 ;env_default = lopy4
 ;env_default = fipy
diff --git a/src/hal/ttgobeam.h b/src/hal/ttgobeam.h
index f1d24830..588cfa0b 100644
--- a/src/hal/ttgobeam.h
+++ b/src/hal/ttgobeam.h
@@ -27,7 +27,7 @@
 // non arduino pin definitions
 #define RST LMIC_UNUSED_PIN // connected to ESP32 RST/EN
 #define DIO0 GPIO_NUM_26    // ESP32 GPIO26 <-> HPD13A IO0
-#define DIO1 GPIO_NUM_33 // Lora1 <-> HPD13A IO1 // !! NEEDS EXTERNAL WIRING !!
+#define DIO1 GPIO_NUM_32 // Lora1 <-> HPD13A IO1 // !! NEEDS EXTERNAL WIRING !!
 #define DIO2                                                                   \
   LMIC_UNUSED_PIN // Lora2 <-> HPD13A IO2 // needs external wiring, but not
                   // necessary for LoRa, only FSK

From 745c4b64cc05d5f77b4904de44d2e263b288055c Mon Sep 17 00:00:00 2001
From: Verkehrsrot <cyberman@obh.snafu.de>
Date: Tue, 12 Jun 2018 12:29:18 +0200
Subject: [PATCH 15/15] Update main.h

---
 src/main.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main.h b/src/main.h
index 2d8c9dce..52f7a44f 100644
--- a/src/main.h
+++ b/src/main.h
@@ -5,7 +5,7 @@
 
 // program version - note: increment version after modifications to configData_t
 // struct!!
-#define PROGVERSION "1.3.8" // use max 10 chars here!
+#define PROGVERSION "1.3.81" // use max 10 chars here!
 #define PROGNAME "PAXCNT"
 
 //--- Declarations ---
@@ -35,4 +35,4 @@ void stop_BLEscan(void);
 #ifdef HAS_GPS
 void gps_read(void);
 void gps_loop(void *pvParameters);
-#endif
\ No newline at end of file
+#endif