mirror
/
RS-tracker
kopia lustrzana https://github.com/rs1729/RS
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

rs41/imet1rs: xdata clean-up

pull/52/head
Zilog80 2022-02-05 10:09:08 +01:00
rodzic 99d0425a66
commit f601902fac
2 zmienionych plików z 9 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
demod/mod/rs41mod.c
Wyświetl plik

@ -1072,7 +1072,7 @@ static int hex2uint(char *str, int nibs) {
if (nibs > 7) return -2;
for (i = 0; i < nibs; i++) {
for (i = 0; i < nibs; i++) { // MSB i.e. most significant nibble first
if (str[i] >= '0' && str[i] <= '9') h = str[i]-'0';
else if (str[i] >= 'a' && str[i] <= 'f') h = str[i]-'a'+0xA;
else if (str[i] >= 'A' && str[i] <= 'F') h = str[i]-'A'+0xA;
@ -1083,9 +1083,11 @@ static int hex2uint(char *str, int nibs) {
}
static int prn_aux_IDx01(char *xdata) {
// V7 ECC (Electrochemical Concentration Cell) Ozonesonde
// https://gml.noaa.gov/aftp/user/jordan/iMet%20Radiosonde%20Protocol.pdf
// ID=0x01: Ozonesonde (MSB)
// N=2*8 nibs (1byte = 2nibs)
// https://harbor.weber.edu/Hardware/Ozonesonde/ECC_Ozonesonde-1.pdf
// ID=0x01: ECC Ozonesonde
// N=2*8 nibs (1byte = 2nibs) (MSB)
// 0 2 u8 Instrument_type = 0x01 (ID)
// 2 2 u8 Instrument_number
// 4 4 u16 Icell, uA (I = n/1000)
@ -1109,7 +1111,7 @@ static int prn_aux_IDx01(char *xdata) {
}
if (strlen(px) < N) return -1;
fprintf(stdout, " ID=0x01 V7 ");
fprintf(stdout, " ID=0x01 ECC ");
val = hex2uint(px+ 2, 2); if (val < 0) return -1;
InstrNum = val & 0xFF;
val = hex2uint(px+ 4, 4); if (val < 0) return -1;
@ -1137,8 +1139,8 @@ static int prn_aux_IDx05(char *xdata) {
// OIF411
// "Ozone Sounding with Vaisala Radiosonde RS41" user's guide M211486EN
//
// ID=0x05: OIF411 (MSB)
// pos nibs
// ID=0x05: OIF411
// pos nibs (MSB)
// 0 2 u8 Instrument_type = 0x05 (ID)
// 2 2 u8 Instrument_number
// Measurement Data, N=2*10

3
imet/imet1rs_dft.c
Wyświetl plik

@ -453,7 +453,7 @@ offset bytes description
1 1 PKT_ID = 0x03
2 2 N = number of data bytes to follow
3+N 2 CRC (16-bit)
N=8, ID=0x01: Ozonesonde (MSB)
N=8, ID=0x01: ECC Ozonesonde (MSB)
3 1 Instrument_type = 0x01 (ID)
4 1 Instrument_number
5 2 Icell, uA (I = n/1000)
@ -469,7 +469,6 @@ ID=0x19: COBALD (Compact Optical Backscatter Aerosol Detector)
*/
int print_xdata(int pos, ui8_t N) {
int P, U;
ui8_t InstrumentNum;
short Tpump;
unsigned short Icell, Ipump, Vbat;