mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-20 04:37:26 -05:00
Random Alignment Fixes;
This commit is contained in:
@@ -298,48 +298,48 @@ int startx = 0;
|
|||||||
int starty = 0;
|
int starty = 0;
|
||||||
|
|
||||||
char *choicesc[] = {
|
char *choicesc[] = {
|
||||||
"Return",
|
"Return",
|
||||||
"Save Decoded Audio WAV (Legacy Mode)",
|
"Save Decoded Audio WAV (Legacy Mode)",
|
||||||
"Save Signal to Symbol Capture Bin",
|
"Save Signal to Symbol Capture Bin",
|
||||||
"Toggle Muting Encrypted Traffic ",
|
"Toggle Muting Encrypted Traffic ",
|
||||||
"Save Per Call Decoded WAV (AUTO and NXDN)",
|
"Save Per Call Decoded WAV (AUTO and NXDN)",
|
||||||
"Setup and Start RTL Input ",
|
"Setup and Start RTL Input ",
|
||||||
"Retune RTL Dongle ",
|
"Retune RTL Dongle ",
|
||||||
"Toggle C4FM/QPSK (P2 TDMA CC)",
|
"Toggle C4FM/QPSK (P2 TDMA CC)",
|
||||||
"Toggle C4FM/QPSK (P1 FDMA CC)",
|
"Toggle C4FM/QPSK (P1 FDMA CC)",
|
||||||
"Start TCP Direct Link Audio",
|
"Start TCP Direct Link Audio",
|
||||||
"Configure RIGCTL",
|
"Configure RIGCTL",
|
||||||
"Stop All Decoded WAV Saving",
|
"Stop All Decoded WAV Saving",
|
||||||
"Read OP25/FME Symbol Capture Bin",
|
"Read OP25/FME Symbol Capture Bin",
|
||||||
"Replay Last Symbol Capture Bin",
|
"Replay Last Symbol Capture Bin",
|
||||||
"Stop & Close Symbol Capture Bin Playback",
|
"Stop & Close Symbol Capture Bin Playback",
|
||||||
"Stop & Close Symbol Capture Bin Saving",
|
"Stop & Close Symbol Capture Bin Saving",
|
||||||
"Toggle Call Alert Beep ",
|
"Toggle Call Alert Beep ",
|
||||||
"Resume Decoding"
|
"Resume Decoding"
|
||||||
};
|
};
|
||||||
|
|
||||||
char *choices[] = {
|
char *choices[] = {
|
||||||
"Resume Decoding",
|
"Resume Decoding",
|
||||||
"Decode AUTO",
|
"Decode AUTO",
|
||||||
"Decode M17",
|
"Decode M17",
|
||||||
"Decode DSTAR",
|
"Decode DSTAR",
|
||||||
"Decode P25p1",
|
"Decode P25p1",
|
||||||
"Decode EDACS/PV",
|
"Decode EDACS/PV",
|
||||||
"Decode P25p2 ",
|
"Decode P25p2 ",
|
||||||
"Decode dPMR",
|
"Decode dPMR",
|
||||||
"Decode NXDN48",
|
"Decode NXDN48",
|
||||||
"Decode NXDN96",
|
"Decode NXDN96",
|
||||||
"Decode DMR TDMA",
|
"Decode DMR TDMA",
|
||||||
"Decode YSF FUSION",
|
"Decode YSF FUSION",
|
||||||
"Toggle Signal Inversion",
|
"Toggle Signal Inversion",
|
||||||
"Key Entry",
|
"Key Entry",
|
||||||
"Reset Call History",
|
"Reset Call History",
|
||||||
"Toggle Payloads to Console",
|
"Toggle Payloads to Console",
|
||||||
"Manually Set P2 Parameters", //16
|
"Manually Set P2 Parameters", //16
|
||||||
"Input & Output Options",
|
"Input & Output Options",
|
||||||
"LRRP Data to File",
|
"LRRP Data to File",
|
||||||
"Exit DSD-FME",
|
"Exit DSD-FME",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
int n_choices = sizeof(choices) / sizeof(char *);
|
int n_choices = sizeof(choices) / sizeof(char *);
|
||||||
|
|||||||
20
src/dstar.c
20
src/dstar.c
@@ -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);
|
uint16_t crc_cmp = calc_fcs(hd_bytes, 39);
|
||||||
|
|
||||||
char str1[9];
|
char str1[9];
|
||||||
char str2[9];
|
char str2[9];
|
||||||
char str3[9];
|
char str3[9];
|
||||||
char str4[13];
|
char str4[13];
|
||||||
char strf[60];
|
char strf[60];
|
||||||
char strt[60];
|
char strt[60];
|
||||||
memset (strf, 0x20, sizeof(strf));
|
memset (strf, 0x20, sizeof(strf));
|
||||||
memset (strt, 0x20, sizeof(strf));
|
memset (strt, 0x20, sizeof(strf));
|
||||||
memcpy (str1, hd_bytes+3, 8);
|
memcpy (str1, hd_bytes+3, 8);
|
||||||
memcpy (str2, hd_bytes+11, 8);
|
memcpy (str2, hd_bytes+11, 8);
|
||||||
memcpy (str3, hd_bytes+19, 8);
|
memcpy (str3, hd_bytes+19, 8);
|
||||||
memcpy (str4, hd_bytes+27, 12);
|
memcpy (str4, hd_bytes+27, 12);
|
||||||
str1[8] = '\0';
|
str1[8] = '\0';
|
||||||
str2[8] = '\0';
|
str2[8] = '\0';
|
||||||
str3[8] = '\0';
|
str3[8] = '\0';
|
||||||
str4[12] = '\0';
|
str4[12] = '\0';
|
||||||
|
|
||||||
//safety check, don't want to load nasty values into the strings
|
//safety check, don't want to load nasty values into the strings
|
||||||
for (i = 1; i < 60; i++)
|
for (i = 1; i < 60; i++)
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ void dstar_header_decode(dsd_state * state, int radioheaderbuffer[660])
|
|||||||
|
|
||||||
//TODO: Add fcs_calc to header as well
|
//TODO: Add fcs_calc to header as well
|
||||||
// uint16_t crc_ext = (radioheader[39] << 8) + radioheader[40];
|
// 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
|
//debug
|
||||||
// fprintf (stderr, "\n HD: ");
|
// fprintf (stderr, "\n HD: ");
|
||||||
|
|||||||
Reference in New Issue
Block a user