diff --git a/.gitmodules b/.gitmodules index bf8bd685..02edf606 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "lib/STM32CubeWB"] path = lib/STM32CubeWB 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"] path = lib/littlefs url = https://github.com/littlefs-project/littlefs.git diff --git a/applications/applications.c b/applications/applications.c index 977c4805..6d506a0c 100644 --- a/applications/applications.c +++ b/applications/applications.c @@ -27,7 +27,6 @@ int32_t app_ibutton(void* p); int32_t cli_task(void* p); int32_t music_player(void* p); int32_t sdnfc(void* p); -int32_t floopper_bloopper(void* p); int32_t sd_filesystem(void* p); int32_t subghz_app(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}, #endif -#ifdef SRV_FLOOPPER_BLOOPPER - {.app = floopper_bloopper, .name = "Floopper Bloopper", .stack_size = 1024, .icon = A_Games_14}, -#endif - #ifdef SRV_SDNFC {.app = sdnfc, .name = "sdnfc", .stack_size = 1024, .icon = A_Plugins_14}, #endif @@ -239,10 +234,6 @@ const FlipperApplication FLIPPER_PLUGINS[] = { {.app = music_player, .name = "music player", .stack_size = 1024, .icon = A_Plugins_14}, #endif -#ifdef APP_FLOOPPER_BLOOPPER - {.app = floopper_bloopper, .name = "Floopper Bloopper", .stack_size = 1024, .icon = A_Games_14}, -#endif - #ifdef APP_SPEAKER_DEMO {.app = coreglitch_demo_0, .name = "coreglitch_demo_0", @@ -326,7 +317,6 @@ const FlipperApplication FLIPPER_SCENE = const FlipperApplication FLIPPER_SCENE_APPS[] = { {.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 = 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); diff --git a/applications/applications.mk b/applications/applications.mk index 03b2b5b3..6b26850f 100644 --- a/applications/applications.mk +++ b/applications/applications.mk @@ -28,7 +28,6 @@ APP_LF_RFID = 1 APP_NFC = 1 APP_GPIO_DEMO = 1 APP_MUSIC_PLAYER = 1 -APP_FLOOPPER_BLOOPPER = 1 APP_IBUTTON = 1 APP_ARCHIVE = 1 @@ -263,16 +262,6 @@ ifeq ($(APP_MUSIC_PLAYER), 1) CFLAGS += -DAPP_MUSIC_PLAYER 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 ifeq ($(SRV_IBUTTON), 1) CFLAGS += -DSRV_IBUTTON diff --git a/applications/floopper-bloopper b/applications/floopper-bloopper deleted file mode 160000 index 82be9fcd..00000000 --- a/applications/floopper-bloopper +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82be9fcd35c2057a3aee799be3172fa4415ef069 diff --git a/applications/gui/canvas.c b/applications/gui/canvas.c index 610c5d7a..f8e9e0fc 100644 --- a/applications/gui/canvas.c +++ b/applications/gui/canvas.c @@ -105,8 +105,6 @@ void canvas_set_font(Canvas* canvas, Font font) { u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tf); } else if(font == FontSecondary) { 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) { u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mf); } else { diff --git a/applications/gui/canvas.h b/applications/gui/canvas.h index f387e20b..b14c23c8 100644 --- a/applications/gui/canvas.h +++ b/applications/gui/canvas.h @@ -13,12 +13,7 @@ typedef enum { ColorBlack = 0x01, } Color; -typedef enum { - FontPrimary = 0x00, - FontSecondary = 0x01, - FontGlyph = 0x02, - FontKeyboard = 0x03 -} Font; +typedef enum { FontPrimary, FontSecondary, FontKeyboard } Font; typedef enum { AlignLeft, diff --git a/applications/gui/view_port.c b/applications/gui/view_port.c index 301c85db..d65b9f7a 100644 --- a/applications/gui/view_port.c +++ b/applications/gui/view_port.c @@ -7,7 +7,7 @@ // 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)); view_port->orientation = ViewPortOrientationHorizontal; view_port->is_enabled = true;