diff --git a/include/dsd.h b/include/dsd.h index 8354c33..f521dee 100644 --- a/include/dsd.h +++ b/include/dsd.h @@ -695,7 +695,7 @@ typedef struct //edacs int ea_mode; - int esk_mode; + unsigned short esk_mask; unsigned long long int edacs_site_id; int edacs_lcn_count; //running tally of lcn's observed on edacs system diff --git a/src/dsd_main.c b/src/dsd_main.c index 05df745..9ded92a 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1047,8 +1047,8 @@ initState (dsd_state * state) //edacs - may need to make these user configurable instead for stability on non-ea systems state->ea_mode = -1; //init on -1, 0 is standard, 1 is ea - state->esk_mode = -1; //same as above, but with esk or not - state->esk_mask = 0x0; //toggles from 0x0 to 0xA0 if esk mode enabled + + state->esk_mask = 0x0; //esk mask value state->edacs_site_id = 0; state->edacs_lcn_count = 0; state->edacs_cc_lcn = 0; @@ -1333,7 +1333,11 @@ usage () printf (" -fz Decode only M17*\n"); printf (" -fi Decode only NXDN48* (6.25 kHz) / IDAS*\n"); printf (" -fn Decode only NXDN96* (12.5 kHz)\n"); - printf (" -fp Decode only EDACS/ProVoice*\n"); + printf (" -fp Decode only ProVoice*\n"); + printf (" -fh Decode only EDACS Standard/ProVoice*\n"); + printf (" -fH Decode only EDACS Standard/ProVoice with ESK 0xA0*\n"); + printf (" -fe Decode only EDACS EA/ProVoice*\n"); + printf (" -fE Decode only EDACS EA/ProVoice with ESK 0xA0*\n"); printf (" -fm Decode only dPMR*\n"); printf (" -l Disable DMR, dPMR, and NXDN input filtering\n"); printf (" -u Unvoiced speech quality (default=3)\n"); @@ -1684,10 +1688,10 @@ main (int argc, char **argv) fprintf (stderr, "TG Hold set to %d \n", state.tg_hold); break; - case '9': //This is a temporary fix for RR issue until a permanent fix can be found - state.ea_mode = 0; - fprintf (stderr,"Force Enabling EDACS Standard/Networked Mode Mode\n"); - break; + // case '9': //This is a temporary fix for RR issue until a permanent fix can be found + // state.ea_mode = 0; + // fprintf (stderr,"Force Enabling EDACS Standard/Networked Mode Mode\n"); + // break; //experimental audio monitoring case '8': @@ -2182,6 +2186,146 @@ main (int argc, char **argv) opts.rtl_bandwidth = 24; // opts.rtl_gain_value = 36; } + else if (optarg[0] == 'h') //standard / net w/o ESK + { + opts.frame_dstar = 0; + opts.frame_x2tdma = 0; + opts.frame_p25p1 = 0; + opts.frame_p25p2 = 0; + opts.frame_nxdn48 = 0; + opts.frame_nxdn96 = 0; + opts.frame_dmr = 0; + opts.frame_dpmr = 0; + opts.frame_provoice = 1; + state.ea_mode = 0; + state.esk_mask = 0; + opts.frame_ysf = 0; + opts.frame_m17 = 0; + state.samplesPerSymbol = 5; + state.symbolCenter = 2; + opts.mod_c4fm = 0; + opts.mod_qpsk = 0; + opts.mod_gfsk = 1; + state.rf_mod = 2; + opts.pulse_digi_rate_out = 8000; + opts.pulse_digi_out_channels = 1; + opts.dmr_stereo = 0; + opts.dmr_mono = 0; + state.dmr_stereo = 0; + // opts.setmod_bw = 12500; + sprintf (opts.output_name, "EDACS/PV"); + fprintf (stderr,"Setting symbol rate to 9600 / second\n"); + fprintf (stderr,"Decoding EDACS STD/NET and ProVoice frames.\n"); + fprintf (stderr,"EDACS Analog Voice Channels are Experimental.\n"); + //rtl specific tweaks + opts.rtl_bandwidth = 24; + // opts.rtl_gain_value = 36; + } + else if (optarg[0] == 'H') //standard / net w/ ESK + { + opts.frame_dstar = 0; + opts.frame_x2tdma = 0; + opts.frame_p25p1 = 0; + opts.frame_p25p2 = 0; + opts.frame_nxdn48 = 0; + opts.frame_nxdn96 = 0; + opts.frame_dmr = 0; + opts.frame_dpmr = 0; + opts.frame_provoice = 1; + state.ea_mode = 0; + state.esk_mask = 0xA0; + opts.frame_ysf = 0; + opts.frame_m17 = 0; + state.samplesPerSymbol = 5; + state.symbolCenter = 2; + opts.mod_c4fm = 0; + opts.mod_qpsk = 0; + opts.mod_gfsk = 1; + state.rf_mod = 2; + opts.pulse_digi_rate_out = 8000; + opts.pulse_digi_out_channels = 1; + opts.dmr_stereo = 0; + opts.dmr_mono = 0; + state.dmr_stereo = 0; + // opts.setmod_bw = 12500; + sprintf (opts.output_name, "EDACS/PV"); + fprintf (stderr,"Setting symbol rate to 9600 / second\n"); + fprintf (stderr,"Decoding EDACS STD/NET w/ ESK and ProVoice frames.\n"); + fprintf (stderr,"EDACS Analog Voice Channels are Experimental.\n"); + //rtl specific tweaks + opts.rtl_bandwidth = 24; + // opts.rtl_gain_value = 36; + } + else if (optarg[0] == 'e') //extended addressing w/o ESK + { + opts.frame_dstar = 0; + opts.frame_x2tdma = 0; + opts.frame_p25p1 = 0; + opts.frame_p25p2 = 0; + opts.frame_nxdn48 = 0; + opts.frame_nxdn96 = 0; + opts.frame_dmr = 0; + opts.frame_dpmr = 0; + opts.frame_provoice = 1; + state.ea_mode = 1; + state.esk_mask = 0; + opts.frame_ysf = 0; + opts.frame_m17 = 0; + state.samplesPerSymbol = 5; + state.symbolCenter = 2; + opts.mod_c4fm = 0; + opts.mod_qpsk = 0; + opts.mod_gfsk = 1; + state.rf_mod = 2; + opts.pulse_digi_rate_out = 8000; + opts.pulse_digi_out_channels = 1; + opts.dmr_stereo = 0; + opts.dmr_mono = 0; + state.dmr_stereo = 0; + // opts.setmod_bw = 12500; + sprintf (opts.output_name, "EDACS/PV"); + fprintf (stderr,"Setting symbol rate to 9600 / second\n"); + fprintf (stderr,"Decoding EDACS Extended Addressing and ProVoice frames.\n"); + fprintf (stderr,"EDACS Analog Voice Channels are Experimental.\n"); + //rtl specific tweaks + opts.rtl_bandwidth = 24; + // opts.rtl_gain_value = 36; + } + else if (optarg[0] == 'E') //extended addressing w/ ESK + { + opts.frame_dstar = 0; + opts.frame_x2tdma = 0; + opts.frame_p25p1 = 0; + opts.frame_p25p2 = 0; + opts.frame_nxdn48 = 0; + opts.frame_nxdn96 = 0; + opts.frame_dmr = 0; + opts.frame_dpmr = 0; + opts.frame_provoice = 1; + state.ea_mode = 1; + state.esk_mask = 0xA0; + opts.frame_ysf = 0; + opts.frame_m17 = 0; + state.samplesPerSymbol = 5; + state.symbolCenter = 2; + opts.mod_c4fm = 0; + opts.mod_qpsk = 0; + opts.mod_gfsk = 1; + state.rf_mod = 2; + opts.pulse_digi_rate_out = 8000; + opts.pulse_digi_out_channels = 1; + opts.dmr_stereo = 0; + opts.dmr_mono = 0; + state.dmr_stereo = 0; + // opts.setmod_bw = 12500; + sprintf (opts.output_name, "EDACS/PV"); + fprintf (stderr,"Setting symbol rate to 9600 / second\n"); + fprintf (stderr,"Decoding EDACS Extended Addressing w/ ESK and ProVoice frames.\n"); + fprintf (stderr,"EDACS Analog Voice Channels are Experimental.\n"); + //rtl specific tweaks + opts.rtl_bandwidth = 24; + // opts.rtl_gain_value = 36; + } else if (optarg[0] == '1') { opts.frame_dstar = 0; diff --git a/src/edacs-fme.c b/src/edacs-fme.c index e81b275..9a7c40a 100644 --- a/src/edacs-fme.c +++ b/src/edacs-fme.c @@ -442,6 +442,7 @@ void edacs(dsd_opts * opts, dsd_state * state) unsigned int peercmd = 0xF88; //using for EA detection test unsigned int netcmd = 0xF3; //using for Networked Test UNUSED2(vcmd, idcmd); + UNUSED2(peercmd, netcmd); char * timestr; //add timestr here, so we can assign it and also free it to prevent memory leak timestr = getTimeE(); @@ -496,34 +497,15 @@ void edacs(dsd_opts * opts, dsd_state * state) else //BCH Pass, continue from here. { - //ESK on/off detection, I honestly don't remember the logic for this anymore, but it works fine - if ( (((fr_1t & 0xF000000000) >> 36) != 0xB) && (((fr_1t & 0xF000000000) >> 36) != 0x1) && (((fr_1t & 0xFF00000000) >> 32) != 0xF3) ) - { - //experimenting with values here, not too high, and not too low - if ( (((fr_1t & 0xF000000000) >> 36) <= 0x8 )) - { - state->esk_mask = 0xA0; - } - //ideal value would be 5, but some other values exist that don't allow it - if ( (((fr_1t & 0xF000000000) >> 36) > 0x8 ) ) - { - state->esk_mask = 0x0; - } - } - - //Standard/Networked Auto Detection - //if (command == netcmd) //netcmd is F3 Standard/Networked (I think) - if ( (fr_1t >> 32 == netcmd) || (fr_1t >> 32 == (netcmd ^ 0xA0)) ) - { - state->ea_mode = 0; //disable extended addressing mode - } - - //EA Auto detection //peercmd is 0xF88 peer site relay 0xFF80000000 >> 28 - if (fr_1t >> 28 == peercmd || fr_1t >> 28 == (peercmd ^ 0xA00) ) - { - state->ea_mode = 1; //enable extended addressing mode - } - + //Auto Detection Modes Have Been Removed due to reliability issues, + //users will now need to manually specify these options: + /* + -fh Decode only EDACS Standard/ProVoice*\n"); + -fH Decode only EDACS Standard/ProVoice with ESK 0xA0*\n"); + -fe Decode only EDACS EA/ProVoice*\n"); + -fE Decode only EDACS EA/ProVoice with ESK 0xA0*\n"); + */ + //Start Extended Addressing Mode if (state->ea_mode == 1) { @@ -1081,7 +1063,7 @@ void edacs(dsd_opts * opts, dsd_state * state) } //end Standard or Networked //supply user warning to use -9 switch if decoding doesn't start shortly - else fprintf (stderr, " Net/EA Auto Detect; Use -9 CLI Switch For Standard;"); + else fprintf (stderr, " Detected: Use -fh, -fH, -fe, or -fE for std, esk, ea, or ea-esk;"); }