ua1zbe
/
rdz_ttgo_sonde
mirror of https://github.com/oh3bsg/rdz_ttgo_sonde
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

some better APRS for wettersonde.net support

This commit is contained in:
Hansi, dl9rdz 2021-10-30 17:36:48 +02:00
parent 327bbca6e6
commit baec8fb8ea
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RX_FSK/RX_FSK.ino
View File

@ -3235,7 +3235,7 @@ 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; 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)); 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);
} }

8
RX_FSK/src/aprs.cpp
View File

@ -260,7 +260,7 @@ char b[251];
//char raw[201]; //char raw[201];
const char *destcall="APRRDZ"; const char *destcall="APRRDZ";
char *aprs_send_beacon(const char *usercall, float lat, float lon, const char *sym) { char *aprs_send_beacon(const char *usercall, float lat, float lon, const char *sym, const char *comment) {
*b = 0; *b = 0;
aprsstr_append(b, usercall); aprsstr_append(b, usercall);
aprsstr_append(b, ">"); aprsstr_append(b, ">");
@ -286,7 +286,9 @@ char *aprs_send_beacon(const char *usercall, float lat, float lon, const char *s
snprintf(b+i, APRS_MAXLEN-i, "%03d%02d.%02d%c%c", loni, lonm/100, lonm%100, lon<0?'W':'E', sym[1]); snprintf(b+i, APRS_MAXLEN-i, "%03d%02d.%02d%c%c", loni, lonm/100, lonm%100, lon<0?'W':'E', sym[1]);
// maybe add alt // maybe add alt
// maybe add DAO? // maybe add DAO?
sprintf(b + strlen(b), "%s", version_name); i = strlen(b);
snprintf(b+i, APRS_MAXLEN-i, "%s", comment);
//sprintf(b + strlen(b), "%s", version_name);
return b; return b;
} }
@ -297,7 +299,7 @@ char *aprs_senddata(SondeInfo *si, const char *usercall, const char *objcall, co
aprsstr_append(b, ">"); aprsstr_append(b, ">");
// const char *destcall="APRARX,SONDEGATE,TCPIP,qAR,oh3bsg"; // const char *destcall="APRARX,SONDEGATE,TCPIP,qAR,oh3bsg";
aprsstr_append(b, destcall); aprsstr_append(b, destcall);
if(*objcall) aprsstr_append(b, usercall); if(*objcall) { aprsstr_append(b, ","); aprsstr_append(b, usercall); }
// uncompressed // uncompressed
aprsstr_append(b, ":;"); aprsstr_append(b, ":;");
char tmp[10]; char tmp[10];

2
RX_FSK/src/aprs.h
View File

@ -8,7 +8,7 @@
void aprs_gencrctab(void); void aprs_gencrctab(void);
int aprsstr_mon2raw(const char *mon, char raw[], int raw_len); int aprsstr_mon2raw(const char *mon, char raw[], int raw_len);
int aprsstr_mon2kiss(const char *mon, char raw[], int raw_len); int aprsstr_mon2kiss(const char *mon, char raw[], int raw_len);
char *aprs_send_beacon(const char *call, float lat, float lon, const char *sym); char *aprs_send_beacon(const char *call, float lat, float lon, const char *sym, const char *comment);
char *aprs_senddata(SondeInfo *s, const char *usercall, const char *objcall, const char *sym); char *aprs_senddata(SondeInfo *s, const char *usercall, const char *objcall, const char *sym);