diff --git a/examples/trunking.sh b/examples/trunking.sh index 324d74f..aad504d 100644 --- a/examples/trunking.sh +++ b/examples/trunking.sh @@ -13,6 +13,10 @@ #dsd-fme -i tcp:192.168.7.8:7355 -U 4532 -T -f2 -m2 -N 2> log.ans #dsd-fme -i rtl:0:855.625M:0:-2:12 -T -f2 -m2 -N 2> log.ans +#P25 P2 TDMA CC with C4FM +#dsd-fme -i tcp:192.168.7.8:7355 -U 4532 -T -f2 -N 2> log.ans +#dsd-fme -i rtl:0:855.625M:0:-2:12 -T -f2 -m2 -N 2> log.ans + #DMR TIII, Con+, Cap+, XPT dsd-fme -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.ans #dsd-fme -fs -i rtl:0:450M:44:-2:8 -T -C connect_plus_chan.csv -G group.csv -N 2> log.ans diff --git a/src/dmr_flco.c b/src/dmr_flco.c index 7e4cb6f..e1a2d72 100644 --- a/src/dmr_flco.c +++ b/src/dmr_flco.c @@ -421,24 +421,17 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C if (fid == 0x10) { /* Check the "Service Option" bits */ - if(so & 0x30) + if(so & 0x20) { - /* Experimentally determined with DSD+, - * is equal to 0x2, this is a TXI call */ - if((so & 0x30) == 0x20) - { - //REMUS! Uncomment Line Below if desired - // strcat (state->call_string[slot], " TXI"); - fprintf(stderr, "TXI "); - } - else - { - //Observation: If RS3 is set, or just the bit at location 0001 0000, - //then the NEXT VC6 will be pre-empted for TXI - //REMUS! Uncomment Line Below if desired - // strcat (state->call_string[slot], " RES"); - fprintf(stderr, "RS%d ", (so & 0x30) >> 4); - } + //REMUS! Uncomment Line Below if desired + // strcat (state->call_string[slot], " TXI"); + fprintf(stderr, "TXI "); + } + if (so & 0x10) + { + //REMUS! Uncomment Line Below if desired + // strcat (state->call_string[slot], " RPT"); + fprintf(stderr, "RPT "); //Short way of saying the next SF's VC6 will be pre-empted/repeat frames for the TXI backwards channel } if(so & 0x08) { diff --git a/src/dsd_main.c b/src/dsd_main.c index bb107cf..740f08d 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1425,7 +1425,7 @@ main (int argc, char **argv) break; case '3': - opts.dmr_le = 1; + opts.dmr_le = 0; fprintf (stderr,"DMR Late Entry Encryption Identifiers Disabled (VC6 Single Burst)\n"); break;