Added back scanning in BHT TX

Added file creation date display in File Manager

firmware/application/apps/ui_bht_tx.cpp

@@ -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) {
@@ -158,10 +150,10 @@ BHTView::BHTView(NavigationView& nav) {
 		&labels,
 		&view_xylos,
 		&view_EPAR,
+		&checkbox_scan,
 		&checkbox_cligno,
 		&field_tempo,
 		&progressbar,
-		&text_message,
 		&tx_view
 	});
 	
@@ -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);
@@ -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(
@@ -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;
@@ -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(
@@ -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(); };
@@ -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;

firmware/application/apps/ui_bht_tx.hpp

@@ -34,8 +34,6 @@
 #include "encoders.hpp"
 #include "portapack.hpp"
 
-#define XY_SEQ_COUNT 14
-
 namespace ui {
 
 class XylosView : public View {
@@ -46,39 +44,9 @@ public:
 	
 	void flip_relays();
 	void generate_message();
+	bool increment_address();
+	uint32_t get_scan_remaining();
 	
-	enum tx_modes {
-		IDLE = 0,
-		SINGLE,
-		SEQUENCE
-	};
-	
-	tx_modes tx_mode = IDLE;
-	
-	uint32_t seq_index { 0 };
-	
-	struct sequence_t {
-		const std::string code;
-		const uint32_t delay;
-	};
-	
-	const sequence_t sequence_matin[XY_SEQ_COUNT] = {
-		{ "0000189000B1002B0000", 19 }, // 18:9:0:00	 R1=OFF (1)	
-		{ "0000189200B2110B0000", 16 },	// 18:9:2:00	 R1=ON  (4)	
-		{ "0000189200B1110B0000", 52 },	// 18:9:2:00	 R1=OFF (4)	
-		{ "0000189200B2110B0000", 17 },	// 18:9:2:00	 R1=ON  (4)	
-		{ "0000189200B1110B0000", 16 },	// 18:9:2:00	 R1=OFF (4)	
-		{ "0000189000B0012B0000", 22 },	// 18:9:0:00	 R3=OFF (2)	
-		{ "0000189200B1120B0000", 17 },	// 18:9:2:00	 R3=ON  (6)	
-		{ "0000189200B1110B0000", 17 },	// 18:9:2:00	 R3=OFF (6)	
-		{ "0000181AAAB1000B0000", 17 },	// 18:1:A:AA	 R1=OFF (10)	
-		{ "0000189400B1000B0000", 17 },	// 18:9:4:00	 R1=OFF (7)	
-		{ "0000189200B1120B0000", 14 },	// 18:9:2:00	 R3=ON  (6)	
-		{ "0000189200B1110B0000", 17 },	// 18:9:2:00	 R3=OFF (6)	
-		{ "0000181AAAB1000B0000", 17 },	// 18:1:A:AA	
-		{ "0000189400B0100B0000", 17 }	// 18:9:4:00	 R2=OFF (8)		
-	};
-
 private:
 	Labels labels {
 		{ { 8 * 8, 1 * 8 }, "Header:", Color::light_grey() },
@@ -107,7 +75,7 @@ private:
 	NumberField field_city {
 		{ 16 * 8, 3 * 8 },
 		2,
-		{ 0, 99 },
+		{ 0, XY_MAX_CITY },
 		1,
 		' '
 	};
@@ -154,11 +122,6 @@ private:
 		{ &bitmap_bulb_off, 1 },
 		{ &bitmap_bulb_on, 2 }
 	};
-	
-	Button button_seq {
-		{ 24 * 8, 1 * 8, 40, 32 },
-		"Seq"
-	};
 };
 
 class EPARView : public View {
@@ -169,8 +132,10 @@ public:
 	
 	void flip_relays();
 	size_t generate_message();
+	bool increment_address();
+	uint32_t get_scan_remaining();
 
-	size_t half { 0 };
+	bool half { false };
 	
 private:
 	Labels labels {
@@ -182,9 +147,9 @@ private:
 	NumberField field_city {
 		{ 16 * 8, 1 * 8 },
 		3,
-		{ 0, 255 },
+		{ 0, EPAR_MAX_CITY },
 		1,
-		' '
+		'0'
 	};
 	
 	OptionsField field_group {
@@ -204,11 +169,6 @@ private:
 		{ &bitmap_bulb_off, 0 },
 		{ &bitmap_bulb_on, 1 }
 	};
-	
-	Button button_scan {
-		{ 22 * 8, 1 * 8, 56, 32 },
-		"Scan"
-	};
 };
 
 class BHTView : public View {
@@ -223,15 +183,24 @@ public:
 private:
 	void on_tx_progress(const uint32_t progress, const bool done);
 	void start_tx();
+	void stop_tx();
 	
-	enum tx_type_t {
+	enum target_system_t {
 		XYLOS = 0,
 		EPAR = 1
 	};
 	
-	tx_type_t tx_type = { };
+	target_system_t target_system = { };
 	
-	Rect view_rect = { 0, 3 * 8, 240, 192 };
+	enum tx_modes {
+		IDLE = 0,
+		SINGLE,
+		SCAN
+	};
+	
+	tx_modes tx_mode = IDLE;
+	
+	Rect view_rect = { 0, 3 * 8, 240, 176 };
 	
 	XylosView view_xylos { view_rect };
 	EPARView view_EPAR { view_rect };
@@ -245,27 +214,29 @@ private:
 		{ { 29 * 8, 14 * 16 + 4 }, "s", Color::light_grey() }
 	};
 	
-	ProgressBar progressbar {
-		{ 1 * 8, 14 * 16, 20 * 8, 16 },
-	};
-	Text text_message {
-		{ 1 * 8, 15 * 16, 20 * 8, 16 },
-		""
+	Checkbox checkbox_scan {
+		{ 1 * 8, 25 * 8 },
+		4,
+		"Scan"
 	};
 	
 	Checkbox checkbox_cligno {
-		{ 22 * 8, 14 * 16 },
-		1,
-		"~"
+		{ 16 * 8, 25 * 8 },
+		6,
+		"Cligno"
 	};
 	NumberField field_tempo {
-		{ 27 * 8, 14 * 16 + 4 },
+		{ 26 * 8, 25 * 8 + 4 },
 		2,
 		{ 1, 99 },
 		1,
 		' '
 	};
 	
+	ProgressBar progressbar {
+		{ 0 * 8, 29 * 8, 30 * 8, 16 },
+	};
+	
 	TransmitterView tx_view {
 		16 * 16,
 		10000,

firmware/application/apps/ui_fileman.cpp

@@ -274,11 +274,17 @@ FileManagerView::FileManagerView(
 	add_children({
 		&menu_view,
 		&text_empty,
+		&labels,
+		&text_date,
 		&button_rename,
 		&button_new_dir,
 		&button_delete
 	});
 	
+	menu_view.on_highlight = [this]() {
+		text_date.set(to_string_FAT_timestamp(file_created_date(get_selected_path())));
+	};
+	
 	refresh_list();
 	
 	on_select_entry = [this]() {

firmware/application/apps/ui_fileman.hpp

@@ -149,21 +149,30 @@ private:
 	void refresh_widgets(const bool v);
 	void on_rename(NavigationView& nav);
 	void on_delete();
+	
+	Labels labels {
+		{ { 0, 26 * 8 }, "Created ", Color::light_grey() }
+	};
+	
+	Text text_date {
+		{ 8 * 8, 26 * 8 , 19 * 8, 16 },
+		""
+	};
 
 	Button button_rename {
-		{ 0 * 8, 28 * 8, 14 * 8, 32 },
+		{ 0 * 8, 29 * 8, 12 * 8, 32 },
 		"Rename"
 	};
+	Button button_delete {
+		{ 18 * 8, 29 * 8, 12 * 8, 32 },
+		"Delete"
+	};
 	
 	Button button_new_dir {
-		{ 0 * 8, 33 * 8, 14 * 8, 32 },
+		{ 0 * 8, 34 * 8, 14 * 8, 32 },
 		"New dir"
 	};
 	
-	Button button_delete {
-		{ 18 * 8, 28 * 8, 12 * 8, 32 },
-		"Delete"
-	};
 };
 
 } /* namespace ui */

firmware/application/apps/ui_freqman.cpp

@@ -72,7 +72,7 @@ void FreqManBaseView::populate_categories() {
 	categories.clear();
 	
 	for (size_t n = 0; n < file_list.size(); n++)
-		categories.emplace_back(std::make_pair(file_list[n], n));
+		categories.emplace_back(std::make_pair(file_list[n].substr(0, 14), n));
 	
 	// Alphabetical sort
 	std::sort(categories.begin(), categories.end(), [](auto &left, auto &right) {

firmware/application/apps/ui_freqman.hpp

@@ -149,8 +149,8 @@ private:
 	};
 	
 	Button button_new_category {
-		{ 18 * 8, 2, 12 * 8, 20 },
-		"Create new"
+		{ 23 * 8, 2, 7 * 8, 20 },
+		"New"
 	};
 
 	Button button_edit_freq {

firmware/application/apps/ui_rds.cpp

@@ -260,6 +260,7 @@ RDSView::RDSView(
 	};
 	
 	tx_view.on_stop = [this]() {
+		// Kill tx_thread here ?
 		tx_view.set_transmitting(false);
 		transmitter_model.disable();
 		txing = false;