From e60c4dc34b73b2c63d33629b7377bac389e3bcdc Mon Sep 17 00:00:00 2001
From: Mark Thompson <129641948+NotherNgineer@users.noreply.github.com>
Date: Fri, 23 Jun 2023 09:57:35 -0500
Subject: [PATCH] Paint Roller icon for S.Painter & fix make_bitmap.py to
 generate Clang-compliant code (#1181)

* Generate Clang-compliant output file

* Paint roller icon for Screen Painter app

* Paint roller icon for Screen Painter app

* Paint roller icon for Spectrum Painter
---
 firmware/application/bitmap.hpp        |  38 +++++++++++++++++++++++++
 firmware/application/ui_navigation.cpp |   2 +-
 firmware/graphics/icon_paint.png       | Bin 0 -> 152 bytes
 firmware/tools/make_bitmap.py          |  13 ++-------
 4 files changed, 42 insertions(+), 11 deletions(-)
 create mode 100644 firmware/graphics/icon_paint.png

diff --git a/firmware/application/bitmap.hpp b/firmware/application/bitmap.hpp
index 8f5df2c7f..e0489aa7c 100644
--- a/firmware/application/bitmap.hpp
+++ b/firmware/application/bitmap.hpp
@@ -5341,6 +5341,44 @@ static constexpr Bitmap bitmap_icon_new_dir{
     {16, 16},
     bitmap_icon_new_dir_data};
 
+static constexpr uint8_t bitmap_icon_paint_data[] = {
+    0xFE,
+    0x3F,
+    0xFF,
+    0x3F,
+    0xFF,
+    0xFF,
+    0xFF,
+    0xBF,
+    0xFE,
+    0xBF,
+    0x00,
+    0x80,
+    0x80,
+    0xFF,
+    0x80,
+    0x00,
+    0x80,
+    0x00,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+    0xC0,
+    0x01,
+};
+static constexpr Bitmap bitmap_icon_paint{
+    {16, 16},
+    bitmap_icon_paint_data};
+
 } /* namespace ui */
 
 #endif /*__BITMAP_HPP__*/
diff --git a/firmware/application/ui_navigation.cpp b/firmware/application/ui_navigation.cpp
index 8fa19783e..553d64848 100644
--- a/firmware/application/ui_navigation.cpp
+++ b/firmware/application/ui_navigation.cpp
@@ -570,7 +570,7 @@ TransmittersMenuView::TransmittersMenuView(NavigationView& nav) {
         {"TEDI/LCR", ui::Color::yellow(), &bitmap_icon_lcr, [&nav]() { nav.push<LCRView>(); }},
         {"TouchTune", ui::Color::yellow(), &bitmap_icon_remote, [&nav]() { nav.push<TouchTunesView>(); }},
         {"Playlist", ui::Color::green(), &bitmap_icon_scanner, [&nav]() { nav.push<PlaylistView>(); }},
-        {"S.Painter", ui::Color::orange(), &bitmap_icon_morse, [&nav]() { nav.push<SpectrumPainterView>(); }},
+        {"S.Painter", ui::Color::orange(), &bitmap_icon_paint, [&nav]() { nav.push<SpectrumPainterView>(); }},
         //{ "Remote",			ui::Color::dark_grey(),	&bitmap_icon_remote,	[&nav](){ nav.push<RemoteView>(); } },
     });
 }
diff --git a/firmware/graphics/icon_paint.png b/firmware/graphics/icon_paint.png
new file mode 100644
index 0000000000000000000000000000000000000000..7b37325e25b94d974ac8e9cad80ccd67a73d9b09
GIT binary patch
literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP|(ZM
z#WBR9_w58jJ_kh}C;5B-&smsWbX@$_|DTeuw>&H34YTQ!R2rsP&T|NL@K$$kHQ0Y*
w+xC}NYx@{p3Ob+WO8%Ai;uAan2gU`=*X?C^U#Lqk0ZnD_boFyt=akR{0N2eg0{{R3

literal 0
HcmV?d00001

diff --git a/firmware/tools/make_bitmap.py b/firmware/tools/make_bitmap.py
index 16920f388..caa0599ba 100755
--- a/firmware/tools/make_bitmap.py
+++ b/firmware/tools/make_bitmap.py
@@ -48,7 +48,6 @@ def convert_png(file):
 	name = path.basename(file).split(".")[0].lower();
 
 	f.write("static constexpr uint8_t bitmap_" + name + "_data[] = {\n")
-	f.write('	')		# Tab
 
 	for i in range(rgb_im.size[1]):
 		for j in range(rgb_im.size[0]):
@@ -60,17 +59,12 @@ def convert_png(file):
 				data += 128
 			
 			if j % 8 == 7:
-				f.write("0x%0.2X, " % data)
+				f.write("    0x%0.2X,\n" % data)
 				data = 0
-		
-		f.write("\n")
-		if i < rgb_im.size[1] - 1:
-			f.write('	')		# Tab
 
 	f.write("};\n")
-	f.write("static constexpr Bitmap bitmap_"  + name + " {\n")
-	f.write("	{ " + str(rgb_im.size[0]) + ", " + str(rgb_im.size[1]) + " }, bitmap_" + name+ "_data\n")
-	f.write("};\n\n")
+	f.write("static constexpr Bitmap bitmap_"  + name + "{\n")
+	f.write("    {" + str(rgb_im.size[0]) + ", " + str(rgb_im.size[1]) + "},\n    bitmap_" + name+ "_data};\n\n")
 	return
 
 count = 0
@@ -108,7 +102,6 @@ for file in listdir(sys.argv[1]):
         convert_png(sys.argv[1] + file)
         count += 1
 
-f.write("\n")
 f.write("} /* namespace ui */\n\n")
 f.write("#endif/*__BITMAP_HPP__*/\n")