ua1zbe
/
rdz_ttgo_sonde_dl9rdz
mirror of https://github.com/dl9rdz/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update

This commit is contained in:
dl9rdz (via Travis CI) 2021-04-22 20:54:59 +03:00
parent 7323d5fed1
commit cbd6446c4a
3 changed files with 11 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
RX_FSK/RX_FSK.ino
View File

@ -12,12 +12,8 @@
#include <ESPmDNS.h> #include <ESPmDNS.h>
#include <MicroNMEA.h> #include <MicroNMEA.h>
#include <Ticker.h> #include <Ticker.h>
<<<<<<< Updated upstream
=======
#include <TimeLib.h> #include <TimeLib.h>
//#include <time.h> //#include <time.h>
>>>>>>> Stashed changes
#include <SX1278FSK.h> #include <SX1278FSK.h>
#include <Sonde.h> #include <Sonde.h>
#include <Display.h> #include <Display.h>
@ -36,11 +32,6 @@ static MainState mainState = ST_WIFISCAN; // ST_WIFISCAN;
const char *mainStateStr[5] = {"DECODER", "SPECTRUM", "WIFISCAN", "UPDATE", "TOUCHCALIB" }; const char *mainStateStr[5] = {"DECODER", "SPECTRUM", "WIFISCAN", "UPDATE", "TOUCHCALIB" };
AsyncWebServer server(80); AsyncWebServer server(80);
<<<<<<< Updated upstream
=======
AsyncWebSocket ws("/ws");
AsyncWebSocketClient * globalClient = NULL;
>>>>>>> Stashed changes
AXP20X_Class axp; AXP20X_Class axp;
#define PMU_IRQ 35 #define PMU_IRQ 35
@ -2138,10 +2129,8 @@ void loopDecoder() {
Serial.print("sending: "); Serial.println(raw); Serial.print("sending: "); Serial.println(raw);
tncclient.write(raw, rawlen); tncclient.write(raw, rawlen);
} }
<<<<<<< Updated upstream
} }
=======
Serial.println("Sending data to the sondehub v2 DB <--------------------------------->"); Serial.println("Sending data to the sondehub v2 DB <--------------------------------->");
sondehub_send_data(&shclient, s, &sonde.config.sondehub); sondehub_send_data(&shclient, s, &sonde.config.sondehub);
@ -2276,14 +2265,13 @@ void loopDecoder() {
*/ */
} }
>>>>>>> Stashed changes
// send to MQTT if enabled // send to MQTT if enabled
if (connected && mqttEnabled) { if (connected && mqttEnabled) {
Serial.println("Sending sonde info via MQTT"); Serial.println("Sending sonde info via MQTT");
mqttclient.publishPacket(s); mqttclient.publishPacket(s);
} }
} //}
// always send data, even if not valid.... // always send data, even if not valid....
if (rdzclient.connected()) { if (rdzclient.connected()) {
Serial.println("Sending position via TCP as rdzJSON"); Serial.println("Sending position via TCP as rdzJSON");
@ -2479,8 +2467,6 @@ void enableNetwork(bool enable) {
mqttclient.init(sonde.config.mqtt.host, sonde.config.mqtt.port, sonde.config.mqtt.id, sonde.config.mqtt.username, sonde.config.mqtt.password, sonde.config.mqtt.prefix); mqttclient.init(sonde.config.mqtt.host, sonde.config.mqtt.port, sonde.config.mqtt.id, sonde.config.mqtt.username, sonde.config.mqtt.password, sonde.config.mqtt.prefix);
} }
<<<<<<< Updated upstream
=======
// rsclient.connect("192.168.1.5", 8881); // rsclient.connect("192.168.1.5", 8881);
shclient.setInsecure(); // Skip verification shclient.setInsecure(); // Skip verification
@ -2519,7 +2505,6 @@ void enableNetwork(bool enable) {
Serial.println("Radiosondy FAIL *************************************************"); Serial.println("Radiosondy FAIL *************************************************");
} }
*/ */
>>>>>>> Stashed changes
connected = true; connected = true;
} else { } else {
MDNS.end(); MDNS.end();

29
RX_FSK/data/qrg.txt
View File

@ -1,23 +1,14 @@
# Frequency in Mhz (format nnn.nnn) # Frequency in Mhz (format nnn.nnn)
# Type (4=RS41, 6=DFM normal, DFM-06, 9=DFM inverted, DFM-09) # Type (4=RS41, 6=DFM normal, DFM-06, 9=DFM inverted, DFM-09)
# #
402.300 4 + Greifswald 403.000 4 + Jokioinen
402.500 4 - Schleswig 405.300 4 + Sundsvall
402.700 4 + HH-Sasel 404.000 4 + Tallinn
403.000 4 - DeBilt 401.000 4 + Niinisalo
404.100 4 + Norderney 401.800 4 + Vaisala
404.300 4 - Schleswig_2 402.000 4 + Vaisala
404.500 4 - Meppen 402.700 4 + Vaisala
404.700 4 - Greifswald_2 402.400 4 + Vaisala
405.100 4 - Lindenberg 403.500 4 + Katajaluoto
405.700 4 + Bergen 402.500 4 + Katajaluoto
405.900 4 + Bergen_2
405.100 4 + Meppen_2
405.300 4 - Essen
403.330 9 - TrUebPl
403.450 9 - TrUebPl
403.470 9 - TrUebPl
403.850 9 - TrUebPl
403.870 9 - TrUebPl
403.890 9 - TrUebPl
# end # end

5
RX_FSK/version.h
View File

@ -1,9 +1,4 @@
<<<<<<< Updated upstream
const char *version_name = "rdzTTGOsonde";
const char *version_id = "devel20210402";
=======
const char *version_name = "BSG TTGO Sonde"; const char *version_name = "BSG TTGO Sonde";
const char *version_id = "v0.2.3"; const char *version_id = "v0.2.3";
>>>>>>> Stashed changes
const int SPIFFS_MAJOR=2; const int SPIFFS_MAJOR=2;
const int SPIFFS_MINOR=11; const int SPIFFS_MINOR=11;