Merge branch 'develop'

RogueMaster · May 21, 2024 · c5f522b · c5f522b
2 parents a7d517d + 2fb9f43
commit c5f522b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/ufbt_build.yaml b/.github/workflows/ufbt_build.yaml
@@ -1,11 +1,11 @@
 name: "uFBT Build"
 on:
   workflow_dispatch:
-  # push:
-  #   branches: 
-  #     - main
-  #     - develop
-  # pull_request:
+  push:
+    branches: 
+      - main
+      - develop
+  pull_request:
   # schedule: 
     # do a build every day
     # - cron: "1 1 * * *"

diff --git a/catalog/manifest.yml b/catalog/manifest.yml
@@ -2,7 +2,7 @@ sourcecode:
   type: git
   location:
     origin: https://github.com/xtruan/flipper-chess.git
-    commit_sha: 4678ec9a6db516e09a9c18929dca2a5f1acca32a
+    commit_sha: 936a32f359f121459a6aa4b124a274062b43b26c
 description: "How about a nice game of chess?"
 changelog: "v1.10 - Update to support new FW"
 author: "@xtruan"

diff --git a/helpers/flipchess_fonts.c b/helpers/flipchess_fonts.c
@@ -2,12 +2,11 @@
 
 /*
   Fontname: -FreeType-LucasArts SCUMM   Subtitle   Roman Outline-Medium-R-Normal--32-320-72-72-P-107-ISO10646-1
-  Copyright: Copyright Goatmeal 2013  LucasArts SCUMM - Subtitle - Roman
+  Copyright: Copyright Goatmeal 2013 - LucasArts SCUMM - Subtitle - Roman
   Glyphs: 74/95
   BBX Build Mode: 0
 */
-const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[1941] U8G2_FONT_SECTION(
-    "_u8g2_font_lucasarts_scumm_subtitle_o_tr") =
+const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[1941] =
     "J\0\3\2\5\4\1\4\6\22\21\0\373\14\374\14\374\1\265\4\345\7x \5\0b\11!\21\246\237"
     "\231!\221F\307I\211\232\206\250\323\220\0\42\11\250>\212'\237\206\3'\11\244>\211A\62\15\2,"
     "\16\346\222\231A\311\222,\221N\312\20\1-\11in\212\207\34x\10.\11\204\36\211A\222\6\1/"

diff --git a/helpers/flipchess_fonts.h b/helpers/flipchess_fonts.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <u8g2.h>
+#include <stdint.h>
 
-extern const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[] U8G2_FONT_SECTION(
-    "_u8g2_font_lucasarts_scumm_subtitle_o_tr");
+extern const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[];
diff --git a/views/flipchess_startscreen.c b/views/flipchess_startscreen.c
@@ -6,7 +6,7 @@
 #include "flipchess_icons.h"
 #include "helpers/flipchess_fonts.h"
 
-#include <assets_icons.h>
+// #include <assets_icons.h>
 
 struct FlipChessStartscreen {
     View* view;