From 9a66ad25ff929bc3c3a777b364423e210949e1b8 Mon Sep 17 00:00:00 2001 From: "dl9rdz (via Travis CI)" Date: Tue, 4 May 2021 21:14:23 +0300 Subject: [PATCH] Manufacturer and type added --- RX_FSK/RX_FSK.ino | 6 +++--- libraries/SondeLib/Sonde.cpp | 3 +++ libraries/SondeLib/Sonde.h | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index fccacba..9d23bda 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -2969,8 +2969,8 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co "\"software_version\": \"%s\"," "\"uploader_callsign\": \"%s\"," "\"time_received\": \"%d-%02d-%02dT%02d:%02d:%02d.000Z\"," - "\"manufacturer\": \"Vaisala\"," // TODO: - "\"type\": \"RS41\"," // TODO: + "\"manufacturer\": \"%s\"," + "\"type\": \"%s\"," "\"serial\": \"%s\"," "\"frame\": %d," "\"datetime\": \"%d-%02d-%02dT%02d:%02d:%02d.000Z\"," @@ -2995,7 +2995,7 @@ void sondehub_send_data(WiFiClient *client, SondeInfo *s, struct st_sondehub *co "}]", version_name, version_id, conf->callsign, _year, _month, _day, _hour, _minute, _second, - s->id, s->frame, + manufacturer_string[s->type], sondeTypeStr[s->type], s->id, s->frame, _year, _month, _day, _hour, _minute, _second, (int)s->lat, (int)((s->lat - (int)s->lat)*1000000), (int)s->lon, (int)((s->lon - (int)s->lon)*1000000), (int)s->alt, (int)((s->alt - (int)s->alt)*100), diff --git a/libraries/SondeLib/Sonde.cpp b/libraries/SondeLib/Sonde.cpp index 9568f2e..05bcde7 100644 --- a/libraries/SondeLib/Sonde.cpp +++ b/libraries/SondeLib/Sonde.cpp @@ -20,6 +20,9 @@ const char *evstring[]={"NONE", "KEY1S", "KEY1D", "KEY1M", "KEY1L", "KEY2S", "KE const char *RXstr[]={"RX_OK", "RX_TIMEOUT", "RX_ERROR", "RX_UNKNOWN"}; +// Dependency to enum SondeType +const char *manufacturer_string[]={"Graw", "Graw", "Vaisala", "Vaisala", "Meteomodem", "Meteomodem", "Graw", "???"}; + int fingerprintValue[]={ 17, 31, 64, 4, 55, 48, 23, 128+23, 119, 128+119, -1 }; const char *fingerprintText[]={ "TTGO T-Beam (new version 1.0), I2C not working after powerup, assuming 0.9\" OLED@21,22", diff --git a/libraries/SondeLib/Sonde.h b/libraries/SondeLib/Sonde.h index 0162624..93bd0b2 100644 --- a/libraries/SondeLib/Sonde.h +++ b/libraries/SondeLib/Sonde.h @@ -58,6 +58,7 @@ enum SondeType { STYPE_DFM, STYPE_DFM09_OLD, STYPE_RS41, STYPE_RS92, STYPE_M10, extern const char *sondeTypeStr[NSondeTypes]; extern const char *sondeTypeLongStr[NSondeTypes]; extern const char sondeTypeChar[NSondeTypes]; +extern const char *manufacturer_string[NSondeTypes]; #define TYPE_IS_DFM(t) ( (t)==STYPE_DFM || (t)==STYPE_DFM09_OLD || (t)==STYPE_DFM06_OLD ) #define TYPE_IS_METEO(t) ( (t)==STYPE_M10 || (t)==STYPE_M20 )