Support for heltec wireless tracker. And many fixes.

Two weeks hard work.

- Webserver config:
  - Allow freq to be configured down to 430.1000.
    Set to at minimum 430.150 if you use bandwith 250 kHz!
  - Added hint for wifi tcp kiss android config

- platformio.ini:
  - less monolithic lib dependencies, because with
    heltec wireless tracker we have another radiolib and
    a TFT instead of OLED, no AXP chip, etc.
 - heltec section: need to have the many defineshere (two hand full
   are needed for TFT)

- heltec wireless tracker:
  - long press (if WiFi off) sets the tracker to deep sleep (there's no
    real power-off due to the lack of an axp chip. But the current is
    very very low). See also notes at webserver config.
  - uses RadioLib SX126X
  - has no AXP chip, and the VEXT_CTRL pin only switches (both at the
    same time!), gps and tft.
    For power saving ("lora rx disabled" config setting), we can
    call radio.sleep(), and wake it up with radio.standby()
  - If you set gps to allow sleep, VEXT_CTRL turns also TFT. Be aware
    of it, it's not a bug but a hardware limitation.
    GPS sleep is for powersave. TFT off saves also power. That's what
    you should expect.
    On wakeup, tft is reinitialized.
  - Funny: If you do Serial.flush() and immediately call
      setCpuFrequencyMhz(adjust_cpuFreq_to),
    then USB chip is reset to a state before that what
    the esp32 driver inizializes. -> Serial.printf's don't work.
    This lead to
      Serial.print("CPU Freq ad"); Serial.flush();
      setCpuFrequencyMhz(adjust_cpuFreq_to);
      // ..survived
      Serial.printf("justed to: %d MHz\r\n", adjust_cpuFreq_to);
    -> "CPU Freq ad" - and finito.
    => removed the flush()
  - TODO: bluetooth LE support. Unfortunately, the chip lacks support
    for classic bluetooth serial.
    If you need to connect aprsdroid to the device, look at the
    wifi tcp server description.

- TTGO_T-Beam_LoRa_APRS.ino:
  - better platform dependend includes
  - I had a bad usb cable or switch with too less voltage which caused
    the ttgo to reboot
    -> Changes to minimum voltage for shutdown
       Disabled brownout detector (which was per default according  to esp32
       libs)
	WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0);
   Please check if this would be a problem of deep discharging your akku:
     #if defined(T_BEAM_V1_0) || defined(T_BEAM_V1_2)
     -    if (InpVolts > 4.3) {
     +    //if (InpVolts > 4.3) {  // No, my usb hub suddenly only made 4.1V
     +    if (InpVolts > 4.0) {
   I suppose no, because AXP does it's job at thosee devices
  - Needed to define BATTERY_PIN for every hardware
  - Renamed definition of LOW to TXLED_LOW
  - What is key_up, t_lock and time_delay? Wrong, it's for button control. ->
    Changed the names to button_key_up, button_t_lock and button_time_delay
  - LORA_MAX_MESSAGE_LEN is for SX127X (B_RF95 lib), because it
    includes the 4 bytes header. For the RadioLib buffer we need to
    reserver more space.
  - quite nice hack for reusing the display.xxx() routines for tft
    (class Emulated_SSD1306 which provides the needed functions)
  - New OLED_LINE_LEN_MAX instead of hardcoded value 21, because
    heltec TFT has in the normal font a width of 25.
  - RadioLib calls interrupt drivven signal_new_packet_received after a packet
    was receeived.
  - RadioLib special: Added definition for lora speeds / coding rate,
    like they have been addigned in the BG_RF95 lib
  - Pseudo-Sema-Locks: does not work 100%. Avoided endless loop by
    adding ESP.restart after 5min
    Also a delay of 1s in LoraSend() to mitigate lock problems when
    digipeating to the second of the both frequencies.
  - BG_RF95 sometimes causes crashes, esp. in waitPacketSent().
    Introduced a delay. 100ms between sendAprs() and waitPacketSend()
    Changed calls to rf95.waitAvailableTimeout() to rf95.available()
    for stability reasons.
  - richonguzman has a good docu for power readings for non-AXP-chips.
    I use it for the heltec wireles tracker We may think about
    using it on T_BEAM_V0_7 and the rest. Problem: intensive testing
    needed, and the old T_BEAM_V0_7 devices became rare.
  - timer_once_a_second():
      This is ok:
        if (!freeze_display)
          fillDisplayLine1(0); //update time & uptime
      But the following operations destroyed line3to5 for a displayed
      "((RX))" packet. -> Commented it out. No side effects observed-.
  - write2display():
    now uses caching (calls write2display_cached()).
    Reason: TFT flickers when updates happen too often.
    On the other hand, caching on OLED is not possible because calling
    display.clearDisplay() is mandatory, else you get a pixel puzzle
    with old and new characters at each position.
    TFT has no display.display() and also nothing like clearLine.
    -> IF we write a line, we have to add (when using the normal font)
    blanks at the end of the text (up to position 25)-.
    Also, instead of OLED, TFT cannot brak long lins to the next;
    that's why we need to break the line ourself. The "next" lines
    we use in this case must not be cached.
  - fillDisplayLine1: Word "Up:" was behind the uptime value
    (caused by one of the commits of the last weeks). Fixed.
  - If own callsign is still N0CALL, disable lora_tx and set txPower to 0.
  - If during setup init lora chip or display fails, do not for(;;); , but
    sleep 5min and do ESP.restart(). Else you cannot land on the moon ;)
    TODO: check for correct initialization of SX126X chip
  - Removed tuplicate "Time used since start"-message
  - start of taskGPS moved to setup_phase2 section
  - If you double-click (or better "dit daah") the user button, manual
    beacon is triggered (like the behaviour at the end of the section).
    Needed by someone driving a car and cannot look at the display menu
    page number.
  - long press (if WiFi off) sets the heltec wireeless trackeer to deep sleep
    (nearly off - see description above). If wifi is off, press
    two times (first long-press starts webserver; second one does the
    shutdown).
    If tracker is not compiled with WIFI, long-press does a shutdown
    on heltec and a a reboot on other devices. TODO (and TEST!): check if other
    non-AXP-chip esp32 devices would instead also profit from a deep sleep
  - Tests before radio.readData() on SX126X devices are easier
    (no locking; no call comparing to rf95.available()), because
    flag_lora_packet_available is set.
    Changed general variable name packet_available to flag_lora_packet_available.
  - In part "((TX))", enforce a display update:
      fillDisplayLines3to5(1);
    Reason: tracker had his first gps fix and transmits - but the OLED
    showed the old position during TX; the sent packet hat the correct
    current position.

- taskGPS:
  - support for heltec wireless tracker (Pin assignment and correct bitrate)
  - fix:
      -              Serial.println(gpsDataBuffer);
      +              Serial.print(gpsDataBuffer);
- taskTNC:
      -        if (serial_bt_client_is_connected) {
      +        if (enable_bluetooth && serial_bt_client_is_connected) {

- taskWebServer.cpp:
    deadlock protection, as in TTGO_T-Beam_LoRa_APRS.ino

- data_embed: style.css and js.js had many blanks and comments which needed
  a quite large amount of disk space.
  A new script ../tools/remove_comment_from_code.py  (which also can be used
  as a library) removes them, but leaves copyright comments intact. Feel free
  to use it in other projects.

In summuary, many changes
$ git diff|wc -l
    2470

Signed-off-by: Thomas Osterried <dl9sau@darc.de>

INSTALL.md

@@ -4,32 +4,36 @@
 2. Install the missing libraries<br>
 There are two possibilities - either using the Library Manager of PlatformIO or the command line tool:<br>
 <h3>1. Built-In Liabrary Manager</h3>
-Press the PlatformIO HOME Button to enter the Home Screen and there the Libraries Button to add missing libraries:<br>
-<img src="img/img1.jpg" width="480"><br>
-Search and install the following libaries:<br>
+Press the PlatformIO HOME Button to enter the Home Screen and there the Libraries Button to add missing libraries.<br>
+Search and install the following libaries:<br/>
 <ul>
 <li>RadioHead</li>
 <li>TinyGPSPlus</li>
 <li>DHT sensor library for ESPx</li>
 <li>Adafruit SSD1306</li>
 <li>Adafruit GFX Library</li>
+<li>Adafruit BusIO</li>
 <li>Adafruit Unified Sensor</li>
-<li>AXP202X_Library</li>
+<li>https://github.com/SQ9MDD/AXP202X_Library.git (AXP202X_Library)</li>
 <li>OneWire</li>
 <li>DallasTemperature</li>
+<li>SparkFun u-blox Arduino Library</li>
+<li>blanchon/ArduinoJson</li>
+<li>arcao/Syslog</li>
 </ul>
 <br>
 <h3>2. Command Line Tool</h3>
-use the following commands<br>
-platformio lib install "RadioHead"<br>
-platformio lib install "TinyGPSPlus"<br>
-platformio lib install "DHT sensor library for ESPx"<br>
-platformio lib install "Adafruit SSD1306"<br>
-platformio lib install "Adafruit GFX Library"<br>
-platformio lib install "AXP202X_Library"<br>
-platformio lib install "Adafruit Unified Sensor"<br>
-platformio lib install "OneWire"<br>
-platformio lib install "DallasTemperature"<br>
-<br>
-Check that the platformio.ini is available as it holds the board type for PlatformIO.<br>
-After pressing the check mark the code will be compiled, after pressing the arrow it will be compiled and uploaded to a connected TTGO.<br>
+If you issue<br/>
+~/.platformio/penv/bin/pio run<br/>
+It should resolve all dependencies automaticaly, thanks to the definitions in the section "lib_deps =".<br/>
+You could (but not need to) install the libraries by hand:
+<br/>
+platformio lib install "&lt;library name&gt;“
+<br/>
+Check that the platformio.ini is available as it holds the board type for PlatformIO.
+
+<h2>Compile</h2>
+<ul>
+<li>GUI: After pressing the check mark the code will be compiled, after pressing the arrow it will be compiled and uploaded to a connected TTGO.</li>
+<li>platformio-cli: ~/.platformio/penv/bin/pio run -e ttgo-t-beam-v1.0 -t upload --upload-port /dev/cu.SLAB_USBtoUART</li>
+</ul>

data/preferences.cfg

@@ -0,0 +1,76 @@
+{
+  "wifi_en": 1,
+  "wifi_ssid": "EnterSSIDofYourAccesspoint",
+  "wifi_password": "EnterPasswordofYourAccesspoint",
+  "wifi_failAP": true,
+  "wifi_pwrAP": 8,
+  "wifi_pwrSTA": 80,
+  "tncsrvr_en": false,
+  "gpssrv_en": false,
+  "ntp_server": "",
+  "syslog_server": "255.255.255.255",
+  "lora_freq": 433.7750,
+  "lora_speed": 300,
+  "lora_rx_en": true,
+  "lora_tx_en": true,
+  "txPower": 23,
+  "preambleLen": 8,
+  "lora_cradapt": false,
+  "lora_rssi2p": 34,
+  "snraprsis": true,
+  "lora_dig_mode": 1,
+  "lora_dig_x_m": 0,
+  "tx_qrg_bc": 1,
+  "tx_aprsis_bc": true,
+  "tx_aprsis_sm": true,
+  "lora_freq_x": 433.9000,
+  "lora_speed_x": 1200,
+  "txPower_x": 23,
+  "rx_qrg": 1,
+  "aprs_callsign": "N0CALL",
+  "aprs_relay_path": "1",
+  "aprs_s_table": "/",
+  "aprs_symbol": "[",
+  "aprs_comment": "Lora Tracker/iGate",
+  "aprs_lat_p": "00-00.0000N",
+  "aprs_lon_p": "000-00.0000E",
+  "aprs_blist": "",
+  "aprs_fb_interv": 1800,
+  "sb_min_interv": 120,
+  "sb_max_interv": 1800,
+  "sb_min_speed": 5,
+  "sb_max_speed": 70,
+  "sb_angle": 28.0000,
+  "sb_turn_slope": 26,
+  "sb_turn_time": 30,
+  "aprs_batt": true,
+  "aprs_fixed_beac": false,
+  "aprs_alt_r": 100,
+  "aprs_CSandA": true,
+  "gps_enabled": true,
+  "kiss_myloc_ok": true,
+  "gps_sleep_ok": true,
+  "tnc_tel": false,
+  "tnc_tel_int": 3600,
+  "tnc_tel_mic": 0,
+  "tnc_tel_path": "",
+  "oled_enabled": true,
+  "show_cmt": true,
+  "aprs_comm_rt": true,
+  "bt_enabled": true,
+  "usbser_proto": 1,
+  "sh_rxtime": 10,
+  "shutdown_act": true,
+  "shutdown_dt": 10,
+  "reboot_intrvl": 0,
+  "sh_oledtime": 0,
+  "cpufreq": 80,
+  "aprsis_en": true,
+  "aprsis_srv_h": "euro.aprs2.net",
+  "aprsis_srv_p": 14580,
+  "aprsis_fltr": "",
+  "aprsis_call": "",
+  "aprsis_pw": "",
+  "aprsis_2rf": 0,
+  "lora_freq_rx_curr": 433.7750
+}

data/wifi.cfg

@@ -0,0 +1,15 @@
+{
+	"AP": [
+		{
+			"SSID": "EnterSSIDofYourAccesspoint",
+			"password": "EnterPasswordofYourAccesspoint",
+			"prio": 1
+		},
+		{
+			"SSID": "EnterSSIDofYour2ndAccesspoint",
+			"password": "EnterPasswordofYour2ndAccesspoint"
+		}
+	],
+
+        "SelfAP_PW": "xxxxxxxxxx"
+}

data_embed/index.html

@@ -19,32 +19,100 @@
         </div>
         <article>
             <form action="/save_wifi_cfg" method="post">
-                <div class="grid-container quarters">
+                <div class="grid-container full">
+                    <div>
+                        <label for="wifi_en">Enable Wifi</label>
+                        <select id="wifi_en" name="wifi_en">
+                            <option value="1">1: Wifi may be off if bluetooth client is connected in between 60s on boot (recommended, see below)</option>
+                            <option value="2">2: Wifi on (during hardware limitation, bluetooth will be disabled on LORA32_21 devices)</option>
+                            <option value="0">0: Wifi off (see below for hints and caveats)</option>
+                        </select>
+                    </div>
+                </div>
+               <div class="grid-container full">
+                       <h5 class="u-full-width">AP settings</h5>
+               </div>
+                <div class="grid-container halves">
+                    <div>
+                        <label for="ap_password">AUTO AP Password</label>
+                        <input type="password" name="ap_password" id="ap_password" placeholder="AUTO AP Password" title="AUTO AP Password, 8 characters minimum">
+                    </div>
+                    <div>
+                        <label for="wifi_pwrAP">TXPWR as AP</label>
+                        <select id="wifi_pwrAP" name="wifi_pwrAP">
+                            <option value="8">Min (2dBm, 2mW, suggested)</option>
+                            <option value="44">Low (11dBm, 12mW)</option>
+                            <option value="60">Mid (15dBm, 32mW)</option>
+                            <option value="72">High (18dBm, 63mW)</option>
+                            <option value="80">Max (20dBm, 100mW)</option>
+                        </select>
+                    </div>
+                </div>
+                <div class="grid-container full">
+                        <h5 class="u-full-width">STA settings</h5>
+                </div>
+                <div class="grid-container full">
                     <div id="wifi_list">
                         <label for="wifi_ssid">Network</label>
                         <input type="button" value="Scan WiFi" id="scan_wifi_btn" onclick="scanWifi();">
                     </div>
+                </div>
+                <div class="grid-container thirds">
                     <div>
                         <label for="wifi_ssid">WiFi SSID</label>
-                        <input class="u-full-width" type="text" name="wifi_ssid" placeholder="Your Wifi SSID" title="Your Wifi SSID" id="wifi_ssid">
+                        <input type="text" name="wifi_ssid" placeholder="Your Wifi SSID" title="Your Wifi SSID" id="wifi_ssid">
                     </div>
                     <div>
                         <label for="wifi_password">WiFi Password</label>
-                        <input class="u-full-width" type="password" name="wifi_password" id="wifi_password" placeholder="Your WiFi Password" title="Your WiFi Password, 8 characters minimum">
+                        <input type="password" name="wifi_password" id="wifi_password" placeholder="Your WiFi Password" title="Your WiFi Password, 8 characters minimum">
                     </div>
                     <div>
-                        <label for="ap_password">AUTO AP Password</label>
-                        <input class="u-full-width" type="password" name="ap_password" id="ap_password" placeholder="AUTO AP Password" title="AUTO AP Password, 8 characters minimum">
+                        <label for="wifi_pwrSTA">TXPWR as STA</label>
+                        <select id="wifi_pwrSTA" name="wifi_pwrSTA">
+                            <option value="80">Max (20dBm, 100mW, suggested)</option>
+                            <option value="8">Min (2dBm, 2mW)</option>
+                            <option value="44">Low (11dBm, 12mW)</option>
+                            <option value="60">Mid (15dBm, 32mW)</option>
+                            <option value="72">High (18dBm, 63mW)</option>
+                        </select>
                     </div>
                 </div>
-                <div class="grid-container quarters">
+                <div class="grid-container halves">
                     <div>
                         <label for="ntp_server">NTP Server</label>
-                        <input type="text" name="ntp_server" id="ntp_server" placeholder="pool.ntp.org" title="NTP Server or IP Address. I.e. pool.ntp.org. If your igate is in the HAMNET, use ntp.hc.r1.ampr.org">
-                      </div>
+                        <input type="text" name="ntp_server" id="ntp_server" placeholder="pool.ntp.org" title="NTP Server name or IP Address. I.e. pool.ntp.org. If your igate is in the HAMNET, use ntp.hc.r1.ampr.org.">
+                    </div>
+                    <div>
+                        <label for="syslog_server">Syslog Server</label>
+                        <input type="text" name="syslog_server" id="syslog_server" placeholder="" title="Syslog Server name or IP Address. Leave empty to switch off. If unsure, you may use the broadcast address 255.255.255.255. Syslog needs do be compiled in (it's by default now)">
+                    </div>
+                </div>
+                <div class="grid-container thirds">
+                    <div>
+                        <label for="wifi_failAP">Allow failback to Mode AP</label>
+                        <input name="wifi_failAP" id="wifi_failAP" type="checkbox" value="1" title="
+If a remoteAP is configured or uptime <3min (grace time for him to be able to reach Webinterface for change config):
+  If wifi-client is connected:
+    If wifi_do_fallback_mode is enabled, we'll keep his connection alive.
+    else: we'll disconnect the wifi-client and search for a remoteAP
+  else: search for a remoteAP
+else:
+   selfAP will stay on and connections are not interrupted.
+
+Disable this for igates, where you don't need your tracker to be a hotspot; or if your phone (which knows your tracker's AP SSID) should not mis-interprete the tracker as Wifi-Hotspot with Internet-Access.
+You like to enable, if you use your tracker portable and it should automatically be wifi client to your home network, and be AP if you are outside, and should not search for a remoteAP.">
+                    </div>
+                    <div>
+                        <label for="tncsrvr_en">Enable TNC-Server</label>
+                        <input name="tncsrvr_en" id="tncsrvr_en" type="checkbox" value="1" title="Enable TNC-Server (KISS over TCP) on port tcp 8001. If your device in open networks like HAMNET, enable it only when needed and consider firewalling. If you use aprsdroid connected to this devices in WiFi-mode-AP, configure: 'Protocol' 'TNC (KISS)', 'Connection type' 'TCP/IP' and 'Server' '192.168.4.1:8001'">
+                    </div>
+                    <div>
+                        <label for="gpssrv_en">Enable GPS-Server</label>
+                        <input name="gpssrv_en" id="gpssrv_en" type="checkbox" value="1" title="Enable GPS-Server (NMEA on port tcp 10110. If your device in open networks like HAMNET, enable it only when needed and consider firewalling.">
+                    </div>
                 </div>
                 <div class="grid-container full">
-                    <input class="button-primary" type="submit" value="Save">
+                    <input class="button-primary" type="submit" value="Save (reboot needed after changes in this section)">
                 </div>
             </form>
         </article>
@@ -61,7 +129,7 @@
                 <div class="grid-container halves">
                     <div>
                         <label for="lora_freq">Main Frequency [MHz]</label>
-                        <input name="lora_freq" id="lora_freq" type="number" min="433.0000" max="928.0000" step="0.0001" title="LoRa center frequency between 433.0001 and 928.0000. I.e. 433.775">
+                        <input name="lora_freq" id="lora_freq" type="number" min="430.1000" max="928.0000" step="0.0001" title="LoRa center frequency between 430.1000 and 928.0000. I.e. 433.775">
                     </div>
                     <div>
                         <label for="lora_speed">Speed</label>
@@ -76,16 +144,20 @@
                     </div>
                     <div>
                         <label for="lora_tx_en">Enable LoRa transmitter</label>
-                        <input name="lora_tx_en" id="lora_tx_en" type="checkbox" value="1" title="Allow TX on LoRa. Disable this if you like to prevent TX under all circumstances (i.e. if your tracker is behind an rx-amplifier)">
+                        <input name="lora_tx_en" id="lora_tx_en" type="checkbox" value="1" title="Allow TX on LoRa. Disable this if you like to prevent TX under all circumstances (i.e. if your tracker is behind an rx-amplifier). If this checkbox keeps off after trying to enable, you might check if your configured CALLSIGN-SSID is correct (see explanation there).">
                     </div>
                     <div>
                         <label for="lora_rx_en">Enable LoRa receiver</label>
-                        <input name="lora_rx_en" id="lora_rx_en" type="checkbox" value="1" title="Allow RX on LoRa. Disable this if you need to save power consumption.">
+                        <input name="lora_rx_en" id="lora_rx_en" type="checkbox" value="1" title="Allow RX on LoRa. Disable this if you need to save power consumption; LoRa chip will be only powered on during TX. Only honored if lora_digipeating_mode == 0 and no bluetooth client is connected on boot">
                     </div>
                     <div>
                         <label for="txPower">TX power [dBm]</label>
                         <input name="txPower" id="txPower" type="number" min="0" max="23" title="LoRa TX Power. Range 0 to 23dBm">
                     </div>
+                    <div>
+                        <label for="preambleLen">TX preamble length [symbols]</label>
+                        <input name="preambleLen" id="preambleLen" type="number" min="8" max="4096" title="A larger preamble size improves packet detection but increases transmission time. Range 8 to 4096 symbols. 8 is default. Please experiment with 12. This setting only affects transmission on Main frequency." placeholder="8">
+                    </div>
                     <div>
                         <label for="lora_cradapt">Automatic CodeRate adaption on TX</label>
                         <input name="lora_cradapt" id="lora_cradapt" type="checkbox" value="1" title="Enable automatic CR adaption. Has only influence on TX (RX can decode every CR). Use this only if you are not a WIDE1 or WIDE2 digi (here you like to send always with higher speed). Still testing, if it behaves good to our network. Currently works only for SF12 modes, because for SF 10 and lower the code for programming CR+SF+BW-combination has not been written yet">
@@ -116,16 +188,16 @@
                           <option value="56">To APRSIS* and RF* and KISS* (also a good setting!)</option>
                           <option value="35">To APRSIS* and RF and KISS (~)</option>
                           <option value="49">To APRSIS* and RF and KISS* (~)</option>
-                          <option value="57">!Too much options. GUI needs redisign!</option>
-                          <option value="9">!I.e. To RF* and RF would not make any sense!<option>
+                          <option value="57">!Too much options. GUI needs redesign!</option>
+                          <option value="9">!I.e. To RF* and RF would not make any sense!</option>
                         </select>
                     </div>
-                </div>
-                <div class="grid-container halves">
-                    More info for SNR/RSSI path encoding see documentation section below
                     <div>
                         <label for="snraprsis">SNR/RSSI-encoding on kiss: compatible to APRS-IS?</label>
                         <input name="snraprsis" id="snraprsis" type="checkbox" value=1 title="Add snr+rssi at last digipeater, without digipeated flag. Use this for APRS-IS connections. If you have connected a digipeater software to kiss, this option has to be switched off">
+                        <div>
+                            More info for SNR/RSSI path encoding see documentation section below
+                        </div>
                     </div>
                 </div>
                 <div class="grid-container full">
@@ -133,12 +205,12 @@
                 </div>
                 <div class="grid-container quarters">
                     <div>
-                        <label for="aprs_callsign">Callsign and SSID</label>
-                        <input class="u-full-width" type="text" minlength="3" maxlength="9" name="aprs_callsign" placeholder="NOCALL-1" id="aprs_callsign" title="your callsign with SSID">
+                        <label for="aprs_callsign">Callsign and SSID *</label>
+                        <input class="u-full-width" type="text" minlength="3" maxlength="9" name="aprs_callsign" placeholder="NOCALL-1" id="aprs_callsign" title="your callsign with SSID. SSID is optional and should be in the range of -1 to -15. SSIDs like '-L4' are ok for aprs-is, but should not be sent on RF; thus LoRa TX will be disabled.">
                     </div>
                     <div>
                         <label for="aprs_relay_path">Relay Path</label>
-                        <input class="u-full-width" type="text" minlength="0" name="aprs_relay_path" id="aprs_relay_path" title="APRS path, use the shortest as possible, ECHO, WIDE1-1 or WIDE2-1. If you really need a fill-in-digi, choose WIDE1-1,WIDE2-1. RFONLY or NOGATE must not be set in front of WIDEn-m. WIDE2-1,WIDE1-1 is not valid. The path with value '1' enables dest-path-digi-notation (like DL9SAU>APRS-1:..) instead of Path ..,WIDE1-1:... If you are a transmitting igate, please leave empty (or set it to Q. See below). About the SNR/RSSI-Path feature: You may request to add SNR/RSSI by adding 'Q' to your path (i.e. 'WIDE1-1,Q'; for transmitting igates (and balloons, aircrafts, ..), only 'Q' is recommended). Then only the first digi (or igate) adds SNR/RSSI to the path. If you add 'QQ' instead of 'Q' to your path (i.e. 'WIDE1-1,QQ'). Then every digi and igate adds SNR/RSSI to the path (useful for analyzing RF net quality). Use with care; resulting longer path consumes a bit more airtime.">
+                        <input class="u-full-width" type="text" minlength="0" name="aprs_relay_path" id="aprs_relay_path" title="APRS path, use the shortest as possible, WIDE1-1 or WIDE2-1. If you really need a fill-in-digi, choose WIDE1-1,WIDE2-1. RFONLY or NOGATE must not be set in front of WIDEn-m. WIDE2-1,WIDE1-1 is not valid. The path with value '1' enables dest-path-digi-notation (like DL9SAU>APRS-1:..) instead of Path ..,WIDE1-1:... If you are a transmitting igate, please leave empty (or set it to Q. See below). About the SNR/RSSI-Path feature: You may request to add SNR/RSSI by adding 'Q' to your path (i.e. 'WIDE1-1,Q'; for transmitting igates (and balloons, aircrafts, ..), only 'Q' is recommended). Then only the first digi (or igate) adds SNR/RSSI to the path. If you add 'QQ' instead of 'Q' to your path (i.e. 'WIDE1-1,QQ'). Then every digi and igate adds SNR/RSSI to the path (useful for analyzing RF net quality). Use with care; resulting longer path consumes a bit more airtime.">
                     </div>
                     <div>
                         <label for="aprs_s_table">Symbol Table</label>
@@ -149,69 +221,135 @@
                         <input class="u-full-width" type="text" minlength="1" maxlength="1" name="aprs_symbol" id="aprs_symbol" title="select an icon, for example: [ - jogger, Y - jacht, > - car, b - bike">
                     </div>
                     <div>
-                        <label for="aprs_alt">Show Altitude</label>
-                        <input name="aprs_alt" id="aprs_alt" type="checkbox" value="1" title=" show altitude as frame part">
+                        <label for="aprs_objnam">ObjectName (optional)</label>
+                        <input class="u-full-width" type="text" minlength="0" maxlength="9" name="aprs_objnam" id="aprs_objnam" title="This is optional; most users will leave this empty. If you set this to DL1AAA-L4 because like to see your gateway as DL1AAA-L4 on the map (and also like to send on RF), we'll send our position as type APRS Object (instead of a normal aprs position), with the configured Callsign you configured above.">
+                    </div>
+                    <div>
+                        <label for="aprs_alt_r">Altitude ratio [%]</label>
+                        <input name="aprs_alt_r" id="aprs_alt_r" type="number" min="0" max="100" title="Altitude ratio every n'th packet.. Use 100 for every packet, 0 for no altitude, or any number in between. Recommended: 10 (altitude every tenth's beacon). If you use compression ('Send Course/Speed along with Altitude switched off') for reducing airtime (-> then n% altitude-encoding packets are sent, and 100-n% course/speed-encoded packets), you may choose 50 for ballons, where speed/dir and altitude are of equal interrest; if you choose 10, then 90 % of your transmissions encode speed/direction. Cave: if you set it to 100 and switch next option 'Always send CSE/SPD and ALT' to off, then only altitude packets are sen; if you switch the next option on, then altitude is always sent and this configured Altitude ratio is ignored. If you configure 0, altitude is never sent (-> only compressed speed). If ratio is < 100 and gps altitude is not refreshed, only encoded speed is sent." placeholder="10">
+                    </div>
+                    <div>
+                        <label for="aprs_CSandA">Always send CSE/SPD and ALT</label>
+                        <input name="aprs_CSandA" id="aprs_CSandA" type="checkbox" value="1" title="If set to on, course/speed and altitude are always sent both in one (larger) packet. If gps signal for course/speed is valid, cse/spd will be encoded in the compressed part and altitude is added as /A=...... in the message-part (this actually overwrites altitude ratio = 100 setting in most cases). If set off, either compressed cse/spd OR compressed altitude packets are sent, according to the 'Altitude ratio' setting.">
                     </div>
                     <div>
                         <label for="show_cmt">Show Comment</label>
                         <input name="show_cmt" id="show_cmt" type="checkbox" value="1" title=" show comment text">
                     </div>
-                    <div>
-                        <label for="aprs_comment">Comment</label>
-                        <input class="u-full-width" type="text" minlength="0" maxlength="64" name="aprs_comment" id="aprs_comment" title=" personal comment">
-                    </div>
                     <div>
                         <label for="aprs_comm_rt">Ratelimit adding comment text</label>
                         <input name="aprs_comm_rt" id="aprs_comm_rt" type="checkbox" value="1" title="If enabled, comment text is sent only every tenth's transmission. Saves airtime.">
                     </div>
+                    <div>
+                        <label for="aprs_comment">Comment</label>
+                        <input class="u-full-width" type="text" minlength="0" maxlength="64" name="aprs_comment" id="aprs_comment" title=" personal comment">
+                    </div>
                     <div>
                         <label for="aprs_batt">Show Battery</label>
                         <input name="aprs_batt" id="aprs_batt" type="checkbox" value="1" title=" show battery voltage after personal comment">
                     </div>
+                    <div>
+                        <label for="aprs_stat_wl">Add winlink notification to position comment once/hour</label>
+                        <select id="aprs_stat_wl" name="aprs_stat_wl">
+                            <option value="0">off (default)</option>
+                            <option value="1">on, if bluetooth kiss device is connected</option>
+                            <option value="2">on</option>
+                        </select>
                     </div>
-                    <div class="grid-container full">
-                        <h5 class="u-full-width">Telemetry Settings</h5>
+                    <div>
+                        <label for="aprs_stat_qrt">Send Status-packet on shutdown</label>
+                        <input name="aprs_stat_qrt" id="aprs_stat_qrt" type="checkbox" value="1" title=" Send status packet 'QRT' right before shutdown on RF. See also option 'Auto power off' if external power is switched off">
                     </div>
-                    <div class="grid-container quarters">
+                    <div>
+                        *) requires reboot only if connection to aprs-is enabled
+                    </div>
+                </div>
+                <div class="grid-container full">
+                    <h5 class="u-full-width">Telemetry Settings</h5>
+                </div>
+                <div class="grid-container thirds">
                     <div>
                         <label for="tnc_tel">Enable Self Telemetry</label>
                         <input name="tnc_tel" id="tnc_tel" type="checkbox" value="1" title="send self telemetry data">
                     </div>
+                    <div>
+                        <label for="tnc_tel_rf">Allow TX on RF</label>
+                        <select id="tnc_tel_rf" name="tnc_tel_rf" title="LoRa is too slow for telemetry. Only on secondary qrg, TX is acceptable: if speed is >= 1200 (comparable to 1k2 AFSK APRS on 2m). We will not add a digipeater to the packet header. TX on main qrg is disabled; there are very few useful reasons, i.e. balloon missions. Read the comment in the source code; you need to hack and recompile.">
+                            <option value="0">no (good!)</option>
+                            <option value="2">on secondary qrg (acceptable)</option>
+                            <option value="1">on main qrg (bad)</option>
+                            <option value="3">on both frequencies (even worse)</option>
+                        </select>
+                    </div>
                     <div>
                         <label for="tnc_tel_int">Self Telemetry Interval [s]</label>
-                        <input name="tnc_tel_int" id="tnc_tel_int" type="number" min="600" title="time between sending telemetry if Enable Self Telemetry option is selected. 3600 is recommended.">
+                        <input name="tnc_tel_int" id="tnc_tel_int" type="number" min="600" title="time between sending telemetry if Enable Self Telemetry option is selected. 3600 is recommended. Min 600.">
                     </div>
                     <div>
                         <label for="tnc_tel_mic">Self Telemetry Sequence</label>
-                        <select id="tnc_tel_mic" name="tnc_tel_mic" title="self telemetry sequence type (numeric supported by aprs.fi and aprsdirect.com)">
+                        <select id="tnc_tel_mic" name="tnc_tel_mic" title="self telemetry sequence type (only 'numeric' sequences and 'time based numeric sequences' are supported by aprs.fi and aprsdirect.de). Time based secuence needs a proper system time (GPS or NTP); else it fails back to 'MIC'. Sequence overflow: Type 'time based, alphanumeric' uses digits and letters 0-9,A-Z,a-z and has a resolution of 23s in two months; 'numeric timebased' has only digits and has resolotuin of 10min in one week. Type 'Numeric' (except for numeric time based): Caution: sequence number is stored to flash; flash has a limited number of writes before it becomes defect.">
+                            <option value="-2">Time based, numeric encoding</option>
+                            <option value="-1">Time based, alphanumeric encoding</option>
                             <option value="0">Numeric</option>
                             <option value="1">MIC</option>
                         </select>
                     </div>
                     <div>
                         <label for="tnc_tel_path">Self Telemetry Relay Path</label>
-                        <input class="u-full-width" type="text" minlength="0" name="tnc_tel_path" id="tnc_tel_path" title="APRS path for self telemetry, use the shortest as possible (émpty path ith recommended. Or ECHO or WIDE2-1 or WIDE1-1). ">
+                        <input class="u-full-width" type="text" minlength="0" name="tnc_tel_path" id="tnc_tel_path" title="APRS path for self telemetry, use the shortest as possible (empty path is recommended; for aprs-is connection, no path is necessary). Or use WIDE2-1. Path is not honored on RF transmission.">
                     </div>
                 </div>
                 <div class="grid-container full">
                     <h5 class="u-full-width">Fixed Beaconing Settings</h5>
                 </div>
-                <div class="grid-container quarters">
+                <div class="grid-container thirds">
                     <div>
                         <label for="aprs_fixed_beac">Fixed Beacon</label>
-                        <input name="aprs_fixed_beac" id="aprs_fixed_beac" type="checkbox" value="1" title="enable fixed beacon when GPS is disabled or no fix, disables Smart Beaconing">
+                        <input name="aprs_fixed_beac" id="aprs_fixed_beac" type="checkbox" value="1" title="enable fixed beacon when GPS is disabled or no fix". If set to off, your tracker will not send the configured fixed position (but only the current GPS position, after GPS-fix), except: if you maually send a position-beacon (using middle button, web-interface, cli), it starts sending in Fixed Beacon Interval (like Fixed Beacon would be enabled)>
                     </div>
                     <div>
                         <label for="aprs_fb_interv">Fixed Beacon Interval [s]</label>
-                        <input name="aprs_fb_interv" id="aprs_fb_interv" type="number" min="120" title="time between sending a beacon if Fixed Beacon option is selected. 1800 or 3600 is recommended for users; 900 or 1800 for digis.">
+                        <input name="aprs_fb_interv" id="aprs_fb_interv" type="number" min="120" title="time between sending a beacon if Fixed Beacon option is selected. 1800 or 3600 is recommended for users; 900 or 1800 for digis. Min 120. This beacon value is also used if GPS is lost when smart-beacooning. If it is >= sb_max_intervall, this value is used.">
                     </div>
+                </div>
+                <div class="grid-container thirds">
                     <div>
                         <label for="aprs_lat_p">Latitude</label>
-                        <input class="u-full-width" type="text" minlength="0" name="aprs_lat_p" id="aprs_lat_p" title="latitude for fixed beacon, APRS format for example: 5215.00N. 'dd.nnnnS', '-dd.nnnn', 'dd mm[.nnn]' and 'dd mm ss' and 'dd mm' ss&quot;' and 'dd-mm[.nn]N' are also supported. If position is south, you can prefix '-' instead of writing 'S' behind the coordinate. '-nnS' does not make sense. If you like to add a locator, add it here and leave longitude field blank. If GPS is enabled and a valid position has been received, that one will be used instead of the configured one, until the next system reboot">
+                        <input type="text" minlength="0" name="aprs_lat_p" id="aprs_lat_p" title="latitude for fixed beacon, APRS format for example: 5215.00N (this is ddmm.mmN). 'dd.nnnnN', '-dd.nnnn', 'dd mm[.nnn]' and 'dd mm ss' and 'dd mm' ss&quot;' and 'dd-mm[.nn]N' are also supported. If position is south, you can prefix '-' instead of writing 'S' behind the coordinate. '-nnS' does not make sense. If you like to add a locator, add it here and leave longitude field blank. APRS spec defindes a special notation for null-position: 0000.00N 00000.00W (W, not E). If GPS is enabled and a valid position has been received, that one will be used instead of the configured one, until the next system reboot">
                     </div>
                     <div>
                         <label for="aprs_lon_p">Longitude</label>
-                        <input class="u-full-width" type="text" minlength="0" name="aprs_lon_p" id="aprs_lon_p" title="longtitude for fixed beacon, APRS format for example 02050.59E. 'ddd.nnnnS', '-ddd.nnnn',  'ddd mm[.nnn]' and 'ddd mm ss' and 'ddd mm' ss&quot;' and 'ddd-mm[.nn]E' are also supported. If position is west, you can prefix '-' instead of writing 'W' behind the coordinate. '-nnW' does not make sense.. If you like to add a locator, add it to the latitude field and leave this field blank.">
+                        <input type="text" minlength="0" name="aprs_lon_p" id="aprs_lon_p" title="longtitude for fixed beacon, APRS format for example 02050.59Ei (this is ddd.mmE). 'ddd.nnnnE', '-ddd.nnnn',  'ddd mm[.nnn]' and 'ddd mm ss' and 'ddd mm' ss&quot;' and 'ddd-mm[.nn]E' are also supported. If position is west, you can prefix '-' instead of writing 'W' behind the coordinate. '-nnW' does not make sense.. If you like to add a locator, add it to the latitude field and leave this field blank. APRS spec defindes a special notation for null-position: 0000.00N 00000.00W (W, not E). If GPS is enabled and a valid position has been received, that one will be used instead of the configured one, until the next system reboot">
+                    </div>
+                    <div>
+                        <label for="aprs_llfgps">Instead, store current GPS position</label>
+                        <input name="aprs_llfgps" id="aprs_llfgps" type="checkbox" value="1" title="Use lat/lon of current GPS position. Overwrites Latitude / Longitude settings above. Requires valid GPS position.">
+                    </div>
+                </div>
+                <div class="grid-container full">
+                    <h5 class="u-full-width">Position format and precision / ambiguity</h5>
+                </div>
+                <div class="grid-container full">
+                    <div>
+                        <label for="pos_amb">Position precision *</label>
+                        <select id="pos_amb" name="pos_amb" title="Position precision / Ambiguity
+I.   High precision: default is compressed (sends cse/speed or altitude without overhead; position is more acurate than uncompressed position, and needs only 8 bytes for lat/lon (but the price is, that the position is not human readable) and it's resolution is 29.17cm for latitude distances, and up to 58.34cm for longitude. Be aware that course has a resolution of only 4 degrees, and height resolution is non-linear (1.002^cs), and could not be negative.
+     Uncompressed (APRS default notation) is not very precise: >18.52m (APRS Notation 1234.56N/01234.56E == 12-34.56N 012-34.56E).
+  Uncompressed can be enhanced with the DAO extension in Text message part: !W..!: 1.852m or !w..!: 20.35cm to 22.39cm. DAO W is better human readable; DAO w is base91-encoded (-> precision loss for the decimals 3+4 by factor 1.10); good for manually positioning your digipeager antenna or fox hunting equipment on the map - but keep in mind that your GPS does not have this great precision anyway.
+     Uncompressed (with / without DAO): If GPS signal is lost and you was not moving and last coordinates have not changed, DAO variant will still be used if configured.
+II:  Ambiguiti 1/10' -> >185.2m), 1' -> > 1.852km, 10' -> >18.12km, 1 deg == 60'-> >111.12km. Works for both modes, compressed and uncompressed.
+III: Values above are referring to latitude; distance between two latitudes is always equal; distance between two longitudes becomes smaller towards the north / south poles of the earth (at 0 deg, even high values  align to 0.0m). At aequator, lat/lon relation is 1:1. At 60 deg N or S it's about factor 2).
+     Keep in mind: While this is is good for high precision, it's worse for ambiguity.
+     Compressed positions have a 2 times lesser precision on the longitude, which leads to factor 1:2 at aequator, and an 1:1 ratio at abt. 60 deg N or S); this is comparable how maidenhead grid locators are defined.">
+                            <option value="0">Compressed (default) == >25.17cm</option>
+                            <option value="-1">Uncompressed == >18.52m.</option>
+                            <option value="-2">Uncompressed, with DAO W == >1.852m</option>
+                            <option value="-3">Uncompressed, with DAO w == >20.35cm</option>
+                            <option value="1">Ambiguity 1/10' == 185.2m</option>
+                            <option value="2">Ambiguity 1' == >1.852km</option>
+                            <option value="3">Ambiguity 10' == >18.12km</option>
+                            <option value="4">Ambiguity 1 deg == 60' == >111.12km</option>
+                        </select>
                     </div>
                 </div>
                 <div class="grid-container full">
@@ -220,42 +358,48 @@
                 <div class="grid-container quarters">
                     <div>
                         <label for="sb_min_interv">Min interval [s]</label>
-                        <input name="sb_min_interv" id="sb_min_interv" type="number" min="10" title="Minimal time for Smart Beaconing. 60 is recommended">
+                        <input class="u-full-width" name="sb_min_interv" id="sb_min_interv" type="number" min="10" title="Minimal time for Smart Beaconing. 60 is recommended. Min 10.">
                     </div>
                     <div>
                         <label for="sb_max_interv">Max interval [s]</label>
-                        <input name="sb_max_interv" id="sb_max_interv" type="number" min="120" title="Maximal time for Smart Beaconing. 1800 is recommended">
+                        <input class="u-full-width" name="sb_max_interv" id="sb_max_interv" type="number" min="90" title="Maximal time for Smart Beaconing. 1800 is recommended. Min 90.">
                     </div>
-                </div>
-                <div class="grid-container quarters">
                     <div>
                         <label for="sb_min_speed">Min speed [km/h]</label>
-                        <input name="sb_min_speed" id="sb_min_speed" type="number" min="0" title="Minimal speed for Smart Beaconing">
+                        <input class="u-full-width" name="sb_min_speed" id="sb_min_speed" type="number" min="0" title="Minimal speed for Smart Beaconing. Min 0.">
                     </div>
                     <div>
                         <label for="sb_max_speed">Max speed [km/h]</label>
-                        <input name="sb_max_speed" id="sb_max_speed" type="number" min="1" title="Maximal speed for Smart Beaconing">
+                        <input class="u-full-width" name="sb_max_speed" id="sb_max_speed" type="number" min="1" title="Maximal speed for Smart Beaconing. Min 1.">
                     </div>
                 </div>
-                <div class="grid-container quarters">
+                <div class="grid-container thirds">
                     <div>
                         <label for="sb_angle">Course change [degrees]</label>
-                        <input name="sb_angle" id="sb_angle" type="number" min="5" max="360" title="Angle of course change to speed up beacon transmission. Recommended value: 28">
+                        <input name="sb_angle" id="sb_angle" type="number" min="5" max="360" title="Angle of course change to speed up beacon transmission. Recommended value: 28. Range 5 to 360.">
                     </div>
                     <div>
                         <label for="sb_turn_slope">Turn Slope [degrees]</label>
-                        <input name="sb_turn_slope" id="sb_turn_slope" type="number" min="5" max="255" title="Smart beaconing turn slope. Use 7 for pedestrian, 11 for low/mid speed and 26 for high speed. Recommended value: 26">
+                        <input name="sb_turn_slope" id="sb_turn_slope" type="number" min="5" max="255" title="Smart beaconing turn slope. Use 7 for pedestrian, 11 for low/mid speed and 26 for high speed. Recommended value: 26. Range 5 to 255.">
                     </div>
                     <div>
                         <label for="sb_turn_time">Turn Time [seconds]</label>
-                        <input name="sb_turn_time" id="sb_turn_time" type="number" min="5", title="Smart beaconing turn time. Wait at least this amount of seconds for next beacon. Recommended value: 30">
+                        <input name="sb_turn_time" id="sb_turn_time" type="number" min="5", title="Smart beaconing turn time. Wait at least this amount of seconds for next beacon. Recommended value: 30. Min 5.">
                     </div>
                 </div>
                 <div class="grid-container quarters">
                     <div>
-                        <label for="gps_enabled">GPS enabled</label>
+                        <label for="gps_enabled">GPS enabled *</label>
                         <input name="gps_enabled" id="gps_enabled" type="checkbox" value="1" title="enable or disable GPS">
                     </div>
+                    <div>
+                        <label for="gps_pwrsve">GPS powersaving mode</label>
+                        <select id="gps_pwrsve" name="gps_pwrsve" title="If there's no GPS fix, allow GPS to go to sleep (chip powered off; taskGPS will suspend). Chip awakes for 1 minute, looking for a fix; if no ifx, sleeps again. Sleep interval is: 1min, 2min, 4min, 8min, 1min, ... You can decide if it may always sleep, or only when you run on battery (default), or if GPS should always be on (according to GPS enabled setting).">
+                          <option value="1">GPS may sleep when running on battery (default)</option>
+                          <option value="2">GPS always may sleep</option>
+                          <option value="0">Ignore this feature</option>
+                        </select>
+                    </div>
                     <div>
                         <label for="kiss_myloc_ok">Accept own positions via KISS</label>
                         <input name="kiss_myloc_ok" id="kiss_myloc_ok" type="checkbox" value="1" title="If set to true, we'll stop sending own position beacons if we heard a position from our call via kiss. Uncheck this, if you like to filter out those positions and keep sending it by this device.">
@@ -264,22 +408,25 @@
                         <label for="gps_sleep_ok">Allow GPS sleep while own positions received via KISS</label>
                         <input name="gps_sleep_ok" id="gps_sleep_ok" type="checkbox" value="1" title="If we have a kiss client like aprsdroid, or a digipeater software, which sends own positions (with same call as ours), we pause sending own positions (neither fixed nor smart beaconing). Uncheck, if you have a display attached and still like to see your current GPS position. This option is only honored if configuration 'Accept own positions via KISS' enabled. Why? If your filter out own positions from and this device sends on it's own, it needs gps running ;)">
                     </div>
+                    <div>
+                            *) requires reboot only if you change enable/disable GPS
+                    </div>
                 </div>
                 <div class="grid-container full">
-                    <h6 class="u-full-width">Additional settings for secondary frequency:<br/>EXPERIMANTAL - USE WITH CARE!</h6>
+                    <h6 class="u-full-width">Additional settings for secondary frequency:<br/>EXPERIMENTAL - USE WITH CARE!</h6>
                 </div>
                 <div class="grid-container halves">
                     <div>
                         <label for="lora_freq_x">Secondary Frequency [MHz]</label>
                         (for cross-repeating or listening transmissions from igates)</label>
-                        <input name="lora_freq_x" id="lora_freq_x" type="number" min="0.0000" max="928.0000" step="0.0001" title="LoRa center frequency - must be different from main frequency and between 433.0001 and 928.0000 or 0 if not needed. I.e. 433.900">
+                        <input name="lora_freq_x" id="lora_freq_x" type="number" min="430.1000" max="928.0000" step="0.0001" title="LoRa center frequency - must be different from main frequency and between 430.0000 and 928.0000 or 0 if not needed. I.e. 433.900">
                     </div>
                     <div>
                         <label for="txPower_x">TX power on secondary frequency [dBm]</label>
                         <input name="txPower_x" id="txPower_x" type="number" min="0" max="23" title="LoRa TX Power on secondary frequency. Range 0 to 23dBm">
                     </div>
                 </div>
-                <div class="grid-container halves">
+                <div class="grid-container full">
                     <div>
                         <label for="lora_speed_x">Speed on secondary frequency</label>
                         <select id="lora_speed_x" name="lora_speed_x">
@@ -308,9 +455,9 @@
                     </div>
                 </div>
                 <div class="grid-container full">
-                    <h6 class="u-full-width">Additional settings for mode repater:<br/>EXPERIMANTAL - USE WITH CARE!</h6>
+                    <h6 class="u-full-width">Additional settings for mode repater:<br/>EXPERIMENTAL - USE WITH CARE!</h6>
                 </div>
-                <div class="grid-container halves">
+                <div class="grid-container full">
                     <div>
                         <label for="lora_dig_mode">LoRa Repater Mode</label>
                         <select id="lora_dig_mode" name="lora_dig_mode">
@@ -321,36 +468,42 @@
                         </select>
                     </div>
                 </div>
+                <div class="grid-container full">
+                    <div>
+                        <label for="lora_myalias">My alias for digipeating (optional)</label>
+                        <input class="u-full-width" type="text" minlength="0" maxlength="9" name="lora_myalias" id="lora_myalias" title="My alias for digipeting (empty recommended). Kenwood users know it as UITRACE. We repeat this alias, if found in first position of the path and if it is not already repeated. Don't set this to WIDEn-m. This option is only active in LoRa Repeater Mode >= 1">
+                    </div>
+                </div>
                 <div class="grid-container halves">
                     <div>
                         <label for="lora_dig_x_m">Digipeat heard stations from MAIN frequency to which frequencies</label>
                         (If LoRa Repeater Mode has not been set to off)
-                        <select id="lora_dig_x_m" name="lora_dig_x_m">
+                        <select class="u-full-width" id="lora_dig_x_m" name="lora_dig_x_m">
                             <option value="0">Repeat only to main frequency (default)</option>
                             <option value="1">Repeat to both frequencies</option>
                             <option value="2">Repeat only to cross-digi frequency</option>
                         </select>
                     </div>
-                </div>
-                <div class="grid-container halves">
                     <div>
                       <label for="tx_qrg_bc">TX our beacon from this device or from-kiss to frequencies</label>
                       (Only honored, if we are configured as WIDE1 or WIDE2 digi)
-                      <select id="tx_qrg_bc" name="tx_qrg_bc">
+                      <select class="u-full-width" id="tx_qrg_bc" name="tx_qrg_bc">
                         <option value="1">TX on main frequency</option>
                         <option value="2">TX on secondary frequency</option>
                         <option value="3">TX on both frequencies</option>
+                        <option value="5">(TX on both frequencies as USER - not recommended, needed in SP)</option>
                         <option value="0">Don't send our beacon on RF (but only to kiss and to APRS-IS)</option>
                       </select>
                     </div>
                 </div>
                 <div class="grid-container full">
                     <h5 class="u-full-width">APRS-IS settings</h5>
+            <h6 class="u-full-width">changes in the foollowing section need a reboot to ensure correct login into APRS-IS</h6>
                 </div>
                 <div class="grid-container halves">
                   <div>
                     <label for="aprsis_en">Enable APRS-IS connection</label>
-                    <input name="aprsis_en" id="aprsis_en" type="checkbox" value="1" title="If we are configured as WIFI client, connet to the APRS-IS net">
+                    <input name="aprsis_en" id="aprsis_en" type="checkbox" value="1" title="If we are configured as WIFI client, connect to the APRS-IS net">
                   </div>
                   <div>
                     <label for="aprsis_srv_h">Server Name</label>
@@ -369,12 +522,24 @@
                     <input type="password" name="aprsis_pw" id="aprsis_pw" title="Your password for the APRS-IS connection.">
                   </div>
                   <div>
-                    <label for="aprsis_fltr">Filter (optional)</label>
+                    <label for="aprsis_fltr">Filter (server-site, optional)</label>
                     <input type="text" name="aprsis_fltr" id="aprsis_fltr" title="Request server-site filter (may be left empty). See http://www.aprs-is.net/javAPRSFilter.aspx ; Example: 't/mqs/YOURCALL/50' -> Gate only messages, query and status messages to RF, from a circle of 50km around your last known position. w, o and i may be of interest, but some people on 2m APRS or APRS-IS may send those packets much too frequently. Please trace the effect! Perhaps in combination with '-e/DB0FRI-10'. In our case, the digi positioning beacon from DB0FRI-10 (which is also an igate nearby, APRS-IS path qAI,DB0FRI-10) came from APRS-IS to us and we gated his beacon, encoded as third-party-trafffic, back to RF (which makes no sense: 1. His direct RF beacon is much better heard than ours -> all RF users heard it. 2. We needless consumed airtime). -> Using -e/IGATE1/IGATE2/.. , everything heard (and sent to APRS-IS) by our neighbor igates like DB0FRI-10 will not be re-gated by us. Please also check, if '-d/..' instead of (or additional to) '-e/..' is more suitiable in your environment; you may also consider -/b/.. ." placeholder="may be left blank">
                   </div>
                   <div>
-                    <label for="tx_aprsis_bc">TX our beacon to APRS-IS</label>
-                    <input name="tx_aprsis_bc" id="tx_aprsis_bc" type="checkbox" value="1" title="TX our beacon from this device or from KISS to APRS-IS. You may like to disable this i.e. if you are a portable hotspot together with your tracker, but others already gate your own packets to APRS-IS -> you'll see at APRS-IS who heard you.">
+                    <label for="aprsis_fli">Filter type (local, optional)</label>
+                      <input type="text" name="aprsis_fli" id="aprsis_fli" title="Local aprsis-filter incoming for packet-types. This is a positive-filter, i.e. 'ms', which means: accept aprs-text-message and status packets. You can invert the filter ('all except ...') by adding a leading '-', i.e. '-mws'. Valid packet type filters are: poimqstunwb (Position packets, objects, items, message, query, status, telemetry, user-defined, NWS, weather, bulletin (bulletins are aprs-messages prefixed with BLN'). If you leave this field empty, aprsis local filter is disabled. Reason for this local filter: We observed that if you have a server-site filter, i.e. for receiving onöly private text messages for hams a radius 20km around you (t/m/MYCALL/20), aprsis sends also some location positions of users (if you heard them on RF), and even if \>20km away. Also we have seen packets of type objects telemetry, etc. With this option, you can filter incoming aprsis-packets localy in order to prevent them from gating to RF." placeholder="[-]poimqstunwb">
+                  </div>
+                  <div>
+                    <label for="aprsis_fliw">Filter 'words' (local, optional)</label>
+                      <input type="text" name="aprsis_fliw" id="aprsis_fliw" title="Local aprsis-filter incoming for 'words': if this word is part of the header or message body of a packet coming from aprsis, the packet is filtered out. You can sepearate multiple word-filters by space. Leave empty to disable a word filter." placeholder="">
+                  </div>
+                  <div>
+                    <label for="tx_aprsis_sm">Send status-message to APRS-IS</label>
+                    <input name="tx_aprsis_sm" id="tx_aprsis_sm" type="checkbox" value="1" title="Send APRS-status-message about new tcp connectioni, -attepts or your requested shutdown/reboot to APRS-IS. This helps you to trace reboots and unexpected loss of wifi- or internet-access.">
+                  </div>
+                  <div>
+                    <label for="tx_aprsis_bc">Allow send our beacon to APRS-IS</label>
+                    <input name="tx_aprsis_bc" id="tx_aprsis_bc" type="checkbox" value="1" title="Allow sending our beacon from this device or from KISS to APRS-IS. You may like to disable this i.e. if you are a portable hotspot together with your tracker, but others already gate your own packets to APRS-IS -> you'll see at APRS-IS who heard you.">
                   </div>
                   <div>
                     <label for="aprsis_2rf">Gate APRS-IS traffic to frequencies</label>
@@ -414,31 +579,133 @@
                     <label for="bt_enabled">Bluetooth enabled</label>
                     <input name="bt_enabled" id="bt_enabled" type="checkbox" value="1" title="enable or disable bluetooth">
                 </div>
+<!--
+                <div>
+                    <label for="logserial_en">Serial Logging</label>
+                    <input name="logserial_en" id="logserial_en" type="checkbox" value="0" title="Enable or disable verbose logging on usb-serial port. If disabled, KISS-receive and KISS-send is disabled on usb-serial.">
+                </div>
+-->
+                <div>
+                    <label for="usbser_proto">USB-Serial protocol</label>
+                    <select id="usbser_proto" name="usbser_proto">
+                      <option value="0">1. KISS (default)</option>
+                      <option value="1">2. Serial logging</option>
+                      <option value="2">3. Trace packets from LoRa (TNC-trace-format)</option>
+                      <option value="4">4. NMEA GPS data</option>
+                      <option value="3">5. 2) and 3)</option>
+                      <option value="5">6. 4) and 2)</option>
+                      <option value="6">7. 4) and 3)</option>
+                      <option value="7">8. 4) and 2) and 3)</option>
+                      <option value="128">8. No KISS, no logging, no tnc-trace, no NMEA.</option>
+                    </select>
+                </div>
                 <div>
                     <label for="led_enable">LED signaling</label>
                     <input name="led_enable" id="led_enable" type="checkbox" value="1" title="enable or disable LED (not implemented)" DISABLED>
                 </div>
-                <div>
-                    <label for="shutdown_act">Auto power off</label>
-                    <input name="shutdown_act" id="shutdown_act" type="checkbox" value="1" title="activate auto shutdown after usb plug off (not for T-BEAM 0.7)">
-                </div>
             </div>
             <div class="grid-container quarters">
                 <div>
-                    <label for="sh_rxtime">Display show RX time [s]</label>
-                    <input name="sh_rxtime" id="sh_rxtime" type="number" min="0" max="45" title="show RX packet for seconds">
-                </div>
-                <div>
-                    <label for="sh_oledtime">Display timeout [s]</label>
-                    <input name="sh_oledtime" id="sh_oledtime" type="number" min="0" max="60" title="Turn OFF OLED after X seconds. Set 0 to disable">
-                </div>
-                <div>
-                    <label for="shutdown_dt">Auto power off delay [s]</label>
-                    <input name="shutdown_dt" id="shutdown_dt" type="number" min="3" max="3600" title="auto shutdown delay in seconds">
+                    <label for="cpufreq">Adjust CPU frequency (MHz)</label>
+                    <input name="cpufreq" id="cpufreq" type="number" min="0" max="250" title="Reduce CPU freq for power consumption (up to 20 % less). Use with extreme care! Tested with value 80. 0 means: no change to power-on-state." placeholder="0">
                 </div>
                 <div>
                     <label for="reboot_intrvl">Reboot every n hours</label>
-                    <input name="reboot_intrvl" id="reboot_intrvl" type="number" min="0" max="1193" title="Do a periodical reboot every n hous. 0 = disable. Max 1193" placeholder="0">
+                    <input name="reboot_intrvl" id="reboot_intrvl" type="number" min="0" max="1193" title="Do a periodical reboot every n hous. 0 = disable. Range 0 to 1193" placeholder="0">
+                </div>
+                <div>
+                    <label for="shutdown_act">Auto power off</label>
+                    <input name="shutdown_act" id="shutdown_act" type="checkbox" value="1" title="activate auto shutdown after usb plug off (not for T-BEAM 0.7). The device will powered down. You can interrupt this by pressing the middle button in time (right after pluging of or short before it powers down). Default: 'yes' (power off). Consider if you need to switch it to 'no' (keep power on), i.e. if you are an additionaly battery-connected igate, or if you have a not reliable power source. Please also look at the option 'Send Status-packet when shutdown' above.">
+                </div>
+                <div>
+                    <label for="shutdown_dt">Auto power off delay [s]</label>
+                    <input name="shutdown_dt" id="shutdown_dt" type="number" min="3" max="3600" title="auto shutdown delay in seconds. Range 3 to 3600. You can interrupt the timer by pressing the middle-button.">
+                </div>
+            </div>
+            <div class="grid-container thirds">
+                <div>
+                    <label for="sh_rxtime">Seconds to show RX packets [s]</label>
+                    <input name="sh_rxtime" id="sh_rxtime" type="number" min="0" max="45" title="show a received packet for seconds, refresh rate for OLED. Range 0 to 45.">
+                </div>
+                <div>
+                    <label for="sh_oledtime">Display timeout [s]</label>
+                    <input name="sh_oledtime" id="sh_oledtime" type="number" min="0" max="60" title="Turn OFF OLED after X seconds. Set 0 to disable (constantly active OLED has a refresh rate of 1s. Range 0 to 60.">
+                </div>
+                <div>
+                  <label for="units">Units</label>
+                  <select id="units" name="units">
+                    <option value="65">km/h, m (metric)</option>
+                    <option value="66">m/s, m (metric)</option>
+                    <option value="132">mph, ft (imperial)</option>
+                    <option value="136">kn, ft (aero)</option>
+                    <option value="72">kn, m (nautic)</option>
+                  </select>
+                </div>
+            </div>
+            <div class="grid-container thirds">
+                <div>
+                  <label for="oledl3l4fmt">OLED Line3 and Line4 Format</label>
+                  <select id="oledl3l4fmt" name="oledl3l4fmt" title="A: (default): Original format, L3: Lat/Lon; L4: speed, course, altitude. Lat/Lon in APRS format. Good for learning how aprs works.
+Bx: Left side: L3: course, altitude. L4: speed. Right side: see below:
+B1: Lat/Lon in classic format, good for non-technicals. Lat/Lon on right side.
+B2: Lat/Lon in nautical notation. Lat/Lon Lat/Lon on right side.
+Cx: Right side: L3: speed. L4: course, altitude. Left side: see below:
+C1: Lat/Lon in classic format, good for non-technicals. Lat/Lon on left side.
+C2: Lat/Lon in nautical notation. Lat/Lon on left side.
+
+About Lat/Lon notations: Acuracy depends on speed, gps signal quality and choosen format; B2 and C2 has room for precision up to 0.1'.
+APRS-style is 1234.56N 01234.56E.
+Beginners style is 012°34.56'.
+Nautical style is 12-34,567N 012-34.567E.
+See also the option beneath about showing maidenhead grid locator.">
+                    <option value="0">A:  Lat/Lon in APRS-notation</option>
+                    <option value="1">B1: Lat/Lon in classic notation</option>
+                    <option value="2">B2: Lat/Lon in nautical notation</option>
+                    <option value="3">C1: Lat/Lon in classic notation, left side</option>
+                    <option value="4">C2: Lat/Lon in nautical notation, left side</option>
+                  </select>
+                </div>
+                <div>
+                  <label for="oledlocator">Maidenhead Locator</label>
+                  <select id="oledlocator" name="oledlocator" title="Show Maidenhead grid locator: always (instead of Lat/Lon), never, alternating. Alternating:
+                          0: Never
+                          1: Always
+                          2: Maidenhead 10s, Lat/Lon 50s
+                          3: Maidenhead 20s, Lat/Lon 100s
+                          4: Maidenhead 20s, Lat/Lon 20s
+                          While showing maidenhead grid locator, free space is left at one side of line3 or line4 (depending on your 'Oled Line3 and Line4 Format' settings), so other values like measurement of temp/humidity/pressure or statistics, etc. may be displayed.">
+                    <option value="0">Off (only Lat/Lon)</option>
+                    <option value="1">On (never Lat/Lon)</option>
+                    <option value="2">Loc 10s, Lat/Lon 50s</option>
+                    <option value="3">Loc 20s, Lat/Lon 100s</option>
+                    <option value="4">Loc 20s, Lat/Lon 20s</option>
+                  </select>
+                </div>
+                <div>
+                  <label for="oled_loc_amb">Locator precision</label>
+                  <select id="oled_loc_amb" name="oled_loc_amb" title="Maidenhead grid locator resolution on your display.
+The longer the string is, the harder it's to read. That's why we toggle between the length of 10 and the length of 8,
+depending on your speed and your configured position precision.
+If you prefer the max. displayed length of 6, choose the first entry.
+  RR99XX (default)
+  RR99XX99
+  RR99XX99xx
+For RR99XX99xx99, we do not have enough space on the display.
+Length of 6 has a precision (for lattitude) with 2.5nm; longitude: 5nm on aequator (and abt 2nm at 60deg N or S).
+Background:
+RR99 has a range of 18*10 degrees in latitude and 18*10*2 degress in longitude and has a resolution of 1 deg (60min == 60nm == 111.12km ) in lat and 2 deg (120min in lon).
+Length of 4 (RR99) would have a resolution 25nm in lat (46.3km). It does not make sense to have this ambiguity being displayed.
+RR99XX is 180deg / 24 = 2.5min = 2.5nm (= 4.63km) in lat (and 5min = 5nm  (= 9.26km in lon at 0 deg north).
+RR99XX99 divides the values above by 10, as you might have expected: 463m in lat, 926m in lon. Good to read, good resolution if you are moving.
+RR99XX99xx has a resolution of 0.010416 nm (== 19.3m) in latitude; standard aprs resolution is 0.01nm (18.52m) -> Matches quite good - for latitude.
+			                             In longgitude, maidenhead's resolution is 0.02083 nm (385.83m at aequator).
+Hard readable lengths / too long for our display:
+  RR99XX99xx99 has half the resolution than the one above. -> 1.93m in lat. It matches quite good to the Position precision 'uncompressed with DAO (!W..!)' extension (which has a resolutuion of 1.852m in lat and lon).
+  RR99XX99xx99xx is unreadable and would give us a resolution of 0.000434' (8.043cm) in lat. So precise is no GPS, and your antenna is probably longer than that locator.">
+                    <option value="0">RR99XX (default)</option>
+                    <option value="-1">RR99XX99</option>
+                    <option value="-2">RR99XX99xx</option>
+                  </select>
                 </div>
             </div>
             <div class="grid-container full">
@@ -449,12 +716,51 @@
             </form>
         </article>
     </section>
+    <section>
+        <div class="grid-container full">
+            <h2 class="u-full-width">Device Info</h2>
+        </div>
+        <div class="grid-container halves">
+            <div>
+              <label for="UptimeMinutes">Uptime of Device [min]</label>
+              <input type="text" name="UptimeMinutes" id="UptimeMinutes" readonly title="uptime device in minutes">
+            </div>
+            <div>
+              <label for="curPos">Current Position</label>
+              <input type="text" name="curPos" id="curPos" readonly title="Current Position of device [P if fixed mode; p, if gps is invalid and used as temporary preset]">
+            </div>
+            <div>
+              <label for="OledLine5">Satellite & Batt Info</label>
+              <input type="text" name="OledLine5" id="OledLine5" readonly title="Satellite (#Sats/HDOP) [more sats are good, lowest HDOP is best. Should be < 8], and Batt Info [B means Battery; P means external pwr. Positive current is battery-charge-current, while prefixed with 'B', and battery voltage shown.]">
+            </div>
+        </div>
+        <div class="grid-container halves">
+            <div>
+              <label for="OledLine1">OledLine1</label>
+              <input type="text" name="OledLine1" id="OledLine1" readonly title="OledLine1">
+            </div>
+            <div>
+              <label for="OledLine2">OledLine2</label>
+              <input type="text" name="OledLine2" id="OledLine2" readonly title="OledLine2">
+            </div>
+        </div>
+        <div class="grid-container halves">
+            <div>
+              <label for="OledLine3">OledLine3</label>
+              <input type="text" name="OledLine3" id="OledLine3" readonly title="OledLine3">
+            </div>
+            <div>
+              <label for="OledLine4">OledLine4</label>
+              <input type="text" name="OledLine4" id="OledLine4" readonly title="OledLine4">
+            </div>
+        </div>
+    </section>
     <section>
         <div class="grid-container full">
             <h2 class="u-full-width">Received</h2>
         </div>
-        <article>
-            <table class="u-full-width">
+        <article style="overflow-x:auto;">
+            <table>
                 <thead>
                 <tr>
                     <th>Time (UTC)</th>
@@ -472,6 +778,7 @@
     <section>
         <div class="grid-container full">
             <h2 class="u-full-width">Actions</h2>
+            <h6 class="u-full-width">NEW: reboot after changes above only necessary, where explicitly stated</h6>
         </div>
         <article>
             <div class="grid-container quarters">
@@ -503,18 +810,49 @@
             <h2 class="u-full-width">Update</h2>
         </div>
         <article>
+            <div class="grid-container full">
+                <h5 class="u-full-width">View configuration</h5>
+            </div>
+            <div class="grid-container full">
+                Click <a href="/cfg">here</a> to view (backup) your current settings.
+            </div>
+            <div class="grid-container full">
+                Click <a href="/wificfg">here</a> to view your configured wifi settings.
+            </div>
+            <div class="grid-container full">
+                <h5 class="u-full-width">Firmware update</h5>
+            </div>
             <div class="grid-container full">
                 <form action="/update" method="post" enctype="multipart/form-data" id="upload_form" onsubmit="updateFileUpload(event)">
                     <div>
-                        <label id="file-input" for="file">Choose file...</label>
+                        <label id="file-input" for="file">Choose firmware_file.bin ...</label>
                         <div><progress id="file-progress" max="100"></progress></div>
                         <input type="file" name="update" id="file" onchange="onFileChange(this)">
-                        <input class="button-primary" type="submit" value="Update">
+                        <input class="button-primary" type="submit" value="Update firmware">
                     </div>
                 </form>
             </div>
             <div class="grid-container full">
-                Click <a href="/cfg">here</a> to view your configuration.
+                <h5 class="u-full-width">Save configuration</h5>
+            </div>
+            <div class="grid-container full">
+                Save configuration to tracker's filesystem (/preferences.cfg)
+                <form action="/save2fs" method="post">
+                    <div>
+                        <input class="button-primary" type="submit" value="save2fs">
+                    </div>
+                </form>
+            </div>
+            <div class="grid-container full">
+                <h5 class="u-full-width">Save configuration</h5>
+            </div>
+            <div class="grid-container full">
+                Save Wifi configuration to tracker's filesystem (/wifi.cfg)
+                <form action="/savewifi2fs" method="post">
+                    <div>
+                        <input class="button-primary" type="submit" value="savewifi2fs">
+                    </div>
+                </form>
             </div>
         </article>
     </section>
@@ -538,25 +876,115 @@
                  Use with care; resulting longer path consumes a bit more airtime.
             </div>
             <div class="grid-container full">
-              <h5 class="u-full-width">User key functions (hardware buttons):</h5>
+              <h5 class="u-full-width">TTGO T-Beam <b>middle</b> hardware-button<br>(User key functions):</h5>
             </div>
             <div>
                <h6 class="u-full-width">short press</h6>
                If OLED is enabled and OLED is OFF:<br/>
                <ul>
-                 <li>a short press will wake it up and show current data (as "Display Timeout" seconds</li>
+                 <li>a short press will wake it up and show current data (as long as your configured "Display Timeout")</li>
                </ul>
                If OLED is disabled or OLED is ON:<br>
                <ul>
-                    <li>with GPS-FIX immediate sending of a frame with the position from the GPS</li>
-                    <li>without GPS-FIX, immediate sending of the frame with the position saved in the configuration</li>
+                    <li>flip through the available pages</li>
+                    <li>1. press: show lastheard list (Call, time, distance, direction). Distance and direction based on your current (or last known) position.</li>
+                    <li>2. press: show current build number</li>
+                    <li>3. - 5. press: show last 3 received packets (raw)</li>
+                    <li>6a. press, if you have GPS-FIX: immediate send a beacon with the position from the GPS</li>
+                    <li>6b. press, if you don't have a GPS-FIX: immediate send a beacon with the position saved in the configuration (or last known position)</li>
                </ul>
                <h6 class="u-full-width">long press</h6>
                <ul>
-                   <li>toggle on or off GPS power supply</li>
-                   <li>if the "FIXED_BEACON_EN" option is enabled in the configuration, a beacon will be sent every set time interval</li>
-                   <li>while booting: reset to factory default</li>
-                </ul>
+                   <li>toggle on or off WiFi and WebServer. Switching off WebServer will cause the device to reboot (or on a heltec wireless tracker device: shutdown (deep sleep)).</li>
+                   <li><b>Cave</b>: if you long-press during boot, your <b>settings are purged!</b></li>
+               </ul>
+            </div>
+            <div class="grid-container full">
+               <h5 class="u-full-width">TTGO T-Beam left/right hardware-buttons:</h5>
+            </div>
+            <div>
+               <ul><li>Left button (nearby USB-port): if long-pressed, your device will powered off (press 7s), or is switched on again (2s).</li></ul>
+               <ul><li>Right button (lateral): short-press reboots your device (restarts the CPU).</li></ul>
+            </div>
+            <div>
+            </div>
+            <div class="grid-container full">
+              <h5 class="u-full-width">Tips for reducing power (Usage as tracker only):</h5>
+            </div>
+            <div>
+               WiFi OFF<br/>
+               <ul>
+                 <li>be aware, that aprs-is connection depends on the Webserver and will stop working).</li>
+                 <li>select option 0 to disable WiFi & APRS-IS</li>
+                 <li>select option 1 to disable WiFi if a bluetooth client is connected in between 60s on boot (recommended for portables, and for LORA32_21 devices)</li>
+               </ul>
+               LoRa Receiver OFF:<br>
+               <ul>
+                    <li>reduces power consumption, if you just use the device as a tracker</li>
+               </ul>
+               Fixed Beacon off:<br>
+               <ul>
+                    <li>Smart Beaconing is activated and GPS position is sent (if GPS fix is available). There is no fixed beacon. Beaconing starts after first GPS-fix (or if you manualy send a fixed beacon). If GPS-fix is lost, the last GPS position is sent in Fixed Beacon Interval.</li>
+               </ul>
+            </div>
+            <div class="grid-container full">
+              <h5 class="u-full-width">Config in Filesystem:</h5>
+            </div>
+            <div>
+               General<br>
+               <ul>
+                 <li>There could be two files: wifi.cfg and preferences.cfg. You find in the directory "data" of this sources-tree. </li>
+                 <li>Each file should not exceed 2560 bytes.</li>
+                 <li>To upload both files to SPIFFS of your board, you have to do this via Upload File System image in PlatformIO!</li>
+                 <li>To find the 'Upload File System image' click the PlatformIO symbol (the little alien) on the left side, choose your configuration, click on 'Platform' and search for 'Upload File System image'. If you use platformio-cli, upload the filesystem as described below.</li>
+               </ul>
+               data/wifi.cfg<br>
+               <ul>
+                 <li>wifi.cfg can to be created manually, following the json structure in the example. The names of the variables (aka keys) must not be altered</li>
+                 <li>The preferred way is to upgrade the firmware to the newest version, make sure, that the wifi credentials are set correctly and then kilck the SAVEWIFI2FS Button.</li>
+                 <li>The content, what will be saved, can be viewed above.</li>
+                 <li>wifi.cfg in the directory data contains SSID and password of up to 10 AP and a password for the local accesspoint</li>
+                 <li>The password must not be shorter that 8 byte. The json structure must not be changed</li>
+                 <li>if something is wrong or the file is missing, the complete file will be ignored. If credentials are available in flash, they will be used.</li>
+                 <li>An alternative to upload wifi.cfg to your board is via Upload File System image in PlatformIO!</li>
+                 <li>To find the 'Upload File System image' click the PlatformIO symbol (the little alien) on the left side, choose your configuration, click on 'Platform' and search for 'Upload File System image'. If you use platformio-cli, upload the filesystem as described below.</li>
+               </ul>
+               which WiFi is selected?<br/>
+               <ul>
+                 <li>An AP entry containing the keyword "prio":1 defines the entry which is taken as first to connect before following the configured order</li>
+                 <li>if there is nothing prioritized, then the configured order is followed. If credentials are available in flash, they will be used first.</li>
+                 <li>if no connection to a configured AP could be established, a local accesspoint with the SSID "call AP" will be created. After connected to, this Webserver will be reachable with the IP Address 192.168.4.1. The password for the selfAP can be preconfigured with the key "ap_password" in this file</li>
+               </ul>
+               data/preferences.cfg<br>
+               <ul>
+                 <li>preferences.cfg can be created by the system, if you kilck to "SAVE2FS" in the Update section of the site.
+                 <li>if you want to changes items of the preferences, you have to start with the data shown in the configuration view of this WebSite. Be sure to deleted everything before the "{". Again the keys must not be altered. The file then has to be placed into the data directory on your system using the name preferences.cfg.
+               </ul>
+               which config is selected?<br/>
+               <ul>
+                 <li>during startup it will be checked, if there is a prevously used config stored in the system. Normally that is the config, you enter via the webserver. This will be used, if available.</li>
+                 <li>If the previously stored config is not available (i.e., after a complete system erase or a factory reset), it will be checked, if a correct file data/preferences.cfg is availabe. If yes, it will be used. If not, the system comes up with the default values.</li>
+               </ul>
+               Factory reset<br/>
+               <ul>
+                 <li>if factory reset is selected (either via the right button or the webserver), the system will start up with the config saved in data/preferences.cfg. So if you are in the field, make sure, that you have a working setup stored there and be carefull when overwriting.</li>
+                 <li>If you really need a fresh system with the compiled default configuration, you have to delete the file data/preferences.cfg on the board, before you do a factory reset.</li>
+               </ul>
+               Platform.IO CLI<br>
+               <ul>
+                 <li>if your computer is a raspberry PI3 or if you do not want/need the overhead of the Platfrom.IO GUI, you can use the CLI</li>
+                 <li>you can find it <a href="https://docs.platformio.org/en/latest/core/installation/methods/installer-script.html">here</a></li>
+                 <li>usefull commands, if the board is connected to the PI via USB:</li>
+                 <li>Clean all of project compilation: ~/.platformio/penv/bin/pio run  -e [board identifier] -t cleanall  --upload-port /dev/[port]</li>
+                 <li>Erase Flash: ~/.platformio/penv/bin/pio run  -e [board identifier] -t erase  --upload-port /dev/[port]</li>
+                 <li>Build Filesystem: ~/.platformio/penv/bin/pio run  -e [board identifier] -t buildfs  --upload-port /dev/[port]</li>
+                 <li>Upload Filesystem: ~/.platformio/penv/bin/pio run  -e [board identifier] -t uploadfs --upload-port /dev/[port]</li>
+                 <li>Compile and Upload Firmware: ~/.platformio/penv/bin/pio run  -e [board identifier] -t upload  --upload-port /dev/[port]</li>
+                 <li>start serial monitor: ~/.platformio/penv/bin/pio device monitor -p /dev/[port] -b 115200</li>
+                 <li>all the commands above executed in that order, will completely erase the board, compile and upload the filesystem, compile and upload the current firmware, reboot the board and start the serial monitor</li>
+                 <li>if a precompiled fw should be uploaded, without compilation, use the nobuild switch:<br/>
+                 ~/.platformio/penv/bin/pio run  -e ttgo-t-beam-v1.0-development -t nobuild -t upload  --upload-port /dev/ttyACM0</li>
+               </ul>
             </div>
         </article>
         <article>
@@ -566,8 +994,11 @@
             <div>
                <h6 class="u-full-width">TTGO LoRa32 V2.1 (aka T3 V1.6.1)</h6>
                Hardware limitation: if bluetooth is enabled and BT-client is connected, WIFI (-> Web-Server) does not work anymore.<br/>
+               You'll see the red LED while booting turned on for 60s as indicatior for waiting for BT-clients.
                Hack: firmware compiled with -e ttgo-lora32-v2.1 and bluetooth configuration variable is set to enabled, now listens on boot up to one minute for your bluetooth device to connect.<br/>
-               If a bluetooth device connects, it does not start the Web-Server. Else, it closes SerialBT port and starts the Web-Server.
+               If a bluetooth device connects, it does not start the Web-Server. Else, it closes SerialBT port and starts the Web-Server on LORA32_21 devices.<br>
+               See also: new feature for switching WIFI off (i.e. if you use the device as portable tracker), if you don't need it: Webserver eats abt 80mA..<br>
+               How to switch the Webserver on again, please read the long-press button (GPS) section.
             </div>
         </article>
     </section>
@@ -575,8 +1006,13 @@
 <footer>
     <center><b>Contributors in order of appearance:</b><br> OE1ACM, OE3CJB, SQ9MDD, SQ5RWU, DJ1AN, M0IGA, SQ5WPR, DO2JMG, SP6VWX, SQ2WB, IU2FRL, DO3BOX, DL9SAU, DL3EL</center>
     <center><b>Latest stable version:</b> <a href=https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS>https://github.com/SQ9MDD/TTGO-T-Beam-LoRa-APRS</a></center>
+    <center><b>This version runs the DL9SAU/DL3EL fork:</b> <a href=https://github.com/DL9SAU/TTGO-T-Beam-LoRa-APRS>https://github.com/DL9SAU/TTGO-T-Beam-LoRa-APRS</a></center>
     <center><b>Licensed under:</b> CC BY-NC-SA</center>
     <center><!--VERSION--></center>
+    <center>
+        <label for="CompileFlags">Hardware / compiled with features:</label>
+        <input type="text" name="CompileFlags" id="CompileFlags" readonly title="CompileFlags">
+    </center>
 </footer>
 </body>
 </html>

include/preference_storage.h

@@ -7,10 +7,24 @@
 extern Preferences preferences;
 
 // MAX 15 chars for preference key!!!
+static const char *const PREF_AP_PASSWORD = "ap_password";
 static const char *const PREF_WIFI_SSID = "wifi_ssid";
 static const char *const PREF_WIFI_PASSWORD = "wifi_password";
-static const char *const PREF_AP_PASSWORD = "ap_password";
 static const char *const PREF_NTP_SERVER = "ntp_server";
+static const char *const PREF_SYSLOG_SERVER = "syslog_server";
+static const char *const PREF_WIFI_ENABLE_INIT = "wifi_en_i";
+static const char *const PREF_WIFI_ENABLE = "wifi_en";
+static const char *const PREF_WIFI_TXPWR_MODE_AP_INIT = "wifi_pwrAP_i";
+static const char *const PREF_WIFI_TXPWR_MODE_AP = "wifi_pwrAP";
+static const char *const PREF_WIFI_TXPWR_MODE_STA_INIT = "wifi_pwrSTA_i";
+static const char *const PREF_WIFI_TXPWR_MODE_STA = "wifi_pwrSTA";
+static const char *const PREF_WIFI_STA_ALLOW_FAILBACK_TO_MODE_AP_AFTER_ONCE_CONNECTED_INIT = "wifi_failAP_i";
+static const char *const PREF_WIFI_STA_ALLOW_FAILBACK_TO_MODE_AP_AFTER_ONCE_CONNECTED = "wifi_failAP";
+static const char *const PREF_TNCSERVER_ENABLE_INIT = "tncsrvr_en_i";
+static const char *const PREF_TNCSERVER_ENABLE = "tncsrvr_en";
+static const char *const PREF_GPSSERVER_ENABLE_INIT = "gpssrv_en_i";
+static const char *const PREF_GPSSERVER_ENABLE = "gpssrv_en";
+
 
 // LoRa settings
 static const char *const PREF_LORA_FREQ_PRESET_INIT = "lora_freq_i";
@@ -23,6 +37,8 @@ static const char *const PREF_LORA_TX_ENABLE_INIT = "lora_tx_en_i";
 static const char *const PREF_LORA_TX_ENABLE = "lora_tx_en";
 static const char *const PREF_LORA_TX_POWER_INIT = "txPower_i";
 static const char *const PREF_LORA_TX_POWER = "txPower";
+static const char *const PREF_LORA_TX_PREAMBLE_LEN_INIT = "preambleLen_i";
+static const char *const PREF_LORA_TX_PREAMBLE_LEN = "preambleLen";
 static const char *const PREF_LORA_ADD_SNR_RSSI_TO_PATH_PRESET_INIT = "lora_rssi2p_i";
 static const char *const PREF_LORA_ADD_SNR_RSSI_TO_PATH_PRESET = "lora_rssi2p";
 static const char *const PREF_LORA_ADD_SNR_RSSI_TO_PATH_END_AT_KISS_PRESET_INIT = "snraprsis_i";
@@ -33,6 +49,8 @@ static const char *const PREF_LORA_TX_BEACON_AND_KISS_TO_FREQUENCIES_PRESET_INIT
 static const char *const PREF_LORA_TX_BEACON_AND_KISS_TO_FREQUENCIES_PRESET = "tx_qrg_bc";
 static const char *const PREF_LORA_TX_BEACON_AND_KISS_TO_APRSIS_PRESET_INIT = "tx_aprsis_bc_i";
 static const char *const PREF_LORA_TX_BEACON_AND_KISS_TO_APRSIS_PRESET = "tx_aprsis_bc";
+static const char *const PREF_LORA_TX_STATUSMESSAGE_TO_APRSIS_PRESET_INIT = "tx_aprsis_sm_i";
+static const char *const PREF_LORA_TX_STATUSMESSAGE_TO_APRSIS_PRESET = "tx_aprsis_sm";
 static const char *const PREF_LORA_SPEED_CROSSDIGI_PRESET_INIT = "lora_speed_x_i";
 static const char *const PREF_LORA_SPEED_CROSSDIGI_PRESET = "lora_speed_x";
 static const char *const PREF_LORA_TX_POWER_CROSSDIGI_PRESET_INIT = "txPower_x_i";
@@ -43,6 +61,8 @@ static const char *const PREF_LORA_AUTOMATIC_CR_ADAPTION_PRESET_INIT = "lora_cra
 static const char *const PREF_LORA_AUTOMATIC_CR_ADAPTION_PRESET = "lora_cradapt";
 static const char *const PREF_APRS_DIGIPEATING_MODE_PRESET_INIT = "lora_dig_mode_i";
 static const char *const PREF_APRS_DIGIPEATING_MODE_PRESET = "lora_dig_mode";
+static const char *const PREF_APRS_DIGIPEATING_MYALIAS_INIT = "lora_myalias_i";
+static const char *const PREF_APRS_DIGIPEATING_MYALIAS = "lora_myalias";
 static const char *const PREF_APRS_CROSS_DIGIPEATING_MODE_PRESET_INIT = "lora_dig_x_m_i";
 static const char *const PREF_APRS_CROSS_DIGIPEATING_MODE_PRESET = "lora_dig_x_m";
 
@@ -52,16 +72,30 @@ static const char *const PREF_APRS_RELAY_PATH = "aprs_relay_path";
 static const char *const PREF_APRS_RELAY_PATH_INIT = "aprs_relay_init";
 static const char *const PREF_APRS_SYMBOL_TABLE = "aprs_s_table";
 static const char *const PREF_APRS_SYMBOL = "aprs_symbol";
+static const char *const PREF_APRS_OBJECT_NAME = "aprs_objnam";
+static const char *const PREF_APRS_OBJECT_NAME_INIT = "aprs_objnam_i";
 static const char *const PREF_APRS_COMMENT = "aprs_comment";
 static const char *const PREF_APRS_COMMENT_INIT = "aprs_comm_init";
 static const char *const PREF_APRS_COMMENT_RATELIMIT_PRESET = "aprs_comm_rt";
 static const char *const PREF_APRS_COMMENT_RATELIMIT_PRESET_INIT = "aprs_comm_rt_i";
-static const char *const PREF_APRS_SHOW_ALTITUDE = "aprs_alt";
-static const char *const PREF_APRS_SHOW_ALTITUDE_INIT = "aprs_alt_init";
+static const char *const PREF_APRS_SHOW_ALTITUDE = "aprs_alt";			/* obsoleted. may be removed later. Use alt ratio 0 .. 100*/
+static const char *const PREF_APRS_SHOW_ALTITUDE_INIT = "aprs_alt_init";	/* obsoleted. may be removed later. Use alt ratio 0 .. 100*/
+static const char *const PREF_APRS_ALTITUDE_RATIO = "aprs_alt_r";
+static const char *const PREF_APRS_ALTITUDE_RATIO_INIT = "aprs_alt_r_i";
+static const char *const PREF_APRS_ALWAYS_SEND_CSE_SPEED_AND_ALTITUDE = "aprs_CSandA";
+static const char *const PREF_APRS_ALWAYS_SEND_CSE_SPEED_AND_ALTITUDE_INIT = "aprs_CSandA_i";
+
 static const char *const PREF_APRS_SHOW_BATTERY = "aprs_batt";
 static const char *const PREF_APRS_SHOW_BATTERY_INIT = "aprs_batt_init";
+static const char *const PREF_APRS_STATUS_WINLINK_NOTIFICATION = "aprs_stat_wl";
+static const char *const PREF_APRS_STATUS_WINLINK_NOTIFICATION_INIT = "aprs_stat_wl_i";
+static const char *const PREF_APRS_STATUS_SHUTDOWN_NOTIFICATION = "aprs_stat_qrt";
+static const char *const PREF_APRS_STATUS_SHUTDOWN_NOTIFICATION_INIT = "aprs_stat_qrt_i";
 static const char *const PREF_APRS_LATITUDE_PRESET = "aprs_lat_p";
 static const char *const PREF_APRS_LATITUDE_PRESET_INIT = "aprs_lat_p_init";
+static const char *const PREF_APRS_LATLON_FROM_GPS = "aprs_llfgps"; // no _INIT needed. Checkbox is evaluated on "save" in the Web interface
+static const char *const PREF_APRS_POSITION_AMBIGUITY = "pos_amb";
+static const char *const PREF_APRS_POSITION_AMBIGUITY_INIT = "pos_amb_init";
 static const char *const PREF_APRS_LONGITUDE_PRESET = "aprs_lon_p";
 static const char *const PREF_APRS_LONGITUDE_PRESET_INIT = "aprs_lon_p_init";
 static const char *const PREF_APRS_SENDER_BLACKLIST = "aprs_blist";
@@ -80,6 +114,8 @@ static const char *const PREF_TNC_SELF_TELEMETRY_MIC = "tnc_tel_mic";
 static const char *const PREF_TNC_SELF_TELEMETRY_MIC_INIT = "tnc_tel_mic_i";
 static const char *const PREF_TNC_SELF_TELEMETRY_PATH = "tnc_tel_path";
 static const char *const PREF_TNC_SELF_TELEMETRY_PATH_INIT = "tnc_tel_path_i";
+static const char *const PREF_TNC_SELF_TELEMETRY_ALLOW_RF = "tnc_tel_rf";
+static const char *const PREF_TNC_SELF_TELEMETRY_ALLOW_RF_INIT = "tnc_tel_rf_i";
 
 // SMART BEACONING
 static const char *const PREF_APRS_SB_MIN_INTERVAL_PRESET = "sb_min_interv";
@@ -100,6 +136,8 @@ static const char *const PREF_APRS_SB_TURN_TIME_PRESET_INIT = "sb_turn_time_i";
 // Device settings
 static const char *const PREF_APRS_GPS_EN = "gps_enabled";
 static const char *const PREF_APRS_GPS_EN_INIT = "gps_state_init";
+static const char *const PREF_GPS_POWERSAVE = "gps_pwrsve";
+static const char *const PREF_GPS_POWERSAVE_INIT = "gps_pwrsve_i";
 static const char *const PREF_ACCEPT_OWN_POSITION_REPORTS_VIA_KISS = "kiss_myloc_ok";
 static const char *const PREF_ACCEPT_OWN_POSITION_REPORTS_VIA_KISS_INIT = "kiss_myloc_ok_i";
 static const char *const PREF_GPS_ALLOW_SLEEP_WHILE_KISS = "gps_sleep_ok";
@@ -108,6 +146,10 @@ static const char *const PREF_APRS_SHOW_CMT = "show_cmt";
 static const char *const PREF_APRS_SHOW_CMT_INIT = "show_cmt_init";
 static const char *const PREF_DEV_BT_EN = "bt_enabled";
 static const char *const PREF_DEV_BT_EN_INIT = "bt_enabled_init";
+static const char *const PREF_DEV_LOGTOSERIAL_EN = "logserial_en";		/* obsoleted. may be removed later. Use alt ratio 0 .. 100*/
+static const char *const PREF_DEV_LOGTOSERIAL_EN_INIT = "logserial_en_i";	/* obsoleted. may be removed later. Use alt ratio 0 .. 100*/
+static const char *const PREF_DEV_USBSERIAL_DATA_TYPE = "usbser_proto";
+static const char *const PREF_DEV_USBSERIAL_DATA_TYPE_INIT= "usbser_proto_i";
 static const char *const PREF_DEV_OL_EN = "oled_enabled";
 static const char *const PREF_DEV_OL_EN_INIT = "ol_enabled_init";
 static const char *const PREF_DEV_SHOW_RX_TIME = "sh_rxtime";
@@ -120,6 +162,17 @@ static const char *const PREF_DEV_REBOOT_INTERVAL = "reboot_intrvl";
 static const char *const PREF_DEV_REBOOT_INTERVAL_INIT = "reboot_intrvl_i";
 static const char *const PREF_DEV_SHOW_OLED_TIME = "sh_oledtime"; // set OLED timeout
 static const char *const PREF_DEV_SHOW_OLED_TIME_INIT = "sh_oledtime_i";
+static const char *const PREF_DEV_CPU_FREQ = "cpufreq";
+static const char *const PREF_DEV_CPU_FREQ_INIT = "cpufreq_i";
+static const char *const PREF_DEV_UNITS = "units";
+static const char *const PREF_DEV_UNITS_INIT = "units_i";
+static const char *const PREF_DEV_OLED_L3_L4_FORMAT = "oledl3l4fmt";
+static const char *const PREF_DEV_OLED_L3_L4_FORMAT_INIT = "oledl3l4fmt_i";
+static const char *const PREF_DEV_OLED_LOCATOR = "oledlocator";
+static const char *const PREF_DEV_OLED_LOCATOR_INIT = "locator_i";
+static const char *const PREF_DEV_OLED_LOCATOR_AMBIGUITY = "oled_loc_amb";
+static const char *const PREF_DEV_OLED_LOCATOR_AMBIGUITY_INIT = "oled_loc_amb_i";
+
 
 // APRSIS settings
 static const char *const PREF_APRSIS_EN_INIT = "aprsis_en_i";
@@ -130,6 +183,10 @@ static const char *const PREF_APRSIS_SERVER_PORT_INIT = "aprsis_srv_p_i";
 static const char *const PREF_APRSIS_SERVER_PORT = "aprsis_srv_p";
 static const char *const PREF_APRSIS_FILTER_INIT = "aprsis_fltr_i";
 static const char *const PREF_APRSIS_FILTER = "aprsis_fltr";
+static const char *const PREF_APRSIS_FILTER_LOCAL_INCOMING_INIT = "aprsis_fli_i";
+static const char *const PREF_APRSIS_FILTER_LOCAL_INCOMING = "aprsis_fli";
+static const char *const PREF_APRSIS_FILTER_LOCAL_WORDS_INCOMING_INIT = "aprsis_fliw_i";
+static const char *const PREF_APRSIS_FILTER_LOCAL_WORDS_INCOMING = "aprsis_fliw";
 static const char *const PREF_APRSIS_CALLSIGN_INIT = "aprsis_call_i";
 static const char *const PREF_APRSIS_CALLSIGN = "aprsis_call";
 static const char *const PREF_APRSIS_PASSWORD_INIT = "aprsis_pw_i";

include/taskWebServer.h

@@ -3,13 +3,21 @@
 #include <WebServer.h>
 #include <ESPmDNS.h>
 #include <Update.h>
-#include <BG_RF95.h>
 #include <esp_wifi.h>
 
 #ifndef TASK_WEBSERVER
 #define TASK_WEBSERVER
 
-extern BG_RF95 rf95;
+#ifdef HAS_SX127X
+  #include <BG_RF95.h>
+  extern BG_RF95 rf95;
+#elif HAS_SX126X
+  #include <RadioLib.h>
+  #if defined(HELTEC_WIRELESS_TRACKER)
+    extern SX1262 radio;
+  #endif
+#endif
+
 #ifdef KISS_PROTOCOL
   extern WiFiServer tncServer;
 #endif
@@ -27,5 +35,12 @@ typedef struct {
 
 extern QueueHandle_t webListReceivedQueue;
 
+// structure for AP Array
+struct AccessPoint {
+    char ssid[33];
+    char pw[64];
+    //uint8_t prio;
+};
+
 [[noreturn]] void taskWebServer(void *parameter);
-#endif
+#endif

lib/BG_RF95/BG_RF95.cpp

@@ -455,3 +455,8 @@ void BG_RF95::setPreambleLength(uint16_t bytes)
     spiWrite(BG_RF95_REG_20_PREAMBLE_MSB, bytes >> 8);
     spiWrite(BG_RF95_REG_21_PREAMBLE_LSB, bytes & 0xff);
 }
+
+bool BG_RF95::SignalDetected(void)
+{
+  return ((spiRead(BG_RF95_REG_18_MODEM_STAT) & 0x01) == 0x01);
+}

lib/BG_RF95/BG_RF95.h

@@ -694,6 +694,8 @@ virtual uint8_t	lastSNR();
     /// \return true if sleep mode was successfully entered.
     virtual bool    sleep();
 
+    virtual bool SignalDetected();
+
 protected:
     /// This is a low level function to handle the interrupts for one instance of BG_RF95.
     /// Called automatically by isr*()

platformio.ini

@@ -11,24 +11,24 @@
 [env]
 framework = arduino
 monitor_speed = 115200
+monitor_filters = esp32_exception_decoder
 board_build.partitions = partitions.csv
-board_build.embed_files = 
+board_build.embed_files =
 	data_embed/index.html.out
 	data_embed/style.css.out
 	data_embed/js.js.out
-extra_scripts = 
+extra_scripts =
 	pre:tools/buildscript_versioning.py
+	pre:tools/remove_comment_from_files_data_embed.py
 	pre:tools/compress_assets.py
-lib_deps = 
-	RadioHead
+lib_deps =
 	TinyGPSPlus
-	Adafruit SSD1306
-	Adafruit GFX Library
 	Adafruit Unified Sensor
 	Adafruit BusIO
-	https://github.com/SQ9MDD/AXP202X_Library.git
 	SparkFun u-blox Arduino Library
 	bblanchon/ArduinoJson
+	arcao/Syslog
+
 build_flags =
 			-Wl,--gc-sections,--relax
 			-D 'KISS_PROTOCOL'				; leave enabled
@@ -38,10 +38,11 @@ build_flags =
 			; -D 'FIXED_BEACON_EN'			; can be set from www interface
 			-D 'SB_ALGO_KENWOOD'				; Kenwood skales better on lower speed.
 			-D 'LATITUDE_PRESET="0000.00N"'			; can be set from www interface
-			-D 'LONGITUDE_PRESET="00000.00E"'		; can be set from www interface
-			-D 'APRS_SYMBOL_TABLE="/"'			; can be set from www interface
-			-D 'APRS_SYMBOL="["'				; can be set from www interface
-			-D 'MY_COMMENT="Lora Tracker"'		; can be set from www interface
+			-D 'LONGITUDE_PRESET="00000.00W"'		; can be set from www interface
+			-D 'APRS_SYMBOL_TABLE="/"'			; can be set from www interface. Hint: if you need Symbol "&", you need to escape: "\&"
+			-D 'APRS_SYMBOL="["'				; can be set from www interface. Hint: if you need Symbol "&", you need to escape: "\&"
+			-D 'APRS_OBJECT_NAME=""'			; can be set from www interface
+			-D 'MY_COMMENT="Lora Tracker/iGate"'		; can be set from www interface
 			-D 'SHOW_ALT'					; can be set from www interface
 			; -D 'SHOW_BATT'				; can be set from www interface
 			-D 'SHOW_RX_PACKET'				; can be set from www interface
@@ -57,69 +58,183 @@ build_flags =
 			; -D 'MAX_TIME_TO_NEXT_TX=120000L'		; can be set from www interface -- not implemented
 			-D 'FIX_BEACON_INTERVAL=1800000L'		; can be set from www interface
 			-D 'NETWORK_GPS_PORT=10110'		; GPS NMEA Port
-			; -D 'ENABLE_TNC_SELF_TELEMETRY'		; can be set from www interface
+			-D 'ENABLE_TNC_SELF_TELEMETRY'		; can be set from www interface. if not defined, telemetry code will not compiled in
 			-D 'TNC_SELF_TELEMETRY_INTERVAL=3600L'		; can be set from www interface (seconds)
 			-D 'SHOW_OLED_TIME=15000'			; can be set from www interface (OLED Timeout)
 
-[env:ttgo-t-beam-v1.0]
+[libs_AXP192]
+lib_deps =
+	https://github.com/SQ9MDD/AXP202X_Library.git
+[libs_AXP2101]
+lib_deps =
+	https://github.com/lewisxhe/XPowersLib
+[libs_SSD1306]
+lib_deps =
+	Adafruit SSD1306
+	Adafruit GFX Library
+[libs_TFT]
+lib_deps =
+	bodmer/TFT_eSPI@^2.5.43
+[libs_SX127X]
+lib_deps =
+	RadioHead
+[libs_SX126X]
+lib_deps =
+	jgromes/RadioLib @ 6.1.0
+
+
+[env:ttgo-t-beam-v1_0]
 platform = espressif32 @ 3.5.0
 board = ttgo-t-beam
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D T_BEAM_V1_0
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D ENABLE_BLUETOOTH
+lib_deps =
+	${env.lib_deps}
+	${libs_AXP192.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
-[env:ttgo-t-beam-v0.7]
+[env:ttgo-t-beam-v1_2]
 platform = espressif32 @ 3.5.0
 board = ttgo-t-beam
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
+			-D T_BEAM_V1_2
 			-D ENABLE_WIFI
-			-D T_BEAM_V0_7
+			-D ENABLE_SYSLOG
+			#-D ENABLE_BLUETOOTH
+lib_deps =
+	${env.lib_deps}
+	${libs_AXP2101.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
-[env:ttgo-lora32-v2.1]
+[env:ttgo-t-beam-v0_7]
+platform = espressif32 @ 3.5.0
+board = ttgo-t-beam
+build_flags =
+			${env.build_flags}
+			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
+			-D T_BEAM_V0_7
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
+
+[env:ttgo-lora32-v2_1]
 platform = espressif32 @ 3.5.0
 board = ttgo-lora32-v21
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D LORA32_21
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D ENABLE_BLUETOOTH
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
 [env:ttgo-lora32-v2]
 platform = espressif32 @ 3.5.0
 board = ttgo-lora32-v2
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D LORA32_2
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
 [env:ttgo-lora32-v1]
 platform = espressif32 @ 3.5.0
 board = ttgo-lora32-v1
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D LORA32_1
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
 [env:Heltec-WiFi-v1]
 platform = espressif32 @ 3.5.0
 board = heltec_wifi_kit_32
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D HELTEC_V1
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
 [env:Heltec-WiFi-v2]
 platform = espressif32 @ 3.5.0
 board = heltec_wifi_kit_32_v2
-build_flags = 
-			${env.build_flags} 
+build_flags =
+			${env.build_flags}
 			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
 			-D HELTEC_V2
+lib_deps =
+	${env.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}
 
-[env:ttgo-t-beam-v1.0-development]
+[env:heltec-wireless-tracker]
+platform = espressif32 @ 6.3.1
+board = esp32-s3-devkitc-1
+board_build.mcu = esp32s3
+build_flags =
+			${env.build_flags}
+			-D HELTEC_WIRELESS_TRACKER
+			-D HAS_SX126X
+			-D ENABLE_WIFI
+			-D ENABLE_SYSLOG
+			#-D ENABLE_BLUETOOTH
+			-D SPI_FREQUENCY=27000000
+			-D USE_HSPI_PORT
+			-D ARDUINO_USB_MODE=1		# needed for serial console else you'd have to call USBSerial.printf instead of Serial.printf
+			-D ARDUINO_USB_CDC_ON_BOOT=1	#
+			-D HAS_TFT
+			-D USER_SETUP_LOADED
+			  -D TFT_WIDTH=80
+			  -D TFT_HEIGHT=160
+			  -D ST7735_DRIVER
+			  -D ST7735_GREENTAB160x80
+			  -D TFT_RGB_ORDER=TFT_BGR
+			  -D TFT_MOSI=42
+			  -D TFT_SCLK=41
+			  -D TFT_CS=38
+			  -D TFT_DC=40
+			  -D TFT_RST=39
+			  -D TFT_BL=21
+			  -D TFT_BACKLIGHT_ON=1
+			  -D TOUCH_CS=-1
+			  -D LOAD_GLCD
+			  -D LOAD_FONT2
+			  -D LOAD_FONT4
+			  -D LOAD_FONT6
+			  -D LOAD_FONT7
+			  -D LOAD_FONT8
+lib_deps =
+	${env.lib_deps}
+	${libs_SX126X.lib_deps}
+	${libs_SX127X.lib_deps}  # needed for compiler dependencies (../lib/BG_RF95/)
+	${libs_TFT.lib_deps}
+
+[env:ttgo-t-beam-v1_0-development]
 platform = espressif32 @ 3.5.0
 board = ttgo-t-beam
 build_flags =
@@ -128,8 +243,10 @@ build_flags =
 	-D ENABLE_WIFI
 	-D ENABLE_BLUETOOTH
 	-D ENABLE_SYSLOG
-	-D 'SYSLOG_IP="192.168.0.102"'
+	-D 'SYSLOG_IP="255.255.255.255"'
     -D DEVELOPMENT_DEBUG
 lib_deps =
 	${env.lib_deps}
-	arcao/Syslog
+	${libs_AXP192.lib_deps}
+	${libs_SX127X.lib_deps}
+	${libs_SSD1306.lib_deps}

src/taskGPS.cpp

@@ -6,6 +6,9 @@
 
 SFE_UBLOX_GPS myGPS;
 
+extern uint8_t usb_serial_data_type;
+extern volatile boolean gps_task_enabled;
+
 #ifdef ENABLE_WIFI
   #include "wifi_clients.h"
   #define MAX_GPS_WIFI_CLIENTS 6
@@ -13,18 +16,30 @@ SFE_UBLOX_GPS myGPS;
 #endif
 
 // Pins for GPS
-#ifdef T_BEAM_V1_0
+#if defined(T_BEAM_V1_0) || defined(T_BEAM_V1_2)
   static const int RXPin = 12, TXPin = 34;
-#else
+#elif defined(HELTEC_WIRELESS_TRACKER)
+  static const int RXPin = 34, TXPin = 33;
+#else /* i.e. T_BEAM_V0_7, or lora32-device-with-self-attached-GPS */
   static const int RXPin = 15, TXPin = 12;
 #endif
-static const uint32_t GPSBaud = 9600; //GPS
+#ifdef LORA32_21
+  /* one user played with self-attached GPS on his LORA32 device. TODO: gps speed choosable in Web-Interface */
+  static const uint32_t GPSBaud = 57600; //GPS
+#elif HELTEC_WIRELESS_TRACKER
+  static const uint32_t GPSBaud = 115200; //GPS
+#else
+  static const uint32_t GPSBaud = 9600; //GPS
+#endif
 HardwareSerial gpsSerial(1);        // TTGO has HW serial
 TinyGPSPlus gps;             // The TinyGPS++ object
 bool gpsInitialized = false;
 
 [[noreturn]] void taskGPS(void *parameter) {
+
+reinitialize:
   if (!gpsInitialized){
+
     gpsSerial.begin(GPSBaud, SERIAL_8N1, TXPin, RXPin);        //Startup HW serial for GPS
 
     // set GPS parameters on restart
@@ -43,13 +58,20 @@ bool gpsInitialized = false;
           delay(1000);
     }
   }
+  gps_task_enabled = true;
 
-
-  esp_task_wdt_init(120, true); //enable panic so ESP32 restarts
+  // esp_task_wdt_init() has already been done in main task during setup()
   esp_task_wdt_add(NULL); //add current thread to WDT watch
 
   String gpsDataBuffer = "              ";
   for (;;) {
+    if (!gps_task_enabled) {
+      //gpsSerial.end();  // No, raises exception
+      esp_task_wdt_delete(NULL);
+      gpsInitialized = false;
+      vTaskSuspend(NULL);
+      goto reinitialize;
+    }
     esp_task_wdt_reset();
     #ifdef ENABLE_WIFI
     check_for_new_clients(&gpsServer, gps_clients, MAX_GPS_WIFI_CLIENTS);
@@ -57,23 +79,25 @@ bool gpsInitialized = false;
     while (gpsSerial.available() > 0) {
       char gpsChar = (char)gpsSerial.read();
       gps.encode(gpsChar);
-      #ifdef ENABLE_WIFI
         if (gpsChar == '$') {
           gpsDataBuffer = String(gpsChar);
         } else {
           gpsDataBuffer += String(gpsChar);
 
           if (gpsChar == '\n') {
+            if ((usb_serial_data_type & 4))
+              Serial.print(gpsDataBuffer);
+      #ifdef ENABLE_WIFI
             iterateWifiClients([](WiFiClient *client, int clientIdx, const String *data){
               if (client->connected()){
                 client->print(*data);
                 client->flush();
               }
             }, &gpsDataBuffer, gps_clients, MAX_GPS_WIFI_CLIENTS);
+      #endif
             gpsDataBuffer = "";
           }
         }
-      #endif
     }
     vTaskDelay(100 / portTICK_PERIOD_MS);
   }

src/taskTNC.cpp

@@ -1,8 +1,13 @@
 #include "taskTNC.h"
 #include <esp_task_wdt.h>
 
+
+extern uint8_t usb_serial_data_type;
+extern boolean enable_bluetooth;
+
 #ifdef ENABLE_BLUETOOTH
   BluetoothSerial SerialBT;
+  extern boolean serial_bt_client_is_connected;
 #endif
 
 QueueHandle_t tncReceivedQueue = nullptr;
@@ -38,9 +43,11 @@ void handleKISSData(char character, int bufferIndex) {
 
     if (isDataFrame) {
       #ifdef LOCAL_KISS_ECHO
-      Serial.print(inTNCData);
+        if (!usb_serial_data_type) {
+          Serial.print(inTNCData);
+        }
         #ifdef ENABLE_BLUETOOTH
-        if (SerialBT.hasClient()) {
+        if (enable_bluetooth && serial_bt_client_is_connected) {
           SerialBT.print(inTNCData);
         }
         #endif
@@ -73,17 +80,19 @@ void handleKISSData(char character, int bufferIndex) {
   tncReceivedQueue = xQueueCreate(4,sizeof(String *));
   String *loraReceivedFrameString = nullptr;
 
-  esp_task_wdt_init(120, true); //enable panic so ESP32 restarts
+  // esp_task_wdt_init() has already been done in main task during setup()
   esp_task_wdt_add(NULL); //add current thread to WDT watch
 
   while (true) {
     esp_task_wdt_reset();
-    while (Serial.available() > 0) {
-      char character = Serial.read();
-      handleKISSData(character, 0);
+    if (!usb_serial_data_type) {
+      while (Serial.available() > 0) {
+        char character = Serial.read();
+        handleKISSData(character, 0);
+      }
     }
     #ifdef ENABLE_BLUETOOTH
-      if (SerialBT.hasClient()) {
+      if (enable_bluetooth && serial_bt_client_is_connected) {
         while (SerialBT.available() > 0) {
           char character = SerialBT.read();
           handleKISSData(character, 1);
@@ -103,9 +112,10 @@ void handleKISSData(char character, int bufferIndex) {
     #endif
     if (xQueueReceive(tncReceivedQueue, &loraReceivedFrameString, (1 / portTICK_PERIOD_MS)) == pdPASS) {
       const String &kissEncoded = encode_kiss(*loraReceivedFrameString);
-      Serial.print(kissEncoded);
+      if (!usb_serial_data_type)
+        Serial.print(kissEncoded);
       #ifdef ENABLE_BLUETOOTH
-        if (SerialBT.hasClient()){
+        if (enable_bluetooth && serial_bt_client_is_connected){
           SerialBT.print(kissEncoded);
         }
       #endif

tools/buildscript_versioning.py

@@ -22,9 +22,22 @@ try:
     git_id = Popen('git rev-parse --short HEAD', stdout=PIPE, shell=True).stdout.read().strip().decode('ascii')
     version_full = "%s-%s" % (version_full, git_id)
 except:
+    #git_id = "0000000"
+    git_id = "No_GIT.."
     pass
 
-version_string = "{} - {}".format(version_full, datetime.datetime.now())
+date_now = "%.16s" % datetime.datetime.now()
+version_string = "{} - {}".format(version_full, date_now)
+
+# dl9sau: build_no in base62 -> base62 (0-9, a-z, A-Z)
+# This gives us room for (62**2)-1 = 3843 builds between git commits. Should be enough
+# git_id: length of 5 has hopefully enough entropy.
+# VERS_XXSHORT_BN may also be sent on RF -> We keep it short. 8 bytes now, instead of typically 3 bytes before.
+s="0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"
+bnA=s[(int(build_no / len(s))) % len(s)]
+bnB=s[build_no % len(s)]
+vers_xxshort_bn="%.5s.%c%c" % (git_id, bnA, bnB)
+
 hf = """
 #ifndef BUILD_NUMBER
   #define BUILD_NUMBER "{}"
@@ -35,7 +48,10 @@ hf = """
 #ifndef VERSION_SHORT
   #define VERSION_SHORT "{}"
 #endif
-""".format(build_no, version_string, version_full)
+#ifndef VERS_XXSHORT_BN
+  #define VERS_XXSHORT_BN "{}"
+#endif
+""".format(build_no, version_string, version_full, vers_xxshort_bn)
 with open(FILENAME_VERSION_H, 'w+') as f:
     f.write(hf)
 
@@ -44,5 +60,5 @@ with open("data_embed/index.html", "r") as f:
 
 index_html_content = index_html_content.replace('<!--VERSION-->', version_string)
 
-with open("data_embed/index.html.out", "w") as f:
+with open("data_embed/index.html.tmp", "w") as f:
     f.write(index_html_content)

tools/compress_assets.py

@@ -1,8 +1,8 @@
 import gzip
 assets_list = {
-    'data_embed/index.html.out': 'data_embed/index.html.out',
-    'data_embed/js.js': 'data_embed/js.js.out',
-    'data_embed/style.css': 'data_embed/style.css.out',
+    'data_embed/index.html.tmp2': 'data_embed/index.html.out',
+    'data_embed/js.js.tmp': 'data_embed/js.js.out',
+    'data_embed/style.css.tmp': 'data_embed/style.css.out',
 }
 
 

tools/remove_comment_from_code.py

@@ -0,0 +1,125 @@
+#!/usr/bin/python3
+
+# remove-comment-from-code.py
+#   removes comments and indents.
+#   works as a filter and reads from stdin.
+#   keeps lines with copyright or license information
+#   reason: on a smal esp32 device we needed to gain space for
+#           flash storage, in concrete: style.css
+#   options: -d "// ^#", meaning also one-line-comments like //,
+#                        and lines beginning with '#'
+#
+#   usage: remove-comment-from-code.py < style.css.orig > style.css
+#
+#   examples:
+#   remove-comment-from-code.py -d "// ^#"
+#       in                       out
+#       -----------------------+-------------
+#       foo /* bar */ abc        foo abc
+#       foo // bar abc           foo
+#       // bar abc               line ignored
+#       /* this is a comment */  line ignored
+#       foo /* this is a         foo bar
+#         comment text */ bar
+#       # foo                    line ignored
+#       foo # bar                foo
+#         foo        bar         foo bar
+#
+# (c) 2024-03-19 Thomas Osterried <dl9sau@darc.de>. License: GPL
+
+import sys
+
+one_line_comment_chars = []
+
+def usage():
+  sys.stderr.write("usage: %s [-d x]\n" % sys.argv[0])
+  sys.stderr.write("       with x i.e. \"// ^#\", meaning also one-line-comments)\n")
+  sys.stderr.write("       like //, and lines beginning with '#'\n")
+  sys.exit(1)
+
+
+def remove_tabs_and_reduce_blanks_to_one_and_strip(s):
+  return s.replace("\t", " ").replace("  ", " ").replace("  ", " ").strip()
+
+
+def set_one_line_comment_chars(s):
+  global one_line_comment_chars
+  if type(s) == list and len(s):
+    one_line_comment_chars = s
+  elif type(s) == str and len(s):
+    one_line_comment_chars = s.split(" ")
+  else:
+    one_line_comment_chars = []
+
+
+def do_remove_comment_from_code(file_in = None, file_out = None):
+  commentStart = -1
+  line_out = ""
+
+  if not file_in:
+    file_in = sys.stdin
+  if not file_out:
+    file_out = sys.stdout
+
+  while True:
+    line_in = file_in.readline()
+    if line_in == "": break
+    line_in = line_in.rstrip()
+
+    if commentStart == -1:
+      commentStart = line_in.find("/*")
+    if commentStart > -1:
+      if len(line_out) > 0 and not line_out[len(line_out)-1].isspace():
+        line_out = line_out + " "
+      line_out = line_out + line_in
+      commentEnd = line_out.find("*/")
+      if commentEnd == -1:
+        continue
+      comment = line_out[commentStart+2:commentEnd]
+      comment = comment.lower()
+      if comment.find("license") == -1 and comment.find("copyright") == -1:
+        line_out = line_out[:commentStart] + " " + line_out[commentEnd+2:]
+      # else:
+        # leave comment as is
+      commentStart = -1
+    else:
+      line_out = line_in
+      for s in one_line_comment_chars:
+        if s[0] == '^':
+          if line_in.startswith(s[1:]):
+            line_out = ""
+            break
+        else:
+          comment_pos = line_in.find(s)
+          if comment_pos > -1:
+            line_out = line_in[:comment_pos]
+            break
+
+    line_out = remove_tabs_and_reduce_blanks_to_one_and_strip(line_out)
+    if len(line_out) > 0:
+      file_out.write(line_out + "\n")
+      line_out = ""
+
+
+# main()
+
+if __name__ == '__main__':
+  argc = len(sys.argv)
+  if argc > 1:
+    if argc > 2:
+      if sys.argv[1] == "-d":
+        set_one_line_comment_chars(sys.argv[2])
+        # cave: not valid for css, because ^# is a valid part of syntax
+        for s in one_line_comment_chars:
+          if s[0] == "^" and len(s) < 2:
+            usage()
+          else:
+            if len(s) < 1:
+              usage()
+      else:
+        usage()
+    else:
+      usage()
+
+  do_remove_comment_from_code()
+

tools/remove_comment_from_files_data_embed.py

@@ -0,0 +1,21 @@
+
+import remove_comment_from_code
+
+assets_list = {
+    'data_embed/index.html.tmp': 'data_embed/index.html.tmp2',
+    'data_embed/js.js': 'data_embed/js.js.tmp',
+    'data_embed/style.css': 'data_embed/style.css.tmp'
+}
+
+
+for src_file_name, out_file_name in assets_list.items():
+    file_in = open(src_file_name, 'r')
+    file_out = open(out_file_name, 'w')
+    try:
+      if src_file_name.find(".js") > -1:
+        remove_comment_from_code.set_one_line_comment_chars("//")
+      else:
+        remove_comment_from_code.set_one_line_comment_chars([])
+      remove_comment_from_code.do_remove_comment_from_code(file_in, file_out)
+    except:
+      file_out.write(file_in.read())