update

RX_FSK/RX_FSK.ino

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

RX_FSK/data/qrg.txt

@@ -1,23 +1,14 @@
 # Frequency in Mhz (format nnn.nnn)
 # Type (4=RS41, 6=DFM normal, DFM-06, 9=DFM inverted, DFM-09)
 #
-402.300 4 + Greifswald
-402.500 4 - Schleswig
-402.700 4 + HH-Sasel
-403.000 4 - DeBilt
-404.100 4 + Norderney
-404.300 4 - Schleswig_2
-404.500 4 - Meppen
-404.700 4 - Greifswald_2
-405.100 4 - Lindenberg
-405.700 4 + Bergen
-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
+403.000 4 + Jokioinen
+405.300 4 + Sundsvall
+404.000 4 + Tallinn
+401.000 4 + Niinisalo
+401.800 4 + Vaisala
+402.000 4 + Vaisala
+402.700 4 + Vaisala
+402.400 4 + Vaisala
+403.500 4 + Katajaluoto
+402.500 4 + Katajaluoto
 # end

RX_FSK/version.h

@@ -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_id = "v0.2.3";
->>>>>>> Stashed changes
 const int SPIFFS_MAJOR=2;
 const int SPIFFS_MINOR=11;