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

sh import last interval as double (for <1h)

This commit is contained in:
Hansi, dl9rdz 2021-11-01 17:31:27 +01:00
parent e4df63e264
commit 8ddf8fa595
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
RX_FSK/RX_FSK.ino
View File

@ -80,7 +80,7 @@ const char *dfmSubtypeStrSH[16] = { NULL, NULL, NULL, NULL, NULL, NULL,
// Times in ms, i.e. station: 10 minutes, mobile: 20 seconds // Times in ms, i.e. station: 10 minutes, mobile: 20 seconds
#define APRS_STATION_UPDATE_TIME (10*60*1000) #define APRS_STATION_UPDATE_TIME (10*60*1000)
#define APRS_MOBILE_STATION_UPDATE_TIME (20*1000) #define APRS_MOBILE_STATION_UPDATE_TIME (20*1000)
unsigned long time_last_aprs_update = 0; unsigned long time_last_aprs_update = -APRS_STATION_UPDATE_TIME;
#if FEATURE_SONDEHUB #if FEATURE_SONDEHUB
#define SONDEHUB_STATION_UPDATE_TIME (60*60*1000) // 60 min #define SONDEHUB_STATION_UPDATE_TIME (60*60*1000) // 60 min
@ -702,7 +702,7 @@ struct st_configitems config_list[] = {
{"sondehub.fiactive", 0, &sonde.config.sondehub.fiactive}, {"sondehub.fiactive", 0, &sonde.config.sondehub.fiactive},
{"sondehub.fiinterval", 0, &sonde.config.sondehub.fiinterval}, {"sondehub.fiinterval", 0, &sonde.config.sondehub.fiinterval},
{"sondehub.fimaxdist", 0, &sonde.config.sondehub.fimaxdist}, {"sondehub.fimaxdist", 0, &sonde.config.sondehub.fimaxdist},
{"sondehub.fimaxage", 0, &sonde.config.sondehub.fimaxage}, {"sondehub.fimaxage", -7, &sonde.config.sondehub.fimaxage},
#endif #endif
}; };
@ -2354,6 +2354,7 @@ void loopDecoder() {
} }
else if ( tcpclient.connected() ) { else if ( tcpclient.connected() ) {
unsigned long now = millis(); unsigned long now = millis();
Serial.printf("aprs: now-last = %ld\n", (now-lasttcp));
if ( (now - lasttcp) > sonde.config.tcpfeed.highrate * 1000L ) { if ( (now - lasttcp) > sonde.config.tcpfeed.highrate * 1000L ) {
strcat(str, "\r\n"); strcat(str, "\r\n");
Serial.print(str); Serial.print(str);
@ -3243,6 +3244,7 @@ void aprs_station_update() {
unsigned long time_now = millis(); unsigned long time_now = millis();
unsigned long time_delta = time_now - time_last_aprs_update; unsigned long time_delta = time_now - time_last_aprs_update;
unsigned long update_time = (chase == SH_LOC_CHASE) ? APRS_MOBILE_STATION_UPDATE_TIME : APRS_STATION_UPDATE_TIME; unsigned long update_time = (chase == SH_LOC_CHASE) ? APRS_MOBILE_STATION_UPDATE_TIME : APRS_STATION_UPDATE_TIME;
Serial.printf("aprs_station_update: delta: %ld, update in %ld\n", time_delta, update_time);
if (time_delta < update_time) return; if (time_delta < update_time) return;
Serial.println("Update is due!!"); Serial.println("Update is due!!");
@ -3261,7 +3263,6 @@ void aprs_station_update() {
} }
} }
Serial.printf("Really updating!! (objcall is %s)", sonde.config.objcall); Serial.printf("Really updating!! (objcall is %s)", sonde.config.objcall);
time_last_aprs_update = time_now;
char *bcn = aprs_send_beacon(sonde.config.call, lat, lon, sonde.config.beaconsym + ((chase==SH_LOC_CHASE)?2:0), sonde.config.comment); char *bcn = aprs_send_beacon(sonde.config.call, lat, lon, sonde.config.beaconsym + ((chase==SH_LOC_CHASE)?2:0), sonde.config.comment);
if ( tcpclient.disconnected()) { if ( tcpclient.disconnected()) {
tcpclient.connect(sonde.config.tcpfeed.host, sonde.config.tcpfeed.port); tcpclient.connect(sonde.config.tcpfeed.host, sonde.config.tcpfeed.port);
@ -3271,6 +3272,7 @@ void aprs_station_update() {
Serial.println("****BEACON****"); Serial.println("****BEACON****");
Serial.print(bcn); Serial.print(bcn);
tcpclient.write(bcn, strlen(bcn)); tcpclient.write(bcn, strlen(bcn));
time_last_aprs_update = time_now;
} }
} }

2
RX_FSK/src/Sonde.h
View File

@ -225,7 +225,7 @@ struct st_sondehub {
int fiactive; int fiactive;
int fiinterval; int fiinterval;
int fimaxdist; int fimaxdist;
int fimaxage; double fimaxage;
}; };
// to be extended // to be extended

2
RX_FSK/version.h
View File

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