Merge branch 'dl9rdz:devel' into devel

RX_FSK/RX_FSK.ino

@@ -503,7 +503,7 @@ void addSondeStatus(char *ptr, int i)
   struct tm ts;
   SondeInfo *s = &sonde.sondeList[i];
   strcat(ptr, "<table>");
-  sprintf(ptr + strlen(ptr), "<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s", s->freq, sondeTypeLongStr[s->type],
+  sprintf(ptr + strlen(ptr), "<tr><td id=\"sfreq\">%3.3f MHz, Type: %s</td><tr><td>ID: %s", s->freq, sondeTypeLongStr[sonde.realType(s)],
           s->d.validID ? s->d.id : "<?""?>");
   if (s->d.validID && (TYPE_IS_DFM(s->type) || TYPE_IS_METEO(s->type) || s->type == STYPE_MP3H) ) {
     sprintf(ptr + strlen(ptr), " (ser: %s)", s->d.ser);
@@ -548,7 +548,7 @@ const char *createLiveJson() {
 
   SondeInfo *s = &sonde.sondeList[sonde.currentSonde];
   sprintf(ptr + strlen(ptr), "\"sonde\": {\"rssi\": %d, \"vframe\": %d, \"time\": %d,\"id\": \"%s\", \"freq\": %3.3f, \"type\": \"%s\"",
-          s->rssi, s->d.vframe, s->d.time, s->d.id, s->freq, sondeTypeStr[s->type]);
+          s->rssi, s->d.vframe, s->d.time, s->d.id, s->freq, sondeTypeStr[sonde.realType(s)]);
 
   if ( !isnan(s->d.lat) && !isnan(s->d.lon) )
     sprintf(ptr + strlen(ptr), ", \"lat\": %.6f, \"lon\": %.6f", s->d.lat, s->d.lon);
@@ -1309,7 +1309,7 @@ void addSondeStatusKML(char *ptr, int i)
   sprintf(ptr + strlen(ptr), "<Placemark id=\"%s\"><name>%s</name><Point><altitudeMode>absolute</altitudeMode><coordinates>%.6f,%.6f,%.0f</coordinates></Point><description>%3.3f MHz, Type: %s, h=%.0fm</description></Placemark>",
           s->d.id, s->d.id,
           s->d.lon, s->d.lat, s->d.alt,
-          s->freq, sondeTypeStr[s->type], s->d.alt);
+          s->freq, sondeTypeStr[sonde.realType(s)], s->d.alt);
 }
 
 const char *createKMLDynamic() {
@@ -2530,7 +2530,6 @@ void loopDecoder() {
       }
       if (sonde.config.tcpfeed.active) {
         static unsigned long lasttcp = 0;
-	  static bool loginok = false;
         if ( tcpclient.disconnected()) {
           tcpclient.connect(sonde.config.tcpfeed.host, sonde.config.tcpfeed.port);
         }
@@ -2574,7 +2573,7 @@ void loopDecoder() {
     char raw[1024];
     char gps[128];
     const char *typestr = s->d.typestr;
-    if (*typestr == 0) typestr = sondeTypeStr[s->type];
+    if (*typestr == 0) typestr = sondeTypeStr[sonde.realType(s)];
     // TODO: only if GPS is valid...
     if (gpsPos.valid) {
       snprintf(gps, 128, ", \"gpslat\": %f,"
@@ -2586,6 +2585,14 @@ void loopDecoder() {
     } else {
       *gps = 0;
     }
+    //maintain backwords compatibility
+    float lat = isnan(s->d.lat)?0:s->d.lat;
+    float lon = isnan(s->d.lon)?0:s->d.lon;
+    float alt = isnan(s->d.alt)?-1:s->d.alt;
+    float vs = isnan(s->d.vs)?0:s->d.vs;
+    float hs = isnan(s->d.hs)?0:s->d.hs;
+    float dir = isnan(s->d.dir)?0:s->d.dir;
+
     //
     int len = snprintf(raw, 1024, "{"
                        "\"res\": %d,"
@@ -2623,12 +2630,12 @@ void loopDecoder() {
                        s->d.ser,
                        (int)s->d.validID,
                        s->launchsite,
-                       s->d.lat,
+                       lat,
-                       s->d.lon,
+                       lon,
-                       s->d.alt,
+                       alt,
-                       s->d.vs,
+                       vs,
-                       s->d.hs,
+                       hs,
-                       s->d.dir,
+                       dir,
                        s->d.sats,
                        s->d.validPos,
                        s->d.time,
@@ -3647,11 +3654,8 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
   char rs_msg[MSG_SIZE];
   char *w;
   struct tm ts;
-  uint8_t realtype = s->type;
   // config setting M10 and M20 will both decode both types, so use the real type that was decoded
-  if (TYPE_IS_METEO(realtype)) {
+  uint8_t realtype = sonde.realType(s);
-    realtype = s->d.subtype == 1 ? STYPE_M10 : STYPE_M20;
-  }
 
   // For DFM, s->d.time is data from subframe DAT8 (gps date/hh/mm), and sec is from DAT1 (gps sec/usec)
   // For all others, sec should always be 0 and time the exact time in seconds

RX_FSK/src/M10M20.cpp

@@ -328,6 +328,25 @@ int M10M20::decodeframeM10(uint8_t *data) {
 		if(dir<0) dir+=360;
 		si->dir = dir;
 		si->validPos = 0x3f;
+		// m10 temp
+		const float p0 = 1.07303516e-03, p1 = 2.41296733e-04, p2 = 2.26744154e-06, p3 = 6.52855181e-08;
+  		const float Rs[3] = { 12.1e3 ,  36.5e3 ,  475.0e3 }; 
+  		const float Rp[3] = { 1e20   , 330.0e3 , 2000.0e3 };
+		uint8_t sct = data[62];
+		float rt = getint16(data+63) & (0xFFF);
+		float T = NAN;
+		if(rt!=0 && sct<3) {
+			rt = (4095-rt)/rt - (Rs[sct]/Rp[sct]);
+			if(rt>0) {
+				rt = Rs[sct] / rt;
+				if(rt>0) {
+					rt = log(rt);
+					rt = 1/( p0 + p1*rt + p2*rt*rt + p3*rt*rt*rt ) - 273.15;
+					if(rt>-99 && rt<50) { T = rt; }
+				}
+			}
+		}
+		si->temperature = T;
 
  		uint32_t gpstime = getint32(data+10);
                 uint16_t gpsweek = getint16(data+32);

RX_FSK/src/Sonde.cpp

@@ -716,4 +716,9 @@ void Sonde::clearDisplay() {
 	disp.rdis->clear();
 }
 
+SondeType Sonde::realType(SondeInfo *si) {
+	if(TYPE_IS_METEO(si->type)) { return si->d.subtype==1 ? STYPE_M10:STYPE_M20; }
+	else return si->type;
+}
+
 Sonde sonde = Sonde();

RX_FSK/src/Sonde.h

@@ -319,6 +319,8 @@ public:
 	// moved to heap, saving space in .bss
 	//SondeInfo sondeList[MAXSONDE+1];
 	SondeInfo *sondeList;
+	// helper function for type string
+	static SondeType realType(SondeInfo *si);
 
 	Sonde();
 	void defaultConfig();

RX_FSK/src/aprs.cpp

@@ -17,6 +17,7 @@
 #include <inttypes.h>
 #include "aprs.h"
 
+extern const char *version_name;
 #if 0
 int openudp(const char *ip, int port, struct sockaddr_in *si) {
 	int fd;
@@ -255,11 +256,10 @@ static uint32_t dao91(double x)
 } /* end dao91() */
 
 
-char b[201];
+char b[251];
 //char raw[201];
 
 char *aprs_senddata(SondeInfo *si, const char *usercall, const char *sym) {
-// float lat, float lon, float alt, float speed, float dir, float climb, const char *type, const char *objname, const char *usercall, const char *sym, const char *comm)
 	SondeData *s = &(si->d);
 	*b=0;
 	aprsstr_append(b, usercall);
@@ -288,7 +288,7 @@ char *aprs_senddata(SondeInfo *si, const char *usercall, const char *sym) {
 	snprintf(b+i, APRS_MAXLEN-i, "%03d%02d.%02d%c%c", loni, lonm/100, lonm%100, s->lon<0?'W':'E', sym[1]);
 	if(s->hs>0.5) {
 		i=strlen(b);
-		snprintf(b+i, APRS_MAXLEN-i, "%03d/%03d", realcard(s->dir+1.5), realcard(s->hs*1.0/KNOTS+0.5));
+		snprintf(b+i, APRS_MAXLEN-i, "%03d/%03d", realcard(s->dir+1.5), realcard(s->hs*3.6/KNOTS+0.5));
 	}
 	if(s->alt>0.5) {
 		i=strlen(b);
@@ -299,13 +299,25 @@ char *aprs_senddata(SondeInfo *si, const char *usercall, const char *sym) {
 	snprintf(b+i, APRS_MAXLEN-i, "!w%c%c!", 33+dao91(s->lat), 33+dao91(s->lon));
 
 	// ??? strcat(b, "&");
-	char comm[100];
+	i=strlen(b);
-        snprintf(comm, 100, "Clb=%.1fm/s %.3fMHz Type=%s", s->vs, si->freq, sondeTypeStr[si->type]);
+        i += snprintf(b+i, APRS_MAXLEN-i, "Clb=%.1fm/s ", s->vs );
-	strcat(b, comm);
+	if( !isnan(s->pressure) ) {
-	if( TYPE_IS_DFM(si->type) || TYPE_IS_METEO(si->type) ) {
+		sprintf(b+strlen(b), "p=%.1fhPa ", s->pressure);
-		snprintf(comm, 100, " ser=%s", s->ser);
-		strcat(b, comm);
 	}
+	if( !isnan(s->temperature) ) {
+		sprintf(b+strlen(b), "t=%.1fC ", s->temperature);
+	}
+	if( !isnan(s->relativeHumidity) ) {
+		sprintf(b+strlen(b), "h=%.1f%% ", s->relativeHumidity);
+	}
+	sprintf(b+strlen(b), "%.3fMHz Type=%s ", si->freq, sondeTypeStr[sonde.realType(si)]);
+	if( s->countKT != 0xffff && s->vframe - s->crefKT < 51 ) {
+		sprintf(b+strlen(b), "TxOff=%dh%dm ", s->countKT/3600, (s->countKT-s->countKT/3600*3600)/60);
+	}
+	if( TYPE_IS_DFM(si->type) || TYPE_IS_METEO(si->type) ) {
+		sprintf(b + strlen(b), "ser=%s ", s->ser);
+	}
+	sprintf(b + strlen(b), "%s", version_name);
 	return b;
 }
 

RX_FSK/version.h

@@ -1,4 +1,4 @@
 const char *version_name = "rdzTTGOsonde";
-const char *version_id = "devel20210923";
+const char *version_id = "devel20210924b";
 const int SPIFFS_MAJOR=2;
 const int SPIFFS_MINOR=16;