LupusE's patch (#2300)

* LupusE's commit

* fix f obj doesn't exist

---------

Co-authored-by: zxkmm <zxkmm@hotmail.com>

firmware/tools/bitmap_tools/make_bitmap.py

@@ -24,25 +24,26 @@
 from os import listdir
 from os import path
 
-usage_message = """
+usage_message = f"""
 1BPP PortaPack bitmap.hpp generator
 
-Usage: <directory>
+Usage: {sys.argv[0]} <directory>
 """
 
 if len(sys.argv) < 2:
 	print(usage_message)
 	sys.exit(-1)
 
+graphics_path = path.join(sys.argv[1], '')
+
 def convert_png(file):
 	c = 0
 	data = 0
 
-	im = Image.open(file)
-	rgb_im = im.convert('RGBA')
+	rgb_im = Image.open(file).convert('RGBA')
 
 	if rgb_im.size[0] % 8 or rgb_im.size[1] % 8:
-		print((file + ": Size isn\'t a multiple of 8"))
+		print((file + ": Size is not a multiple of 8. Image is not included in bitmap.hpp."))
 		sys.exit(-1)
 
 	name = path.basename(file).split(".")[0].lower();
@@ -70,36 +71,36 @@ def convert_png(file):
 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)
+f.write("/*\n"
+	" * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc.\n"
+	" * Copyright (C) 2016 Furrtek\n"
+	" *\n"
+	" * This file is part of PortaPack.\n"
+	" *\n"
+	" * This program is free software; you can redistribute it and/or modify\n"
+	" * it under the terms of the GNU General Public License as published by\n"
+	" * the Free Software Foundation; either version 2, or (at your option)\n"
+	" * any later version.\n"
+	" *\n"
+	" * This program is distributed in the hope that it will be useful,\n"
+	" * but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+	" * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+	" * GNU General Public License for more details.\n"
+	" *\n"
+	" * You should have received a copy of the GNU General Public License\n"
+	" * along with this program; see the file COPYING.  If not, write to\n"
+	" * the Free Software Foundation, Inc., 51 Franklin Street,\n"
+	" * Boston, MA 02110-1301, USA.\n"
+	" */\n\n"
+	"// This file was generated by make_bitmap.py\n\n"
+	"#ifndef __BITMAP_HPP__\n"
+	"#define __BITMAP_HPP__\n\n"
+	"#include \"ui.hpp\"\n\n"
+	"namespace ui {\n\n")
+
+for file in listdir(graphics_path):
+    if file.endswith(".png") and path.isfile(graphics_path + file):
+        convert_png(graphics_path + file)
         count += 1
 
 f.write("} /* namespace ui */\n\n")