From a5a3ba184a40ebffb369f7b0ea3f6f0f5b74d2bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D0=B5=D0=BB=D0=BE=D1=83=D1=81=D0=BE=D0=B2=20=D0=9E?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B3?= <belousov.oleg@gmail.com>
Date: Tue, 22 Sep 2020 11:46:44 +0300
Subject: [PATCH] Morse TX speed in WPS

---
 firmware/application/apps/ui_morse.cpp | 8 ++++----
 firmware/application/apps/ui_morse.hpp | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/firmware/application/apps/ui_morse.cpp b/firmware/application/apps/ui_morse.cpp
index a9b997b37..b0f10234e 100644
--- a/firmware/application/apps/ui_morse.cpp
+++ b/firmware/application/apps/ui_morse.cpp
@@ -115,7 +115,7 @@ bool MorseView::start_tx() {
 void MorseView::update_tx_duration() {
 	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);
 	
 	if (symbol_count) {
@@ -152,7 +152,7 @@ MorseView::MorseView(
 		&labels,
 		&checkbox_foxhunt,
 		&options_foxhunt,
-		&field_time_unit,
+		&field_speed,
 		&field_tone,
 		&options_modulation,
 		&text_tx_duration,
@@ -163,7 +163,7 @@ MorseView::MorseView(
 	});
 	
 	// Default settings
-	field_time_unit.set_value(50);				// 50ms unit
+	field_speed.set_value(15);					// 15wps
 	field_tone.set_value(700);					// 700Hz FM tone
 	options_modulation.set_selected_index(0);	// CW mode
 	
@@ -183,7 +183,7 @@ MorseView::MorseView(
 		modulation = (modulation_t)i;
 	};
 	
-	field_time_unit.on_change = [this](int32_t) {
+	field_speed.on_change = [this](int32_t) {
 		update_tx_duration();
 	};
 	
diff --git a/firmware/application/apps/ui_morse.hpp b/firmware/application/apps/ui_morse.hpp
index a9dcb79e7..e1857fbfc 100644
--- a/firmware/application/apps/ui_morse.hpp
+++ b/firmware/application/apps/ui_morse.hpp
@@ -80,7 +80,7 @@ private:
 	bool foxhunt_mode { false };
 	
 	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, 10 * 8 }, "Modulation:", Color::light_grey() },
 		{ { 1 * 8, 25 * 8 }, "TX will last", Color::light_grey() }
@@ -109,10 +109,10 @@ private:
 		}
 	};
 	
-	NumberField field_time_unit {
-		{ 14 * 8, 6 * 8 },
+	NumberField field_speed {
+		{ 10 * 8, 6 * 8 },
 		3,
-		{ 10, 999 },
+		{ 10, 45 },
 		1,
 		' '
 	};