2020-10-07 12:37:43 +03:00
|
|
|
LIB_DIR = $(PROJECT_ROOT)/lib
|
|
|
|
|
|
Display and UI implementation (#169)
* Menu app. Lib: add mlib submodule.
* Menu: new startup lib dependency definition
* Menu: hierarchy in menu. Cube: fix heap1/4 inconsistency, stack protection.
* GUI: rendering pipeline initial version.
* GUI: layered widget composing, FURI record. Menu: FURI record, api.
* GUI: input dispatching. Menu: switch to input from GUI.
* GUI, MENU: code style cleanup, fix type conversion warnings.
* GUI, Menu: syntax check.
* Makefile: check and reinit submodules, format.
* Menu: lock on event processing. Makefile: proper submodule initialization.
* Menu: fix stack corruption by queue.
* GUI: refactor.
* Makefile: format rule fix, st-util pid.
* GUI, Menu, FURI: format with clang-format.
* GUI, MENU: locks in critical sections, fix stack corruption, ready signaling.
* Makefile: clang format rule cleanup.
* GUI,MENU: migrate to new API.
* Applications: PRODUCTION_HW variable, skip drivers build on local target.
* refactor production build
* add git to dockerfile
* GUI: uncomment lock block
Co-authored-by: Aleksandr Kutuzov <aku@plooks.com>
2020-10-14 13:21:55 +03:00
|
|
|
# TODO: some places use lib/header.h includes, is it ok?
|
2020-10-07 12:37:43 +03:00
|
|
|
CFLAGS += -I$(LIB_DIR)
|
|
|
|
|
|
2020-10-13 11:22:43 +03:00
|
|
|
# Mlib containers
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/mlib
|
|
|
|
|
|
|
|
|
|
# U8G2 display library
|
2020-10-07 12:37:43 +03:00
|
|
|
U8G2_DIR = $(LIB_DIR)/u8g2
|
|
|
|
|
CFLAGS += -I$(U8G2_DIR)
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_d_st7565.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_d_setup.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_intersection.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_setup.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_d_memory.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_cad.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_byte.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_gpio.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_display.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_setup.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_hvline.c
|
2020-10-26 20:00:17 +03:00
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_line.c
|
2020-10-07 12:37:43 +03:00
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_ll_hvline.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_circle.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_box.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_buffer.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_font.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_fonts.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8x8_8x8.c
|
|
|
|
|
C_SOURCES += $(U8G2_DIR)/u8g2_bitmap.c
|
2020-10-08 17:37:19 +03:00
|
|
|
|
|
|
|
|
FATFS_DIR = $(LIB_DIR)/fatfs
|
|
|
|
|
C_SOURCES += $(FATFS_DIR)/ff.c
|
|
|
|
|
C_SOURCES += $(FATFS_DIR)/ff_gen_drv.c
|
|
|
|
|
C_SOURCES += $(FATFS_DIR)/diskio.c
|
2020-10-19 01:09:48 +03:00
|
|
|
C_SOURCES += $(FATFS_DIR)/option/unicode.c
|
|
|
|
|
|
2021-04-30 14:07:13 +03:00
|
|
|
ifeq ($(SRV_NFC), 1)
|
2020-10-19 01:09:48 +03:00
|
|
|
ST25RFAL002_DIR = $(LIB_DIR)/ST25RFAL002
|
|
|
|
|
CFLAGS += -I$(ST25RFAL002_DIR)
|
|
|
|
|
CFLAGS += -I$(ST25RFAL002_DIR)/include
|
|
|
|
|
CFLAGS += -I$(ST25RFAL002_DIR)/source/st25r3916
|
|
|
|
|
C_SOURCES += $(wildcard $(ST25RFAL002_DIR)/*.c)
|
|
|
|
|
C_SOURCES += $(wildcard $(ST25RFAL002_DIR)/source/*.c)
|
2020-10-19 01:49:21 +03:00
|
|
|
C_SOURCES += $(wildcard $(ST25RFAL002_DIR)/source/st25r3916/*.c)
|
2020-11-12 14:13:29 +03:00
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# callback connector (C to CPP) library
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/callback-connector
|
|
|
|
|
|
|
|
|
|
# app template library
|
2020-11-14 19:24:38 +03:00
|
|
|
CFLAGS += -I$(LIB_DIR)/app-template
|
|
|
|
|
|
|
|
|
|
# fnv1a hash library
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/fnv1a-hash
|
2020-11-25 10:25:13 +03:00
|
|
|
C_SOURCES += $(LIB_DIR)/fnv1a-hash/fnv1a-hash.c
|
|
|
|
|
|
|
|
|
|
# build onewire/cyfral library only if
|
|
|
|
|
# we build iButton application
|
2021-04-30 14:07:13 +03:00
|
|
|
ifeq ($(APP_IBUTTON), 1)
|
2020-11-25 10:25:13 +03:00
|
|
|
# onewire library
|
2021-04-30 14:07:13 +03:00
|
|
|
APP_ONEWIRE = 1
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
endif
|
|
|
|
|
|
2021-04-30 14:07:13 +03:00
|
|
|
APP_ONEWIRE ?= 0
|
|
|
|
|
ifeq ($(APP_ONEWIRE), 1)
|
new iButton app (#328)
* rename old ibutton app to ibutton-test
* more renames
* updated onewire library compilation condition
* add submenu_clean subroutine
* add index for submenu callback
* c++ guard for gui modules
* add released ibutton app
* fix the position of the submenu window if there are too few items
* iButton app basis
* negative icon position info
* fix submenu_clean subroutine
* add ibutton app to applications makefile
* add onewire key read routine to read mode
* rename mode to scene
* rename files and folder (mode to scene)
* rename ibutton view to view manager
* rename get_view to get_view_manager
* cpp guards
* key read, store and notify features
* syntax fix
* make iButtonScene functions pure virtual
* fix syntax
* add text store, add new scene (crc error)
* not a key scene
* syntax fix
* read success scene
* app, switching to the previous scene with the number of scenes to be skipped
* scene whith menu when key is readed
* fix font height calculation, fix offsets
* add key write scene
* view_dispatcher_remove_view subroutine
* generic pause/resume os methods
* fix furi_assert usage
* key store, worker
* fix pointer comparsion
* saved keys, saved key action scenes
* key delete/confirm delete scenes and routines
* use last input subsystem changes
* fix syntax
* fix new model usage in submenu
* fix includes
* use vibro pin
* use stored key name if valid
* emulate scene
* random name generator
* name and save readed key scenes, new icon
* fix icon position
* fix text scene exit
* fix naming, fix text placement, new info scene
* state-driven cyfral decoder
* better cyfral decoder
* better cyfral decoder
* one wire: search command set
* metakom decoder
* more key types
* add next scene to error scenes
* universal key reader
* use new key reader
* syntax fix
* warning fix
* byte input module template
* new thread and insomnia api usage
* New element: slightly rounded frame
* Use elements_slightly_rounded_frame in text input
* Gui test app: byte input usage
* Byte input module: data drawing and selection
* Byte input: comment currently unused fns
* remove volatile qualifier
* base byte input realisation
* App gui test: remove internal fns visibility
* Byne input, final version
* test install gcc-arm-none-eabi-10-2020-q4-major
* test install gcc-arm-none-eabi-10-2020-q4-major
* App iButton: byte input view managment
* App iButton: add key manually scenes
* App iButton: rename scenes, add popup timeout
* App iButton: use new scenes, new fn for rollback to specific prevous scene.
* App iButton: remove byte input view on app exit
* App iButton: edit key scene
* Module byte input: reduce swintch value to uint8_t
* Module byte input: switch from switch-case to if, unfortunately we need compile-time constants to use with switch
* Icons: new small arrows
* Module byte input: new arrangement of elements
* OneWire slave lib: fix deattach sequence
* App iButton: pulse sequencer
* App iButton: add more keys to store
* App iButton: split key worker to separate read/write/emulate entitys
* App iButton: use new read/emulate entities
* fix callback pointer saving
* App iButton: use KeyReader error enum instead of KeyWorker error list handling
* App iButton: do not use insomnia fns in pulse sequencer
* App iButton: use KeyReader error enum in read scene
* OneWire slave lib: more READ ROM command variants, call callback only if positive result
* GPIO resources: add external gpio
* App SD/NFC: removed application
* App iButton-test: update to new light api
* App iButton: update to new light-api
* Outdated apps: add api-light-usage
* Gpio: update SD card CS pin settings
* API-power: added fns to disable/enable external 3v3 dc-dc
* API-gpio: separated SD card detect routines
* Resources: removed sd cs pin
* SD card: low level init now resets card power supply
* App SD-filesystem: use new card detect fns
* SD card: fix low level init headers
* SD card: more realilable low level init, power reset, exit from command read cycle conditionally
* App SD-filesystem: led notifiers, init cycling
* SD card: backport to F4
* Api PWM: add c++ guards
* App iButton: yellow blink in emulate scene, vibro on
* App iButton: one wire keys command set
* App iButton: successful write scene
* App iButton: key writer
* App iButton: syntax fix
* App iButton: notify write success
* App iButton: fix double scene change
* SD card: handle eject in init sequence
* SD card: api to set level on detect gpio
* SPI: api to set state on bus pins
* SD card: set low state on bus pins while power reset
* File select: init
* File select: fix input consuming
* SD Card: fixed dir open api error
* SD-card: replace strncpy by strlcpy. Fix buffer overflow error.
* API HAL OS: replace CMP based ticks with ARR based one, hard reset lptimer on reconfiguration.
* GUI: More stack size for (temporary, wee need to implement sd card api in separate thread)
* GUI: File select module.
* App iButton-test: remove obsolete app
Co-authored-by: rusdacent <rusdacentx0x08@gmail.com>
Co-authored-by: coreglitch <mail@s3f.ru>
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-03-12 15:45:18 +03:00
|
|
|
# onewire library
|
2020-11-25 10:25:13 +03:00
|
|
|
ONEWIRE_DIR = $(LIB_DIR)/onewire
|
|
|
|
|
CFLAGS += -I$(ONEWIRE_DIR)
|
|
|
|
|
CPP_SOURCES += $(wildcard $(ONEWIRE_DIR)/*.cpp)
|
|
|
|
|
|
|
|
|
|
# cyfral library
|
|
|
|
|
CYFRAL_DIR = $(LIB_DIR)/cyfral
|
|
|
|
|
CFLAGS += -I$(CYFRAL_DIR)
|
|
|
|
|
CPP_SOURCES += $(wildcard $(CYFRAL_DIR)/*.cpp)
|
2020-12-02 13:47:13 +03:00
|
|
|
endif
|
|
|
|
|
|
2021-01-11 17:52:35 +03:00
|
|
|
# common apps api
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/common-api
|
|
|
|
|
|
2020-12-02 13:47:13 +03:00
|
|
|
# drivers
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/drivers
|
|
|
|
|
C_SOURCES += $(wildcard $(LIB_DIR)/drivers/*.c)
|
2021-04-19 19:30:25 +03:00
|
|
|
|
|
|
|
|
#version
|
|
|
|
|
CFLAGS += -I$(LIB_DIR)/version
|
|
|
|
|
C_SOURCES += $(LIB_DIR)/version/version.c
|
|
|
|
|
|
