diff --git a/DMRDefines.h b/DMRDefines.h index 5335a03..1bbeff0 100644 --- a/DMRDefines.h +++ b/DMRDefines.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009-2016 by Jonathan Naylor G4KLX + * Copyright (C) 2009-2017 by Jonathan Naylor G4KLX * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,7 +19,7 @@ #if !defined(DMRDEFINES_H) #define DMRDEFINES_H -const unsigned int DMR_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate +const unsigned int DMR_RADIO_SYMBOL_LENGTH = 10U; // At 48 kHz sample rate const unsigned int DMR_FRAME_LENGTH_BYTES = 33U; const unsigned int DMR_FRAME_LENGTH_BITS = DMR_FRAME_LENGTH_BYTES * 8U; diff --git a/DStarDefines.h b/DStarDefines.h index 2983c9e..0d5637d 100644 --- a/DStarDefines.h +++ b/DStarDefines.h @@ -19,7 +19,7 @@ #if !defined(DSTARDEFINES_H) #define DSTARDEFINES_H -const unsigned int DSTAR_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate +const unsigned int DSTAR_RADIO_SYMBOL_LENGTH = 10U; // At 48 kHz sample rate const unsigned int DSTAR_HEADER_LENGTH_BYTES = 41U; diff --git a/IO.cpp b/IO.cpp index 64a7e23..ae18e90 100644 --- a/IO.cpp +++ b/IO.cpp @@ -27,8 +27,8 @@ static q31_t DC_FILTER[] = {3367972, 0, 3367972, 0, 2140747704, 0}; // {b0, 0, const uint32_t DC_FILTER_STAGES = 1U; // One Biquad stage // One symbol boxcar filter -static q15_t BOXCAR_FILTER[] = {12000, 12000, 12000, 12000, 12000, 0}; -const uint16_t BOXCAR_FILTER_LEN = 6U; +static q15_t BOXCAR_FILTER[] = {6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 6000, 0, 0}; +const uint16_t BOXCAR_FILTER_LEN = 12U; const uint16_t DC_OFFSET = 2048U; diff --git a/P25Defines.h b/P25Defines.h index 9aede9e..2bfd73d 100644 --- a/P25Defines.h +++ b/P25Defines.h @@ -19,7 +19,7 @@ #if !defined(P25DEFINES_H) #define P25DEFINES_H -const unsigned int P25_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate +const unsigned int P25_RADIO_SYMBOL_LENGTH = 10U; // At 48 kHz sample rate const unsigned int P25_HDR_FRAME_LENGTH_BYTES = 99U; const unsigned int P25_HDR_FRAME_LENGTH_BITS = P25_HDR_FRAME_LENGTH_BYTES * 8U; diff --git a/TODO.txt b/TODO.txt new file mode 100644 index 0000000..5c4971e --- /dev/null +++ b/TODO.txt @@ -0,0 +1,40 @@ +Jobs To Do +---------- + +1. DC Offset coefficients +2. TX Filters: + D-Star + DMR + YSF + P25 +3. TX Filter workspaces and clearing: + D-Star + DMR + YSF + P25 +4. CW Id sine wave, silence and construction +5. RX Filters +6. RX Filter workspaces and clearing: + D-Star + DMR + YSF + P25 +7. Sample ring buffer sizing + RX + TX +8. TX symbols. +9. DC Offset workspace and clearing. +10. Hardware sample rates: + Due + STM32 + Teensy + +Jobs Done +--------- + +1. Boxcar coefficients +2. Symbols lengths for: + D-Star + DMR + YSF + P25 diff --git a/YSFDefines.h b/YSFDefines.h index c05f426..4dc73b6 100644 --- a/YSFDefines.h +++ b/YSFDefines.h @@ -19,7 +19,7 @@ #if !defined(YSFDEFINES_H) #define YSFDEFINES_H -const unsigned int YSF_RADIO_SYMBOL_LENGTH = 5U; // At 24 kHz sample rate +const unsigned int YSF_RADIO_SYMBOL_LENGTH = 10U; // At 48 kHz sample rate const unsigned int YSF_FRAME_LENGTH_BYTES = 120U; const unsigned int YSF_FRAME_LENGTH_BITS = YSF_FRAME_LENGTH_BYTES * 8U;