From 14dd045312cf5be5e1196c1249624977a3a8ce0f Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 9 Dec 2022 08:36:42 -0500 Subject: [PATCH] Remus; --- include/dsd.h | 2 +- src/dmr_block.c | 18 +++++++++--------- src/dmr_flco.c | 2 +- src/dsd_main.c | 4 ++-- src/dsd_ncurses.c | 15 ++++++++++++--- 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/include/dsd.h b/include/dsd.h index 2d34e91..b45f791 100644 --- a/include/dsd.h +++ b/include/dsd.h @@ -618,7 +618,7 @@ typedef struct //char dmr_branding[25]; //may need higher value? char dmr_branding_sub[25]; - //Roman DMR End Call Alert Beep + //Remus DMR End Call Alert Beep int dmr_end_alert[2]; //dmr TLC end call alert beep has already played once flag } dsd_state; diff --git a/src/dmr_block.c b/src/dmr_block.c index 273c912..6f56074 100644 --- a/src/dmr_block.c +++ b/src/dmr_block.c @@ -92,7 +92,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 these line + //Remus! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) // 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,7 +107,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 these line + //Remus! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) // 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]); @@ -122,7 +122,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 + //Remus! Uncomment this line // 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,7 +136,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = dheader[3]; - //ROMAN! Uncomment these line + //Remus! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) // sprintf (state->dmr_lrrp_gps[slot], "IPC SRC [%d] DST [%d] ", dheader[3], dheader[2]); @@ -151,7 +151,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ state->dmr_lrrp_source[slot] = dheader[3]; - //ROMAN! Uncomment these line + //Remus! Uncomment these line // if ( (state->data_header_format[slot] & 0xF ) != 0x1 && state->data_p_head[slot] == 0) // sprintf (state->dmr_lrrp_gps[slot], "UDP SRC [%d] DST [%d] ", dheader[3], dheader[2]); @@ -169,7 +169,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, " Destination: "); fprintf (stderr, "[%d]", (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4] ); - //ROMAN! Uncomment this line + //Remus! Uncomment this line // 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]); } @@ -181,7 +181,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, " Destination: "); fprintf (stderr, "[%d]", (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4] ); - //ROMAN! Uncomment this line + //Remus! Uncomment this line // 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]); } @@ -193,7 +193,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, " Destination: "); fprintf (stderr, "[%d]", (dheader[2] <<16 ) + (dheader[3] <<8 ) + dheader[4] ); - //ROMAN! Uncomment these lines + //Remus! 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_lrrp_gps[slot], rsp); @@ -210,7 +210,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint32_ fprintf (stderr, " Destination:"); fprintf (stderr, " [%d]", (dheader[5] <<16 ) + (dheader[6] <<8 ) + dheader[7] ); - //ROMAN! Uncomment these lines + //Remus! Uncomment these lines // char rsp[90]; // sprintf (rsp, "- RSP REQ "); // strcat (state->dmr_lrrp_gps[slot], rsp); diff --git a/src/dmr_flco.c b/src/dmr_flco.c index 9070042..2460eef 100644 --- a/src/dmr_flco.c +++ b/src/dmr_flco.c @@ -190,7 +190,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C //group labels for (int i = 0; i < state->group_tally; i++) { - //ROMAN! Change target to source if you prefer + //Remus! Change target to source if you prefer if (state->group_array[i].groupNumber == target) { fprintf (stderr, "%s", KCYN); diff --git a/src/dsd_main.c b/src/dsd_main.c index 6b7a969..5f72661 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -737,7 +737,7 @@ initState (dsd_state * state) state->nxdn_location_sys_code = 0; sprintf (state->nxdn_location_category, "%s", " "); - //Roman DMR End Call Alert Beep + //Remus DMR End Call Alert Beep state->dmr_end_alert[0] = 0; state->dmr_end_alert[1] = 0; @@ -1924,7 +1924,7 @@ main (int argc, char **argv) if((strncmp(opts.audio_out_dev, "/dev/dsp", 8) == 0)) { sprintf (opts.audio_out_dev, "%s", "pulse"); - fprintf (stderr, "I told you to stop trying to use /dev/dsp, Roman!!\n"); + fprintf (stderr, "I told you to stop trying to use /dev/dsp!!\n"); opts.audio_out_type = 0; } diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index a18ce1a..e0d5b5b 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -1955,7 +1955,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } - //Roman DMR End Call Alert Beep + //Remus DMR End Call Alert Beep // if (opts->call_alert == 1) // { // if (state->dmrburstL == 2 && state->dmr_end_alert[0] == 0) //if TLC and flag not tripped @@ -2417,6 +2417,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) //printw ("| | "); //10 spaces printw ("| D XTRA | "); + attron(COLOR_PAIR(4)); + //Frequency Display if (state->p25_vc_freq[0] != 0) { @@ -2475,6 +2477,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } } + if (state->carrier == 1) attron(COLOR_PAIR(3)); + else attroff(COLOR_PAIR(4)); + printw ("\n"); //Slot 2 [1] @@ -2597,6 +2602,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) //printw ("| | "); printw ("| D XTRA | "); + attron(COLOR_PAIR(4)); + //Frequency Display if (state->p25_vc_freq[1] != 0) { @@ -2610,7 +2617,6 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if(state->dmrburstR == 16) //only during call { - attron(COLOR_PAIR(5)); //Embedded GPS (not LRRP) printw ("%s ", state->dmr_embedded_gps[1]); @@ -2656,6 +2662,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } } + if (state->carrier == 1) attron(COLOR_PAIR(3)); + else attroff(COLOR_PAIR(4)); + printw ("\n"); } // end if not MS } //end DMR BS Types @@ -2814,7 +2823,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) } printw ("%s ", getDateC(call_matrix[9-j][5]) ); //You're welcome - printw ("%s \n", getTimeC(call_matrix[9-j][5]) ); //Roman + printw ("%s \n", getTimeC(call_matrix[9-j][5]) ); //Remus } //EDACS and ProVoice, outside of timestamp loop