Icons and icon tool update

firmware/application/ui_alphanum.hpp

@@ -71,7 +71,7 @@ private:
 		{ 8, 0, 232, 16 }
 	};
 
-	std::array<Button, 40> buttons;
+	std::array<Button, 40> buttons { };
 
 	Button button_lowercase {
 		{ 21 * 8, 270, 32, 24 },

firmware/application/ui_bht_tx.hpp

@@ -98,7 +98,7 @@ private:
 	};
 	Image bmp_speaker {
 		{ 204, 8, 16, 16 },
-		&bitmap_speaker,
+		&bitmap_icon_speaker,
 		ui::Color::white(),
 		ui::Color::black()
 	};

firmware/application/ui_navigation.cpp

@@ -88,9 +88,9 @@ SystemStatusView::SystemStatusView() {
 	title.set_style(&style_systemstatus);
 	
 	if (!portapack::persistent_memory::ui_config_textentry())
-		button_textentry.set_bitmap(&bitmap_keyboard);
+		button_textentry.set_bitmap(&bitmap_icon_keyboard);
 	else
-		button_textentry.set_bitmap(&bitmap_unistroke);
+		button_textentry.set_bitmap(&bitmap_icon_unistroke);
 	
 	if (portapack::persistent_memory::stealth_mode())
 		button_stealth.set_foreground(ui::Color::green());
@@ -152,9 +152,9 @@ void SystemStatusView::on_textentry() {
 	portapack::persistent_memory::set_config_textentry(cfg ^ 1);
 	
 	if (!cfg)
-		button_textentry.set_bitmap(&bitmap_unistroke);
+		button_textentry.set_bitmap(&bitmap_icon_unistroke);
 	else
-		button_textentry.set_bitmap(&bitmap_keyboard);
+		button_textentry.set_bitmap(&bitmap_icon_keyboard);
 }
 
 void SystemStatusView::on_camera() {
@@ -292,7 +292,7 @@ ReceiverMenuView::ReceiverMenuView(NavigationView& nav) {
 		{ "CCIR", 					ui::Color::grey(),	nullptr,	[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "Nordic/BTLE", 			ui::Color::grey(),	&bitmap_icon_nordic,	[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "POCSAG", 				ui::Color::cyan(),	nullptr,	[&nav](){ nav.push<POCSAGAppView>(); } },
-		{ "SIGFOX", 				ui::Color::grey(),	&bitmap_icon_foxhunt,	[&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
+		{ "SIGFOX", 				ui::Color::grey(),	&bitmap_icon_fox,	[&nav](){ nav.push<NotImplementedView>(); } }, // SIGFRXView
 		{ "Transponders", 			ui::Color::green(),	nullptr,	[&nav](){ nav.push<TranspondersMenuView>(); } },
 	} });
 	on_left = [&nav](){ nav.pop(); };
@@ -351,7 +351,7 @@ void SystemMenuView::hackrf_mode(NavigationView& nav) {
 SystemMenuView::SystemMenuView(NavigationView& nav) {
 	add_items<12>({ {
 		{ "Play dead",				ui::Color::red(),	&bitmap_icon_playdead,	[&nav](){ nav.push<PlayDeadView>(); } },
-		{ "Receivers", 				ui::Color::cyan(),	&bitmap_icon_receiver,	[&nav](){ nav.push<ReceiverMenuView>(); } },
+		{ "Receivers", 				ui::Color::cyan(),	&bitmap_icon_receivers,	[&nav](){ nav.push<ReceiverMenuView>(); } },
 		{ "Capture",				ui::Color::cyan(),	&bitmap_icon_capture,	[&nav](){ nav.push<CaptureAppView>(); } },	//CaptureAppView
 		{ "Replay",					ui::Color::grey(),	&bitmap_icon_replay,	[&nav](){ nav.push<NotImplementedView>(); } },
 		{ "Code transmitters", 		ui::Color::green(),	&bitmap_icon_codetx,	[&nav](){ nav.push<TransmitterCodedMenuView>(); } },

firmware/application/ui_navigation.hpp

@@ -72,7 +72,7 @@ private:
 
 	ImageButton button_back {
 		{ 2, 0 * 16, 16, 16 },
-		&bitmap_previous,
+		&bitmap_icon_previous,
 		Color::white(),
 		Color::dark_grey()
 	};
@@ -84,28 +84,28 @@ private:
 	
 	ImageButton button_stealth {
 		{ 152, 0, 2 * 8, 1 * 16 },
-		&bitmap_stealth,
+		&bitmap_icon_stealth,
 		Color::light_grey(),
 		Color::dark_grey()
 	};
 	
 	ImageButton button_textentry {
 		{ 170, 0, 2 * 8, 1 * 16 },
-		&bitmap_unistroke,
+		&bitmap_icon_unistroke,
 		Color::white(),
 		Color::dark_grey()
 	};
 
 	ImageButton button_camera {
 		{ 188, 0, 2 * 8, 1 * 16 },
-		&bitmap_camera,
+		&bitmap_icon_camera,
 		Color::white(),
 		Color::dark_grey()
 	};
 
 	ImageButton button_sleep {
 		{ 206, 0, 2 * 8, 1 * 16 },
-		&bitmap_sleep,
+		&bitmap_icon_sleep,
 		Color::white(),
 		Color::dark_grey()
 	};

firmware/tools/make_bitmap.py

@@ -21,51 +21,95 @@
 import sys
 import struct
 from PIL import Image
+from os import listdir
+from os import path
 
 usage_message = """
-1BPP PortaPack bitmap generator
+1BPP PortaPack bitmap.hpp generator
 
-Usage: <command> <name> <filename>
+Usage: <directory>
 """
 
-if len(sys.argv) < 3:
+if len(sys.argv) < 1:
 	print(usage_message)
 	sys.exit(-1)
 
-c = 0
+def convert_png(file):
-data = 0
+	c = 0
+	data = 0
 
-im = Image.open(sys.argv[2])
+	im = Image.open(file)
-rgb_im = im.convert('RGBA')
+	rgb_im = im.convert('RGBA')
 
-if rgb_im.size[0] % 8 or rgb_im.size[1] % 8:
+	if rgb_im.size[0] % 8 or rgb_im.size[1] % 8:
-	print('Bitmap size isn\'t a multiple of 8')
+		print(file + ": Size isn\'t a multiple of 8")
-	sys.exit(-1)
+		sys.exit(-1)
 
-name = sys.argv[1]
+	name = path.basename(file).split(".")[0].lower();
 
-print "static constexpr uint8_t bitmap_" + name + "_data[] = {"
+	f.write("static constexpr uint8_t bitmap_" + name + "_data[] = {\n")
-print '	',		# Tab
+	f.write('	')		# Tab
 
-for i in range(rgb_im.size[0]):
+	for i in range(rgb_im.size[1]):
-	for j in range(rgb_im.size[1]):
+		for j in range(rgb_im.size[0]):
-		r, g, b, a = rgb_im.getpixel((j, i))
+			r, g, b, a = rgb_im.getpixel((j, i))
-		
+			
-		data >>= 1
+			data >>= 1
-		
+			
-		if r > 127 and g > 127 and b > 127 and a > 127:
+			if r > 127 and g > 127 and b > 127 and a > 127:
-			data += 128
+				data += 128
-		
+			
-		if j % 8 == 7:
+			if j % 8 == 7:
-			print "0x%0.2X," % data,
+				f.write("0x%0.2X, " % data)
-			data = 0
+				data = 0
 
-	print ''
+		f.write("\n")
-	if i < rgb_im.size[0] - 1:
+		if i < rgb_im.size[0] - 1:
-		print '	',		# Tab
+			f.write('	')		# Tab
 
-print "};"
+	f.write("};\n")
-print ''
+	f.write("static constexpr Bitmap bitmap_"  + name + " {\n")
-print "static constexpr Bitmap bitmap_"  + name + " {"
+	f.write("	{ " + str(rgb_im.size[0]) + ", " + str(rgb_im.size[1]) + " }, bitmap_" + name+ "_data\n")
-print "	{ " + str(rgb_im.size[0]) + ", " + str(rgb_im.size[1]) + " }, bitmap_" + name+ "_data"
+	f.write("};\n\n")
-print "};"
+	return
+
+count = 0
+
+f = open('bitmap.hpp', 'w')
+f.write("/*\n")
+f.write(" * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.\n")
+f.write(" * Copyright (C) 2016 Furrtek\n")
+f.write(" *\n")
+f.write(" * This file is part of PortaPack.\n")
+f.write(" *\n")
+f.write(" * This program is free software; you can redistribute it and/or modify\n")
+f.write(" * it under the terms of the GNU General Public License as published by\n")
+f.write(" * the Free Software Foundation; either version 2, or (at your option)\n")
+f.write(" * any later version.\n")
+f.write(" *\n")
+f.write(" * This program is distributed in the hope that it will be useful,\n")
+f.write(" * but WITHOUT ANY WARRANTY; without even the implied warranty of\n")
+f.write(" * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n")
+f.write(" * GNU General Public License for more details.\n")
+f.write(" *\n")
+f.write(" * You should have received a copy of the GNU General Public License\n")
+f.write(" * along with this program; see the file COPYING.  If not, write to\n")
+f.write(" * the Free Software Foundation, Inc., 51 Franklin Street,\n")
+f.write(" * Boston, MA 02110-1301, USA.\n")
+f.write(" */\n\n")
+f.write("// This file was generated by make_bitmap.py\n\n")
+f.write("#ifndef __BITMAP_HPP__\n")
+f.write("#define __BITMAP_HPP__\n\n")
+f.write("#include \"ui.hpp\"\n\n")
+f.write("namespace ui {\n\n")
+
+for file in listdir(sys.argv[1]):
+    if file.endswith(".png"):
+        convert_png(sys.argv[1] + file)
+        count += 1
+
+f.write("\n")
+f.write("} /* namespace ui */\n\n")
+f.write("#endif/*__BITMAP_HPP__*/\n")
+
+print "Converted " + str(count) + " files"