Merge pull request #2 from eried/master

Upstream merge

firmware/application/apps/replay_app.cpp

@@ -231,6 +231,7 @@ ReplayAppView::~ReplayAppView() {
 }
 
 void ReplayAppView::on_hide() {
+	stop(false);
 	// TODO: Terrible kludge because widget system doesn't notify Waterfall that
 	// it's being shown or hidden.
 	waterfall.on_hide();

firmware/application/apps/ui_fileman.hpp

@@ -97,7 +97,7 @@ protected:
 	};
 	
 	Button button_exit {
-		{ 20 * 8, 34 * 8, 10 * 8, 4 * 8 },
+		{ 16 * 8, 34 * 8, 14 * 8, 32 },
 		"Exit"
 	};
 };
@@ -157,11 +157,11 @@ private:
 	};
 
 	Button button_rename {
-		{ 0 * 8, 29 * 8, 12 * 8, 32 },
+		{ 0 * 8, 29 * 8, 14 * 8, 32 },
 		"Rename"
 	};
 	Button button_delete {
-		{ 18 * 8, 29 * 8, 12 * 8, 32 },
+		{ 16 * 8, 29 * 8, 14 * 8, 32 },
 		"Delete"
 	};
 	

firmware/application/bitmap.hpp

@@ -451,20 +451,20 @@ static constexpr Bitmap bitmap_icon_debug {
 
 static constexpr uint8_t bitmap_icon_dir_data[] = {
 	0x00, 0x00, 
-	0xFC, 0x00, 
-	0x02, 0x01, 
-	0x01, 0x3E, 
-	0x01, 0xE0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x01, 0xA0, 
-	0x02, 0x40, 
-	0x02, 0x40, 
-	0x02, 0x40, 
-	0x02, 0x40, 
-	0x02, 0x40, 
-	0xFC, 0x3F, 
+	0x3E, 0x00, 
+	0x41, 0x00, 
+	0xC1, 0x7F, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xFF, 0xFF, 
+	0xAF, 0xEA, 
+	0x57, 0xF5, 
+	0xEF, 0xEF, 
+	0xF7, 0xF7, 
+	0xEE, 0x6F, 
 	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_icon_dir {
@@ -560,22 +560,22 @@ static constexpr Bitmap bitmap_icon_file_image {
 };
 
 static constexpr uint8_t bitmap_icon_file_iq_data[] = {
-	0x98, 0x00, 
-	0x24, 0x06, 
-	0xA4, 0x08, 
-	0x34, 0x10, 
-	0xB8, 0x20, 
-	0x20, 0x20, 
-	0x80, 0x00, 
-	0xD5, 0x55, 
-	0x80, 0x00, 
-	0x02, 0x70, 
-	0x82, 0x20, 
+	0xFC, 0x03, 
+	0x04, 0x06, 
+	0x04, 0x0E, 
+	0x04, 0x1E, 
+	0x04, 0x3E, 
 	0x04, 0x20, 
-	0x88, 0x20, 
-	0x30, 0x70, 
-	0x80, 0x00, 
-	0x00, 0x00, 
+	0x04, 0x20, 
+	0x04, 0x21, 
+	0x44, 0x25, 
+	0x54, 0x25, 
+	0xF4, 0x2F, 
+	0xA4, 0x2A, 
+	0x84, 0x22, 
+	0x04, 0x22, 
+	0x04, 0x20, 
+	0xFC, 0x3F, 
 };
 static constexpr Bitmap bitmap_icon_file_iq {
 	{ 16, 16 }, bitmap_icon_file_iq_data
@@ -627,20 +627,20 @@ static constexpr Bitmap bitmap_icon_fox {
 
 static constexpr uint8_t bitmap_icon_freqman_data[] = {
 	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0xE6, 0x7F, 
-	0x02, 0x00, 
 	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0xE6, 0x7B, 
-	0x02, 0x00, 
 	0x00, 0x00, 
-	0x0E, 0x00, 
-	0x02, 0x00, 
-	0x66, 0x7F, 
-	0x02, 0x00, 
+	0x7E, 0x7E, 
+	0x81, 0x81, 
+	0xBD, 0xBD, 
+	0x81, 0x81, 
+	0xBD, 0xBD, 
+	0x81, 0x81, 
+	0xBD, 0x9D, 
+	0x81, 0x81, 
+	0xBD, 0xE1, 
+	0x81, 0x61, 
+	0x7E, 0x3E, 
+	0x00, 0x00, 
 	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_icon_freqman {
@@ -692,22 +692,22 @@ static constexpr Bitmap bitmap_icon_hackrf {
 };
 
 static constexpr uint8_t bitmap_icon_jammer_data[] = {
-	0xA6, 0xAC, 
-	0x73, 0x47, 
-	0xAE, 0xB9, 
-	0x55, 0xD7, 
-	0x7E, 0xAE, 
-	0xD3, 0x45, 
-	0xCA, 0xBA, 
-	0x71, 0x15, 
-	0xDA, 0xFE, 
-	0xF5, 0xAB, 
-	0xAF, 0x98, 
-	0x4A, 0x77, 
-	0xAD, 0xCA, 
-	0x58, 0x7D, 
-	0xBF, 0xAF, 
-	0x5A, 0x65, 
+	0xE0, 0x07, 
+	0xF8, 0x1F, 
+	0x1C, 0x38, 
+	0x0E, 0x78, 
+	0x06, 0x7C, 
+	0x03, 0xCE, 
+	0x03, 0xC7, 
+	0x83, 0xC3, 
+	0xC3, 0xC1, 
+	0xE3, 0xC0, 
+	0x73, 0xC0, 
+	0x3E, 0x60, 
+	0x1E, 0x70, 
+	0x1C, 0x38, 
+	0xF8, 0x1F, 
+	0xE0, 0x07, 
 };
 static constexpr Bitmap bitmap_icon_jammer {
 	{ 16, 16 }, bitmap_icon_jammer_data
@@ -1198,44 +1198,44 @@ static constexpr Bitmap bitmap_icon_sleep {
 };
 
 static constexpr uint8_t bitmap_icon_sonde_data[] = {
-	0xE0, 0x03, 
-	0x90, 0x07, 
-	0xE8, 0x0F, 
-	0xF8, 0x0F, 
-	0xF8, 0x0F, 
-	0xF0, 0x07, 
-	0xF0, 0x07, 
-	0xE0, 0x03, 
-	0xE0, 0x03, 
-	0xC0, 0x01, 
-	0xC0, 0x01, 
-	0x80, 0x00, 
-	0x80, 0x00, 
-	0x80, 0x02, 
-	0xC0, 0x01, 
-	0xC0, 0x01, 
+	0x80, 0x03, 
+	0xE0, 0x0F, 
+	0xE0, 0x0F, 
+	0xF0, 0x1F, 
+	0xF0, 0x1F, 
+	0xF0, 0x1F, 
+	0xE0, 0x0F, 
+	0xE0, 0x0F, 
+	0x00, 0x00, 
+	0x20, 0x09, 
+	0x00, 0x00, 
+	0x40, 0x05, 
+	0x00, 0x00, 
+	0xC0, 0x07, 
+	0xC0, 0x07, 
+	0xC0, 0x07, 
 };
 static constexpr Bitmap bitmap_icon_sonde {
 	{ 16, 16 }, bitmap_icon_sonde_data
 };
 
 static constexpr uint8_t bitmap_icon_soundboard_data[] = {
+	0xFF, 0xAA, 
+	0x81, 0x00, 
+	0xA1, 0x42, 
+	0xB1, 0x20, 
+	0xBD, 0x52, 
+	0xBD, 0x28, 
+	0xBD, 0x52, 
+	0xB1, 0x20, 
+	0xA1, 0x42, 
+	0x81, 0x00, 
+	0xFF, 0xAA, 
 	0x00, 0x00, 
-	0xFF, 0xFF, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xDF, 0xFB, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xDF, 0xFB, 
-	0x63, 0x8C, 
-	0x21, 0x84, 
-	0x21, 0x84, 
-	0xFF, 0xFF, 
-	0x00, 0x00, 
-	0x00, 0x00, 
+	0xAA, 0xAA, 
+	0x01, 0x00, 
+	0xA0, 0x42, 
+	0x11, 0x20, 
 };
 static constexpr Bitmap bitmap_icon_soundboard {
 	{ 16, 16 }, bitmap_icon_soundboard_data
@@ -1264,22 +1264,22 @@ static constexpr Bitmap bitmap_icon_speaker {
 };
 
 static constexpr uint8_t bitmap_icon_sstv_data[] = {
-	0x10, 0x08, 
-	0x20, 0x04, 
-	0x40, 0x02, 
-	0x80, 0x01, 
-	0xFF, 0xFF, 
-	0x03, 0xF8, 
-	0x5D, 0xF0, 
-	0x05, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0xD0, 
-	0x01, 0xF0, 
-	0x01, 0x90, 
-	0x03, 0x98, 
+	0x00, 0x00, 
+	0x00, 0x00, 
+	0xFE, 0x7F, 
+	0x03, 0xC0, 
+	0x53, 0xD5, 
+	0xAB, 0xCA, 
+	0x53, 0xD5, 
+	0xAB, 0xCA, 
+	0x53, 0xD5, 
+	0xAB, 0xCA, 
+	0x53, 0xD5, 
+	0x03, 0xC0, 
 	0xFF, 0xFF, 
+	0xFB, 0xD7, 
+	0xFE, 0x7F, 
+	0x00, 0x00, 
 };
 static constexpr Bitmap bitmap_icon_sstv {
 	{ 16, 16 }, bitmap_icon_sstv_data
@@ -1396,14 +1396,14 @@ static constexpr Bitmap bitmap_icon_utilities {
 };
 
 static constexpr uint8_t bitmap_more_data[] = {
-	0x20, 
+	0x10, 
+	0x10, 
+	0x10, 
+	0x10, 
+	0x54, 
+	0x38, 
+	0x10, 
 	0x00, 
-	0x20, 
-	0x00, 
-	0x20, 
-	0xA8, 
-	0x70, 
-	0x20, 
 };
 static constexpr Bitmap bitmap_more {
 	{ 8, 8 }, bitmap_more_data

firmware/application/ui_navigation.hpp

@@ -109,7 +109,7 @@ public:
 	void set_title(const std::string new_value);
 
 private:
-	static constexpr auto default_title = "MAYHEM v1.0.2"; // TODO: Move the version somewhere
+	static constexpr auto default_title = "MAYHEM v1.0.3"; // TODO: Move the version somewhere
 	
 	NavigationView& nav_;