Explorar el Código

Merge chess from https://github.com/xtruan/flipper-chess

# Conflicts:
#	chess/helpers/flipchess_fonts.c
#	chess/helpers/flipchess_fonts.h
#	chess/views/flipchess_startscreen.c
Willy-JL hace 1 año
padre
commit
03ecedf7fb

+ 1 - 1
chess/.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
       - develop
 
 env:
-  firmware_version: '0.86.1'
+  firmware_version: '0.101.2'
 
 jobs:
   build:

+ 1 - 1
chess/.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 
 env:
-  firmware_version: '0.86.1'
+  firmware_version: '0.101.2'
 
 jobs:
   build:

+ 4 - 3
chess/.github/workflows/ufbt_build.yaml

@@ -1,5 +1,6 @@
-name: "FAP: Build for multiple SDK sources"
+name: "uFBT Build"
 on:
+  workflow_dispatch:
   push:
     branches: 
       - main
@@ -21,9 +22,9 @@ jobs:
     name: 'ufbt: Build for ${{ matrix.name }}'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build with ufbt
-        uses: flipperdevices/flipperzero-ufbt-action@v0.1.2
+        uses: flipperdevices/flipperzero-ufbt-action@v0.1.3
         id: build-app
         with:
           sdk-channel: ${{ matrix.sdk-channel }}

+ 1 - 1
chess/README.md

@@ -7,7 +7,7 @@
 ![FLIPR](https://github.com/xtruan/flipper-chess/blob/main/icons/FLIPR_128x64.png)
 
 ## Chess game for Flipper Zero
-- Built against `0.86.1` Flipper Zero firmware release
+- Built against `0.101.2` Flipper Zero firmware release
 - Uses [smallchesslib](https://codeberg.org/drummyfish/smallchesslib)
 
 ### Installation

+ 1 - 1
chess/application.fam

@@ -14,6 +14,6 @@ App(
     fap_category="Games",
     fap_author="Struan Clark (xtruan)",
     fap_weburl="https://github.com/xtruan/flipper-chess",
-    fap_version=(1, 9),
+    fap_version=(1, 10),
     fap_description="Chess for Flipper",
 )

+ 2 - 2
chess/catalog/manifest.yml

@@ -2,9 +2,9 @@ sourcecode:
   type: git
   location:
     origin: https://github.com/xtruan/flipper-chess.git
-    commit_sha: c340eb5ec6a68f9e1213d725002d25812bbe989b
+    commit_sha: 936a32f359f121459a6aa4b124a274062b43b26c
 description: "How about a nice game of chess?"
-changelog: "v1.9.0 - Gameplay enhancements and bug fixes"
+changelog: "v1.10 - Update to support new FW"
 author: "@xtruan"
 screenshots:
   - "./catalog/startscreen.png"

+ 1 - 1
chess/flipchess.h

@@ -16,7 +16,7 @@
 #include "views/flipchess_startscreen.h"
 #include "views/flipchess_scene_1.h"
 
-#define FLIPCHESS_VERSION "v1.9.0"
+#define FLIPCHESS_VERSION "v1.10"
 
 #define TEXT_BUFFER_SIZE 96
 #define TEXT_SIZE (TEXT_BUFFER_SIZE - 1)

+ 2 - 3
chess/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/"

+ 2 - 3
chess/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[];

+ 1 - 1
chess/sam/stm32_sam.cpp

@@ -5700,4 +5700,4 @@ inline void STM32SAM::SetAUDIO(unsigned char main_volume) {
     }
 
     LL_TIM_OC_SetCompareCH1(FURI_HAL_SPEAKER_TIMER, data);
-}
+}

+ 1 - 1
chess/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;