mirror
/
radiosonde_auto_rx
kopia lustrzana https://github.com/projecthorus/radiosonde_auto_rx
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Rebase dfm09mod, bump version

pull/732/head
Mark Jessop 2022-12-17 20:00:47 +10:30
rodzic 64a63393cc
commit 793da49174
3 zmienionych plików z 26 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

7
README.md
Wyświetl plik

@ -18,13 +18,14 @@ Manufacturer | Model | Position | Temperature | Humidity | Pressure | XDATA
-------------|-------|----------|-------------|----------|----------|------
Vaisala | RS92-SGP/NGP | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
Vaisala | RS41-SG/SGP/SGM | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (for -SGP) | :heavy_check_mark:
Graw | DFM06/09/17 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :x:
Graw | DFM06/09/17 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark:
Meteomodem | M10 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :x:
Meteomodem | M20 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: (For some models) | :x:
Intermet Systems | iMet-4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :x:
Intermet Systems | iMet-4 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark:
Intermet Systems | iMet-54 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | Not Sent | :x:
Lockheed Martin | LMS6-400/1680 | :heavy_check_mark: | :x: | :x: | :x: | Not Sent
Meisei | iMS-100 | :heavy_check_mark: | :x: | :x: | :x: | Not Sent
Meisei | iMS-100 | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | Not Sent
Meisei | RS11G | :heavy_check_mark: | :x: | :x: | :x: | Not Sent
Meteo-Radiy | MRZ-H1 (400 MHz) | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | Not Sent
Meteosis | MTS01 | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | Not Sent

2
auto_rx/autorx/__init__.py
Wyświetl plik

@ -12,7 +12,7 @@ from queue import Queue
# MINOR - New sonde type support, other fairly big changes that may result in telemetry or config file incompatability issus.
# PATCH - Small changes, or minor feature additions.
__version__ = "1.6.0-beta21"
__version__ = "1.6.0-beta22"
# Global Variables

29
demod/mod/dfm09mod.c
Wyświetl plik

@ -110,7 +110,7 @@ typedef struct {
double dir; double horiV; double vertV;
double lat2; double lon2; double alt2;
double dir2; double horiV2; double vertV2;
//float T;
float T;
float Rf;
float _frmcnt;
float meas24[9];
@ -691,6 +691,7 @@ static int reset_cfgchk(gpx_t *gpx) {
gpx->ptu_out = 0;
//gpx->gps.dMSL = 0;
*gpx->SN_out = '\0';
gpx->T = -273.15f;
return 0;
}
@ -946,6 +947,18 @@ static void print_gpx(gpx_t *gpx) {
gpx->prev_cntsec_diff = cntsec_diff;
gpx->prev_manpol = gpx->option.inv;
}
gpx->T = -273.15f;
if (gpx->cfgchk && gpx->ptu_out)
{
gpx->T = get_Temp(gpx);
if (gpx->T < -270.0f && gpx->dfmtyp != DFM_types[UNDEF]) {
if ((gpx->sonde_typ & 0xF) == 0x8 || (gpx->sonde_typ & 0xF) == 0xC)
{
gpx->dfmtyp = DFM_types[UNKNW];
}
}
}
}
if (output & 0xF000) {
@ -977,16 +990,16 @@ static void print_gpx(gpx_t *gpx) {
if (gpx->cfgchk)
{
if (gpx->option.ptu && gpx->ptu_out) {
float t = get_Temp(gpx);
if (t > -270.0) {
printf(" T=%.1fC ", t); // 0xC:P+ DFM-09P , 0xC:T- DFM-17TU , 0xD:P- DFM-17P ?
//float t = get_Temp(gpx);
if (gpx->T > -270.0f) {
printf(" T=%.1fC ", gpx->T); // 0xC:P+ DFM-09P , 0xC:T- DFM-17TU , 0xD:P- DFM-17P ?
if (gpx->option.vbs == 3) printf(" (0x%X:%c%c) ", gpx->sonde_typ & 0xF, gpx->sensortyp, gpx->option.inv?'-':'+');
}
if (gpx->option.dbg) {
float t2 = get_Temp2(gpx);
float t4 = get_Temp4(gpx);
if (t2 > -270.0) printf(" T2=%.1fC ", t2);
if (t4 > -270.0) printf(" T4=%.1fC ", t4);
if (t2 > -270.0f) printf(" T2=%.1fC ", t2);
if (t4 > -270.0f) printf(" T4=%.1fC ", t4);
}
}
if (gpx->option.vbs == 3 && gpx->ptu_out >= 0xA) {
@ -1089,8 +1102,8 @@ static void print_gpx(gpx_t *gpx) {
printf(", \"batt\": %.2f", gpx->status[0]);
}
if (gpx->ptu_out) { // get temperature
float t = get_Temp(gpx); // ecc-valid temperature?
if (t > -270.0) printf(", \"temp\": %.1f", t);
//float t = get_Temp(gpx); // ecc-valid temperature?
if (gpx->T > -270.0f) printf(", \"temp\": %.1f", gpx->T);
}
if (gpx->posmode == 4 && contaux && gpx->xdata[0]) {
char xdata_str[2*XDATA_LEN+1];