Merge pull request #1 from eried/master

Upstream merge 29/05/2020 15:45

firmware/application/apps/ui_encoders.hpp

@@ -55,7 +55,7 @@ private:
 	//uint8_t scan_count;
 	//double scan_progress;
 	//unsigned int scan_index;
-	int16_t waveform_buffer[512];
+	int16_t waveform_buffer[550];
 	const encoder_def_t * encoder_def { };
 	//uint8_t enc_type = 0;
 

firmware/application/bitmap.hpp

@@ -439,9 +439,9 @@ static constexpr uint8_t bitmap_icon_debug_data[] = {
 	0xAA, 0x0A, 
 	0x52, 0x01, 
 	0xAA, 0x12, 
-	0x02, 0x18, 
+	0x02, 0x08, 
 	0x02, 0xFC, 
-	0x02, 0x18, 
+	0x02, 0x08, 
 	0xFE, 0x13, 
 	0x00, 0x00, 
 };
@@ -1008,8 +1008,8 @@ static constexpr uint8_t bitmap_icon_receivers_data[] = {
 	0x80, 0x01, 
 	0x80, 0x01, 
 	0x80, 0x01, 
-	0xF8, 0x1F, 
-	0xF0, 0x0F, 
+	0x98, 0x19, 
+	0xB0, 0x0D, 
 	0xE0, 0x07, 
 	0xC0, 0x03, 
 	0x83, 0xC1, 
@@ -1074,10 +1074,10 @@ static constexpr uint8_t bitmap_icon_scanner_data[] = {
 	0x00, 0x00, 
 	0x03, 0x01, 
 	0x80, 0x01, 
-	0xC3, 0x01, 
+	0xC3, 0x00, 
 	0xE0, 0xFF, 
 	0xEF, 0xFF, 
-	0xC0, 0x01, 
+	0xC0, 0x00, 
 	0x83, 0x01, 
 	0x00, 0x01, 
 	0x03, 0x00, 
@@ -1355,8 +1355,8 @@ static constexpr uint8_t bitmap_icon_transmit_data[] = {
 	0x80, 0x01, 
 	0xC0, 0x03, 
 	0xE0, 0x07, 
-	0xF0, 0x0F, 
-	0xF8, 0x1F, 
+	0xB0, 0x0D, 
+	0x98, 0x19, 
 	0x80, 0x01, 
 	0x80, 0x01, 
 	0x80, 0x01, 
@@ -1396,14 +1396,14 @@ static constexpr Bitmap bitmap_icon_utilities {
 };
 
 static constexpr uint8_t bitmap_more_data[] = {
-	0x18, 
-	0x18, 
-	0x18, 
-	0x18, 
-	0xFF, 
-	0x7E, 
-	0x3C, 
-	0x18, 
+	0x20, 
+	0x00, 
+	0x20, 
+	0x00, 
+	0x20, 
+	0xA8, 
+	0x70, 
+	0x20, 
 };
 static constexpr Bitmap bitmap_more {
 	{ 8, 8 }, bitmap_more_data
@@ -1432,22 +1432,22 @@ static constexpr Bitmap bitmap_play {
 };
 
 static constexpr uint8_t bitmap_record_data[] = {
-	0xE0, 0x07, 
-	0xF8, 0x1F, 
-	0xFC, 0x3F, 
-	0xFE, 0x7F, 
-	0xFE, 0x7F, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0xFF, 0xFF, 
-	0xFE, 0x7F, 
-	0xFE, 0x7F, 
-	0xFC, 0x3F, 
-	0xF8, 0x1F, 
-	0xE0, 0x07, 
+	0xC0, 0x07, 
+	0xF0, 0x1F, 
+	0xF8, 0x3F, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0x66, 0xCC, 
+	0x56, 0xF7, 
+	0x66, 0xF6, 
+	0x56, 0xF7, 
+	0x56, 0xCC, 
+	0xFC, 0x7F, 
+	0xFC, 0x7F, 
+	0xF8, 0x3F, 
+	0xF0, 0x1F, 
+	0xC0, 0x07, 
+	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_record {
 	{ 16, 16 }, bitmap_record_data
@@ -1808,21 +1808,21 @@ static constexpr Bitmap bitmap_sig_tri {
 };
 
 static constexpr uint8_t bitmap_stop_data[] = {
-	0x00, 0x00, 
-	0x00, 0x00, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0xFC, 0x3F, 
-	0x00, 0x00, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0x8B, 0xCD, 
+	0xDD, 0xAA, 
+	0xDB, 0xCA, 
+	0xDB, 0xEA, 
+	0xDD, 0xED, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
 	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_stop {

firmware/application/ui/ui_receiver.hpp

@@ -247,8 +247,6 @@ public:
 			parent_pos,
 			5,
 			{
-				{ "  1  ",        1 },
-				{ "  10 ",       10 },
 				{ "  100",      100 },
 				{ "  1k ",     1000 },
 				{ "  3k ",     3000 },	/* Approximate SSB bandwidth */

firmware/application/ui_record_view.cpp

@@ -201,6 +201,11 @@ void RecordView::start() {
 	update_status_display();
 }
 
+void RecordView::on_hide() {
+	stop(); // Stop current recording
+	View::on_hide();
+}
+
 void RecordView::stop() {
 	if( is_active() ) {
 		capture_thread.reset();

firmware/application/ui_record_view.hpp

@@ -59,6 +59,7 @@ public:
 
 	void start();
 	void stop();
+	void on_hide() override;
 
 	bool is_active() const;
 

firmware/tools/make_bitmap.py

@@ -112,4 +112,4 @@ f.write("\n")
 f.write("} /* namespace ui */\n\n")
 f.write("#endif/*__BITMAP_HPP__*/\n")
 
-print "Converted " + str(count) + " files"
+print("Converted " + str(count) + " files")