[FL-1149] Dolphin: stage 3 (#422)

* dolphin scenes refactoring & restructuring phase 1
* Passport app: mood and level display, opens from main menu and dolphin scenes. Dolphin scenes: minor refactoring (WIP)
* dolphin scene app restruct
* use gui defines for screen size
* mv passport to dolphin dir

Co-authored-by: あく <alleteam@gmail.com>
This commit is contained in:
its your bedtime
2021-04-26 15:19:14 +03:00
committed by GitHub
parent dbb8a92653
commit 51d726c2d7
19 changed files with 199 additions and 214 deletions

View File

@@ -16,7 +16,6 @@ APP_BT = 1
APP_CLI = 1
APP_SD_FILESYSTEM = 1
BUILD_IRDA = 1
BUILD_DOLPHIN_SCENE = 1
APP_DOLPHIN = 1
BUILD_EXAMPLE_BLINK = 1
BUILD_EXAMPLE_UART_WRITE = 1
@@ -46,6 +45,9 @@ ifeq ($(APP_DOLPHIN), 1)
APP_MENU = 1
CFLAGS += -DAPP_DOLPHIN
C_SOURCES += $(wildcard $(APP_DIR)/dolphin/*.c)
C_SOURCES += $(wildcard $(APP_DIR)/dolphin/scenes/*.c)
C_SOURCES += $(wildcard $(APP_DIR)/dolphin/scenes/assets/*.c)
C_SOURCES += $(wildcard $(APP_DIR)/dolphin/passport/*.c)
endif
APP_POWER ?= 0
@@ -261,18 +263,6 @@ CFLAGS += -DBUILD_FLOOPPER_BLOOPPER
C_SOURCES += $(wildcard $(APP_DIR)/floopper-bloopper/*.c)
endif
APP_DOLPHIN_SCENE ?= 0
ifeq ($(APP_DOLPHIN_SCENE), 1)
CFLAGS += -DAPP_DOLPHIN_SCENE
BUILD_DOLPHIN_SCENE = 1
endif
BUILD_DOLPHIN_SCENE ?= 0
ifeq ($(BUILD_DOLPHIN_SCENE), 1)
CFLAGS += -DBUILD_DOLPHIN_SCENE
C_SOURCES += $(wildcard $(APP_DIR)/dolphin_scene/*.c)
C_SOURCES += $(wildcard $(APP_DIR)/passport/*.c)
endif
APP_IBUTTON ?= 0
ifeq ($(APP_IBUTTON), 1)
CFLAGS += -DAPP_IBUTTON