GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-15 02:07:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

More DMR Staging, Fix MI to Hex in P25

Browse Source 
More DMR Staging, Fix MI to Hex in P25
-switch back to 7 octets on AMB payloads
--will break compatibility with 6 octets
-Print MI values as Hex now, not as binary strings
This commit is contained in:
lwvmobile
2022-03-06 22:38:29 -05:00
committed by GitHub
parent c994f00e5d
commit f053e53e76
6 changed files with 31 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dsd_ncurses.c
View File

@@ -374,9 +374,9 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (lls == 12 || lls == 13) //DMR Voice Types
{
//printw ("| DCC: [%i] FID: [%02X]\n", dcc, state->dmr_fid);
printw ("| DCC: [%i] FID: [%02X] SOP: [%X] \n", dcc, state->dmr_fid, state->dmr_so);
printw ("| DCC: [%i] MFID: [%02X] SOP: [%X] \n", dcc, state->dmr_fid, state->dmr_so);
printw ("| TID: [%i] RID: [%i]", tg, rd);
if(state->dmr_so & 0x80) //& apparently is same as ==
if(state->dmr_so & 0x80) //1000 0000
{
attron(COLOR_PAIR(2));
printw (" **Emergency** ");
@@ -384,17 +384,17 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
attron(COLOR_PAIR(3));
}
if(state->dmr_so & 0x40)
if(state->dmr_so & 0x40) //0100 0000
{
attron(COLOR_PAIR(2));
printw (" **ENC** ");
//printw ("0x%X", state->payload_algid);
attroff(COLOR_PAIR(2));
attron(COLOR_PAIR(3));
//opts->p25enc = 1; //just testing for now
opts->p25enc = 1; //just testing for now
}
if(state->dmr_so & 0x30)
if(state->dmr_so & 0x30) //0010 0000
{
attron(COLOR_PAIR(2));
printw (" **Private Call** ");