Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

Commit

Permalink
Added back scanning in BHT TX
Browse files Browse the repository at this point in the history 
Added file creation date display in File Manager
  • Loading branch information
furrtek authored and furrtek committed Jan 9, 2018
1 parent aebd175 commit 441a266
Show file tree
Hide file tree
Showing 17 changed files with 231 additions and 363 deletions.
216 changes: 114 additions & 102 deletions firmware/application/apps/ui_bht_tx.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,119 +37,111 @@ void BHTView::focus() {
void BHTView::start_tx() {
baseband::shutdown();

if (tx_type == XYLOS) {
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);

if (target_system == XYLOS) {

baseband::run_image(portapack::spi_flash::image_tag_tones);

view_xylos.generate_message();

//if (view_xylos.tx_mode == XylosView::tx_modes::SINGLE)
progressbar.set_max(20);
//else if (view_xylos.tx_mode == XylosView::tx_modes::SEQUENCE)
// progressbar.set_max(20 * XY_SEQ_COUNT);
//if (tx_mode == SINGLE) {
progressbar.set_max(XY_TONE_COUNT);
/*} else if (tx_mode == SCAN) {
progressbar.set_max(XY_TONE_COUNT * view_xylos.get_scan_remaining());
}*/

transmitter_model.set_sampling_rate(TONES_SAMPLERATE);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

// Setup tones
for (size_t c = 0; c < ccir_deltas.size(); c++)
baseband::set_tone(c, ccir_deltas[c], XY_TONE_LENGTH);
baseband::set_tone(c, ccir_deltas[c], XY_TONE_DURATION);

baseband::set_tones_config(transmitter_model.channel_bandwidth(), XY_SILENCE, XY_TONE_COUNT, false, false);

} else if (tx_type == EPAR) {
} else if (target_system == EPAR) {

baseband::run_image(portapack::spi_flash::image_tag_ook);

size_t bitstream_length = view_EPAR.generate_message();
auto bitstream_length = view_EPAR.generate_message();

progressbar.set_max(2 * 26);
//if (tx_mode == SINGLE) {
progressbar.set_max(2 * EPAR_REPEAT_COUNT);
/*} else if (tx_mode == SCAN) {
progressbar.set_max(2 * EPAR_REPEAT_COUNT * view_EPAR.get_scan_remaining());
}*/

transmitter_model.set_sampling_rate(OOK_SAMPLERATE);
transmitter_model.set_rf_amp(true);
transmitter_model.set_baseband_bandwidth(1750000);
transmitter_model.enable();

baseband::set_ook_data(
bitstream_length,
OOK_SAMPLERATE / 580,
26,
EPAR_BIT_DURATION,
EPAR_REPEAT_COUNT,
encoder_defs[ENCODER_UM3750].pause_symbols
);
}
}

void BHTView::stop_tx() {
transmitter_model.disable();
baseband::shutdown();
tx_mode = IDLE;
tx_view.set_transmitting(false);
progressbar.set_value(0);
}

void BHTView::on_tx_progress(const uint32_t progress, const bool done) {
//if (view_xylos.tx_mode == XylosView::tx_modes::SINGLE) {

if (done) {
transmitter_model.disable();
view_xylos.tx_mode = XylosView::tx_modes::IDLE;
tx_view.set_transmitting(false);
}

if (tx_type == XYLOS) {
if (target_system == XYLOS) {
if (done) {
if (!checkbox_cligno.value()) {
view_xylos.tx_mode = XylosView::tx_modes::IDLE;
tx_view.set_transmitting(false);
progressbar.set_value(0);
} else {
chThdSleepMilliseconds(field_tempo.value() * 1000); // Dirty :(

view_xylos.flip_relays();

start_tx();
if (tx_mode == SINGLE) {
if (checkbox_cligno.value()) {
// TODO: Thread !
chThdSleepMilliseconds(field_tempo.value() * 1000); // Dirty :(
view_xylos.flip_relays();
start_tx();
} else
stop_tx();
} else if (tx_mode == SCAN) {
if (view_xylos.increment_address())
start_tx();
else
stop_tx(); // Reached end of scan range
}
} else
progressbar.set_value(progress);
} else if (tx_type == EPAR) {
} else if (target_system == EPAR) {
if (done) {

if (!view_EPAR.half) {
view_EPAR.half = 1;
view_EPAR.half = true;
start_tx(); // Start second half of transmission
} else {
view_EPAR.half = 0;
progressbar.set_value(0);
if (checkbox_cligno.value()) {
chThdSleepMilliseconds(field_tempo.value() * 1000); // Dirty :(

view_EPAR.flip_relays();

start_tx();
view_EPAR.half = false;
if (tx_mode == SINGLE) {
if (checkbox_cligno.value()) {
// TODO: Thread !
chThdSleepMilliseconds(field_tempo.value() * 1000); // Dirty :(
view_EPAR.flip_relays();
start_tx();
} else
stop_tx();
} else if (tx_mode == SCAN) {
if (view_EPAR.increment_address())
start_tx();
else
stop_tx(); // Reached end of scan range
}
}
} else
progressbar.set_value((26 * view_EPAR.half) + progress);
progressbar.set_value(progress);
}

/*} else if (view_xylos.tx_mode == XylosView::tx_modes::SEQUENCE) {
if (done) {
transmitter_model.disable();
if (view_xylos.seq_index < (XY_SEQ_COUNT - 1)) {
for (c = 0; c < view_xylos.sequence_matin[view_xylos.seq_index].delay; c++)
chThdSleepMilliseconds(1000);
view_xylos.seq_index++;
start_tx();
} else {
progressbar.set_value(0);
view_xylos.tx_mode = XylosView::tx_modes::IDLE;
tx_view.set_transmitting(false);
}
} else {
progressbar.set_value((view_xylos.seq_index * 20) + progress);
}
}*/
}

BHTView::~BHTView() {
transmitter_model.disable();
baseband::shutdown();
}

BHTView::BHTView(NavigationView& nav) {
Expand All @@ -158,10 +150,10 @@ BHTView::BHTView(NavigationView& nav) {
&labels,
&view_xylos,
&view_EPAR,
&checkbox_scan,
&checkbox_cligno,
&field_tempo,
&progressbar,
&text_message,
&tx_view
});

Expand All @@ -174,31 +166,42 @@ BHTView::BHTView(NavigationView& nav) {
};
};

/*button_seq.on_select = [this, &nav](Button&) {
if (tx_mode == IDLE) {
seq_index = 0;
tx_mode = SEQUENCE;
tx_view.set_transmitting(true);
start_tx();
}
};*/

tx_view.on_start = [this]() {
if (view_xylos.tx_mode == XylosView::tx_modes::IDLE) {
view_xylos.tx_mode = XylosView::tx_modes::SINGLE;
if (tx_mode == IDLE) {
if (checkbox_scan.value()) {
tx_mode = SCAN;
} else {
tx_mode = SINGLE;
}

progressbar.set_value(0);
tx_view.set_transmitting(true);
tx_type = (tx_type_t)tab_view.selected();
target_system = (target_system_t)tab_view.selected();
view_EPAR.half = false;

start_tx();
}
};

tx_view.on_stop = [this]() {
transmitter_model.disable();
tx_view.set_transmitting(false);
view_xylos.tx_mode = XylosView::tx_modes::IDLE;
stop_tx();
};
}

bool EPARView::increment_address() {
auto city_code = field_city.value();

if (city_code < EPAR_MAX_CITY) {
field_city.set_value(city_code + 1);
return true;
} else
return false;
}

uint32_t EPARView::get_scan_remaining() {
return EPAR_MAX_CITY - field_city.value();
}

void EPARView::flip_relays() {
// Invert first relay's state
relay_states[0].set_selected_index(relay_states[0].selected_index() ^ 1);
Expand All @@ -207,7 +210,7 @@ void EPARView::flip_relays() {
size_t EPARView::generate_message() {
// R2, then R1
return gen_message_ep(field_city.value(), field_group.selected_index_value(),
1 - half, relay_states[half].selected_index());
half ? 0 : 1, relay_states[half].selected_index());
}

EPARView::EPARView(
Expand All @@ -219,18 +222,17 @@ EPARView::EPARView(
add_children({
&labels,
&field_city,
&field_group,
//&button_scan
&field_group
});

field_city.set_value(220);
field_city.set_value(0);
field_group.set_selected_index(2);

field_city.on_change = [this](int32_t) { generate_message(); };
field_group.on_change = [this](size_t, int32_t) { generate_message(); };

const auto relay_state_fn = [this](size_t, OptionsField::value_t) {
this->generate_message();
generate_message();
};

size_t n = 0;
Expand Down Expand Up @@ -259,19 +261,25 @@ void XylosView::flip_relays() {
relay_states[0].set_selected_index(rs ^ 3);
}

bool XylosView::increment_address() {
auto city_code = field_city.value();

if (city_code < XY_MAX_CITY) {
field_city.set_value(city_code + 1);
return true;
} else
return false;
}

uint32_t XylosView::get_scan_remaining() {
return XY_MAX_CITY - field_city.value();
}

void XylosView::generate_message() {
//if (tx_mode == SINGLE) {
//text_message.set(
gen_message_xy(field_header_a.value(), field_header_b.value(), field_city.value(), field_family.value(),
checkbox_wcsubfamily.value(), field_subfamily.value(), checkbox_wcid.value(), field_receiver.value(),
relay_states[0].selected_index(), relay_states[1].selected_index(),
relay_states[2].selected_index(), relay_states[3].selected_index());
//);
/*} else if (tx_mode == SEQUENCE) {
//text_message.set(
gen_message_xy(sequence_matin[seq_index].code);
//);
}*/
gen_message_xy(field_header_a.value(), field_header_b.value(), field_city.value(), field_family.value(),
checkbox_wcsubfamily.value(), field_subfamily.value(), checkbox_wcid.value(), field_receiver.value(),
relay_states[0].selected_index(), relay_states[1].selected_index(),
relay_states[2].selected_index(), relay_states[3].selected_index());
}

XylosView::XylosView(
Expand Down Expand Up @@ -300,7 +308,11 @@ XylosView::XylosView(
field_subfamily.set_value(1);
field_receiver.set_value(1);

field_header_a.on_change = [this](int32_t) { generate_message(); };
const auto field_fn = [this](int32_t) {
generate_message();
};

field_header_a.on_change = field_fn;
field_header_b.on_change = [this](int32_t) { generate_message(); };
field_city.on_change = [this](int32_t) { generate_message(); };
field_family.on_change = [this](int32_t) { generate_message(); };
Expand All @@ -321,7 +333,7 @@ XylosView::XylosView(
checkbox_wcid.set_value(true);

const auto relay_state_fn = [this](size_t, OptionsField::value_t) {
this->generate_message();
generate_message();
};

size_t n = 0;
Expand Down
Loading

0 comments on commit 441a266

Please sign in to comment.