Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-12-24 23:09:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Morse TX speed in WPS

Browse Source
This commit is contained in:
Белоусов Олег 2020-09-22 11:46:44 +03:00
parent 17cb092978
commit a5a3ba184a
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/application/apps/ui_morse.cpp
View File

@ -115,7 +115,7 @@ bool MorseView::start_tx() {
void MorseView::update_tx_duration() { void MorseView::update_tx_duration() {
uint32_t duration_ms; uint32_t duration_ms;
time_unit_ms = field_time_unit.value(); time_unit_ms = 1200 / field_speed.value();
symbol_count = morse_encode(message, time_unit_ms, field_tone.value(), &time_units); symbol_count = morse_encode(message, time_unit_ms, field_tone.value(), &time_units);
if (symbol_count) { if (symbol_count) {
@ -152,7 +152,7 @@ MorseView::MorseView(
&labels, &labels,
&checkbox_foxhunt, &checkbox_foxhunt,
&options_foxhunt, &options_foxhunt,
&field_time_unit, &field_speed,
&field_tone, &field_tone,
&options_modulation, &options_modulation,
&text_tx_duration, &text_tx_duration,
@ -163,7 +163,7 @@ MorseView::MorseView(
}); });
// Default settings // Default settings
field_time_unit.set_value(50); // 50ms unit field_speed.set_value(15); // 15wps
field_tone.set_value(700); // 700Hz FM tone field_tone.set_value(700); // 700Hz FM tone
options_modulation.set_selected_index(0); // CW mode options_modulation.set_selected_index(0); // CW mode
@ -183,7 +183,7 @@ MorseView::MorseView(
modulation = (modulation_t)i; modulation = (modulation_t)i;
}; };
field_time_unit.on_change = [this](int32_t) { field_speed.on_change = [this](int32_t) {
update_tx_duration(); update_tx_duration();
}; };

8
firmware/application/apps/ui_morse.hpp
View File

@ -80,7 +80,7 @@ private:
bool foxhunt_mode { false }; bool foxhunt_mode { false };
Labels labels { Labels labels {
{ { 4 * 8, 6 * 8 }, "Time unit: ms", Color::light_grey() }, { { 4 * 8, 6 * 8 }, "Speed: wps", Color::light_grey() },
{ { 4 * 8, 8 * 8 }, "Tone: Hz", Color::light_grey() }, { { 4 * 8, 8 * 8 }, "Tone: Hz", Color::light_grey() },
{ { 4 * 8, 10 * 8 }, "Modulation:", Color::light_grey() }, { { 4 * 8, 10 * 8 }, "Modulation:", Color::light_grey() },
{ { 1 * 8, 25 * 8 }, "TX will last", Color::light_grey() } { { 1 * 8, 25 * 8 }, "TX will last", Color::light_grey() }
@ -109,10 +109,10 @@ private:
} }
}; };
NumberField field_time_unit { NumberField field_speed {
{ 14 * 8, 6 * 8 }, { 10 * 8, 6 * 8 },
3, 3,
{ 10, 999 }, { 10, 45 },
1, 1,
' ' ' '
}; };