diff --git a/data/igate_conf.json b/data/igate_conf.json index 2339fdc..98766f4 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -1,13 +1,13 @@ { - "callsign": "NOCALL-10", - "stationMode": 1, + "callsign": "CD2RXU-11", + "stationMode": 2, "iGateComment": "LoRa_APRS_iGate", "wifi": { "AP": [ - { "ssid": "Wifi_1", - "password": "wifi_1_password", - "latitude": 0.0000000, - "longitude": 0.0000000 + { "ssid": "Richon", + "password": "k4fPnmg5qnyf", + "latitude": -32.8805195, + "longitude": -71.4282433 }, { "ssid": "Wifi_2", "password": "wifi_2_password", @@ -22,8 +22,8 @@ "longitude": 0.0000000 }, "aprs_is": { - "passcode": "VWXYZ", - "server": "euro.aprs2.net", + "passcode": "23201", + "server": "soam.aprs2.net", "port": 14580, "reportingDistance": 30 }, diff --git a/data/index.html b/data/index.html new file mode 100644 index 0000000..5ec7554 --- /dev/null +++ b/data/index.html @@ -0,0 +1,316 @@ + + + + + + TTGO-T-Beam-LoRa-APRS <!--VERSION--> + + + + + +
+
+ +
+
+
+

WiFi Settings

+
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+
+
+
+
+

APRS Settings

+
+
+
+
+
Transmission Settings
+
+
+
+ + +
+
+ + +
+
+
+
Station Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
Telemetry Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
Fixed Beaconing Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
Smart Beaconing Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+

Device Settings

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ +
+
+
+
+
+
+
+

Received

+
+
+ + + + + + + + + + + + +
Time (UTC)FrameRSSISNR
+
+
+
+
+

Actions

+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+

Update

+
+
+
+
+
+ +
+ + +
+
+
+
+
+
+ + + diff --git a/data/index2.html b/data/index2.html new file mode 100644 index 0000000..4bae33d --- /dev/null +++ b/data/index2.html @@ -0,0 +1,972 @@ + + + + + + TTGO-T-Beam-LoRa-APRS <!--VERSION--> + + + + + +
+
+ +
+
+
+

WiFi Settings

+
+
+
+
+
+ + +
+
+
+
AP settings
+
+
+
+ + +
+
+ + +
+
+
+
STA settings
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+
+
+
+
+
+

APRS Settings

+
+
+
+
Transmission Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+ More info for SNR/RSSI path encoding see documentation section below +
+
+
+
+
Station Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ *) requires reboot only if connection to aprs-is enabled +
+
+
+
Telemetry Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
Fixed Beaconing Settings
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
Position format and precision / ambiguity
+
+
+
+ + +
+
+
+
Smart Beaconing Settings
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ *) requires reboot only if you change enable/disable GPS +
+
+
+
Additional settings for secondary frequency:
EXPERIMENTAL - USE WITH CARE!
+
+
+
+ + (for cross-repeating or listening transmissions from igates) + +
+
+ + +
+
+
+
+ + +
+
+
+
+ + (Only honored, if we are NOT configured as WIDE1 or WIDE2 digi. If set to both frequencies: Ratio depends on how many packets are received on each qrg in a 10min window; we stay 20s on one qrg.) + +
+
+ + +
+
+
+
Additional settings for mode repater:
EXPERIMENTAL - USE WITH CARE!
+
+
+
+ + +
+
+
+
+ + (If LoRa Repeater Mode has not been set to off) + +
+
+ + (Only honored, if we are configured as WIDE1 or WIDE2 digi) + +
+
+
+
APRS-IS settings
+
changes in the foollowing section need a reboot to ensure correct login into APRS-IS
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + (Will be '3rd-party encoded'. Be careful - do not flood our slow main frequency! Use filters..) + +
+
+ + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+

Device Settings

+
+
+
+ + +
+
+ + +
+ +
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+
+
+
+
+
+
+

Device Info

+
+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+ + +
+
+ + +
+
+
+
+
+

Received

+
+
+ + + + + + + + + + + + +
Time (UTC)FrameRSSISNR
+
+
+
+
+

Actions

+
NEW: reboot after changes above only necessary, where explicitly stated
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+

Update

+
+
+
+
View configuration
+
+
+ Click here to view (backup) your current settings. +
+
+ Click here to view your configured wifi settings. +
+
+
Firmware update
+
+
+
+
+ +
+ + +
+
+
+
+
Save configuration
+
+
+ Save configuration to tracker's filesystem (/preferences.cfg) +
+
+ +
+
+
+
+
Save configuration
+
+
+ Save Wifi configuration to tracker's filesystem (/wifi.cfg) +
+
+ +
+
+
+
+
+
+
+

Documentation

+
+
+
+
Tooltip
+
+
If you navigate your mouse over an input field / button, you see a detailed description what it does / which values are expected.
+
+
Info for SNR/RSSI path encoding
+
+
If enabled, add SNR and RSSI in path on receiption, prefixed with 'Q'. Examples:
+ SNR 23 RSSI -73 -> Q2373
+ SNR -03 RSSI -104 -> QA3K4
+ SNR -13 RSSI -114 -> QB3L4
+ Still testing, if it behaves good to our network.
+ Use with care; resulting longer path consumes a bit more airtime. +
+
+
TTGO T-Beam middle hardware-button
(User key functions):
+
+
+
short press
+ If OLED is enabled and OLED is OFF:
+
    +
  • a short press will wake it up and show current data (as long as your configured "Display Timeout")
    • +
+ If OLED is disabled or OLED is ON:
+
    +
  • with GPS-FIX immediate sending of a frame with the position from the GPS
    • +
  • without GPS-FIX, immediate sending of the frame with the position saved in the configuration
    • +
+
long press
+
    +
  • toggle on or off WiFi and WebServer
    • +
  • Cave: if you long-press during boot, your settings are purged!
    • +
+
+
+
TTGO T-Beam left/right hardware-buttons:
+
+
+
  • Left button (nearby USB-port): if long-pressed, your device will powered off (press 7s), or is switched on again (2s).
+
  • Right button (lateral): short-press reboots your device (restarts the CPU).
+
+
+
+
+
Tips for reducing power (Usage as tracker only):
+
+
+ WiFi OFF
+
    +
  • be aware, that aprs-is connection depends on the Webserver and will stop working).
    • +
  • select option 0 to disable WiFi & APRS-IS
    • +
  • 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)
    • +
+ LoRa Receiver OFF:
+
    +
  • reduces power consumption, if you just use the device as a tracker
    • +
+ Fixed Beacon off:
+
    +
  • Smart Beaconing is activated, if there is no fixed beacon
    • +
+
+
+
Config in Filesystem:
+
+
+ General
+
    +
  • There could be two files: wifi.cfg and preferences.cfg. You find in the directory "data" of this sources-tree.
    • +
  • Each file should not exceed 2560 bytes.
    • +
  • To upload both files to SPIFFS of your board, you have to do this via Upload File System image in PlatformIO!
    • +
  • 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.
    • +
+ data/wifi.cfg
+
    +
  • 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
    • +
  • 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.
    • +
  • The content, what will be saved, can be viewed above.
    • +
  • wifi.cfg in the directory data contains SSID and password of up to 10 AP and a password for the local accesspoint
    • +
  • The password must not be shorter that 8 byte. The json structure must not be changed
    • +
  • 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.
    • +
  • An alternative to upload wifi.cfg to your board is via Upload File System image in PlatformIO!
    • +
  • 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.
    • +
+ which WiFi is selected?
+
    +
  • An AP entry containing the keyword "prio":1 defines the entry which is taken as first to connect before following the configured order
    • +
  • if there is nothing prioritized, then the configured order is followed. If credentials are available in flash, they will be used first.
    • +
  • 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
    • +
+ data/preferences.cfg
+
    +
  • preferences.cfg can be created by the system, if you kilck to "SAVE2FS" in the Update section of the site. +
  • 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. +
+ which config is selected?
+
    +
  • 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.
    • +
  • 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.
    • +
+ Factory reset
+
    +
  • 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.
    • +
  • 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.
    • +
+ Platform.IO CLI
+
    +
  • 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
    • +
  • you can find it here
    • +
  • usefull commands, if the board is connected to the PI via USB:
    • +
  • Clean all of project compilation: ~/.platformio/penv/bin/pio run -e [board identifier] -t cleanall --upload-port /dev/[port]
    • +
  • Erase Flash: ~/.platformio/penv/bin/pio run -e [board identifier] -t erase --upload-port /dev/[port]
    • +
  • Build Filesystem: ~/.platformio/penv/bin/pio run -e [board identifier] -t buildfs --upload-port /dev/[port]
    • +
  • Upload Filesystem: ~/.platformio/penv/bin/pio run -e [board identifier] -t uploadfs --upload-port /dev/[port]
    • +
  • Compile and Upload Firmware: ~/.platformio/penv/bin/pio run -e [board identifier] -t upload --upload-port /dev/[port]
    • +
  • start serial monitor: ~/.platformio/penv/bin/pio device monitor -p /dev/[port] -b 115200
    • +
  • 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
    • +
  • if a precompiled fw should be uploaded, without compilation, use the nobuild switch:
    + ~/.platformio/penv/bin/pio run -e ttgo-t-beam-v1.0-development -t nobuild -t upload --upload-port /dev/ttyACM0
    • +
+
+
+
+
+
Hardware notices
+
+
+
TTGO LoRa32 V2.1 (aka T3 V1.6.1)
+ Hardware limitation: if bluetooth is enabled and BT-client is connected, WIFI (-> Web-Server) does not work anymore.
+ 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.
+ 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.
+ 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..
+ How to switch the Webserver on again, please read the long-press button (GPS) section. +
+
+
+
+ + + diff --git a/src/utils.cpp b/src/utils.cpp index 74191c6..0c50e7a 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -16,11 +16,6 @@ #include "display.h" #include "utils.h" -// -#include "web_utils.h" -// - - AsyncWebServer server(80); extern WiFiClient espClient; @@ -274,16 +269,11 @@ void startOTAServer() { }); server.on("/test1", HTTP_GET, [](AsyncWebServerRequest *request) { - request->send(200, "text/html", htmlPage1); + request->send(SPIFFS, "/index.html", "text/html"); }); server.on("/test2", HTTP_GET, [](AsyncWebServerRequest *request) { - String dynamicContent = String(htmlPage3); - dynamicContent.replace("%VCALLSIGN%", Config.callsign); - - - - request->send(200, "text/html", dynamicContent); + request->send(SPIFFS, "/index2.html", "text/html"); }); AsyncElegantOTA.begin(&server); diff --git a/src/web_utils.h b/src/web_utils.h deleted file mode 100644 index 2c2350d..0000000 --- a/src/web_utils.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef WEB_UTILS_H_ -#define WEB_UTILS_H_ - - -#include "configuration.h" -#include - -extern Configuration Config; - -// -const char* htmlPage1 = "

Page 1

"; -//const char* htmlPage2 = "

Page 2

"; -const char* htmlPage3 = "Dynamic Content Example

LoRa iGate Configuration Data

Callsign: %VCALLSIGN%

"; - -// - - -namespace WEB_Utils { - -/*void checkWiFi(); -void startWiFi(); -void setup();*/ - -} - -#endif \ No newline at end of file