llib: make icons const

and3rson · Feb 8, 2024 · f8cb271 · f8cb271
1 parent a65453f
commit f8cb271
Show file tree

Hide file tree

Showing 14 changed files with 34 additions and 10 deletions.
diff --git a/assets/letris.png → assets/letris_splash.png b/assets/letris.png → assets/letris_splash.png
diff --git a/assets/letris.xcf → assets/letris_splash.xcf b/assets/letris.xcf → assets/letris_splash.xcf
diff --git a/assets/lilka.png → assets/splash.png b/assets/lilka.png → assets/splash.png
diff --git a/assets/lilka.xcf → assets/splash.xcf b/assets/lilka.xcf → assets/splash.xcf
diff --git a/firmware-demo/src/demo_letris.cpp b/firmware-demo/src/demo_letris.cpp
@@ -1,6 +1,6 @@
 #include <lilka.h>
 
-#include "letris.h"
+#include "letris_splash.h"
 
 #define BLOCK_SIZE 10
 #define FIELD_COLS 10
@@ -141,7 +141,7 @@ void demo_letris() {
         for (uint16_t y = 0; y < 64; y++) {
             int16_t xShift = sin(time * 5 + y / 4.0) * 8;
             for (uint16_t x = 0; x < 128; x++) {
-                canvas.drawPixel(x + xShift, y, letris[y * LILKA_DISPLAY_WIDTH + x]);
+                canvas.drawPixel(x + xShift, y, letris_splash[y * LILKA_DISPLAY_WIDTH + x]);
             }
         }
         lilka::display.renderCanvas(canvas);

diff --git a/firmware-demo/src/letris.h → firmware-demo/src/letris_splash.h b/firmware-demo/src/letris.h → firmware-demo/src/letris_splash.h
@@ -1,5 +1,9 @@
+// This file was generated automatically. Do not edit.
 // clang-format off
-const uint16_t letris[] = {
+#include <stdint.h>
+const uint16_t letris_splash_width = 240;
+const uint16_t letris_splash_height = 64;
+const uint16_t letris_splash[] = {
     0x0015,
     0x0015,
     0x0015,

diff --git a/firmware-demo/src/main.cpp b/firmware-demo/src/main.cpp
@@ -62,7 +62,7 @@ void sd_browser_menu(String path) {
     }
 
     String filenames[32];
-    menu_icon_t *icons[32];
+    const menu_icon_t *icons[32];
     for (int i = 0; i < numEntries; i++) {
         filenames[i] = entries[i].name;
         icons[i] = entries[i].type == lilka::EntryType::DIRECTORY ? &folder : (entries[i].name.endsWith(".rom") || entries[i].name.endsWith(".nes")) ? &nes : &file;

diff --git a/lib/lilka/src/lilka/icons/file.h b/lib/lilka/src/lilka/icons/file.h
@@ -1,5 +1,9 @@
+// This file was generated automatically. Do not edit.
 // clang-format off
-uint16_t file[] = {
+#include <stdint.h>
+const uint16_t file_width = 24;
+const uint16_t file_height = 24;
+const uint16_t file[] = {
     0x0000,
     0x0000,
     0x0000,

diff --git a/lib/lilka/src/lilka/icons/folder.h b/lib/lilka/src/lilka/icons/folder.h
@@ -1,5 +1,9 @@
+// This file was generated automatically. Do not edit.
 // clang-format off
-uint16_t folder[] = {
+#include <stdint.h>
+const uint16_t folder_width = 24;
+const uint16_t folder_height = 24;
+const uint16_t folder[] = {
     0x0000,
     0x0000,
     0x0000,

diff --git a/lib/lilka/src/lilka/icons/nes.h b/lib/lilka/src/lilka/icons/nes.h
@@ -1,5 +1,9 @@
+// This file was generated automatically. Do not edit.
 // clang-format off
-uint16_t nes[] = {
+#include <stdint.h>
+const uint16_t nes_width = 24;
+const uint16_t nes_height = 24;
+const uint16_t nes[] = {
     0x0000,
     0x0000,
     0x0000,

diff --git a/lib/lilka/src/lilka/splash.h b/lib/lilka/src/lilka/splash.h
@@ -1,4 +1,8 @@
+// This file was generated automatically. Do not edit.
 // clang-format off
+#include <stdint.h>
+const uint16_t splash_width = 240;
+const uint16_t splash_height = 280;
 const uint16_t splash[] = {
     0x00eb,
     0x00eb,

diff --git a/lib/lilka/src/lilka/ui.cpp b/lib/lilka/src/lilka/ui.cpp
@@ -5,7 +5,7 @@
 
 namespace lilka {
 
-int ui_menu(String title, String menu[], int menu_size, int cursor, menu_icon_t *icons[]) {
+int ui_menu(String title, String menu[], int menu_size, int cursor, const menu_icon_t *icons[]) {
     display.fillScreen(display.color565(0, 0, 0));
     controller.resetState();
     while (1) {
@@ -21,7 +21,7 @@ int ui_menu(String title, String menu[], int menu_size, int cursor, menu_icon_t
         for (int i = 0; i < menu_size; i++) {
             display.fillRect(0, 96 + i * 24 - 20, LILKA_DISPLAY_WIDTH, 24, i == cursor ? display.color565(255, 0, 0) : display.color565(0, 0, 0));
             if (icons != NULL && icons[i] != NULL) {
-                display.draw16bitRGBBitmapWithTranColor(0, 96 + i * 24 - 20, *icons[i], display.color565(0, 0, 0), 24, 24);
+                display.draw16bitRGBBitmap(0, 96 + i * 24 - 20, *icons[i], 24, 24);
             }
             display.setCursor(32, 96 + i * 24);
             display.setTextColor(display.color565(255, 255, 255));

diff --git a/lib/lilka/src/lilka/ui.h b/lib/lilka/src/lilka/ui.h
@@ -7,7 +7,7 @@
 
 namespace lilka {
 
-int ui_menu(String title, String menu[], int menu_size, int cursor, menu_icon_t *icons[] = 0);
+int ui_menu(String title, String menu[], int menu_size, int cursor, const menu_icon_t *icons[] = 0);
 void ui_alert(String title, String message);
 
 } // namespace lilka

diff --git a/tools/image2code/image2code.py b/tools/image2code/image2code.py
@@ -39,7 +39,11 @@
 
 with open(out, "w") as f:
     print(f"Записуємо {len(pixels)} пікселів у {out}... ", end="")
+    print("// This file was generated automatically. Do not edit.", file=f)
     print("// clang-format off", file=f)
+    print(f"#include <stdint.h>", file=f)
+    print(f"const uint16_t {var_name}_width = {img.width};", file=f)
+    print(f"const uint16_t {var_name}_height = {img.height};", file=f)
     print(f"const uint16_t {var_name}[] = {{", file=f)
     for pixel in pixels:
         print(f"    0x{pixel:04x},", file=f)