ua1zbe
/
dsd-fme_20_06_2023
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc Tweaks and Fixes;

This commit is contained in:
lwvmobile 2023-05-03 23:45:04 -04:00
parent 741ed51d08
commit 98bcdd203e
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/dsd.h
View File

@ -859,8 +859,7 @@ short nxdn_filter(short sample);
short dpmr_filter(short sample);
int strncmperr(const char *s1, const char *s2, size_t size, int MaxErr);
/* Global functions */
uint32_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength);
uint64_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength);
void ncursesOpen (dsd_opts * opts, dsd_state * state);
void ncursesPrinter (dsd_opts * opts, dsd_state * state);

6
src/dmr_utils.c
View File

@ -325,15 +325,15 @@ uint8_t ComputeCrc5Bit(uint8_t * DMRData)
return CRC;
} /* End ComputeCrc5Bit() */
uint32_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength)
uint64_t ConvertBitIntoBytes(uint8_t * BufferIn, uint32_t BitLength)
{
uint32_t Output = 0;
uint64_t Output = 0;
uint32_t i;
for(i = 0; i < BitLength; i++)
{
Output <<= 1;
Output |= (uint32_t)(BufferIn[i] & 1);
Output |= (uint64_t)(BufferIn[i] & 1);
}
return Output;

4
src/dsd_main.c
View File

@ -318,8 +318,8 @@ noCarrier (dsd_opts * opts, dsd_state * state)
state->fourv_counter[1] = 0;
//values displayed in ncurses terminal
state->p25_vc_freq[0] = 0;
state->p25_vc_freq[1] = 0;
// state->p25_vc_freq[0] = 0;
// state->p25_vc_freq[1] = 0;
//new nxdn stuff
state->nxdn_part_of_frame = 0;

2
src/nxdn_element.c
View File

@ -1329,8 +1329,6 @@ void NXDN_decode_scch(dsd_opts * opts, dsd_state * state, uint8_t * Message, uin
if (gu == 0) sprintf (state->active_channel[rep1], "Active Ch: %d TG: %d-%d; ", rep1, rep2, id); //Group TG
else sprintf (state->active_channel[rep1], "Active Ch: %d TGT: %d-%d; ", rep1, rep2, id); //Private TGT
}
//may not be needed -- DISC also zips the entire thing (all channels)
else if (rep1 == 31) sprintf (state->active_channel[rep1], "%s", ""); //zip it
//start tuning section here
uint8_t tune = 0; //use this to check to see if okay to tune

1
src/p25p1_mdpu.c
View File

@ -28,7 +28,6 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//reset some strings when returning from a call in case they didn't get zipped already
sprintf (state->call_string[0], "%s", " "); //21 spaces
sprintf (state->call_string[1], "%s", " "); //21 spaces
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
int tsbkbit[196]; //tsbk bit array, 196 trellis encoded bits
int tsbk_dibit[98];

1
src/p25p1_tsbk.c
View File

@ -14,7 +14,6 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
//reset some strings when returning from a call in case they didn't get zipped already
sprintf (state->call_string[0], "%s", " "); //21 spaces
sprintf (state->call_string[1], "%s", " "); //21 spaces
state->p25_vc_freq[0] = state->p25_vc_freq[1] = 0;
int tsbkbit[196]; //tsbk bit array, 196 trellis encoded bits
int tsbk_dibit[98];