Fixed Nuoptix TX, merged DTMF TX with tones TX

This commit is contained in:
furrtek
2016-12-26 17:51:30 +01:00
parent 1e34a48be9
commit a67feb01fd
7 changed files with 24 additions and 261 deletions

View File

@@ -63,16 +63,19 @@ void NuoptixView::transmit(bool setup) {
timecode = lfsr_iterate(timecode) % 1999; // Could be 9999 but that would be one long audio track !
if (setup) {
pbar.set_max(4);
pbar.set_max(6 * 2);
if (tx_mode == NORMAL)
if (tx_mode == IMPROVISE) {
// Seed from RTC
rtcGetTime(&RTCD1, &datetime);
timecode = datetime.day() + datetime.second();
} else {
timecode = number_timecode.value();
else
timecode = 0125; // TODO: Use RTC as seed ?
}
transmitter_model.set_baseband_configuration({
.mode = 0,
.sampling_rate = 1536000,
.sampling_rate = 1536000U,
.decimation_factor = 1,
});
transmitter_model.set_rf_amp(true);
@@ -137,7 +140,7 @@ void NuoptixView::transmit(bool setup) {
shared_memory.bb_data.tones_data.silence = NUOPTIX_TONE_LENGTH; // 49ms tone, 49ms space
audio::set_rate(audio::Rate::Hz_24000);
baseband::set_tones_data(number_bw.value(), 0, 6 * 2, true, true);
baseband::set_tones_data(number_bw.value() * 500, 0, 6 * 2, true, true);
timecode++;
}

View File

@@ -29,6 +29,7 @@
#include "baseband_api.hpp"
#include "ui_navigation.hpp"
#include "ui_receiver.hpp"
#include "time.hpp"
#include "message.hpp"
#include "volume.hpp"
#include "audio.hpp"
@@ -89,6 +90,7 @@ private:
void transmit(bool setup);
uint32_t timecode;
rtc::RTC datetime;
FrequencyField field_frequency {
{ 1 * 8, 4 },
@@ -148,7 +150,7 @@ private:
Message::ID::TXDone,
[this](const Message* const p) {
const auto message = *reinterpret_cast<const TXDoneMessage*>(p);
if (message.progress == 0xFF)
if (message.done)
transmit(false);
else
pbar.set_value(message.progress);