mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 05:05:38 -05:00
Remus Ncurses Call String Stuff;
This commit is contained in:
@@ -164,10 +164,12 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
|
|
||||||
if(so & 0x40)
|
if(so & 0x40)
|
||||||
{
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
// strcat (state->call_string[slot], " Encrypted");
|
// strcat (state->call_string[slot], " Encrypted");
|
||||||
fprintf (stderr, "%s", KRED);
|
fprintf (stderr, "%s", KRED);
|
||||||
fprintf(stderr, "Encrypted ");
|
fprintf(stderr, "Encrypted ");
|
||||||
}
|
}
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
// else strcat (state->call_string[slot], " ");
|
// else strcat (state->call_string[slot], " ");
|
||||||
|
|
||||||
/* Check the "Service Option" bits */
|
/* Check the "Service Option" bits */
|
||||||
@@ -175,17 +177,57 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
{
|
{
|
||||||
/* Experimentally determined with DSD+,
|
/* Experimentally determined with DSD+,
|
||||||
* is equal to 0x2, this is a TXI call */
|
* is equal to 0x2, this is a TXI call */
|
||||||
if((so & 0x30) == 0x20) fprintf(stderr, "TXI ");
|
if((so & 0x30) == 0x20)
|
||||||
else fprintf(stderr, "Reserved=%d ", (so & 0x30) >> 4);
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], " TXI");
|
||||||
|
fprintf(stderr, "TXI ");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], " RES");
|
||||||
|
fprintf(stderr, "Reserved=%d ", (so & 0x30) >> 4);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(so & 0x08) fprintf(stderr, "Broadcast ");
|
if(so & 0x08)
|
||||||
if(so & 0x04) fprintf(stderr, "OVCM ");
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], "-BC ");
|
||||||
|
fprintf(stderr, "Broadcast ");
|
||||||
|
}
|
||||||
|
if(so & 0x04)
|
||||||
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], "-OVCM ");
|
||||||
|
fprintf(stderr, "OVCM ");
|
||||||
|
}
|
||||||
if(so & 0x03)
|
if(so & 0x03)
|
||||||
{
|
{
|
||||||
if((so & 0x03) == 0x01) fprintf(stderr, "Priority 1 ");
|
if((so & 0x03) == 0x01)
|
||||||
else if((so & 0x03) == 0x02) fprintf(stderr, "Priority 2 ");
|
{
|
||||||
else if((so & 0x03) == 0x03) fprintf(stderr, "Priority 3 ");
|
//REMUS! Uncomment Line Below if desired
|
||||||
else fprintf(stderr, "No Priority "); /* We should never go here */
|
// strcat (state->call_string[slot], "-P1");
|
||||||
|
fprintf(stderr, "Priority 1 ");
|
||||||
|
}
|
||||||
|
else if((so & 0x03) == 0x02)
|
||||||
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], "-P2");
|
||||||
|
fprintf(stderr, "Priority 2 ");
|
||||||
|
}
|
||||||
|
else if((so & 0x03) == 0x03)
|
||||||
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], "-P3");
|
||||||
|
fprintf(stderr, "Priority 3 ");
|
||||||
|
}
|
||||||
|
else /* We should never go here */
|
||||||
|
{
|
||||||
|
//REMUS! Uncomment Line Below if desired
|
||||||
|
// strcat (state->call_string[slot], " ");
|
||||||
|
fprintf(stderr, "No Priority ");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stderr, "Call ");
|
fprintf(stderr, "Call ");
|
||||||
|
|||||||
@@ -314,7 +314,7 @@ noCarrier (dsd_opts * opts, dsd_state * state)
|
|||||||
memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
|
memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
|
||||||
memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
|
memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
|
||||||
|
|
||||||
//multi-purpose call_string
|
//REMUS! multi-purpose call_string
|
||||||
sprintf (state->call_string[0], "%s", " "); //20 spaces
|
sprintf (state->call_string[0], "%s", " "); //20 spaces
|
||||||
sprintf (state->call_string[1], "%s", " "); //20 spaces
|
sprintf (state->call_string[1], "%s", " "); //20 spaces
|
||||||
|
|
||||||
@@ -797,7 +797,7 @@ initState (dsd_state * state)
|
|||||||
memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
|
memset(state->dmr_embedded_gps, 0, sizeof(state->dmr_embedded_gps));
|
||||||
memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
|
memset(state->dmr_lrrp_gps, 0, sizeof(state->dmr_lrrp_gps));
|
||||||
|
|
||||||
//multi-purpose call_string
|
//REMUS! multi-purpose call_string
|
||||||
sprintf (state->call_string[0], "%s", " "); //20 spaces
|
sprintf (state->call_string[0], "%s", " "); //20 spaces
|
||||||
sprintf (state->call_string[1], "%s", " "); //20 spaces
|
sprintf (state->call_string[1], "%s", " "); //20 spaces
|
||||||
|
|
||||||
|
|||||||
@@ -2306,10 +2306,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
attroff(COLOR_PAIR(2));
|
attroff(COLOR_PAIR(2));
|
||||||
attron(COLOR_PAIR(3));
|
attron(COLOR_PAIR(3));
|
||||||
}
|
}
|
||||||
printw ("FID: [%02X] SVC: [%02X] ", state->dmr_fid, state->dmr_so);
|
|
||||||
|
//REMUS! THIS IS THE OLD ONE
|
||||||
|
// printw ("FID: [%02X] SVC: [%02X] ", state->dmr_fid, state->dmr_so);
|
||||||
|
//This is the new one
|
||||||
|
printw ("%s | ", state->call_string[0]);
|
||||||
printw ("%s ", DMRBusrtTypes[state->dmrburstL]);
|
printw ("%s ", DMRBusrtTypes[state->dmrburstL]);
|
||||||
printw ("\n");
|
printw ("\n");
|
||||||
//printw ("| | "); //10 spaces
|
|
||||||
printw ("| V XTRA | "); //10 spaces
|
printw ("| V XTRA | "); //10 spaces
|
||||||
|
|
||||||
if(state->dmrburstL == 16 && state->payload_algid == 0 && (state->dmr_so & 0xCF) == 0x40) //4F or CF mask? & 0xCF currently
|
if(state->dmrburstL == 16 && state->payload_algid == 0 && (state->dmr_so & 0xCF) == 0x40) //4F or CF mask? & 0xCF currently
|
||||||
@@ -2497,10 +2501,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
|
|||||||
attroff(COLOR_PAIR(2));
|
attroff(COLOR_PAIR(2));
|
||||||
attron(COLOR_PAIR(3));
|
attron(COLOR_PAIR(3));
|
||||||
}
|
}
|
||||||
printw ("FID: [%02X] SVC: [%02X] ", state->dmr_fidR, state->dmr_soR);
|
|
||||||
|
//REMUS! THIS IS THE OLD ONE
|
||||||
|
// printw ("FID: [%02X] SVC: [%02X] ", state->dmr_fidR, state->dmr_soR);
|
||||||
|
//THIS IS THE NEW ONE
|
||||||
|
printw ("%s | ", state->call_string[1]);
|
||||||
printw ("%s ", DMRBusrtTypes[state->dmrburstR]);
|
printw ("%s ", DMRBusrtTypes[state->dmrburstR]);
|
||||||
printw ("\n");
|
printw ("\n");
|
||||||
//printw ("| | "); //12 spaces
|
|
||||||
printw ("| V XTRA | "); //10 spaces
|
printw ("| V XTRA | "); //10 spaces
|
||||||
|
|
||||||
if(state->dmrburstR == 16 && state->payload_algidR == 0 && (state->dmr_soR & 0xCF) == 0x40) //4F or CF mask?
|
if(state->dmrburstR == 16 && state->payload_algidR == 0 && (state->dmr_soR & 0xCF) == 0x40) //4F or CF mask?
|
||||||
|
|||||||
Reference in New Issue
Block a user