From fbb00f78fede119e43d025c6b9b7cdc6fd05ad37 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Thu, 8 Dec 2022 12:35:34 -0500 Subject: [PATCH] Roman NCurses EGPS/LRRP/Data Display Fix; --- src/dmr_block.c | 26 +++++++++++++------------- src/dmr_pdu.c | 2 +- src/dsd_main.c | 2 +- src/dsd_ncurses.c | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/dmr_block.c b/src/dmr_block.c index a8fddff..273c912 100644 --- a/src/dmr_block.c +++ b/src/dmr_block.c @@ -92,9 +92,9 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7]; - //ROMAN! Uncomment this line + //ROMAN! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) - // sprintf (state->dmr_embedded_gps[slot], "IP DATA SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); + // sprintf (state->dmr_lrrp_gps[slot], "IP DATA SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); } @@ -107,9 +107,9 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7]; - //ROMAN! Uncomment this line + //ROMAN! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) - // sprintf (state->dmr_embedded_gps[slot], "UDT SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); + // sprintf (state->dmr_lrrp_gps[slot], "UDT SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); } @@ -123,7 +123,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7]; //ROMAN! Uncomment this line - // sprintf (state->dmr_embedded_gps[slot], "P_HEAD SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); + // sprintf (state->dmr_lrrp_gps[slot], "P_HEAD SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); } @@ -136,9 +136,9 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = dheader[3]; - //ROMAN! Uncomment this line + //ROMAN! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) - // sprintf (state->dmr_embedded_gps[slot], "IPC SRC [%d] DST [%d] ", dheader[3], dheader[2]); + // sprintf (state->dmr_lrrp_gps[slot], "IPC SRC [%d] DST [%d] ", dheader[3], dheader[2]); } @@ -151,9 +151,9 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = dheader[3]; - //ROMAN! Uncomment this line + //ROMAN! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) - // sprintf (state->dmr_embedded_gps[slot], "UDP SRC [%d] DST [%d] ", dheader[3], dheader[2]); + // sprintf (state->dmr_lrrp_gps[slot], "UDP SRC [%d] DST [%d] ", dheader[3], dheader[2]); } @@ -170,7 +170,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, "[%d]", (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4] ); //ROMAN! Uncomment this line - // sprintf (state->dmr_embedded_gps[slot], "SD-D SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); + // sprintf (state->dmr_lrrp_gps[slot], "SD-D SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); } @@ -182,7 +182,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, "[%d]", (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4] ); //ROMAN! Uncomment this line - // sprintf (state->dmr_embedded_gps[slot], "SD-R/P SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); + // sprintf (state->dmr_lrrp_gps[slot], "SD-R/P SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); } @@ -196,7 +196,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ //ROMAN! Uncomment these lines // char rsp[90]; // sprintf (rsp, " - RSP SRC [%d] DST [%d] ", (dheader[5] <<16 ) + (dheader[6] << 8) + dheader[7], (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4]); - // strcat (state->dmr_embedded_gps[slot], rsp); + // strcat (state->dmr_lrrp_gps[slot], rsp); } @@ -213,7 +213,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ //ROMAN! Uncomment these lines // char rsp[90]; // sprintf (rsp, "- RSP REQ "); - // strcat (state->dmr_embedded_gps[slot], rsp); + // strcat (state->dmr_lrrp_gps[slot], rsp); } diff --git a/src/dmr_pdu.c b/src/dmr_pdu.c index 18f314f..3836719 100644 --- a/src/dmr_pdu.c +++ b/src/dmr_pdu.c @@ -380,7 +380,7 @@ uint8_t dmr_lrrp (dsd_opts * opts, dsd_state * state, uint8_t block_len, uint8_t if (lat) sprintf (lrrpstr, "LRRP %0d (%s%lf, %lf)", source, sign, (double)lat * lat_unit, (double)lon * lon_unit); if (vel_set) sprintf (velstr, " %.4lf km/h", velocity * 3.6); if (deg_set) sprintf (degstr, " %d deg", degrees); - sprintf (state->dmr_embedded_gps[slot], "%s%s%s", lrrpstr, velstr, degstr); + sprintf (state->dmr_lrrp_gps[slot], "%s%s%s", lrrpstr, velstr, degstr); } diff --git a/src/dsd_main.c b/src/dsd_main.c index e0fec38..6b7a969 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -278,7 +278,7 @@ noCarrier (dsd_opts * opts, dsd_state * state) sprintf(state->dmr_branding_sub, "%s", ""); sprintf(state->dmr_branding, "%s", ""); sprintf (state->dmr_site_parms, "%s", ""); //may not zero this out - state->dmr_mfid = 0; + state->dmr_mfid = -1; //dmr slco stuff memset(state->dmr_cach_fragment, 0, sizeof(state->dmr_cach_fragment)); diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 395c223..a18ce1a 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2635,7 +2635,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) //LRRP if(state->dmrburstR != 16) //only during data { - printw ("%s", state->dmr_embedded_gps[1]); + printw ("%s", state->dmr_lrrp_gps[1]); } //Group Name Labels from CSV import