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 10:21:55 +00:00
|
|
|
#include "canvas_i.h"
|
2020-10-26 17:00:17 +00:00
|
|
|
#include "icon_i.h"
|
2021-07-07 08:57:49 +00:00
|
|
|
#include "icon_animation_i.h"
|
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 10:21:55 +00:00
|
|
|
|
[FL-140] Core api dynamic records (#296)
* SYSTEM: tickless mode with deep sleep.
* Move FreeRTOS ticks to lptim2
* API: move all sumbodules init routines to one place. Timebase: working lptim2 at tick source.
* API Timebase: lp-timer routines, timer access safe zones prediction and synchronization. FreeRTOS: adjust configuration for tickless mode.
* NFC: support for tickless mode.
* API Timebase: improve tick error handling in IRQ. Apploader: use insomnia mode to run applications.
* BLE: prevent sleep while core2 starting
* HAL: nap while in insomnia mode
* init records work
* try to implement record delete
* tests and flapp
* flapp subsystem
* new core functions to get app stat, simplify core code
* fix thread termination
* add strdup to core
* fix tests
* Refactoring: remove all unusued parts, update API usage, aggreagate API sources and headers, new record storage
* Refactoring: update furi record api usage, cleanup code
* Fix broken merge for freertos apps
* Core, Target: fix compilation warnings
* Drop firmware target local
* HAL Timebase, Power, Clock: semaphore guarded access to clock and power modes, better sleep mode.
* SD-Filesystem: wait for all deps to arrive before adding widget. Core, BLE: disable debug dump to serial.
* delete old app example-ipc
* delete old app fatfs list
* fix strobe app, add input header
* delete old display driver
* comment old app qr-code
* fix sd-card test, add forced widget update
* remove unused new core test
* increase heap to 128k
* comment and assert old core tests
* fix syntax
Co-authored-by: Aleksandr Kutuzov <alleteam@gmail.com>
2021-01-20 16:09:26 +00:00
|
|
|
#include <furi.h>
|
2022-01-05 16:10:18 +00:00
|
|
|
#include <furi_hal.h>
|
2021-10-17 20:34:36 +00:00
|
|
|
#include <u8g2_glue.h>
|
2020-10-15 15:56:47 +00:00
|
|
|
|
2021-10-27 18:55:03 +00:00
|
|
|
const CanvasFontParameters canvas_font_params[FontTotalNumber] = {
|
|
|
|
[FontPrimary] = {.leading_default = 12, .leading_min = 11, .height = 8, .descender = 2},
|
|
|
|
[FontSecondary] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2},
|
|
|
|
[FontKeyboard] = {.leading_default = 11, .leading_min = 9, .height = 7, .descender = 2},
|
|
|
|
[FontBigNumbers] = {.leading_default = 18, .leading_min = 16, .height = 15, .descender = 0},
|
|
|
|
};
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
Canvas* canvas_init() {
|
2020-10-16 13:34:36 +00:00
|
|
|
Canvas* canvas = furi_alloc(sizeof(Canvas));
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2021-08-08 18:03:25 +00:00
|
|
|
furi_hal_power_insomnia_enter();
|
2021-03-04 17:12:41 +00:00
|
|
|
|
2021-10-25 14:37:14 +00:00
|
|
|
// Setup u8g2
|
2021-10-21 12:24:34 +00:00
|
|
|
u8g2_Setup_st756x_flipper(&canvas->fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32);
|
2021-10-25 14:37:14 +00:00
|
|
|
canvas->orientation = CanvasOrientationHorizontal;
|
|
|
|
// Initialize display
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_InitDisplay(&canvas->fb);
|
2021-10-25 14:37:14 +00:00
|
|
|
// Wake up display
|
2020-12-14 10:50:32 +00:00
|
|
|
u8g2_SetPowerSave(&canvas->fb, 0);
|
2021-10-25 14:37:14 +00:00
|
|
|
|
|
|
|
// Clear buffer and send to device
|
|
|
|
canvas_clear(canvas);
|
|
|
|
canvas_commit(canvas);
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2021-08-08 18:03:25 +00:00
|
|
|
furi_hal_power_insomnia_exit();
|
2021-10-25 14:37:14 +00:00
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
return canvas;
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_free(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
free(canvas);
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_reset(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2021-10-25 14:37:14 +00:00
|
|
|
|
2021-03-31 17:52:26 +00:00
|
|
|
canvas_clear(canvas);
|
2021-10-25 14:37:14 +00:00
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
canvas_set_color(canvas, ColorBlack);
|
|
|
|
canvas_set_font(canvas, FontSecondary);
|
2021-12-15 17:39:06 +00:00
|
|
|
canvas_set_font_direction(canvas, CanvasDirectionLeftToRight);
|
2020-10-29 07:11:16 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_commit(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SendBuffer(&canvas->fb);
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2021-02-13 11:40:20 +00:00
|
|
|
uint8_t* canvas_get_buffer(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
return u8g2_GetBufferPtr(&canvas->fb);
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t canvas_get_buffer_size(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
return u8g2_GetBufferTileWidth(&canvas->fb) * u8g2_GetBufferTileHeight(&canvas->fb) * 8;
|
|
|
|
}
|
|
|
|
|
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 10:21:55 +00:00
|
|
|
void canvas_frame_set(
|
2020-12-14 10:50:32 +00:00
|
|
|
Canvas* canvas,
|
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 10:21:55 +00:00
|
|
|
uint8_t offset_x,
|
|
|
|
uint8_t offset_y,
|
|
|
|
uint8_t width,
|
|
|
|
uint8_t height) {
|
2020-12-14 10:50:32 +00:00
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
canvas->offset_x = offset_x;
|
|
|
|
canvas->offset_y = offset_y;
|
|
|
|
canvas->width = width;
|
|
|
|
canvas->height = height;
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
uint8_t canvas_width(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
return canvas->width;
|
2020-10-15 15:05:28 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
uint8_t canvas_height(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
return canvas->height;
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2021-02-03 09:52:54 +00:00
|
|
|
uint8_t canvas_current_font_height(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2021-07-04 16:01:16 +00:00
|
|
|
uint8_t font_height = u8g2_GetMaxCharHeight(&canvas->fb);
|
|
|
|
|
|
|
|
if(canvas->fb.font == u8g2_font_haxrcorp4089_tr) {
|
|
|
|
font_height += 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
return font_height;
|
2021-02-03 09:52:54 +00:00
|
|
|
}
|
|
|
|
|
2021-10-27 18:55:03 +00:00
|
|
|
CanvasFontParameters* canvas_get_font_params(Canvas* canvas, Font font) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
furi_assert(font < FontTotalNumber);
|
|
|
|
return (CanvasFontParameters*)&canvas_font_params[font];
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_clear(Canvas* canvas) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_ClearBuffer(&canvas->fb);
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_set_color(Canvas* canvas, Color color) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SetDrawColor(&canvas->fb, color);
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2021-12-15 17:39:06 +00:00
|
|
|
void canvas_set_font_direction(Canvas* canvas, CanvasDirection dir) {
|
2021-10-25 14:37:14 +00:00
|
|
|
furi_assert(canvas);
|
|
|
|
u8g2_SetFontDirection(&canvas->fb, dir);
|
|
|
|
}
|
|
|
|
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
2021-02-04 23:35:06 +00:00
|
|
|
void canvas_invert_color(Canvas* canvas) {
|
|
|
|
canvas->fb.draw_color = !canvas->fb.draw_color;
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_set_font(Canvas* canvas, Font font) {
|
|
|
|
furi_assert(canvas);
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SetFontMode(&canvas->fb, 1);
|
2020-10-16 13:36:05 +00:00
|
|
|
if(font == FontPrimary) {
|
2021-10-13 17:33:09 +00:00
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tr);
|
2020-10-16 13:36:05 +00:00
|
|
|
} else if(font == FontSecondary) {
|
2020-11-11 06:31:35 +00:00
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_haxrcorp4089_tr);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
2021-02-04 23:35:06 +00:00
|
|
|
} else if(font == FontKeyboard) {
|
2021-10-13 17:33:09 +00:00
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_profont11_mr);
|
2021-10-10 14:35:10 +00:00
|
|
|
} else if(font == FontBigNumbers) {
|
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_profont22_tn);
|
2020-10-16 13:34:36 +00:00
|
|
|
} else {
|
2021-09-15 09:59:49 +00:00
|
|
|
furi_crash(NULL);
|
2020-10-16 13:34:36 +00:00
|
|
|
}
|
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 10:21:55 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_str(Canvas* canvas, uint8_t x, uint8_t y, const char* str) {
|
|
|
|
furi_assert(canvas);
|
2020-10-26 17:00:17 +00:00
|
|
|
if(!str) return;
|
2020-10-16 13:34:36 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawStr(&canvas->fb, x, y, str);
|
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 10:21:55 +00:00
|
|
|
}
|
2020-10-26 17:00:17 +00:00
|
|
|
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
2021-02-04 23:35:06 +00:00
|
|
|
void canvas_draw_str_aligned(
|
|
|
|
Canvas* canvas,
|
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
Align horizontal,
|
|
|
|
Align vertical,
|
|
|
|
const char* str) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
if(!str) return;
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
|
|
|
|
switch(horizontal) {
|
|
|
|
case AlignLeft:
|
|
|
|
break;
|
|
|
|
case AlignRight:
|
|
|
|
x -= u8g2_GetStrWidth(&canvas->fb, str);
|
|
|
|
break;
|
|
|
|
case AlignCenter:
|
|
|
|
x -= (u8g2_GetStrWidth(&canvas->fb, str) / 2);
|
|
|
|
break;
|
|
|
|
default:
|
2021-09-15 09:59:49 +00:00
|
|
|
furi_crash(NULL);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
2021-02-04 23:35:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(vertical) {
|
|
|
|
case AlignTop:
|
|
|
|
y += u8g2_GetAscent(&canvas->fb);
|
|
|
|
break;
|
|
|
|
case AlignBottom:
|
|
|
|
break;
|
|
|
|
case AlignCenter:
|
|
|
|
y += (u8g2_GetAscent(&canvas->fb) / 2);
|
|
|
|
break;
|
|
|
|
default:
|
2021-09-15 09:59:49 +00:00
|
|
|
furi_crash(NULL);
|
Implementation of some widgets based on real use cases and designs [FL-392][FL-809] (#315)
* gui test app
* aligned string draw functions
* add canvas_invert_color, canvas_draw_button_left, canvas_draw_button_right
* use new str and button fns in dialog
* real dialog mockup
* add new gui test app recipe
* submenu module init
* delete unused variable
* move buttons to element, add canvas_string_width fn, new center button element
* button icons
* submenu module
* use submenu module, switch views
* keyboard buttons img
* new font for keyboard
* text input (keyboard) module
* add text input to gui test app
* add gui tesst app to release build, fix flags
* handle transition from start and end position, fix input switch
* add long text support to text input
* canvas_string_width and the underlying u8g2_GetStrWidth now return uint16_t
* remove deprecated libs and apps
* canvas_font_max_height fn
* new element, aligned multiline text
* use multiline text instead of plain string
* fix second keyboard row, rename uppercase fn
* qwerty-like keyboard layout
* new icons for iButton app
* better dialog text position and events handling
* remove confusing comment
* new extended dialog module
* extended dialog module usage
* update docs
* new gui module, popup with timeout
* popup usage
* canvas, remove outdated canvas_font_max_height, use canvas_current_font_height
* use furi check
* use new view_enter and view_exit callback for timers
* add DrZlo to gui tester codeowner
Co-authored-by: aanper <mail@s3f.ru>
2021-02-04 23:35:06 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
u8g2_DrawStr(&canvas->fb, x, y, str);
|
|
|
|
}
|
|
|
|
|
|
|
|
uint16_t canvas_string_width(Canvas* canvas, const char* str) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
if(!str) return 0;
|
|
|
|
return u8g2_GetStrWidth(&canvas->fb, str);
|
|
|
|
}
|
|
|
|
|
2021-07-08 20:41:34 +00:00
|
|
|
uint8_t canvas_glyph_width(Canvas* canvas, char symbol) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
return u8g2_GetGlyphWidth(&canvas->fb, symbol);
|
|
|
|
}
|
|
|
|
|
2021-07-07 08:57:49 +00:00
|
|
|
void canvas_draw_icon_animation(
|
|
|
|
Canvas* canvas,
|
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
IconAnimation* icon_animation) {
|
2020-12-14 10:50:32 +00:00
|
|
|
furi_assert(canvas);
|
2021-07-07 08:57:49 +00:00
|
|
|
furi_assert(icon_animation);
|
|
|
|
|
2020-10-26 17:00:17 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
2021-10-21 14:46:36 +00:00
|
|
|
uint8_t* icon_data = NULL;
|
|
|
|
furi_hal_compress_icon_decode(icon_animation_get_data(icon_animation), &icon_data);
|
2020-10-26 17:00:17 +00:00
|
|
|
u8g2_DrawXBM(
|
2021-07-07 08:57:49 +00:00
|
|
|
&canvas->fb,
|
|
|
|
x,
|
|
|
|
y,
|
|
|
|
icon_animation_get_width(icon_animation),
|
|
|
|
icon_animation_get_height(icon_animation),
|
2021-10-21 14:46:36 +00:00
|
|
|
icon_data);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
|
2021-07-07 08:57:49 +00:00
|
|
|
void canvas_draw_icon(Canvas* canvas, uint8_t x, uint8_t y, const Icon* icon) {
|
2021-01-08 04:42:48 +00:00
|
|
|
furi_assert(canvas);
|
2021-07-07 08:57:49 +00:00
|
|
|
furi_assert(icon);
|
|
|
|
|
2021-01-08 04:42:48 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
2021-10-21 14:46:36 +00:00
|
|
|
uint8_t* icon_data = NULL;
|
|
|
|
furi_hal_compress_icon_decode(icon_get_data(icon), &icon_data);
|
|
|
|
u8g2_DrawXBM(&canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_data);
|
2021-01-08 04:42:48 +00:00
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_dot(Canvas* canvas, uint8_t x, uint8_t y) {
|
|
|
|
furi_assert(canvas);
|
2020-10-29 07:11:16 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
2020-10-26 17:00:17 +00:00
|
|
|
u8g2_DrawPixel(&canvas->fb, x, y);
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_box(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
|
|
|
furi_assert(canvas);
|
2020-10-29 07:11:16 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
2020-10-26 17:00:17 +00:00
|
|
|
u8g2_DrawBox(&canvas->fb, x, y, width, height);
|
|
|
|
}
|
|
|
|
|
2021-06-02 15:16:05 +00:00
|
|
|
void canvas_draw_rbox(
|
|
|
|
Canvas* canvas,
|
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
uint8_t width,
|
|
|
|
uint8_t height,
|
|
|
|
uint8_t radius) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawRBox(&canvas->fb, x, y, width, height, radius);
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_frame(Canvas* canvas, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
|
|
|
furi_assert(canvas);
|
2020-10-29 07:11:16 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
2020-10-26 17:00:17 +00:00
|
|
|
u8g2_DrawFrame(&canvas->fb, x, y, width, height);
|
|
|
|
}
|
|
|
|
|
2021-06-02 15:16:05 +00:00
|
|
|
void canvas_draw_rframe(
|
|
|
|
Canvas* canvas,
|
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
uint8_t width,
|
|
|
|
uint8_t height,
|
|
|
|
uint8_t radius) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawRFrame(&canvas->fb, x, y, width, height, radius);
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_line(Canvas* canvas, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2) {
|
|
|
|
furi_assert(canvas);
|
2020-10-29 07:11:16 +00:00
|
|
|
x1 += canvas->offset_x;
|
|
|
|
y1 += canvas->offset_y;
|
|
|
|
x2 += canvas->offset_x;
|
|
|
|
y2 += canvas->offset_y;
|
2020-10-26 17:00:17 +00:00
|
|
|
u8g2_DrawLine(&canvas->fb, x1, y1, x2, y2);
|
|
|
|
}
|
2020-11-18 08:01:51 +00:00
|
|
|
|
2021-03-10 12:38:01 +00:00
|
|
|
void canvas_draw_circle(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawCircle(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
|
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_draw_disc(Canvas* canvas, uint8_t x, uint8_t y, uint8_t radius) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawDisc(&canvas->fb, x, y, radius, U8G2_DRAW_ALL);
|
|
|
|
}
|
|
|
|
|
2021-12-15 17:39:06 +00:00
|
|
|
void canvas_draw_triangle(
|
|
|
|
Canvas* canvas,
|
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
uint8_t base,
|
|
|
|
uint8_t height,
|
|
|
|
CanvasDirection dir) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
if(dir == CanvasDirectionBottomToTop) {
|
|
|
|
canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y);
|
|
|
|
canvas_draw_line(canvas, x - base / 2, y, x, y - height + 1);
|
|
|
|
canvas_draw_line(canvas, x, y - height + 1, x + base / 2, y);
|
|
|
|
} else if(dir == CanvasDirectionTopToBottom) {
|
|
|
|
canvas_draw_line(canvas, x - base / 2, y, x + base / 2, y);
|
|
|
|
canvas_draw_line(canvas, x - base / 2, y, x, y + height - 1);
|
|
|
|
canvas_draw_line(canvas, x, y + height - 1, x + base / 2, y);
|
|
|
|
} else if(dir == CanvasDirectionRightToLeft) {
|
|
|
|
canvas_draw_line(canvas, x, y - base / 2, x, y + base / 2);
|
|
|
|
canvas_draw_line(canvas, x, y - base / 2, x - height + 1, y);
|
|
|
|
canvas_draw_line(canvas, x - height + 1, y, x, y + base / 2);
|
|
|
|
} else if(dir == CanvasDirectionLeftToRight) {
|
|
|
|
canvas_draw_line(canvas, x, y - base / 2, x, y + base / 2);
|
|
|
|
canvas_draw_line(canvas, x, y - base / 2, x + height - 1, y);
|
|
|
|
canvas_draw_line(canvas, x + height - 1, y, x, y + base / 2);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-18 08:01:51 +00:00
|
|
|
void canvas_draw_xbm(
|
2020-12-14 10:50:32 +00:00
|
|
|
Canvas* canvas,
|
2020-11-18 08:01:51 +00:00
|
|
|
uint8_t x,
|
|
|
|
uint8_t y,
|
|
|
|
uint8_t w,
|
|
|
|
uint8_t h,
|
|
|
|
const uint8_t* bitmap) {
|
2020-12-14 10:50:32 +00:00
|
|
|
furi_assert(canvas);
|
2020-11-18 08:01:51 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawXBM(&canvas->fb, x, y, w, h, bitmap);
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
void canvas_draw_glyph(Canvas* canvas, uint8_t x, uint8_t y, uint16_t ch) {
|
|
|
|
furi_assert(canvas);
|
2020-11-18 08:01:51 +00:00
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawGlyph(&canvas->fb, x, y, ch);
|
2021-02-13 11:40:20 +00:00
|
|
|
}
|
2021-04-13 18:06:25 +00:00
|
|
|
|
|
|
|
void canvas_set_bitmap_mode(Canvas* canvas, bool alpha) {
|
|
|
|
u8g2_SetBitmapMode(&canvas->fb, alpha ? 1 : 0);
|
|
|
|
}
|
2021-05-19 09:43:15 +00:00
|
|
|
|
|
|
|
void canvas_set_orientation(Canvas* canvas, CanvasOrientation orientation) {
|
|
|
|
furi_assert(canvas);
|
|
|
|
if(canvas->orientation != orientation) {
|
|
|
|
canvas->orientation = orientation;
|
2021-09-01 21:05:00 +00:00
|
|
|
if(canvas->orientation == CanvasOrientationHorizontal) {
|
|
|
|
FURI_SWAP(canvas->width, canvas->height);
|
2021-05-19 09:43:15 +00:00
|
|
|
u8g2_SetDisplayRotation(&canvas->fb, U8G2_R0);
|
2021-09-01 21:05:00 +00:00
|
|
|
} else if(canvas->orientation == CanvasOrientationVertical) {
|
|
|
|
FURI_SWAP(canvas->width, canvas->height);
|
2021-05-19 09:43:15 +00:00
|
|
|
u8g2_SetDisplayRotation(&canvas->fb, U8G2_R3);
|
2021-09-01 21:05:00 +00:00
|
|
|
} else {
|
2021-05-19 09:43:15 +00:00
|
|
|
furi_assert(0);
|
2021-09-01 21:05:00 +00:00
|
|
|
}
|
2021-05-19 09:43:15 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
CanvasOrientation canvas_get_orientation(const Canvas* canvas) {
|
|
|
|
return canvas->orientation;
|
|
|
|
}
|