ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Random Alignment Fixes;

This commit is contained in:
lwvmobile 2023-07-31 20:01:11 -04:00
parent 6978ac9cd3
commit 1568ee6176
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/dsd_ncurses.c
View File

@ -298,48 +298,48 @@ int startx = 0;
int starty = 0;
char *choicesc[] = {
"Return",
"Save Decoded Audio WAV (Legacy Mode)",
"Save Signal to Symbol Capture Bin",
"Toggle Muting Encrypted Traffic ",
"Save Per Call Decoded WAV (AUTO and NXDN)",
"Setup and Start RTL Input ",
"Retune RTL Dongle ",
"Toggle C4FM/QPSK (P2 TDMA CC)",
"Toggle C4FM/QPSK (P1 FDMA CC)",
"Start TCP Direct Link Audio",
"Configure RIGCTL",
"Stop All Decoded WAV Saving",
"Read OP25/FME Symbol Capture Bin",
"Replay Last Symbol Capture Bin",
"Stop & Close Symbol Capture Bin Playback",
"Stop & Close Symbol Capture Bin Saving",
"Toggle Call Alert Beep ",
"Resume Decoding"
};
"Return",
"Save Decoded Audio WAV (Legacy Mode)",
"Save Signal to Symbol Capture Bin",
"Toggle Muting Encrypted Traffic ",
"Save Per Call Decoded WAV (AUTO and NXDN)",
"Setup and Start RTL Input ",
"Retune RTL Dongle ",
"Toggle C4FM/QPSK (P2 TDMA CC)",
"Toggle C4FM/QPSK (P1 FDMA CC)",
"Start TCP Direct Link Audio",
"Configure RIGCTL",
"Stop All Decoded WAV Saving",
"Read OP25/FME Symbol Capture Bin",
"Replay Last Symbol Capture Bin",
"Stop & Close Symbol Capture Bin Playback",
"Stop & Close Symbol Capture Bin Saving",
"Toggle Call Alert Beep ",
"Resume Decoding"
};
char *choices[] = {
"Resume Decoding",
"Decode AUTO",
"Decode M17",
"Decode DSTAR",
"Decode P25p1",
"Decode EDACS/PV",
"Decode P25p2 ",
"Decode dPMR",
"Decode NXDN48",
"Decode NXDN96",
"Decode DMR TDMA",
"Decode YSF FUSION",
"Toggle Signal Inversion",
"Key Entry",
"Reset Call History",
"Toggle Payloads to Console",
"Manually Set P2 Parameters", //16
"Input & Output Options",
"LRRP Data to File",
"Exit DSD-FME",
};
"Resume Decoding",
"Decode AUTO",
"Decode M17",
"Decode DSTAR",
"Decode P25p1",
"Decode EDACS/PV",
"Decode P25p2 ",
"Decode dPMR",
"Decode NXDN48",
"Decode NXDN96",
"Decode DMR TDMA",
"Decode YSF FUSION",
"Toggle Signal Inversion",
"Key Entry",
"Reset Call History",
"Toggle Payloads to Console",
"Manually Set P2 Parameters", //16
"Input & Output Options",
"LRRP Data to File",
"Exit DSD-FME",
};
int n_choices = sizeof(choices) / sizeof(char *);

20
src/dstar.c
View File

@ -129,21 +129,21 @@ void processDSTAR_SD(dsd_opts * opts, dsd_state * state, uint8_t * sd)
uint16_t crc_cmp = calc_fcs(hd_bytes, 39);
char str1[9];
char str2[9];
char str3[9];
char str4[13];
char str2[9];
char str3[9];
char str4[13];
char strf[60];
char strt[60];
memset (strf, 0x20, sizeof(strf));
memset (strt, 0x20, sizeof(strf));
memcpy (str1, hd_bytes+3, 8);
memcpy (str2, hd_bytes+11, 8);
memcpy (str3, hd_bytes+19, 8);
memcpy (str4, hd_bytes+27, 12);
memcpy (str1, hd_bytes+3, 8);
memcpy (str2, hd_bytes+11, 8);
memcpy (str3, hd_bytes+19, 8);
memcpy (str4, hd_bytes+27, 12);
str1[8] = '\0';
str2[8] = '\0';
str3[8] = '\0';
str4[12] = '\0';
str2[8] = '\0';
str3[8] = '\0';
str4[12] = '\0';
//safety check, don't want to load nasty values into the strings
for (i = 1; i < 60; i++)

2
src/dstar_header.c
View File

@ -67,7 +67,7 @@ void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660])
//TODO: Add fcs_calc to header as well
// uint16_t crc_ext = (radioheader[39] << 8) + radioheader[40];
// uint16_t crc_cmp = calc_fcs(radioheader, 39);
// uint16_t crc_cmp = calc_fcs(radioheader, 39);
//debug
// fprintf (stderr, "\n HD: ");