Fixed proc_tones skipping last tone

Split ui_bht to bht
This commit is contained in:
furrtek 2016-12-26 16:15:54 +01:00
parent f033782d4b
commit 1e34a48be9
11 changed files with 277 additions and 290 deletions

View file

@ -22,7 +22,6 @@
#include "ui_bht_tx.hpp"
#include "portapack.hpp"
#include "baseband_api.hpp"
#include "portapack_persistent_memory.hpp"
@ -43,110 +42,27 @@ BHTView::~BHTView() {
}
void BHTView::generate_message() {
size_t c;
const encoder_def_t * um3750_def;
uint8_t bit[12];
uint8_t city_code;
std::string ep_symbols;
char ook_bitstream[256];
char ep_message[13] = { 0 };
if (!_mode) {
// Xy CCIR frame
// Header
ccir_message[0] = (header_code_a.value() / 10) + '0';
ccir_message[1] = (header_code_a.value() % 10) + '0';
ccir_message[2] = (header_code_b.value() / 10) + '0';
ccir_message[3] = (header_code_b.value() % 10) + '0';
// Addresses
ccir_message[4] = (city_code_xy.value() / 10) + '0';
ccir_message[5] = (city_code_xy.value() % 10) + '0';
ccir_message[6] = family_code_xy.value() + '0';
if (!checkbox_wcsubfamily.value())
ccir_message[7] = subfamily_code.value() + '0';
else
ccir_message[7] = 'A'; // Wildcard
if (!checkbox_wcid.value()) {
ccir_message[8] = (receiver_code.value() / 10) + '0';
ccir_message[9] = (receiver_code.value() % 10) + '0';
} else {
ccir_message[8] = 'A'; // Wildcard
ccir_message[9] = 'A'; // Wildcard
}
ccir_message[10] = 'B';
// Relay states
for (c = 0; c < 4; c++)
ccir_message[c + 11] = relay_states[c].selected_index() + '0';
ccir_message[15] = 'B';
// End
for (c = 16; c < 20; c++)
ccir_message[c] = '0';
ccir_message[20] = 0;
// Replace repeats with E code
for (c = 1; c < 20; c++)
if (ccir_message[c] == ccir_message[c - 1]) ccir_message[c] = 'E';
// Display as text
text_message.set(ccir_message);
ascii_to_ccir(ccir_message);
text_message.set(
gen_message_xy(header_code_a.value(), header_code_b.value(), city_code_xy.value(), subfamily_code.value(),
checkbox_wcsubfamily.value(), subfamily_code.value(), checkbox_wcid.value(), receiver_code.value(),
relay_states[0].selected_index(), relay_states[1].selected_index(),
relay_states[2].selected_index(), relay_states[3].selected_index())
);
} else {
// EP frame
// Repeated 2x 26 times
// Whole frame + space = 128ms, data only = 64ms
um3750_def = &encoder_defs[8];
city_code = city_code_ep.value();
for (c = 0; c < 8; c++)
bit[c] = (city_code >> c) & 1;
bit[8] = family_code_ep.selected_index_value() >> 1;
bit[9] = family_code_ep.selected_index_value() & 1;
bit[10] = 0; // R1 first
if (relay_states[0].selected_index())
bit[11] = relay_states[0].selected_index() - 1;
else
bit[11] = 0;
for (c = 0; c < 12; c++)
ep_message[c] = bit[c] + '0';
text_message.set(ep_message);
c = 0;
for (auto ch : um3750_def->word_format) {
if (ch == 'S')
ep_symbols += um3750_def->sync;
else
ep_symbols += um3750_def->bit_format[bit[c++]];
}
c = 0;
for (auto ch : ep_symbols) {
if (ch != '0')
ook_bitstream[c >> 3] |= (1 << (7 - (c & 7)));
c++;
}
text_message.set(
gen_message_ep(city_code_ep.value(), family_code_ep.selected_index_value(),
relay_states[0].selected_index(), relay_states[1].selected_index())
);
}
}
void BHTView::start_tx() {
if (speaker_enabled && !_mode)
audio::headphone::set_volume(volume_t::decibel(90 - 99) + audio::headphone::volume_range().max);
generate_message();
transmitter_model.set_tuning_frequency(bht_freqs[options_freq.selected_index()]);
transmitter_model.set_baseband_configuration({
.mode = 0,
@ -159,25 +75,14 @@ void BHTView::start_tx() {
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();
memcpy(shared_memory.bb_data.tones_data.message, ccir_message, 20);
// Setup for Xy
for (uint8_t c = 0; c < 16; c++) {
shared_memory.bb_data.tones_data.tone_defs[c].delta = ccir_deltas[c];
shared_memory.bb_data.tones_data.tone_defs[c].duration = CCIR_TONE_LENGTH;
}
audio::set_rate(audio::Rate::Hz_24000);
baseband::set_tones_data(10000, CCIR_SILENCE, 20, false, checkbox_speaker.value());
}
// ASCII to frequency LUT index
void BHTView::ascii_to_ccir(char * ascii) {
for (size_t c = 0; c < 20; c++) {
if (ascii[c] > '9')
ascii[c] -= 0x37;
else
ascii[c] -= '0';
}
baseband::set_tones_data(6000, CCIR_SILENCE, 20, false, checkbox_speaker.value());
}
void BHTView::on_tx_progress(const int progress, const bool done) {
@ -248,11 +153,13 @@ BHTView::BHTView(NavigationView& nav) {
&text_cligno
} });
options_mode.set_selected_index(0); // Xy
options_mode.set_selected_index(0); // Start up in Xy mode
header_code_a.set_value(0);
header_code_b.set_value(0);
city_code_xy.set_value(18);
city_code_ep.set_value(220);
family_code_xy.set_value(1);
family_code_ep.set_selected_index(2);
subfamily_code.set_value(1);
receiver_code.set_value(1);
options_freq.set_selected_index(0);
@ -389,19 +296,13 @@ BHTView::BHTView(NavigationView& nav) {
generate_message();
button_transmit.on_select = [this, &nav](Button&) {
if (tx_mode == IDLE) {
//auto modal_view = nav.push<ModalMessageView>("TX", "TX ?", true);
//modal_view->on_choice = [this](bool choice) {
// if (choice) {
if (speaker_enabled && _mode)
audio::headphone::set_volume(volume_t::decibel(90 - 99) + audio::headphone::volume_range().max);
tx_mode = SINGLE;
button_transmit.set_style(&style_cancel);
button_transmit.set_text("Wait");
generate_message();
start_tx();
// }
//};
if ((tx_mode == IDLE) && (!_mode)) { // DEBUG
if (speaker_enabled && _mode)
audio::headphone::set_volume(volume_t::decibel(90 - 99) + audio::headphone::volume_range().max);
tx_mode = SINGLE;
button_transmit.set_style(&style_cancel);
button_transmit.set_text("Wait");
start_tx();
}
};
}