mirror
/
DL9SAU-TTGO-T-Beam-LoRa-APRS
kopia lustrzana https://github.com/DL9SAU/TTGO-T-Beam-LoRa-APRS
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

New enhanced display 

If OLED is ON: flip through the available pages
1. press: show lastheard list (Call, time, distance, direction)
2. press: show current build number
3. - 5. press: show last 3 received packets (raw)
6. press: with GPS-FIX immediate send a beacon with the position from the GPS
6. press: without GPS-FIX, immediate send a beacon with the position saved in the configuration

changed behaviour when external power is switched off and and autopower off is selected:
- any keypress or new plugin of external power within auto power off delay will abort the process and return to normal op
- fo

Signed-off-by: DL3EL <dl3el@darc.de>
pull/11/head
DL3EL 2024-03-10 16:16:14 +01:00
rodzic a121c6b8c7
commit 9f6e6d9ee4
6 zmienionych plików z 6 dodań i 81 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
comp.sh
Wyświetl plik

@ -1,3 +0,0 @@
# rem ~/.platformio/penv/bin/pio run -e ttgo-t-beam-v1.0 -t upload --upload-port /dev/ttyACM0
~/.platformio/penv/bin/pio run -e ttgo-t-beam-v1.0-development -t upload --upload-port /dev/ttyACM0
~/.platformio/penv/bin/pio device monitor

5
data/wifi.cfg
Wyświetl plik

@ -1,8 +1,4 @@
{
<<<<<<< HEAD
"SSID": "yourssidhere",
"password": "yourpwhere"
=======
"AP": [
{
"SSID": "EnterSSIDofYourAccesspoint",
@ -16,5 +12,4 @@
],
"SelfAP_PW": "xxxxxxxxxx"
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
}

9
data_embed/index.html
Wyświetl plik

@ -561,14 +561,6 @@ III: Values above are referring to latitude; distance between two latitudes is a
</div>
<!--
<div>
<<<<<<< HEAD
<<<<<<< HEAD
<label for="logserial_en">Serial Logging</label>
=======
<label for="logserial_en">LED signaling</label>
>>>>>>> bb1a5b6196eb0db1f572438e24bb00550f8a7bf6
<input name="logserial_en" id="logserial_en" type="checkbox" value="0" title="enable or disable verbose logging on usb-serial port. Use only if NOT attached at the remote site an AX.25 kiss-device: your logging may corrupt the frames sent in parallel to that device.">
=======
<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>
@ -586,7 +578,6 @@ III: Values above are referring to latitude; distance between two latitudes is a
<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>
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
</div>
<div>
<label for="led_enable">LED signaling</label>

20
platformio.ini
Wyświetl plik

@ -33,27 +33,19 @@ lib_deps =
build_flags =
-Wl,--gc-sections,--relax
-D 'KISS_PROTOCOL' ; leave enabled
-D 'CALLSIGN="DL3EL-10"' ; can be set from www interface
-D 'DIGI_PATH="WIDE1-1"' ; can be set from www interface
-D 'FIXED_BEACON_EN' ; can be set from www interface
-D 'CALLSIGN="N0CALL"' ; can be set from www interface
; -D 'DIGI_PATH="WIDE1-1"' ; can be set from www interface
-D 'DIGI_PATH="1"' ; can be set from www interface
; -D 'FIXED_BEACON_EN' ; can be set from www interface
-D 'SB_ALGO_KENWOOD' ; Kenwood skales better on lower speed.
<<<<<<< HEAD
-D 'LATITUDE_PRESET="5009.21N"' ; can be set from www interface
-D 'LONGITUDE_PRESET="00839.42E"' ; can be set from www interface
-D 'APRS_SYMBOL_TABLE="L"' ; can be set from www interface L
-D 'APRS_SYMBOL="\&"' ; can be set from www interface
;-D 'APRS_SYMBOL_TABLE="/"' ; can be set from www interface Runner
;-D 'APRS_SYMBOL="["' ; can be set from www interface
=======
-D 'LATITUDE_PRESET="0000.00N"' ; 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
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
-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_BATT' ; can be set from www interface
-D 'SHOW_RX_PACKET' ; can be set from www interface
-D 'SHOW_RX_TIME=10000' ; can be set from www interface
-D 'TXFREQ=433.775' ; set operating frequency
@ -65,7 +57,7 @@ build_flags =
-D 'ENABLE_LED_SIGNALING' ; can be set from www interface
-D 'NETWORK_TNC_PORT=8001' ; default KISS TCP port
; -D 'MAX_TIME_TO_NEXT_TX=120000L' ; can be set from www interface -- not implemented
-D 'FIX_BEACON_INTERVAL=180000L' ; can be set from www interface
-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. if not defined, telemetry code will not compiled in
-D 'TNC_SELF_TELEMETRY_INTERVAL=3600L' ; can be set from www interface (seconds)

48
src/taskWebServer.cpp
Wyświetl plik

@ -1314,15 +1314,6 @@ boolean restart_STA(String use_ssid, String use_password) {
do_serial_println("WiFi: Searching for AP " + use_ssid);
while (WiFi.status() != WL_CONNECTED) {
esp_task_wdt_reset();
<<<<<<< HEAD
<<<<<<< HEAD
// do_serial_println(String(int(WiFi.status())));
=======
do_serial_println(String(int(WiFi.status())));
>>>>>>> bb1a5b6196eb0db1f572438e24bb00550f8a7bf6
do_serial_println(String("WiFi: Status " + String(int(WiFi.status())) + ". Try " + retryWifi));
=======
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
if (retryWifi > 30) {
do_serial_println(String("WiFi: Status " + String((int ) WiFi.status()) + ". Try " + retryWifi + ". Giving up."));
return false;
@ -2177,13 +2168,6 @@ void send_queue_to_aprsis()
// hack to circumvent crash on interrupt handler isr0():
rf95.setFrequency(lora_freq_rx_curr + 1);
rf95.sleep(); // disable rf95 before update
<<<<<<< HEAD
<<<<<<< HEAD
Serial.printf("Firmware: Update: %s\n", upload.filename.c_str());
=======
Serial.printf("%c\nFirmware: Update: %s\n", 0xC0, upload.filename.c_str());
>>>>>>> bb1a5b6196eb0db1f572438e24bb00550f8a7bf6
=======
// switch LORA chip off during firmware upload
#ifdef T_BEAM_V1_0
axp.setPowerOutPut(AXP192_LDO2, AXP202_OFF);
@ -2193,7 +2177,6 @@ void send_queue_to_aprsis()
if (!enable_bluetooth)
WiFi.setSleep(false);
Serial.printf("Firmware: Update: %s\r\n", upload.filename.c_str());
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
if (!Update.begin(UPDATE_SIZE_UNKNOWN)) { //start with max available size
#if defined(ENABLE_SYSLOG)
syslog_log(LOG_ERR, String("Firmware: Update begin error: ") + Update.errorString());
@ -2228,21 +2211,10 @@ void send_queue_to_aprsis()
}
} else if (upload.status == UPLOAD_FILE_END) {
if (Update.end(true)) { //true to set the size to the current progress
<<<<<<< HEAD
<<<<<<< HEAD
Serial.printf("Firmware: Update Success: %u\nRebooting...\n", upload.totalSize);
=======
Serial.printf("%c\nFirmware: Update Success: %u\nRebooting...\n", 0xC0, upload.totalSize);
>>>>>>> bb1a5b6196eb0db1f572438e24bb00550f8a7bf6
#if defined(ENABLE_SYSLOG)
syslog_log(LOG_WARNING, String("Firmware: Update Success: ") + String((int)upload.totalSize));
#endif
=======
Serial.printf("Firmware: Update Success: %u\r\nFirmware: Rebooting...\r\n", upload.totalSize);
#if defined(ENABLE_SYSLOG)
syslog_log(LOG_WARNING, String("Firmware: Update Success: ") + String((int)upload.totalSize) + "byte. Rebooting...");
#endif
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
} else {
#if defined(ENABLE_SYSLOG)
syslog_log(LOG_ERR, String("Firmware: Update error: ") + Update.errorString());
@ -2471,26 +2443,6 @@ void send_queue_to_aprsis()
if (!aprsis_status.startsWith("Error: "))
aprsis_status = "Disconnected";
}
<<<<<<< HEAD
outString = outString + String(buf);
if (aprsis_time_last_successful_connect.length())
outString = outString + ", last " + aprsis_time_last_successful_connect;
else
<<<<<<< HEAD
outString = outString + ", Reboot[Build#" + buildnr + "]";
=======
outString = outString + "(Reboot[V" + buildnr + "])";
>>>>>>> bb1a5b6196eb0db1f572438e24bb00550f8a7bf6
aprsis_time_last_successful_connect = String(buf);
outString = outString + ", tries " + String(aprsis_connect_tries);
log_msg = String("APRS-IS: sent status '" + outString + String("'"));
#if defined(ENABLE_SYSLOG)
syslog_log(LOG_INFO, log_msg);
#endif
do_serial_println(log_msg);
aprs_is_client.print(outString + "\r\n");
=======
>>>>>>> 55018abf7b01825fad89cd1e599f4f5b33d28e8b
}
// session died during read / write?

2
upfs.sh
Wyświetl plik

@ -1,2 +0,0 @@
~/.platformio/penv/bin/pio run -e ttgo-t-beam-v1.0-development -t uploadfs --upload-port /dev/ttyACM0
~/.platformio/penv/bin/pio device monitor