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

Clarify M17 modulator constant naming 

Further clarify modulator constant naming for sample rate and frame
lengths, to distinguish between demodulator values.
pull/68/head
Niccolò Izzo 2021-11-08 13:55:57 +01:00 zatwierdzone przez Silvano Seva
rodzic 6588a6718e
commit 3aeade6c1f
2 zmienionych plików z 6 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
openrtx/include/protocols/M17/M17Modulator.h
Wyświetl plik

@ -107,11 +107,11 @@ private:
return symbols; return symbols;
} }
static constexpr size_t M17_RTX_SAMPLE_RATE = 48000; static constexpr size_t M17_TX_SAMPLE_RATE = 48000;
static constexpr size_t M17_FRAME_SAMPLES = 1920; static constexpr size_t M17_FRAME_SAMPLES_48K = 1920;
static constexpr size_t M17_FRAME_SYMBOLS = 192; static constexpr size_t M17_FRAME_SYMBOLS = 192;
using dataBuffer_t = std::array< int16_t, M17_FRAME_SAMPLES >; using dataBuffer_t = std::array< int16_t, M17_FRAME_SAMPLES_48K >;
std::array< int16_t, M17_FRAME_SYMBOLS > symbols; std::array< int16_t, M17_FRAME_SYMBOLS > symbols;
int16_t *baseband_buffer; ///< Buffer for baseband audio handling. int16_t *baseband_buffer; ///< Buffer for baseband audio handling.

6
openrtx/src/protocols/M17/M17Modulator.cpp
Wyświetl plik

@ -52,7 +52,7 @@ void M17Modulator::init()
* placement new. * placement new.
*/ */
baseband_buffer = new int16_t[2 * M17_FRAME_SAMPLES]; baseband_buffer = new int16_t[2 * M17_FRAME_SAMPLES_48K];
idleBuffer = new (baseband_buffer) dataBuffer_t; idleBuffer = new (baseband_buffer) dataBuffer_t;
int16_t *ptr = baseband_buffer + activeBuffer->size(); int16_t *ptr = baseband_buffer + activeBuffer->size();
activeBuffer = new (ptr) dataBuffer_t; activeBuffer = new (ptr) dataBuffer_t;
@ -111,7 +111,7 @@ void M17Modulator::emitBaseband()
dsp_pwmCompensate(idleBuffer->data(), idleBuffer->size()); dsp_pwmCompensate(idleBuffer->data(), idleBuffer->size());
dsp_invertPhase(idleBuffer->data(), idleBuffer->size()); dsp_invertPhase(idleBuffer->data(), idleBuffer->size());
for(size_t i = 0; i < M17_FRAME_SAMPLES; i++) for(size_t i = 0; i < M17_FRAME_SAMPLES_48K; i++)
{ {
int32_t pos_sample = idleBuffer->at(i) + 32768; int32_t pos_sample = idleBuffer->at(i) + 32768;
uint16_t shifted_sample = pos_sample >> 8; uint16_t shifted_sample = pos_sample >> 8;
@ -122,7 +122,7 @@ void M17Modulator::emitBaseband()
{ {
// First run, start transmission // First run, start transmission
toneGen_playAudioStream(reinterpret_cast< uint16_t *>(baseband_buffer), toneGen_playAudioStream(reinterpret_cast< uint16_t *>(baseband_buffer),
2*M17_FRAME_SAMPLES, M17_RTX_SAMPLE_RATE, true); 2*M17_FRAME_SAMPLES_48K, M17_TX_SAMPLE_RATE, true);
txRunning = true; txRunning = true;
stopTx = false; stopTx = false;
} }