Merge pull request #1432 from NickeZ/nickez/ttf2ugui-compat

NickeZ · web-flow · commit 094f049df7d3 · 2025-05-01T16:37:09.000+02:00
fonts: Make fonts closer to original
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -179,6 +179,7 @@ set(FIRMWARE-U2F-SOURCES ${FIRMWARE-U2F-SOURCES} PARENT_SCOPE)
 
 set(INCLUDES
   ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_SOURCE_DIR}/src/ui/ugui
   ${CMAKE_SOURCE_DIR}/src/platform
   ${CMAKE_SOURCE_DIR}/src/qtouch
   ${CMAKE_SOURCE_DIR}/src/usb/class
@@ -538,5 +539,7 @@ if(CMAKE_CROSSCOMPILING)
     if(NOT CMAKE_BUILD_TYPE STREQUAL "DEBUG")
       target_compile_options(${name}.elf PRIVATE "-Werror")
     endif()
+
+    target_link_libraries(${name}.elf PRIVATE -Wl,--print-memory-usage)
   endforeach()
 endif()
diff --git a/src/rust/bitbox02-sys/build.rs b/src/rust/bitbox02-sys/build.rs
@@ -189,6 +189,7 @@ pub fn main() -> Result<(), &'static str> {
     let mut includes = vec![
         // $INCLUDES
         "../..",
+        "../../ui/ugui",
         "../../platform",
         "../../qtouch",
         "../../usb/class",
diff --git a/src/ui/fonts/font_a_11X10.c b/src/ui/fonts/font_a_11X10.c
@@ -3,7 +3,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_11X10[95][20] = {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_11X10.h b/src/ui/fonts/font_a_11X10.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_11X10;
diff --git a/src/ui/fonts/font_a_11X12.c b/src/ui/fonts/font_a_11X12.c
@@ -4,7 +4,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_11X12[95][24] = {
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_11X12.h b/src/ui/fonts/font_a_11X12.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_11X12;
diff --git a/src/ui/fonts/font_a_13X14.c b/src/ui/fonts/font_a_13X14.c
@@ -4,7 +4,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_13X14[95][28] = {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_13X14.h b/src/ui/fonts/font_a_13X14.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_13X14;
diff --git a/src/ui/fonts/font_a_15X16.c b/src/ui/fonts/font_a_15X16.c
@@ -4,7 +4,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_15X16[95][32] = {
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_15X16.h b/src/ui/fonts/font_a_15X16.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_15X16;
diff --git a/src/ui/fonts/font_a_17X18.c b/src/ui/fonts/font_a_17X18.c
@@ -4,7 +4,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_17X18[95][54] = {
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_17X18.h b/src/ui/fonts/font_a_17X18.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_17X18;
diff --git a/src/ui/fonts/font_a_9X9.c b/src/ui/fonts/font_a_9X9.c
@@ -4,7 +4,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_font_a_9X9[95][18] = {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/font_a_9X9.h b/src/ui/fonts/font_a_9X9.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_font_a_9X9;
diff --git a/src/ui/fonts/monogram_5X9.c b/src/ui/fonts/monogram_5X9.c
@@ -3,7 +3,7 @@
 //  --bpp 1
 // For copyright, see original font file.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_monogram_5X9[95][9] = {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, // 0x20 ' '
diff --git a/src/ui/fonts/monogram_5X9.h b/src/ui/fonts/monogram_5X9.h
@@ -1,3 +1,3 @@
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_monogram_5X9;
diff --git a/src/ui/fonts/password_11X12.c b/src/ui/fonts/password_11X12.c
@@ -1,6 +1,6 @@
 // This is a copy of font_a_11X12.c with a modified space character
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_password_11X12[95][24] = {
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x00, 0x7F, 0x00, 0x00, 0x00 }, // 0x20 (0x2423) '#'
diff --git a/src/ui/fonts/password_11X12.h b/src/ui/fonts/password_11X12.h
@@ -12,6 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_password_11X12;
diff --git a/src/ui/fonts/password_9X9.c b/src/ui/fonts/password_9X9.c
@@ -1,6 +1,6 @@
 // This is a copy of font_a_9X9.c with a modified space character
 
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 static UG_FONT_DATA unsigned char fontBits_password_9X9[95][18] = {
   {0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x22,0x00,0x22,0x00,0x3E,0x00 }, // 0x20 (0x2423) '#'
diff --git a/src/ui/fonts/password_9X9.h b/src/ui/fonts/password_9X9.h
@@ -1,3 +1,3 @@
-#include <ui/ugui/ugui.h>
+#include <ugui.h>
 
 extern const UG_FONT font_password_9X9;
diff --git a/src/ui/ugui/ugui.h b/src/ui/ugui/ugui.h
@@ -67,7 +67,7 @@ typedef struct {
     UG_U8  *widths;
 } UG_FONT;
 
-#define UG_FONT_DATA
+#define UG_FONT_DATA const
 
 /* -------------------------------------------------------------------------------- */
 /* -- µGUI CORE STRUCTURE                                                        -- */
diff --git a/tools/ttf2ugui b/tools/ttf2ugui
@@ -1 +1 @@
-Subproject commit d923bac28cd0aafc12b28be692fac1ee59f4f184
+Subproject commit 1d1a254065fa0852fb51fdf6efc7b4d70feae391

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`		`-#include <ui/ugui/ugui.h>`
	`1`	`+#include <ugui.h>`
`2`	`2`
`3`	`3`	`extern const UG_FONT font_monogram_5X9;`