mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-14 17:57:28 -05:00
Event History Setup: #287;
Misc Tweaks Regarding How Trunking Elements May Indirectly Interact with Event History;
DMR Alias Tweak: Allow Extra UTF8 characters (grave, diacritical leters, etc); Allow any UTF16 character that isn't an ASCII special char;
Add GI String (GROUP or PRIVATE) to wav file names, if set and known at close;
Add Encrypted PDU ALG/KID values if not decrypted/decoded;
Allow Manual RTL Input PPM Error Adjustment with { and } keys;
LRRP: Simple Request Handling; Report Handling Tweaks; Simple Handling for Unknown Formats;
Don't reset DMR Color Code on NoCarrier;
This commit is contained in:
@@ -494,15 +494,21 @@ SNDFILE * close_and_rename_wav_file(SNDFILE * wav_file, char * wav_out_filename,
|
||||
|
||||
uint32_t source_id = event_struct->Event_History_Items[0].source_id;
|
||||
uint32_t target_id = event_struct->Event_History_Items[0].target_id;
|
||||
int8_t gi = event_struct->Event_History_Items[0].gi;
|
||||
|
||||
char sys_str[200]; memset (sys_str, 0, sizeof(sys_str));
|
||||
char src_str[200]; memset (src_str, 0, sizeof(src_str));
|
||||
char tgt_str[200]; memset (tgt_str, 0, sizeof(tgt_str));
|
||||
char gi_str[10]; memset (gi_str, 0, sizeof(gi_str));
|
||||
|
||||
sprintf (sys_str, "%s", event_struct->Event_History_Items[0].sysid_string);
|
||||
sprintf (src_str, "%s", event_struct->Event_History_Items[0].src_str);
|
||||
sprintf (tgt_str, "%s", event_struct->Event_History_Items[0].tgt_str);
|
||||
|
||||
sprintf (gi_str, "%s", "");
|
||||
if (gi == 0) sprintf (gi_str, "%s", "GROUP");
|
||||
else if (gi == 1) sprintf (gi_str, "%s", "PRIVATE");
|
||||
|
||||
uint8_t is_string = 0;
|
||||
char emp_str[200]; memset (emp_str, 0, sizeof(emp_str));
|
||||
sprintf (emp_str, "%s", "BUMBLEBEETUNA");
|
||||
@@ -515,9 +521,9 @@ SNDFILE * close_and_rename_wav_file(SNDFILE * wav_file, char * wav_out_filename,
|
||||
|
||||
//check for String based TGT and SRC values (M17, YSF, DSTAR)
|
||||
if (is_string == 1)
|
||||
sprintf (new_filename, "%s/%s_%s_%05d_%s_TGT_%s_SRC_%s.wav", dir, datestr, timestr, random_number, sys_str, tgt_str, src_str);
|
||||
sprintf (new_filename, "%s/%s_%s_%05d_%s_%s_TGT_%s_SRC_%s.wav", dir, datestr, timestr, random_number, sys_str, gi_str, tgt_str, src_str);
|
||||
else //is a numerical value
|
||||
sprintf (new_filename, "%s/%s_%s_%05d_%s_TGT_%d_SRC_%d.wav", dir, datestr, timestr, random_number, sys_str, target_id, source_id);
|
||||
sprintf (new_filename, "%s/%s_%s_%05d_%s_%s_TGT_%d_SRC_%d.wav", dir, datestr, timestr, random_number, sys_str, gi_str, target_id, source_id);
|
||||
|
||||
if (timestr != NULL)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user