kopia lustrzana https://github.com/dl9rdz/rdz_ttgo_sonde
Merge branch 'dl9rdz:devel' into devel
commit
6df02c1fd0
|
@ -47,7 +47,7 @@ install:
|
||||||
- arduino --pref "build.path=$PWD/build" --save-prefs
|
- arduino --pref "build.path=$PWD/build" --save-prefs
|
||||||
- arduino --install-boards esp32:esp32:1.0.6 --save-prefs
|
- arduino --install-boards esp32:esp32:1.0.6 --save-prefs
|
||||||
- ln -s $PWD/libraries/SondeLib /usr/local/share/arduino/libraries/SondeLib
|
- ln -s $PWD/libraries/SondeLib /usr/local/share/arduino/libraries/SondeLib
|
||||||
- arduino --install-library "U8g2"
|
- arduino --install-library "U8g2:2.28.8"
|
||||||
- arduino --install-library "MicroNMEA"
|
- arduino --install-library "MicroNMEA"
|
||||||
- arduino --install-library "GFX Library for Arduino"
|
- arduino --install-library "GFX Library for Arduino"
|
||||||
script:
|
script:
|
||||||
|
|
|
@ -2051,7 +2051,7 @@ void setup()
|
||||||
{
|
{
|
||||||
char buf[12];
|
char buf[12];
|
||||||
// Open serial communications and wait for port to open:
|
// Open serial communications and wait for port to open:
|
||||||
Serial.begin(921600 /*115200*/);
|
Serial.begin(/*921600 */115200);
|
||||||
for (int i = 0; i < 39; i++) {
|
for (int i = 0; i < 39; i++) {
|
||||||
int v = gpio_get_level((gpio_num_t)i);
|
int v = gpio_get_level((gpio_num_t)i);
|
||||||
Serial.printf("%d:%d ", i, v);
|
Serial.printf("%d:%d ", i, v);
|
||||||
|
@ -2428,6 +2428,7 @@ void loopDecoder() {
|
||||||
i = 0;
|
i = 0;
|
||||||
rtc_wdt_protect_off();
|
rtc_wdt_protect_off();
|
||||||
rtc_wdt_disable();
|
rtc_wdt_disable();
|
||||||
|
// Requires serial speed 921600, otherweise interrupt wdt will occur
|
||||||
heap_caps_dump(MALLOC_CAP_8BIT);
|
heap_caps_dump(MALLOC_CAP_8BIT);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -3714,8 +3715,8 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub *
|
||||||
}
|
}
|
||||||
|
|
||||||
// Only send burst timer if RS41 and not 0
|
// Only send burst timer if RS41 and not 0
|
||||||
if ((realtype == STYPE_RS41) && ((int)s->burstKT != 0)) {
|
if ((realtype == STYPE_RS41) && ((int)s->countKT != 0)) {
|
||||||
sprintf(w, "\"burst_timer\": %d,", (int)s->burstKT);
|
sprintf(w, "\"burst_timer\": %d,", (int)s->countKT);
|
||||||
w += strlen(w);
|
w += strlen(w);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@ var cfgs = [
|
||||||
[ "mdnsname", "Network mDNS name"],
|
[ "mdnsname", "Network mDNS name"],
|
||||||
[ "ephftp", "FTP server for ephemeris data (RS92 decoder)"],
|
[ "ephftp", "FTP server for ephemeris data (RS92 decoder)"],
|
||||||
[ "debug", "Debug mode (0/1)" ],
|
[ "debug", "Debug mode (0/1)" ],
|
||||||
[ "maxsonde", "Maxumum number of QRG entries (must be ⋚50)" ],
|
[ "maxsonde", "Maximum number of QRG entries (must be ≤ 50)" ],
|
||||||
[ "rxlat", "Receiver fixed latitude"],
|
[ "rxlat", "Receiver fixed latitude"],
|
||||||
[ "rxlon", "Receiver fixed longitude"],
|
[ "rxlon", "Receiver fixed longitude"],
|
||||||
[ "rxalt", "Receiver fixed altitude"],
|
[ "rxalt", "Receiver fixed altitude"],
|
||||||
|
|
|
@ -500,6 +500,8 @@ void ProcessSubframe( byte *subframeBytes, int subframeNumber ) {
|
||||||
memcpy( s->rawData+16*subframeNumber, subframeBytes, 16);
|
memcpy( s->rawData+16*subframeNumber, subframeBytes, 16);
|
||||||
s->valid |= (1ULL << subframeNumber);
|
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%032x\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
|
// subframeReceived[subframeNumber] = true; // mark this row of the total subframe as complete
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
@ -865,6 +867,7 @@ int RS41::getSubtype(char *buf, int buflen, SondeInfo *si) {
|
||||||
strncpy(buf, sf->value.names.variant, buflen);
|
strncpy(buf, sf->value.names.variant, buflen);
|
||||||
buf[buflen-1]=0;
|
buf[buflen-1]=0;
|
||||||
if(*buf==0) return -1;
|
if(*buf==0) return -1;
|
||||||
|
Serial.printf("subframe valid: %x%032x; subtype=%s\n", (uint32_t)(sf->valid>>32), (uint32_t)sf->valid, buf);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
const char *version_name = "rdzTTGOsonde";
|
const char *version_name = "rdzTTGOsonde";
|
||||||
const char *version_id = "devel20210919";
|
const char *version_id = "devel20210920";
|
||||||
const int SPIFFS_MAJOR=2;
|
const int SPIFFS_MAJOR=2;
|
||||||
const int SPIFFS_MINOR=16;
|
const int SPIFFS_MINOR=16;
|
||||||
|
|
Ładowanie…
Reference in New Issue