mirror
/
NucleoTNC
kopia lustrzana https://github.com/mobilinkd/NucleoTNC
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Update M17 modulator to use 72MHz clock for increased accuracy.

master
Rob Riggs 2021-06-20 20:40:49 -05:00
rodzic 3548060ae0
commit fe49e88122
2 zmienionych plików z 17 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
TNC/M17Modulator.cpp
Wyświetl plik

@ -11,10 +11,10 @@ void M17Modulator::init(const kiss::Hardware& hw)
(void) hw; // unused (void) hw; // unused
SysClock80(); SysClock72();
// Configure 80MHz clock for 48kHz. // Configure 72MHz clock for 48kHz.
htim7.Init.Period = 1665; htim7.Init.Period = 1499;
htim7.Init.Prescaler = 0; htim7.Init.Prescaler = 0;
if (HAL_TIM_Base_Init(&htim7) != HAL_OK) if (HAL_TIM_Base_Init(&htim7) != HAL_OK)
{ {

18
TNC/M17Modulator.h
Wyświetl plik

@ -26,7 +26,7 @@ struct M17Modulator : Modulator
// Six buffers per M17 frame, or 12 half-buffer interrupts. // Six buffers per M17 frame, or 12 half-buffer interrupts.
static constexpr uint8_t UPSAMPLE = 10; static constexpr uint8_t UPSAMPLE = 10;
static constexpr uint32_t BLOCKSIZE = 4; static constexpr uint32_t BLOCKSIZE = 4;
static constexpr uint32_t STATE_SIZE = (m17::FILTER_TAP_NUM_15 / UPSAMPLE) + BLOCKSIZE - 1; static constexpr uint32_t STATE_SIZE = (m17::FILTER_TAP_NUM_9 / UPSAMPLE) + BLOCKSIZE - 1;
static constexpr int16_t DAC_BUFFER_LEN = 80; // 8 symbols, 16 bits, 2 bytes. static constexpr int16_t DAC_BUFFER_LEN = 80; // 8 symbols, 16 bits, 2 bytes.
static constexpr int16_t TRANSFER_LEN = DAC_BUFFER_LEN / 2; // 4 symbols, 8 bits, 1 byte. static constexpr int16_t TRANSFER_LEN = DAC_BUFFER_LEN / 2; // 4 symbols, 8 bits, 1 byte.
static constexpr uint16_t VREF = 4095; static constexpr uint16_t VREF = 4095;
@ -48,8 +48,8 @@ struct M17Modulator : Modulator
: dacOutputQueueHandle_(queue), ptt_(ptt) : dacOutputQueueHandle_(queue), ptt_(ptt)
{ {
arm_fir_interpolate_init_f32( arm_fir_interpolate_init_f32(
&fir_interpolator, UPSAMPLE, m17::FILTER_TAP_NUM_15, &fir_interpolator, UPSAMPLE, m17::FILTER_TAP_NUM_9,
(float32_t*) m17::rrc_taps_f15.data(), fir_state.data(), BLOCKSIZE); (float32_t*) m17::rrc_taps_f9.data(), fir_state.data(), BLOCKSIZE);
} }
~M17Modulator() override {} ~M17Modulator() override {}
@ -314,7 +314,7 @@ private:
buffer[i] = adjust_level(tmp[i]); buffer[i] = adjust_level(tmp[i]);
} }
} }
#if 0
[[gnu::noinline]] [[gnu::noinline]]
void fill_empty(int16_t* buffer) void fill_empty(int16_t* buffer)
{ {
@ -328,6 +328,16 @@ private:
buffer[i] = adjust_level(tmp[i]); buffer[i] = adjust_level(tmp[i]);
} }
} }
#endif
[[gnu::noinline]]
void fill_empty(int16_t* buffer)
{
for (size_t i = 0; i != TRANSFER_LEN; ++i)
{
buffer[i] = 2048;
}
}
}; };
}} // mobilinkd::tnc }} // mobilinkd::tnc