From 2dcbcc31419de773e4c25425276c1aad29187c32 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Mon, 20 Sep 2021 16:20:53 +0200 Subject: [PATCH 1/3] fix RS41 subtype --- RX_FSK/src/RS41.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RX_FSK/src/RS41.cpp b/RX_FSK/src/RS41.cpp index 6f8d637..801c402 100644 --- a/RX_FSK/src/RS41.cpp +++ b/RX_FSK/src/RS41.cpp @@ -862,7 +862,7 @@ int RS41::waitRXcomplete() { int RS41::getSubtype(char *buf, int buflen, SondeInfo *si) { struct subframeBuffer *sf = (struct subframeBuffer *)si->extra; if(!sf) return -1; - if( (sf->valid & (3<<21)) != (3<<21) ) return -1; // or 1 instead of 3 for the first 8 chars only, as in autorx? + if( (sf->valid & (3<<0x21)) != (3<<0x21) ) return -1; // or 1 instead of 3 for the first 8 chars only, as in autorx? if(buflen>11) buflen=11; // then buflen should be capped at 9 (8+trailing \0) strncpy(buf, sf->value.names.variant, buflen); buf[buflen-1]=0; From f5281e523cbde86a311bd1d972ef59ba4eff9623 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Mon, 20 Sep 2021 16:57:37 +0200 Subject: [PATCH 2/3] really fix RS41 subtype --- RX_FSK/src/RS41.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RX_FSK/src/RS41.cpp b/RX_FSK/src/RS41.cpp index 801c402..9b0c2bb 100644 --- a/RX_FSK/src/RS41.cpp +++ b/RX_FSK/src/RS41.cpp @@ -499,7 +499,7 @@ void ProcessSubframe( byte *subframeBytes, int subframeNumber ) { } memcpy( s->rawData+16*subframeNumber, subframeBytes, 16); s->valid |= (1ULL << subframeNumber); - Serial.printf("subframe %d; valid: %x%032x\n", subframeNumber, (uint32_t)(s->valid>>32), (uint32_t)s->valid); + Serial.printf("subframe %d; valid: %x%08x\n", subframeNumber, (uint32_t)(s->valid>>32), (uint32_t)s->valid); for(int i=0; i<16; i++) { Serial.printf("%02x[%c]", subframeBytes[i],( subframeBytes[i]>20 && subframeBytes[i]<127)? subframeBytes[i] : '.'); } Serial.println(""); // subframeReceived[subframeNumber] = true; // mark this row of the total subframe as complete @@ -862,12 +862,12 @@ int RS41::waitRXcomplete() { int RS41::getSubtype(char *buf, int buflen, SondeInfo *si) { struct subframeBuffer *sf = (struct subframeBuffer *)si->extra; if(!sf) return -1; - if( (sf->valid & (3<<0x21)) != (3<<0x21) ) return -1; // or 1 instead of 3 for the first 8 chars only, as in autorx? + if( ( (sf->valid>>0x21) &3) != 3 ) return -1; // or 1 instead of 3 for the first 8 chars only, as in autorx? if(buflen>11) buflen=11; // then buflen should be capped at 9 (8+trailing \0) strncpy(buf, sf->value.names.variant, buflen); buf[buflen-1]=0; if(*buf==0) return -1; - Serial.printf("subframe valid: %x%032x; subtype=%s\n", (uint32_t)(sf->valid>>32), (uint32_t)sf->valid, buf); + Serial.printf("subframe valid: %x%08x; subtype=%s\n", (uint32_t)(sf->valid>>32), (uint32_t)sf->valid, buf); return 0; } From 86566c042710f4062fa20a2912925d85cb2591d6 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Mon, 20 Sep 2021 18:18:09 +0200 Subject: [PATCH 3/3] sync sh import / sh telemetry --- RX_FSK/RX_FSK.ino | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 40b9bb7..441120f 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -3358,12 +3358,6 @@ void loop() { } #endif -#if FEATURE_SONDEHUB - if (sonde.config.sondehub.active) { - // interval check moved to sondehub_station_update to avoid having to calculate distance in auto mode twice - sondehub_station_update(&shclient, &sonde.config.sondehub); - } -#endif } #if FEATURE_SONDEHUB @@ -3472,6 +3466,7 @@ void sondehub_station_update(WiFiClient *client, struct st_sondehub *conf) { Serial.println(strlen(data)); Serial.println(data); Serial.println("Waiting for response"); + // TODO: better do this asyncrhonously String response = client->readString(); Serial.println(response); Serial.println("Response done..."); @@ -3530,7 +3525,6 @@ void sondehub_reply_handler(WiFiClient *client) { } } } - // send import requests if needed if (sonde.config.sondehub.fiactive) { if (shImport == 2) { @@ -3547,6 +3541,13 @@ void sondehub_reply_handler(WiFiClient *client) { sondehub_send_fimport(&shclient); } } + + // also handle periodic station updates here... + // interval check moved to sondehub_station_update to avoid having to calculate distance in auto mode twice + if(shState == SH_CONN_IDLE) { + // (do not set station update while a telemetry report is being sent + sondehub_station_update(&shclient, &sonde.config.sondehub); + } } void sondehub_send_fimport(WiFiClient * client) {