diff --git a/dsd-fme2.png b/dsd-fme2.png index 41d9ad7..933bed6 100644 Binary files a/dsd-fme2.png and b/dsd-fme2.png differ diff --git a/dsd-fme3.png b/dsd-fme3.png index d343b44..ed998e1 100644 Binary files a/dsd-fme3.png and b/dsd-fme3.png differ diff --git a/include/dsd.h b/include/dsd.h index ecc575e..708f35a 100644 --- a/include/dsd.h +++ b/include/dsd.h @@ -852,8 +852,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); diff --git a/src/dmr_utils.c b/src/dmr_utils.c index 9fb08cb..dfc2f06 100644 --- a/src/dmr_utils.c +++ b/src/dmr_utils.c @@ -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; diff --git a/src/dsd_main.c b/src/dsd_main.c index 8838e26..fe918f1 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -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; diff --git a/src/nxdn_element.c b/src/nxdn_element.c index ea062cd..842adf0 100644 --- a/src/nxdn_element.c +++ b/src/nxdn_element.c @@ -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 diff --git a/src/p25p1_mdpu.c b/src/p25p1_mdpu.c index e821e2c..1e0fa98 100644 --- a/src/p25p1_mdpu.c +++ b/src/p25p1_mdpu.c @@ -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]; diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c index 5b9ce84..4d2a239 100644 --- a/src/p25p1_tsbk.c +++ b/src/p25p1_tsbk.c @@ -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];