Skip to content

Commit c5f522b

Browse files
committed
Merge branch 'develop'
2 parents a7d517d + 2fb9f43 commit c5f522b

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

.github/workflows/ufbt_build.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
name: "uFBT Build"
22
on:
33
workflow_dispatch:
4-
# push:
5-
# branches:
6-
# - main
7-
# - develop
8-
# pull_request:
4+
push:
5+
branches:
6+
- main
7+
- develop
8+
pull_request:
99
# schedule:
1010
# do a build every day
1111
# - cron: "1 1 * * *"

catalog/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ sourcecode:
22
type: git
33
location:
44
origin: https://github.com/xtruan/flipper-chess.git
5-
commit_sha: 4678ec9a6db516e09a9c18929dca2a5f1acca32a
5+
commit_sha: 936a32f359f121459a6aa4b124a274062b43b26c
66
description: "How about a nice game of chess?"
77
changelog: "v1.10 - Update to support new FW"
88
author: "@xtruan"

helpers/flipchess_fonts.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22

33
/*
44
Fontname: -FreeType-LucasArts SCUMM Subtitle Roman Outline-Medium-R-Normal--32-320-72-72-P-107-ISO10646-1
5-
Copyright: Copyright Goatmeal 2013 LucasArts SCUMM - Subtitle - Roman
5+
Copyright: Copyright Goatmeal 2013 - LucasArts SCUMM - Subtitle - Roman
66
Glyphs: 74/95
77
BBX Build Mode: 0
88
*/
9-
const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[1941] U8G2_FONT_SECTION(
10-
"_u8g2_font_lucasarts_scumm_subtitle_o_tr") =
9+
const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[1941] =
1110
"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"
1211
"\231!\221F\307I\211\232\206\250\323\220\0\42\11\250>\212'\237\206\3'\11\244>\211A\62\15\2,"
1312
"\16\346\222\231A\311\222,\221N\312\20\1-\11in\212\207\34x\10.\11\204\36\211A\222\6\1/"

helpers/flipchess_fonts.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#pragma once
22

3-
#include <u8g2.h>
3+
#include <stdint.h>
44

5-
extern const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[] U8G2_FONT_SECTION(
6-
"_u8g2_font_lucasarts_scumm_subtitle_o_tr");
5+
extern const uint8_t _u8g2_font_lucasarts_scumm_subtitle_o_tr[];

views/flipchess_startscreen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "flipchess_icons.h"
77
#include "helpers/flipchess_fonts.h"
88

9-
#include <assets_icons.h>
9+
// #include <assets_icons.h>
1010

1111
struct FlipChessStartscreen {
1212
View* view;

0 commit comments

Comments
 (0)