Merge branch 'next' into jimi-merging-conflicts

firmware/application/apps/ais_app.cpp

@@ -254,8 +254,18 @@ AISRecentEntryDetailView::AISRecentEntryDetailView(NavigationView& nav) {
 
 		
 	};
-	
-	
+}
+
+
+AISRecentEntryDetailView::AISRecentEntryDetailView(const AISRecentEntryDetailView&Entry) : View()
+{
+    (void)Entry;
+}
+
+AISRecentEntryDetailView & AISRecentEntryDetailView::operator=(const AISRecentEntryDetailView&Entry) 
+{
+    (void)Entry;
+    return *this;
 }
 
 void AISRecentEntryDetailView::update_position() {

firmware/application/apps/ais_app.hpp

@@ -127,6 +127,9 @@ public:
 	void focus() override;
 	void paint(Painter&) override;
 
+    AISRecentEntryDetailView(const AISRecentEntryDetailView&Entry);
+    AISRecentEntryDetailView &operator=(const AISRecentEntryDetailView&Entry);
+
 private:
 	AISRecentEntry entry_ { };
 
@@ -163,7 +166,7 @@ public:
 
 	void focus() override;
 
-	std::string title() const override { return "AIS"; };
+	std::string title() const override { return "AIS Boats RX"; };
 
 private:
 	static constexpr uint32_t initial_target_frequency = 162025000;

firmware/application/apps/analog_audio_app.hpp

@@ -143,7 +143,7 @@ public:
 
 	void focus() override;
 
-	std::string title() const override { return "Analog audio"; };
+	std::string title() const override { return "Audio RX"; };
 
 	size_t get_spec_bw_index();
 	void set_spec_bw(size_t index, uint32_t bw);

firmware/application/apps/analog_tv_app.hpp

@@ -53,7 +53,7 @@ public:
 
 	void focus() override;
 
-	std::string title() const override { return "Analog TV"; };
+	std::string title() const override { return "Analog TV RX"; };
 	
 private:
 	static constexpr ui::Dim header_height = 3 * 16;

firmware/application/apps/ert_app.hpp

@@ -125,7 +125,7 @@ public:
 
 	void focus() override;
 
-	std::string title() const override { return "ERT"; };
+	std::string title() const override { return "ERT Meter RX"; };
 
 private:
 	ERTRecentEntries recent { };

firmware/application/apps/gps_sim_app.hpp

@@ -44,7 +44,7 @@ public:
 	void set_parent_rect(const Rect new_parent_rect) override;
 	void focus() override;
 
-	std::string title() const override { return "GPS Simulator"; };
+	std::string title() const override { return "GPS Sim TX"; };
 	
 private:
 	NavigationView& nav_;

firmware/application/apps/lge_app.hpp

@@ -40,7 +40,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "LGE tool"; };
+	std::string title() const override { return "LGE tool TX"; };
 
 private:
 	enum tx_modes {

firmware/application/apps/soundboard_app.hpp

@@ -45,7 +45,7 @@ public:
 
 	void focus() override;
 	
-	std::string title() const override { return "Soundboard"; };
+	std::string title() const override { return "Soundboard TX"; };
 	
 private:
 	NavigationView& nav_;

firmware/application/apps/tpms_app.hpp

@@ -103,7 +103,7 @@ public:
 
 	void focus() override;
 
-	std::string title() const override { return "TPMS"; };
+	std::string title() const override { return "TPMS Cars RX"; };
 
 private:
 	static constexpr uint32_t initial_target_frequency = 315000000;

firmware/application/apps/ui_adsb_rx.hpp

@@ -184,7 +184,7 @@ private:
 	AircraftRecentEntry 		entry_copy { 0 };
 	std::function<void(void)> 	on_close_ { };
 	bool 				send_updates { false };
-	std::database 			db;
+	std::database 			db = { };
 	std::string 			icao_code = "";
 	int 				return_code = 0;
 
@@ -279,7 +279,7 @@ private:
 	GeoMapView* 			geomap_view { nullptr };
 	ADSBRxAircraftDetailsView* 	aircraft_details_view { nullptr };
 	bool 				send_updates { false };
-	std::database 			db;	
+	std::database 			db = { };	
 	std::string 			airline_code = "";
 	int 				return_code = 0;
 	
@@ -361,14 +361,14 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "ADS-B receive"; };
+	std::string title() const override { return "ADS-B RX"; };
 
 	void replace_entry(AircraftRecentEntry & entry);
 	AircraftRecentEntry find_or_create_entry(uint32_t ICAO_address);
 	void sort_entries_by_state();
 
 private:
-	rf::Frequency prevFreq;
+	rf::Frequency prevFreq = { 0 };
 	std::unique_ptr<ADSBLogger> logger { };
 	void on_frame(const ADSBFrameMessage * message);
 	void on_tick_second();

firmware/application/apps/ui_adsb_tx.hpp

@@ -152,7 +152,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "ADS-B transmit"; };
+	std::string title() const override { return "ADS-B TX"; };
 
 private:
 	/*enum tx_modes {

firmware/application/apps/ui_aprs_rx.hpp

@@ -57,12 +57,12 @@ struct APRSRecentEntry {
 	uint16_t hits { 0 };
 	uint32_t age { 0 };	
 	
-	uint64_t source;
+	uint64_t source { 0 };
 	std::string source_formatted { "        " };
 	std::string time_string { "" };
 	std::string info_string { "" };
 	
-	aprs::aprs_pos pos;
+	aprs::aprs_pos pos { 0 , 0 , 0 , 0 };
 	bool has_position = false;
 	APRSRecentEntry(uint64_t src)
 	{

firmware/application/apps/ui_bht_tx.hpp

@@ -178,7 +178,7 @@ public:
 
 	void focus() override;
 	
-	std::string title() const override { return "BHT transmit"; };
+	std::string title() const override { return "BHT Xy/EP TX"; };
 
 private:
 	void on_tx_progress(const uint32_t progress, const bool done);

firmware/application/apps/ui_coasterp.hpp

@@ -39,7 +39,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Si44xx TX"; };
+	std::string title() const override { return "BurgerPgr TX"; };
 
 private:
 	enum tx_modes {

firmware/application/apps/ui_debug.cpp

@@ -352,7 +352,7 @@ DebugMenuView::DebugMenuView(NavigationView& nav) {
 		{ "SD Card",		ui::Color::dark_cyan(),	&bitmap_icon_sdcard,	[&nav](){ nav.push<SDCardDebugView>(); } },
 		{ "Peripherals",	ui::Color::dark_cyan(),	&bitmap_icon_peripherals,	[&nav](){ nav.push<DebugPeripheralsMenuView>(); } },
 		{ "Temperature",	ui::Color::dark_cyan(),	&bitmap_icon_temperature,	[&nav](){ nav.push<TemperatureView>(); } },
-		{ "Buttons test",	ui::Color::dark_cyan(),	&bitmap_icon_controls,	[&nav](){ nav.push<DebugControlsView>(); } },
+		{ "Buttons Test",	ui::Color::dark_cyan(),	&bitmap_icon_controls,	[&nav](){ nav.push<DebugControlsView>(); } },
 	});
 	set_max_rows(2); // allow wider buttons
 }

firmware/application/apps/ui_debug.hpp

@@ -43,6 +43,8 @@ public:
 
 	void focus() override;
 
+	std::string title() const override { return "Memory"; };
+
 private:
 	Text text_title {
 		{ 96, 96, 48, 16 },
@@ -113,6 +115,8 @@ public:
 
 	void focus() override;
 
+	std::string title() const override { return "Temperature"; };
+
 private:
 	Text text_title {
 		{ 76, 16, 240, 16 },
@@ -252,6 +256,8 @@ public:
 
 	void focus() override;
 
+	std::string title() const override { return "Buttons Test"; };
+
 private:
 	Text text_title {
 		{ 64, 16, 184, 16 },

firmware/application/apps/ui_encoders.hpp

@@ -158,7 +158,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "OOK transmit"; };
+	std::string title() const override { return "OOK TX"; };
 
 private:
 	NavigationView& nav_;

firmware/application/apps/ui_jammer.hpp

@@ -106,7 +106,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Jammer"; };
+	std::string title() const override { return "Jammer TX"; };
 	
 private:
 	NavigationView& nav_;

firmware/application/apps/ui_keyfob.hpp

@@ -36,7 +36,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Keyfob (BETA)"; };
+	std::string title() const override { return "Key fob TX (beta)"; };
 
 private:
 	NavigationView& nav_;

firmware/application/apps/ui_lcr.hpp

@@ -39,7 +39,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "LCR transmit"; };
+	std::string title() const override { return "TEDI/LCR TX"; };
 	
 private:
 	struct scan_list_t {

firmware/application/apps/ui_mictx.hpp

@@ -58,7 +58,7 @@ public:
 	};
 	*/
 
-	std::string title() const override { return "Mic TX RX"; };
+	std::string title() const override { return "Microphone"; };
 
 private:
 	static constexpr uint32_t sampling_rate = 1536000U;

firmware/application/apps/ui_rds.hpp

@@ -144,7 +144,7 @@ public:
 	
 	void focus() override;
 
-	std::string title() const override { return "RDS transmit"; };
+	std::string title() const override { return "RDS TX"; };
 
 private:
 	NavigationView& nav_;

firmware/application/apps/ui_scanner.cpp

@@ -484,6 +484,7 @@ void ScannerView::scan_pause() {
 		scan_thread->set_freq_lock(0); 		//Reset the scanner lock (because user paused, or MAX_FREQ_LOCK reached) for next freq scan	
 		scan_thread->set_scanning(false); // WE STOP SCANNING
 		audio::output::start();
+		on_headphone_volume_changed(field_volume.value()); // quick fix to make sure WM8731S chips don't stay silent after pause
 	}
 }
 

firmware/application/apps/ui_scanner.hpp

@@ -111,7 +111,7 @@ public:
 		.foreground = Color::red(),
 	};
 
-	std::string title() const override { return "SCANNER"; };
+	std::string title() const override { return "Scanner"; };
 	std::vector<rf::Frequency> frequency_list{ };
 	std::vector<string> description_list { };
 

firmware/application/apps/ui_sd_wipe.hpp

@@ -38,7 +38,7 @@ public:
 	~WipeSDView();
 	void focus() override;
 	
-	std::string title() const override { return "Wipe FAT"; };	
+	std::string title() const override { return "Wipe SD Card"; };	
 
 private:
 	NavigationView& nav_;

firmware/application/apps/ui_settings.cpp

@@ -43,7 +43,7 @@ namespace ui {
 SetDateTimeView::SetDateTimeView(
 	NavigationView& nav
 ) {
-	button_done.on_select = [&nav, this](Button&){
+	button_save.on_select = [&nav, this](Button&){
 		const auto model = this->form_collect();
 		const rtc::RTC new_datetime {
 			model.year, model.month, model.day,
@@ -65,7 +65,7 @@ SetDateTimeView::SetDateTimeView(
 		&field_hour,
 		&field_minute,
 		&field_second,
-		&button_done,
+		&button_save,
 		&button_cancel,
 	});
 
@@ -150,7 +150,7 @@ SetRadioView::SetRadioView(
 		&value_freq_step,
 		&labels_bias,
 		&check_bias,
-		&button_done,
+		&button_save,
 		&button_cancel
 	});
 
@@ -200,7 +200,7 @@ SetRadioView::SetRadioView(
 		EventDispatcher::send_message(message);
 	};
 
-	button_done.on_select = [this, &nav](Button&){
+	button_save.on_select = [this, &nav](Button&){
 		const auto model = this->form_collect();
 		portapack::persistent_memory::set_correction_ppb(model.ppm * 1000);
 		portapack::persistent_memory::set_clkout_freq(model.freq);
@@ -210,7 +210,7 @@ SetRadioView::SetRadioView(
 }
 
 void SetRadioView::focus() {
-	button_done.focus();
+	button_save.focus();
 }
 
 void SetRadioView::form_init(const SetFrequencyCorrectionModel& model) {
@@ -224,76 +224,24 @@ SetFrequencyCorrectionModel SetRadioView::form_collect() {
 	};
 }
 
-/*
-SetPlayDeadView::SetPlayDeadView(NavigationView& nav) {
-	add_children({
-		&text_sequence,
-		&button_enter,
-		&button_cancel
-	});
-
-	button_enter.on_select = [this, &nav](Button&){
-		if (!entermode) {
-			sequence = 0;
-			keycount = 0;
-			memset(sequence_txt, '-', 10);
-			text_sequence.set(sequence_txt);
-			entermode = true;
-			button_cancel.hidden(true);
-			set_dirty();
-		} else {
-			if (sequence == 0x8D1)	// U D L R
-				nav.display_modal("Warning", "Default sequence entered !", ABORT, nullptr);
-			else {
-				persistent_memory::set_playdead_sequence(sequence);
-				nav.pop();
-			}
-		}
-	};
-	
-	button_enter.on_dir = [this](Button&, KeyEvent key){
-		if ((entermode == true) && (keycount < 10)) {
-			key_code = static_cast<std::underlying_type<KeyEvent>::type>(key);
-			if (key_code == 0)
-				sequence_txt[keycount] = 'R';
-			else if (key_code == 1)
-				sequence_txt[keycount] = 'L';
-			else if (key_code == 2)
-				sequence_txt[keycount] = 'D';
-			else if (key_code == 3)
-				sequence_txt[keycount] = 'U';
-			text_sequence.set(sequence_txt);
-			sequence = (sequence << 3) | (key_code + 1);
-			keycount++;
-			return true;
-		}
-		return false;
-	};
-	
-	button_cancel.on_select = [&nav](Button&){ nav.pop(); };
-}
-
-void SetPlayDeadView::focus() {
-	button_cancel.focus();
-}
-*/
 
 SetUIView::SetUIView(NavigationView& nav) {
 	add_children({
-		//&checkbox_login,
+		&checkbox_disable_touchscreen,
 		&checkbox_speaker,
 		&checkbox_bloff,
 		&options_bloff,
 		&checkbox_showsplash,
 		&checkbox_showclock,
-		&options_clockformat,		
-		&button_ok
+		&options_clockformat,
+		&button_save,
+		&button_cancel
 	});
 	
+	checkbox_disable_touchscreen.set_value(persistent_memory::disable_touchscreen());
 	checkbox_speaker.set_value(persistent_memory::config_speaker());
 	checkbox_showsplash.set_value(persistent_memory::config_splash());
 	checkbox_showclock.set_value(!persistent_memory::hide_clock());
-	//checkbox_login.set_value(persistent_memory::config_login());
 	
 	uint32_t backlight_timer = persistent_memory::config_backlight_timer();
 	if (backlight_timer) {
@@ -309,16 +257,14 @@ SetUIView::SetUIView(NavigationView& nav) {
 		options_clockformat.set_selected_index(0);
 	}
 
-	checkbox_speaker.on_select = [this](Checkbox&, bool v) {
-    		if (v) audio::output::speaker_mute();		//Just mute audio if speaker is disabled
+	//checkbox_speaker.on_select = [this](Checkbox&, bool v) {
+    	//	if (v) audio::output::speaker_mute();			//Just mute audio if speaker is disabled
+	//		persistent_memory::set_config_speaker(v);	//Store Speaker status
+        //	StatusRefreshMessage message { };			//Refresh status bar with/out speaker
+        //	EventDispatcher::send_message(message);
+    	//};
 
-			persistent_memory::set_config_speaker(v);	//Store Speaker status
-
-        StatusRefreshMessage message { };				//Refresh status bar with/out speaker
-        EventDispatcher::send_message(message);
-    };
-
-	button_ok.on_select = [&nav, this](Button&) {
+	button_save.on_select = [&nav, this](Button&) {
 		if (checkbox_bloff.value())
 			persistent_memory::set_config_backlight_timer(options_bloff.selected_index() + 1);
 		else
@@ -329,225 +275,83 @@ SetUIView::SetUIView(NavigationView& nav) {
 			    persistent_memory::set_clock_with_date(true);    
      		else
 			    persistent_memory::set_clock_with_date(false);		
-		}		
+		}
+
+		if (checkbox_speaker.value())  audio::output::speaker_mute();		//Just mute audio if speaker is disabled
+		persistent_memory::set_config_speaker(checkbox_speaker.value());	//Store Speaker status
+        	StatusRefreshMessage message { };					//Refresh status bar with/out speaker
+        	EventDispatcher::send_message(message);
+	
 		persistent_memory::set_config_splash(checkbox_showsplash.value());
 		persistent_memory::set_clock_hidden(!checkbox_showclock.value());
-		//persistent_memory::set_config_login(checkbox_login.value());
+		persistent_memory::set_disable_touchscreen(checkbox_disable_touchscreen.value());
+		nav.pop();
+	};
+	button_cancel.on_select = [&nav, this](Button&) {
 		nav.pop();
 	};
 }
 
 void SetUIView::focus() {
-	button_ok.focus();
+	button_save.focus();
 }
 
 SetAudioView::SetAudioView(NavigationView& nav) {
 	add_children({
 		&labels,
 		&field_tone_mix,
-		&button_ok
+		&button_save,
+		&button_cancel
 	});
 
 	field_tone_mix.set_value(persistent_memory::tone_mix());
 	
-	button_ok.on_select = [&nav, this](Button&) {
+	button_save.on_select = [&nav, this](Button&) {
 		persistent_memory::set_tone_mix(field_tone_mix.value());
 		nav.pop();
 	};
+
+	button_cancel.on_select = [&nav, this](Button&) {
+		nav.pop();
+	};
 }
 
 void SetAudioView::focus() {
-	field_tone_mix.focus();
+	button_save.focus();
 }
 
-/*void ModInfoView::on_show() {
-	if (modules_nb) update_infos(0);
-}
+SetQRCodeView::SetQRCodeView(NavigationView& nav) {
+	add_children({
+		&checkbox_bigger_qr,
+		&button_save,
+		&button_cancel
+	});
 
-void ModInfoView::update_infos(uint8_t modn) {
-	char info_str[27];
-	char ch;
-	uint8_t c;
-	Point pos = { 0, 0 };
-	Rect rect = { { 16, 144 }, { 208, 144 } };
+	checkbox_bigger_qr.set_value(persistent_memory::show_bigger_qr_code());
 	
-	info_str[0] = 0;
-	strcat(info_str, module_list[modn].name);
-	text_namestr.set(info_str);
-	
-	info_str[0] = 0;
-	strcat(info_str, to_string_dec_uint(module_list[modn].size).c_str());
-	strcat(info_str, " bytes");
-	text_sizestr.set(info_str);
-	
-	info_str[0] = 0;
-	for (c = 0; c < 8; c++)
-		strcat(info_str, to_string_hex(module_list[modn].md5[c], 2).c_str());
-	text_md5_a.set(info_str);
-
-	info_str[0] = 0;
-	for (c = 8; c < 16; c++)
-		strcat(info_str, to_string_hex(module_list[modn].md5[c], 2).c_str());
-	text_md5_b.set(info_str);
-	
-	// TODO: Use ui_console
-	display.fill_rectangle(rect, Color::black());
-	
-	const Font& font = font::fixed_8x16;
-	const auto line_height = font.line_height();
-	c = 0;
-	while((ch = module_list[modn].description[c++])) {
-		const auto glyph = font.glyph(ch);
-		const auto advance = glyph.advance();
-		if((pos.x + advance.x) > rect.width()) {
-			pos.x = 0;
-			pos.y += line_height;
-		}
-		const Point pos_glyph {
-			static_cast<Coord>(rect.pos.x + pos.x),
-			static_cast<Coord>(rect.pos.y + pos.y)
-		};
-		display.draw_glyph(pos_glyph, glyph, Color::white(), Color::black());
-		pos.x += advance.x;
-	}
-}
-
-ModInfoView::ModInfoView(NavigationView& nav) {
-	const char magic[4] = {'P', 'P', 'M', ' '};
-	UINT bw;
-	uint8_t i;
-	char read_buf[16];
-	char info_str[25];
-	FILINFO modinfo;
-	FIL modfile;
-	DIR rootdir;
-	FRESULT res;
-	uint8_t c;
-	
-	using option_t = std::pair<std::string, int32_t>;
-	using options_t = std::vector<option_t>;
-	option_t opt;
-	options_t opts;
-	
-	static constexpr Style style_orange {
-		.font = font::fixed_8x16,
-		.background = Color::black(),
-		.foreground = Color::orange(),
-	};
-	
-	add_children({{
-		&text_modcount,
-		&text_name,
-		&text_namestr,
-		&text_size,
-		&text_sizestr,
-		&text_md5,
-		&text_md5_a,
-		&text_md5_b,
-		&button_ok
-	}});
-	
-	text_name.set_style(&style_orange);
-	text_size.set_style(&style_orange);
-	text_md5.set_style(&style_orange);
-
-	// TODO: Find a way to merge this with m4_load_image() in m4_startup.cpp
-	
-	// Scan SD card root directory for files starting with the magic bytes
-	c = 0;
-	if (f_opendir(&rootdir, "/") == FR_OK) {
-		for (;;) {
-			res = f_readdir(&rootdir, &modinfo);
-			if (res != FR_OK || modinfo.fname[0] == 0) break;	// Reached last file, abort
-			// Only care about files with .bin extension
-			if ((!(modinfo.fattrib & AM_DIR)) && (modinfo.fname[9] == 'B') && (modinfo.fname[10] == 'I') && (modinfo.fname[11] == 'N')) {
-				f_open(&modfile, modinfo.fname, FA_OPEN_EXISTING | FA_READ);
-				// Magic bytes check
-				f_read(&modfile, &read_buf, 4, &bw);
-				for (i = 0; i < 4; i++)
-					if (read_buf[i] != magic[i]) break;
-				if (i == 4) {
-					memcpy(&module_list[c].filename, modinfo.fname, 8);
-					module_list[c].filename[8] = 0;
-					
-					f_lseek(&modfile, 4);
-					f_read(&modfile, &module_list[c].version, 2, &bw);
-					f_lseek(&modfile, 6);
-					f_read(&modfile, &module_list[c].size, 4, &bw);
-					f_lseek(&modfile, 10);
-					f_read(&modfile, &module_list[c].name, 16, &bw);
-					f_lseek(&modfile, 26);
-					f_read(&modfile, &module_list[c].md5, 16, &bw);
-					f_lseek(&modfile, 42);
-					f_read(&modfile, &module_list[c].description, 214, &bw);
-					f_lseek(&modfile, 256);
-					
-					// Sanitize
-					module_list[c].name[15] = 0;
-					module_list[c].description[213] = 0;
-					
-					memcpy(info_str, module_list[c].filename, 16);
-					strcat(info_str, "(V");
-					strcat(info_str, to_string_dec_uint(module_list[c].version, 4, '0').c_str());
-					strcat(info_str, ")");
-					while(strlen(info_str) < 24)
-						strcat(info_str, " ");
-					
-					opt = std::make_pair(info_str, c);
-					opts.insert(opts.end(), opt);
-					
-					c++;
-				}
-				f_close(&modfile);
-			}
-			if (c == 8) break;
-		}
-	}
-	f_closedir(&rootdir);
-	
-	modules_nb = c;
-
-	if (modules_nb) {
-		strcpy(info_str, "Found ");
-		strcat(info_str, to_string_dec_uint(modules_nb, 1).c_str());
-		strcat(info_str, " module(s)");
-		
-		text_modcount.set(info_str);
-		option_modules.set_options(opts);
-		
-		add_child(&option_modules);
-		
-		option_modules.on_change = [this](size_t n, OptionsField::value_t v) {
-			(void)n;
-			update_infos(v);
-		};
-	} else {
-		strcpy(info_str, "No modules found");
-		text_modcount.set(info_str);
-	}
-
-	button_ok.on_select = [&nav,this](Button&){
+	button_save.on_select = [&nav, this](Button&) {
+		persistent_memory::set_show_bigger_qr_code(checkbox_bigger_qr.value());
 		nav.pop();
 	};
+
+	button_cancel.on_select = [&nav, this](Button&) {
+		nav.pop();
+	};
+
 }
 
-void ModInfoView::focus() {
-	if (modules_nb)
-		option_modules.focus();
-	else
-		button_ok.focus();
-}*/
+void SetQRCodeView::focus() {
+	button_save.focus();
+}
 
 SettingsMenuView::SettingsMenuView(NavigationView& nav) {
 	add_items({
-		//{ "..", 			  ui::Color::light_grey(), &bitmap_icon_previous,		  [&nav](){ nav.pop(); } },
-		{ "Audio", 			ui::Color::dark_cyan(), &bitmap_icon_speaker,			[&nav](){ nav.push<SetAudioView>(); } },
-		{ "Radio",			ui::Color::dark_cyan(), &bitmap_icon_options_radio,		[&nav](){ nav.push<SetRadioView>(); } },
-		{ "Interface", 		ui::Color::dark_cyan(), &bitmap_icon_options_ui,		[&nav](){ nav.push<SetUIView>(); } },
-		//{ "SD card modules", ui::Color::dark_cyan(), 								  [&nav](){ nav.push<ModInfoView>(); } },
-		{ "Date/Time",		ui::Color::dark_cyan(), &bitmap_icon_options_datetime,	[&nav](){ nav.push<SetDateTimeView>(); } },
-		{ "Touchscreen",	ui::Color::dark_cyan(), &bitmap_icon_options_touch,		[&nav](){ nav.push<TouchCalibrationView>(); } },
-		//{ "Play dead",	   ui::Color::dark_cyan(), &bitmap_icon_playdead,		  [&nav](){ nav.push<SetPlayDeadView>(); } }
+		{ "Audio", 		ui::Color::dark_cyan(), &bitmap_icon_speaker,			[&nav](){ nav.push<SetAudioView>(); } },
+		{ "Radio",		ui::Color::dark_cyan(), &bitmap_icon_options_radio,		[&nav](){ nav.push<SetRadioView>(); } },
+		{ "User Interface", 		ui::Color::dark_cyan(), &bitmap_icon_options_ui,		[&nav](){ nav.push<SetUIView>(); } },
+		{ "Date/Time",		ui::Color::dark_cyan(), &bitmap_icon_options_datetime,		[&nav](){ nav.push<SetDateTimeView>(); } },
+		{ "Calibration",	ui::Color::dark_cyan(), &bitmap_icon_options_touch,		[&nav](){ nav.push<TouchCalibrationView>(); } },
+		{ "QR Code",		ui::Color::dark_cyan(), &bitmap_icon_qr_code,		[&nav](){ nav.push<SetQRCodeView>(); } }
 	});
 	set_max_rows(2); // allow wider buttons
 }

firmware/application/apps/ui_settings.hpp

@@ -47,7 +47,7 @@ public:
 
 	void focus() override;
 	
-	std::string title() const override { return "Set Date/Time"; };
+	std::string title() const override { return "Date/Time"; };
 
 private:
 	Labels labels {
@@ -99,7 +99,7 @@ private:
 		'0',
 	};
 
-	Button button_done {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
@@ -197,7 +197,7 @@ private:
 		"Turn on bias voltage"
 	};
 
-	Button button_done {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
@@ -219,11 +219,12 @@ public:
 	std::string title() const override { return "UI settings"; };
 	
 private:
-	/*Checkbox checkbox_login {
+
+	Checkbox checkbox_disable_touchscreen {
 		{ 3 * 8, 2 * 16 },
 		20,
-		"Login with play dead"
-	};*/
+		"Disable touchscreen"
+	};
 	
 	Checkbox checkbox_speaker {
 		{ 3 * 8, 4 * 16 },
@@ -271,10 +272,15 @@ private:
 		}
 	};	
 	
-	Button button_ok {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
 };
 
 class SetAudioView : public View {
@@ -298,111 +304,43 @@ private:
 		'0'
 	};
 	
-	Button button_ok {
+	Button button_save {
 		{ 2 * 8, 16 * 16, 12 * 8, 32 },
 		"Save"
 	};
+	
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
+	};
 };
 
-/*
-class SetPlayDeadView : public View {
-public:
-	SetPlayDeadView(NavigationView& nav);
-	
-	void focus() override;
-	
-	std::string title() const override { return "Playdead settings"; };
-	
-private:
-	bool entermode = false;
-	uint32_t sequence { 0 };
-	uint8_t keycount { 0 }, key_code { };
-	char sequence_txt[11] = { 0 };
-	
-	Text text_sequence {
-		{ 64, 32, 14 * 8, 16 },
-		"Enter sequence",
-	};
-	
-	Button button_enter {
-		{ 16, 192, 96, 24 },
-		"Enter"
-	};
-	Button button_cancel {
-		{ 128, 192, 96, 24 },
-		"Cancel"
-	};
-};*/
 
-/*class ModInfoView : public View {
+class SetQRCodeView : public View {
 public:
-	ModInfoView(NavigationView& nav);
+	SetQRCodeView(NavigationView& nav);
+	
 	void focus() override;
-	void on_show() override;
+	
+	std::string title() const override { return "QR Code"; };
 	
 private:
-	void update_infos(uint8_t modn);
-	
-	typedef struct moduleinfo_t{
-		char filename[9];
-		uint16_t version;
-		uint32_t size;
-		char md5[16];
-		char name[16];
-		char description[214];
-	} moduleinfo_t;
-	
-	moduleinfo_t module_list[8];	// 8 max for now
-	
-	uint8_t modules_nb;
-	
-	Text text_modcount {
-		{ 2 * 8, 1 * 16, 18 * 8, 16 },
-		"Searching..."
+	Checkbox checkbox_bigger_qr {
+		{ 3 * 8, 9 * 16 },
+		20,
+		"Show large QR code"
 	};
 	
-	OptionsField option_modules {
-		{ 2 * 8, 2 * 16 },
-		24,
-		{
-			{ "-", 0 }
-		}
+	Button button_save {
+		{ 2 * 8, 16 * 16, 12 * 8, 32 },
+		"Save"
 	};
 	
-	Text text_name {
-		{ 2 * 8, 4 * 16, 5 * 8, 16 },
-		"Name:"
+	Button button_cancel {
+		{ 16 * 8, 16 * 16, 12 * 8, 32 },
+		"Cancel",
 	};
-	Text text_namestr {
-		{ 8 * 8, 4 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_size {
-		{ 2 * 8, 5 * 16, 5 * 8, 16 },
-		"Size:"
-	};
-	Text text_sizestr {
-		{ 8 * 8, 5 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_md5 {
-		{ 2 * 8, 6 * 16, 4 * 8, 16 },
-		"MD5:"
-	};
-	Text text_md5_a {
-		{ 7 * 8, 6 * 16, 16 * 8, 16 },
-		"..."
-	};
-	Text text_md5_b {
-		{ 7 * 8, 7 * 16, 16 * 8, 16 },
-		"..."
-	};
-	
-	Button button_ok {
-		{ 4 * 8, 272, 64, 24 },
-		"Ok"
-	};
-};*/
+};
 
 class SettingsMenuView : public BtnGridView {
 public:

firmware/application/apps/ui_siggen.hpp

@@ -40,7 +40,7 @@ public:
 	
 	void focus() override;
 	
-	std::string title() const override { return "Generator"; };
+	std::string title() const override { return "Signal gen"; };
 
 private:
 	void start_tx();