mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-19 20:27:26 -05:00
Experimental EDACS Analog Voice Monitoring;
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -7,3 +7,4 @@ build
|
|||||||
examples
|
examples
|
||||||
*.bin
|
*.bin
|
||||||
*.ans
|
*.ans
|
||||||
|
*.patch
|
||||||
@@ -100,7 +100,7 @@ and in a second terminal tab, same folder, run
|
|||||||
|
|
||||||
EDACS Trunking (w/ channel map import)
|
EDACS Trunking (w/ channel map import)
|
||||||
|
|
||||||
--EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (Tested and Working on EDACS/EDACS-EA with Provoice only, no analog voice monitoring)
|
--EDACS/PV Trunking using RIGCTL and TCP Direct Link Audio inside of SDR++ (Tested and Working on EDACS/EDACS-EA with Provoice, Analog Voice Monitoring and Per Call is Experimental)
|
||||||
|
|
||||||
`dsd-fme -i tcp -fp -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans`
|
`dsd-fme -i tcp -fp -C channel_map.csv -G group.csv -T -U 4532 -N 2> log.ans`
|
||||||
|
|
||||||
|
|||||||
@@ -1906,6 +1906,7 @@ main (int argc, char **argv)
|
|||||||
sprintf (opts.output_name, "EDACS/PV");
|
sprintf (opts.output_name, "EDACS/PV");
|
||||||
fprintf (stderr,"Setting symbol rate to 9600 / second\n");
|
fprintf (stderr,"Setting symbol rate to 9600 / second\n");
|
||||||
fprintf (stderr,"Decoding only ProVoice frames.\n");
|
fprintf (stderr,"Decoding only ProVoice frames.\n");
|
||||||
|
fprintf (stderr,"EDACS Analog Voice Channels are Experimental.\n");
|
||||||
//rtl specific tweaks
|
//rtl specific tweaks
|
||||||
opts.rtl_bandwidth = 24;
|
opts.rtl_bandwidth = 24;
|
||||||
// opts.rtl_gain_value = 36;
|
// opts.rtl_gain_value = 36;
|
||||||
|
|||||||
272
src/edacs-fme.c
272
src/edacs-fme.c
@@ -14,7 +14,7 @@
|
|||||||
* 1994-7
|
* 1994-7
|
||||||
*
|
*
|
||||||
* LWVMOBILE
|
* LWVMOBILE
|
||||||
* 2022-10 Version EDACS-FM Florida Man Edition
|
* 2023-08 Version EDACS-FM Florida Man Edition
|
||||||
*-----------------------------------------------------------------------------*/
|
*-----------------------------------------------------------------------------*/
|
||||||
#include "dsd.h"
|
#include "dsd.h"
|
||||||
|
|
||||||
@@ -49,6 +49,197 @@ char * getTimeE(void) //get pretty hh:mm:ss timestamp
|
|||||||
return curr;
|
return curr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void openWavOutFile48k (dsd_opts * opts, dsd_state * state)
|
||||||
|
{
|
||||||
|
|
||||||
|
SF_INFO info;
|
||||||
|
info.samplerate = 48000; //48k for analog output (has to match input)
|
||||||
|
info.channels = 1;
|
||||||
|
info.format = SF_FORMAT_WAV | SF_FORMAT_PCM_16 | SF_ENDIAN_LITTLE;
|
||||||
|
opts->wav_out_f = sf_open (opts->wav_out_file, SFM_RDWR, &info);
|
||||||
|
|
||||||
|
if (opts->wav_out_f == NULL)
|
||||||
|
{
|
||||||
|
fprintf (stderr,"Error - could not open wav output file %s\n", opts->wav_out_file);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//generic rms type function
|
||||||
|
long int gen_rms(short *samples, int len, int step)
|
||||||
|
{
|
||||||
|
|
||||||
|
int i;
|
||||||
|
long int rms;
|
||||||
|
long p, t, s;
|
||||||
|
double dc, err;
|
||||||
|
|
||||||
|
p = t = 0L;
|
||||||
|
for (i=0; i<len; i+=step) {
|
||||||
|
s = (long)samples[i];
|
||||||
|
t += s;
|
||||||
|
p += s * s;
|
||||||
|
}
|
||||||
|
/* correct for dc offset in squares */
|
||||||
|
dc = (double)(t*step) / (double)len;
|
||||||
|
err = t * 2 * dc - dc * dc * len;
|
||||||
|
|
||||||
|
rms = (long int)sqrt((p-err) / len);
|
||||||
|
//make sure it doesnt' randomly feed us a large negative value (overflow?)
|
||||||
|
if (rms < 0) rms = 150; //could also consider returning 0 and making it return the last known good value instead
|
||||||
|
return rms;
|
||||||
|
}
|
||||||
|
|
||||||
|
//listening to and playing back analog audio
|
||||||
|
void edacs_analog(dsd_opts * opts, dsd_state * state)
|
||||||
|
{
|
||||||
|
|
||||||
|
int i;
|
||||||
|
short analog1[960];
|
||||||
|
short analog2[960];
|
||||||
|
short analog3[960];
|
||||||
|
short sample = 0;
|
||||||
|
|
||||||
|
state->last_cc_sync_time = time(NULL);
|
||||||
|
state->last_vc_sync_time = time(NULL);
|
||||||
|
|
||||||
|
memset (analog1, 0, sizeof(analog1));
|
||||||
|
memset (analog2, 0, sizeof(analog2));
|
||||||
|
memset (analog3, 0, sizeof(analog3));
|
||||||
|
|
||||||
|
long int rms = opts->rtl_squelch_level + 1; //one more for the initial loop phase
|
||||||
|
long int sql = opts->rtl_squelch_level;
|
||||||
|
|
||||||
|
fprintf (stderr, "\n");
|
||||||
|
|
||||||
|
while (rms > sql) //!exitflag && -- no exitflag on this version
|
||||||
|
{
|
||||||
|
//this will only work on 48k/1 short output
|
||||||
|
if (opts->audio_in_type == 0)
|
||||||
|
{
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
|
||||||
|
analog1[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
|
||||||
|
analog2[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
pa_simple_read(opts->pulse_digi_dev_in, &sample, 2, NULL );
|
||||||
|
analog3[i] = sample;
|
||||||
|
}
|
||||||
|
//this rms will only work properly (for now) with squelch enabled in SDR++ or other
|
||||||
|
rms = gen_rms(analog3, 960, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//TCP Input -- TODO: Error Handling if connection drops
|
||||||
|
if (opts->audio_in_type == 8)
|
||||||
|
{
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
sf_read_short(opts->tcp_file_in, &sample, 1);
|
||||||
|
analog1[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
sf_read_short(opts->tcp_file_in, &sample, 1);
|
||||||
|
analog2[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
sf_read_short(opts->tcp_file_in, &sample, 1);
|
||||||
|
analog3[i] = sample;
|
||||||
|
}
|
||||||
|
//this rms will only work properly (for now) with squelch enabled in SDR++
|
||||||
|
rms = gen_rms(analog3, 960, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//RTL Input
|
||||||
|
#ifdef USE_RTLSDR
|
||||||
|
if (opts->audio_in_type == 3)
|
||||||
|
{
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
get_rtlsdr_sample(&sample, opts, state);
|
||||||
|
analog1[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
get_rtlsdr_sample(&sample, opts, state);
|
||||||
|
analog2[i] = sample;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 960; i++)
|
||||||
|
{
|
||||||
|
get_rtlsdr_sample(&sample, opts, state);
|
||||||
|
analog3[i] = sample;
|
||||||
|
}
|
||||||
|
//the rtl rms value works properly without needing a 'hard' squelch value
|
||||||
|
rms = rtl_return_rms();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (opts->audio_out_type == 0)
|
||||||
|
{
|
||||||
|
pa_simple_write(opts->pulse_digi_dev_out, analog1, 960*2, NULL);
|
||||||
|
pa_simple_write(opts->pulse_digi_dev_out, analog2, 960*2, NULL);
|
||||||
|
pa_simple_write(opts->pulse_digi_dev_out, analog3, 960*2, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts->audio_out_type == 5)
|
||||||
|
{
|
||||||
|
write (opts->audio_out_fd, analog1, 960*2);
|
||||||
|
write (opts->audio_out_fd, analog1, 960*2);
|
||||||
|
write (opts->audio_out_fd, analog1, 960*2);
|
||||||
|
}
|
||||||
|
|
||||||
|
opts->rtl_rms = rms;
|
||||||
|
|
||||||
|
//NOTE: On really busy EDACS systems, this could end up being incorrect if we decode an extra frame or two
|
||||||
|
//before tuning and setting due to slight tuner lag and another frame has another call in it
|
||||||
|
int afs = state->lastsrc;
|
||||||
|
int a = afs >> 7;
|
||||||
|
int fs = afs & 0x7F;
|
||||||
|
int lcn = state->edacs_vc_lcn;
|
||||||
|
|
||||||
|
printFrameSync (opts, state, " EDACS", 0, "A");
|
||||||
|
|
||||||
|
if (rms < sql) fprintf (stderr, "%s", KRED);
|
||||||
|
else fprintf (stderr, "%s", KGRN);
|
||||||
|
|
||||||
|
fprintf (stderr, " Analog RMS: %04ld SQL: %ld", rms, sql);
|
||||||
|
if (afs != 0)
|
||||||
|
fprintf (stderr, " AFS [0x%03X] [%02d-%03d] LCN [%02d]", afs, a, fs, lcn);
|
||||||
|
|
||||||
|
fprintf (stderr, "%s", KNRM);
|
||||||
|
if (rms > sql) fprintf (stderr, "\n");
|
||||||
|
|
||||||
|
//Update Ncurses Terminal
|
||||||
|
if (opts->use_ncurses_terminal == 1)
|
||||||
|
ncursesPrinter(opts, state);
|
||||||
|
|
||||||
|
//WIP: Write Analog Samples to wav file, easy enough,
|
||||||
|
//but needs wav to be opened as 48k, or downsampled
|
||||||
|
//working on 48k version of openWavOutFile
|
||||||
|
if (opts->wav_out_f != NULL)
|
||||||
|
{
|
||||||
|
sf_write_short(opts->wav_out_f, analog1, 960);
|
||||||
|
sf_write_short(opts->wav_out_f, analog2, 960);
|
||||||
|
sf_write_short(opts->wav_out_f, analog3, 960);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void edacs(dsd_opts * opts, dsd_state * state)
|
void edacs(dsd_opts * opts, dsd_state * state)
|
||||||
{
|
{
|
||||||
//changed to ulli here for 32-bit cygwin (not sure if was an issue, but playing it safe)
|
//changed to ulli here for 32-bit cygwin (not sure if was an issue, but playing it safe)
|
||||||
@@ -68,7 +259,6 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
unsigned char command = 0xFF;
|
unsigned char command = 0xFF;
|
||||||
unsigned char mt1 = 0x1F;
|
unsigned char mt1 = 0x1F;
|
||||||
unsigned char mt2 = 0xF;
|
unsigned char mt2 = 0xF;
|
||||||
unsigned char mta = 0;
|
|
||||||
unsigned char lcn = 0;
|
unsigned char lcn = 0;
|
||||||
|
|
||||||
//commands; may not use these anymore
|
//commands; may not use these anymore
|
||||||
@@ -79,7 +269,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
state->edacs_vc_lcn = -1; //init on negative for ncurses and tuning
|
state->edacs_vc_lcn = -1; //init on negative for ncurses and tuning
|
||||||
|
|
||||||
int i, j;
|
int i;
|
||||||
int edacs_bit[241] = {0}; //zero out bit array and collect bits into it.
|
int edacs_bit[241] = {0}; //zero out bit array and collect bits into it.
|
||||||
|
|
||||||
for (i = 0; i < 240; i++) //288 bits every transmission minus 48 bit (24 dibit) sync pattern
|
for (i = 0; i < 240; i++) //288 bits every transmission minus 48 bit (24 dibit) sync pattern
|
||||||
@@ -288,6 +478,7 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
{
|
{
|
||||||
sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld TG %d SRC %d.wav", getDateE(), getTimeE(), state->edacs_site_id, group, source);
|
sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld TG %d SRC %d.wav", getDateE(), getTimeE(), state->edacs_site_id, group, source);
|
||||||
openWavOutFile (opts, state);
|
openWavOutFile (opts, state);
|
||||||
|
// openWavOutFile48k (opts, state); //debug for testing analog wav only
|
||||||
}
|
}
|
||||||
|
|
||||||
//do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
|
//do condition here, in future, will allow us to use tuning methods as well, or rtl_udp as well
|
||||||
@@ -297,7 +488,8 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because the lcn index starts at zero
|
SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because the lcn index starts at zero
|
||||||
state->edacs_tuned_lcn = lcn;
|
state->edacs_tuned_lcn = lcn;
|
||||||
opts->p25_is_tuned = 1;
|
opts->p25_is_tuned = 1;
|
||||||
|
//debug testing (since I don't have EDACS standard w/ Analog nearby)
|
||||||
|
// edacs_analog(opts, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (opts->audio_in_type == 3) //rtl dongle
|
if (opts->audio_in_type == 3) //rtl dongle
|
||||||
@@ -306,6 +498,8 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
|
rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
|
||||||
state->edacs_tuned_lcn = lcn;
|
state->edacs_tuned_lcn = lcn;
|
||||||
opts->p25_is_tuned = 1;
|
opts->p25_is_tuned = 1;
|
||||||
|
//debug testing (since I don't have EDACS standard w/ Analog nearby)
|
||||||
|
// edacs_analog(opts, state);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -404,46 +598,52 @@ void edacs(dsd_opts * opts, dsd_state * state)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//NOTE: Restructured below so that analog and digital are handled the same, just that when
|
||||||
|
//its analog, it will now start edacs_analog which will while loop analog samples until
|
||||||
|
//signal level drops (RMS, or a dotting sequence is detected)
|
||||||
|
|
||||||
|
//analog working now with edacs_analog
|
||||||
if (command == 0xEE)
|
if (command == 0xEE)
|
||||||
{
|
|
||||||
//no handling for raw audio yet...that works properly atleast
|
|
||||||
fprintf (stderr, " Analog");
|
fprintf (stderr, " Analog");
|
||||||
}
|
|
||||||
else //Digital Call (ProVoice, hopefully not Aegis in 2022)
|
//Digital Call (ProVoice, hopefully, and not Aegis in 2022)
|
||||||
{
|
else
|
||||||
fprintf (stderr, " Digital");
|
fprintf (stderr, " Digital");
|
||||||
//this is working now with the new import setup
|
|
||||||
if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block
|
|
||||||
|
//this is working now with the new import setup
|
||||||
|
if (opts->p25_trunk == 1 && (strcmp(mode, "DE") != 0) && (strcmp(mode, "B") != 0) ) //DE is digital encrypted, B is block
|
||||||
|
{
|
||||||
|
if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise)
|
||||||
{
|
{
|
||||||
if (lcn < 26 && state->trunk_lcn_freq[lcn-1] != 0) //don't tune if zero (not loaded or otherwise)
|
//openwav file and do per call right here
|
||||||
|
if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
|
||||||
{
|
{
|
||||||
//openwav file and do per call right here
|
sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld AFS %02d-%03d - %X.wav", getDateE(), getTimeE(), state->edacs_site_id, a, fs, afs);
|
||||||
if (opts->dmr_stereo_wav == 1 && (opts->use_rigctl == 1 || opts->audio_in_type == 3))
|
if (command == 0xEF) openWavOutFile (opts, state); //digital
|
||||||
{
|
if (command == 0xEE) openWavOutFile48k (opts, state); //analog at 48k
|
||||||
sprintf (opts->wav_out_file, "./WAV/%s %s pV Site %lld AFS %X.wav", getDateE(), getTimeE(), state->edacs_site_id, afs);
|
|
||||||
openWavOutFile (opts, state);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (opts->use_rigctl == 1)
|
|
||||||
{
|
|
||||||
if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
|
|
||||||
SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because our index starts at zero
|
|
||||||
state->edacs_tuned_lcn = lcn;
|
|
||||||
opts->p25_is_tuned = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (opts->audio_in_type == 3) //rtl dongle
|
|
||||||
{
|
|
||||||
#ifdef USE_RTLSDR
|
|
||||||
rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
|
|
||||||
state->edacs_tuned_lcn = lcn;
|
|
||||||
opts->p25_is_tuned = 1;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (opts->use_rigctl == 1)
|
||||||
|
{
|
||||||
|
if (opts->setmod_bw != 0 ) SetModulation(opts->rigctl_sockfd, opts->setmod_bw);
|
||||||
|
SetFreq(opts->rigctl_sockfd, state->trunk_lcn_freq[lcn-1]); //minus one because our index starts at zero
|
||||||
|
state->edacs_tuned_lcn = lcn;
|
||||||
|
opts->p25_is_tuned = 1;
|
||||||
|
if (command == 0xEE) edacs_analog(opts, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (opts->audio_in_type == 3) //rtl dongle
|
||||||
|
{
|
||||||
|
#ifdef USE_RTLSDR
|
||||||
|
rtl_dev_tune (opts, state->trunk_lcn_freq[lcn-1]);
|
||||||
|
state->edacs_tuned_lcn = lcn;
|
||||||
|
opts->p25_is_tuned = 1;
|
||||||
|
if (command == 0xEE) edacs_analog(opts, state);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
fprintf (stderr, "%s", KNRM);
|
fprintf (stderr, "%s", KNRM);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user