liz/flipperzero-firmware
liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed app floopper-bloopper and font FontGlyph (#549)

Browse Source 
* Remove app floopper-bloopper and FontGlyph
* Gui: proper viewport allocator declaration

Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
This commit is contained in:
SG 2021-07-01 21:33:43 +10:00 committed by GitHub
parent 8211432685
commit b09f68c43d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,9 +4,6 @@
[submodule "lib/STM32CubeWB"] [submodule "lib/STM32CubeWB"]
path = lib/STM32CubeWB path = lib/STM32CubeWB
url = https://github.com/Flipper-Zero/STM32CubeWB.git url = https://github.com/Flipper-Zero/STM32CubeWB.git
[submodule "applications/floopper-bloopper"]
path = applications/floopper-bloopper
url = https://github.com/Flipper-Zero/floopper-bloopper.git
[submodule "lib/littlefs"] [submodule "lib/littlefs"]
path = lib/littlefs path = lib/littlefs
url = https://github.com/littlefs-project/littlefs.git url = https://github.com/littlefs-project/littlefs.git

10
applications/applications.c
View File

@ -27,7 +27,6 @@ int32_t app_ibutton(void* p);
int32_t cli_task(void* p); int32_t cli_task(void* p);
int32_t music_player(void* p); int32_t music_player(void* p);
int32_t sdnfc(void* p); int32_t sdnfc(void* p);
int32_t floopper_bloopper(void* p);
int32_t sd_filesystem(void* p); int32_t sd_filesystem(void* p);
int32_t subghz_app(void* p); int32_t subghz_app(void* p);
int32_t gui_test(void* p); int32_t gui_test(void* p);
@ -144,10 +143,6 @@ const FlipperApplication FLIPPER_SERVICES[] = {
{.app = app_gpio_test, .name = "gpio test", .stack_size = 1024, .icon = A_Plugins_14}, {.app = app_gpio_test, .name = "gpio test", .stack_size = 1024, .icon = A_Plugins_14},
#endif #endif
#ifdef SRV_FLOOPPER_BLOOPPER
{.app = floopper_bloopper, .name = "Floopper Bloopper", .stack_size = 1024, .icon = A_Games_14},
#endif
#ifdef SRV_SDNFC #ifdef SRV_SDNFC
{.app = sdnfc, .name = "sdnfc", .stack_size = 1024, .icon = A_Plugins_14}, {.app = sdnfc, .name = "sdnfc", .stack_size = 1024, .icon = A_Plugins_14},
#endif #endif
@ -239,10 +234,6 @@ const FlipperApplication FLIPPER_PLUGINS[] = {
{.app = music_player, .name = "music player", .stack_size = 1024, .icon = A_Plugins_14}, {.app = music_player, .name = "music player", .stack_size = 1024, .icon = A_Plugins_14},
#endif #endif
#ifdef APP_FLOOPPER_BLOOPPER
{.app = floopper_bloopper, .name = "Floopper Bloopper", .stack_size = 1024, .icon = A_Games_14},
#endif
#ifdef APP_SPEAKER_DEMO #ifdef APP_SPEAKER_DEMO
{.app = coreglitch_demo_0, {.app = coreglitch_demo_0,
.name = "coreglitch_demo_0", .name = "coreglitch_demo_0",
@ -326,7 +317,6 @@ const FlipperApplication FLIPPER_SCENE =
const FlipperApplication FLIPPER_SCENE_APPS[] = { const FlipperApplication FLIPPER_SCENE_APPS[] = {
{.app = passport, .name = "Passport", .stack_size = 1024, .icon = A_Games_14}, {.app = passport, .name = "Passport", .stack_size = 1024, .icon = A_Games_14},
{.app = music_player, .name = "Music player", .stack_size = 1024, .icon = A_Plugins_14}, {.app = music_player, .name = "Music player", .stack_size = 1024, .icon = A_Plugins_14},
{.app = floopper_bloopper, .name = "Floopper Bloopper", .stack_size = 1024, .icon = A_Games_14},
}; };
const size_t FLIPPER_SCENE_APPS_COUNT = sizeof(FLIPPER_SCENE_APPS) / sizeof(FlipperApplication); const size_t FLIPPER_SCENE_APPS_COUNT = sizeof(FLIPPER_SCENE_APPS) / sizeof(FlipperApplication);

11
applications/applications.mk
View File

@ -28,7 +28,6 @@ APP_LF_RFID = 1
APP_NFC = 1 APP_NFC = 1
APP_GPIO_DEMO = 1 APP_GPIO_DEMO = 1
APP_MUSIC_PLAYER = 1 APP_MUSIC_PLAYER = 1
APP_FLOOPPER_BLOOPPER = 1
APP_IBUTTON = 1 APP_IBUTTON = 1
APP_ARCHIVE = 1 APP_ARCHIVE = 1
@ -263,16 +262,6 @@ ifeq ($(APP_MUSIC_PLAYER), 1)
CFLAGS += -DAPP_MUSIC_PLAYER CFLAGS += -DAPP_MUSIC_PLAYER
endif endif
SRV_FLOOPPER_BLOOPPER ?= 0
ifeq ($(SRV_FLOOPPER_BLOOPPER), 1)
CFLAGS += -DSRV_FLOOPPER_BLOOPPER
APP_FLOOPPER_BLOOPPER = 1
endif
APP_FLOOPPER_BLOOPPER ?= 0
ifeq ($(APP_FLOOPPER_BLOOPPER), 1)
CFLAGS += -DAPP_FLOOPPER_BLOOPPER
endif
SRV_IBUTTON ?= 0 SRV_IBUTTON ?= 0
ifeq ($(SRV_IBUTTON), 1) ifeq ($(SRV_IBUTTON), 1)
CFLAGS += -DSRV_IBUTTON CFLAGS += -DSRV_IBUTTON

1
applications/floopper-bloopper

@ -1 +0,0 @@
Subproject commit 82be9fcd35c2057a3aee799be3172fa4415ef069

2
applications/gui/canvas.c
View File

@ -105,8 +105,6 @@ void canvas_set_font(Canvas* canvas, Font font) {
u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tf); u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tf);
} else if(font == FontSecondary) { } else if(font == FontSecondary) {
u8g2_SetFont(&canvas->fb, u8g2_font_haxrcorp4089_tr); u8g2_SetFont(&canvas->fb, u8g2_font_haxrcorp4089_tr);
} else if(font == FontGlyph) {
u8g2_SetFont(&canvas->fb, u8g2_font_unifont_t_symbols);
} else if(font == FontKeyboard) { } else if(font == FontKeyboard) {
u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mf); u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mf);
} else { } else {

7
applications/gui/canvas.h
View File

@ -13,12 +13,7 @@ typedef enum {
ColorBlack = 0x01, ColorBlack = 0x01,
} Color; } Color;
typedef enum { typedef enum { FontPrimary, FontSecondary, FontKeyboard } Font;
FontPrimary = 0x00,
FontSecondary = 0x01,
FontGlyph = 0x02,
FontKeyboard = 0x03
} Font;
typedef enum { typedef enum {
AlignLeft, AlignLeft,

2
applications/gui/view_port.c
View File

@ -7,7 +7,7 @@
// TODO add mutex to view_port ops // TODO add mutex to view_port ops
ViewPort* view_port_alloc(ViewPortDrawCallback callback, void* callback_context) { ViewPort* view_port_alloc() {
ViewPort* view_port = furi_alloc(sizeof(ViewPort)); ViewPort* view_port = furi_alloc(sizeof(ViewPort));
view_port->orientation = ViewPortOrientationHorizontal; view_port->orientation = ViewPortOrientationHorizontal;
view_port->is_enabled = true; view_port->is_enabled = true;