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

Fix DAC output glitch when starting transmission.

m17
Rob Riggs 2018-08-11 16:06:07 -05:00
rodzic 0250e5a7f2
commit 6783a39e8c
1 zmienionych plików z 33 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

55
TNC/AFSKModulator.hpp
Wyświetl plik

@ -69,17 +69,16 @@ struct AFSKModulator {
static const size_t MARK_SKIP = 12;
static const size_t SPACE_SKIP = 22;
size_t pos_;
int running_;
size_t pos_{0};
int running_{-1};
osMessageQId dacOutputQueueHandle_;
PTT* ptt_;
uint8_t twist_;
uint8_t twist_{50};
uint16_t volume_{4096};
uint16_t buffer_[DAC_BUFFER_LEN];
AFSKModulator(osMessageQId queue, PTT* ptt)
: pos_(0), running_(-1), dacOutputQueueHandle_(queue), ptt_(ptt)
, twist_(50), buffer_()
: dacOutputQueueHandle_(queue), ptt_(ptt)
{
for (size_t i = 0; i != DAC_BUFFER_LEN; i++)
buffer_[i] = 2048;
@ -105,17 +104,22 @@ struct AFSKModulator {
void set_twist(uint8_t twist) {twist_ = twist;}
void send(bool bit) {
if (running_ != 1) {
switch (running_) {
case -1:
fill_first(bit);
running_ = 0;
break;
case 0:
fill_last(bit);
running_ = 1;
ptt_->on();
HAL_TIM_Base_Start(&htim7);
HAL_DAC_Start_DMA(&hdac1, DAC_CHANNEL_1, (uint32_t*) buffer_, DAC_BUFFER_LEN, DAC_ALIGN_12B_R);
break;
case 1:
osMessagePut(dacOutputQueueHandle_, bit, osWaitForever);
running_ += 1;
if (running_ == 1) {
ptt_->on();
HAL_TIM_Base_Start(&htim7);
HAL_DAC_Start_DMA(&hdac1, DAC_CHANNEL_1, (uint32_t*) buffer_, DAC_BUFFER_LEN, DAC_ALIGN_12B_R);
}
break;
}
osMessagePut(dacOutputQueueHandle_, bit, osWaitForever);
}
void fill(uint16_t* buffer, bool bit) {
@ -154,13 +158,19 @@ struct AFSKModulator {
}
void empty() {
if (running_ != -1) {
--running_;
if (running_ == -1) {
HAL_DAC_Stop_DMA(&hdac1, DAC_CHANNEL_1);
HAL_TIM_Base_Stop(&htim7);
ptt_->off();
}
switch (running_) {
case 1:
running_ = 0;
break;
case 0:
running_ = -1;
HAL_DAC_Stop_DMA(&hdac1, DAC_CHANNEL_1);
HAL_TIM_Base_Stop(&htim7);
ptt_->off();
pos_ = 0;
break;
case -1:
break;
}
}
@ -169,8 +179,9 @@ struct AFSKModulator {
HAL_DAC_Stop_DMA(&hdac1, DAC_CHANNEL_1);
HAL_TIM_Base_Stop(&htim7);
ptt_->off();
// Drain the queue.
pos_ = 0;
// Drain the queue.
while (osMessageGet(dacOutputQueueHandle_, 0).status == osEventMessage);
}
};