From 5c573317e9e7149cbfa917723402ecdb6a528578 Mon Sep 17 00:00:00 2001 From: Zilog80 Date: Tue, 3 Oct 2023 15:34:43 +0200 Subject: [PATCH] rs41: cal/conf via JSON v0.3 --- demod/mod/rs41mod.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/demod/mod/rs41mod.c b/demod/mod/rs41mod.c index aadb32a..937f7ed 100644 --- a/demod/mod/rs41mod.c +++ b/demod/mod/rs41mod.c @@ -2132,25 +2132,33 @@ static int print_position(gpx_t *gpx, int ec) { } if (gpx->option.cal == 1) { // cal/conf + int _j; if ( !gpx->calconf_sent && gpx->calconf_complete ) { - fprintf(stdout, ", \"rs41_calconf320\": \""); + /* + fprintf(stdout, ", \"rs41_calconf320h\": \""); // only constant/crc part for (int _j = 0; _j < 50*16; _j++) { fprintf(stdout, "%02X", gpx->calibytes[_j]); } + */ + fprintf(stdout, ", \"rs41_calconf51x16\": \""); + for (_j = 0; _j < 51*16; _j++) { + fprintf(stdout, "%02X", gpx->calibytes[_j]); + } fprintf(stdout, "\""); gpx->calconf_sent = 1; } if (gpx->calconf_subfrm[0] == 0x32) { fprintf(stdout, ", \"rs41_conf0x32\": \""); - for (int _j = 0; _j < 16; _j++) { + for (_j = 0; _j < 16; _j++) { fprintf(stdout, "%02X", gpx->calconf_subfrm[1+_j]); } fprintf(stdout, "\""); } } if (gpx->option.cal == 2) { // cal/conf + int _j; fprintf(stdout, ", \"rs41_subfrm\": \"0x%02X:", gpx->calconf_subfrm[0]); - for (int _j = 0; _j < 16; _j++) { + for (_j = 0; _j < 16; _j++) { fprintf(stdout, "%02X", gpx->calconf_subfrm[1+_j]); } fprintf(stdout, "\"");