iMet-54/50 fixes, M10 raw fixes

pull/754/head
Mark Jessop 2023-02-21 09:26:29 +10:30
rodzic dc2725774c
commit 8f99bb79cc
4 zmienionych plików z 5 dodań i 4 usunięć

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"
__version__ = "1.6.1-beta1"
# Global Variables

Wyświetl plik

@ -417,7 +417,7 @@ def calculate_skewt_data(
_temp = temperature[i]
if humidity[i] >= 0.0:
if humidity[i] > 0.0:
_rh = humidity[i]
_dp = (

Wyświetl plik

@ -549,7 +549,7 @@ static int print_position(gpx_t *gpx, int len, int ecc_frm, int ecc_gps, int ecc
// prnGPS,prnTPU
if (gpx->option.jsn && frm_ok && (crc_ok || std_ok) && (gpx->status&0x30)==0x30) {
char *ver_jsn = NULL;
char *subtype = (rs_type == 54) ? "IMET54" : "IMET50";
char *subtype = (rs_type == 54) ? "iMet-54" : "iMet-50";
unsigned long count_day = (unsigned long)(gpx->std*3600 + gpx->min*60 + gpx->sek+0.5); // (gpx->timems/1e3+0.5) has gaps
fprintf(stdout, "{ \"type\": \"%s\"", "IMET5");
fprintf(stdout, ", \"frame\": %lu", count_day);

Wyświetl plik

@ -1120,7 +1120,7 @@ static int print_frame(gpx_t *gpx, int pos, int b2B) {
}
fprintf(stdout, "\n");
}
if (gpx->option.slt /*&& gpx->option.jsn*/) {
if (gpx->frame_bytes[1] != 0x49 && gpx->option.slt /*&& gpx->option.jsn*/) {
print_pos(gpx, cs1 == cs2);
}
}
@ -1130,6 +1130,7 @@ static int print_frame(gpx_t *gpx, int pos, int b2B) {
byte = gpx->frame_bytes[i];
fprintf(stdout, "%02x", byte);
}
if (cs1 == cs2) fprintf(stdout, " [OK]"); else fprintf(stdout, " [NO]");
fprintf(stdout, "\n");
}
}