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.h"
|
|
|
|
#include "canvas_i.h"
|
2020-10-26 17:00:17 +00:00
|
|
|
#include "icon.h"
|
|
|
|
#include "icon_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
|
|
|
|
|
|
|
#include <flipper.h>
|
2020-10-29 06:27:17 +00:00
|
|
|
#include <flipper_v2.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
|
|
|
|
2020-10-16 13:34:36 +00:00
|
|
|
typedef struct {
|
|
|
|
CanvasApi api;
|
|
|
|
|
|
|
|
u8g2_t fb;
|
|
|
|
uint8_t offset_x;
|
|
|
|
uint8_t offset_y;
|
|
|
|
uint8_t width;
|
|
|
|
uint8_t height;
|
|
|
|
} Canvas;
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
uint8_t canvas_width(CanvasApi* api);
|
|
|
|
uint8_t canvas_height(CanvasApi* api);
|
|
|
|
void canvas_clear(CanvasApi* api);
|
|
|
|
void canvas_color_set(CanvasApi* api, uint8_t color);
|
|
|
|
void canvas_font_set(CanvasApi* api, Font font);
|
|
|
|
void canvas_str_draw(CanvasApi* api, uint8_t x, uint8_t y, const char* str);
|
2020-10-26 17:00:17 +00:00
|
|
|
void canvas_icon_draw(CanvasApi* api, uint8_t x, uint8_t y, Icon* icon);
|
|
|
|
void canvas_dot_draw(CanvasApi* api, uint8_t x, uint8_t y);
|
|
|
|
void canvas_box_draw(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
|
|
|
|
void canvas_draw_frame(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height);
|
|
|
|
void canvas_draw_line(CanvasApi* api, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2);
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2020-10-15 15:56:47 +00:00
|
|
|
uint8_t u8g2_gpio_and_delay_stm32(u8x8_t* u8x8, uint8_t msg, uint8_t arg_int, void* arg_ptr);
|
|
|
|
uint8_t u8x8_hw_spi_stm32(u8x8_t* u8x8, uint8_t msg, uint8_t arg_int, void* arg_ptr);
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
CanvasApi* canvas_api_init() {
|
2020-10-16 13:34:36 +00:00
|
|
|
Canvas* canvas = furi_alloc(sizeof(Canvas));
|
2020-10-15 15:05:28 +00:00
|
|
|
|
|
|
|
u8g2_Setup_st7565_erc12864_alt_f(
|
2020-10-16 13:34:36 +00:00
|
|
|
&canvas->fb, U8G2_R0, u8x8_hw_spi_stm32, u8g2_gpio_and_delay_stm32);
|
2020-10-15 15:56:47 +00:00
|
|
|
|
|
|
|
// send init sequence to the display, display is in sleep mode after this
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_InitDisplay(&canvas->fb);
|
|
|
|
u8g2_SetContrast(&canvas->fb, 36);
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SetPowerSave(&canvas->fb, 0); // wake up display
|
|
|
|
u8g2_SendBuffer(&canvas->fb);
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2020-10-16 13:34:36 +00:00
|
|
|
canvas->api.width = canvas_width;
|
|
|
|
canvas->api.height = canvas_height;
|
|
|
|
canvas->api.clear = canvas_clear;
|
|
|
|
canvas->api.set_color = canvas_color_set;
|
|
|
|
canvas->api.set_font = canvas_font_set;
|
|
|
|
canvas->api.draw_str = canvas_str_draw;
|
2020-10-26 17:00:17 +00:00
|
|
|
canvas->api.draw_icon = canvas_icon_draw;
|
|
|
|
canvas->api.draw_dot = canvas_dot_draw;
|
|
|
|
canvas->api.draw_box = canvas_box_draw;
|
|
|
|
canvas->api.draw_frame = canvas_draw_frame;
|
|
|
|
canvas->api.draw_line = canvas_draw_line;
|
2020-10-15 15:05:28 +00:00
|
|
|
|
2020-10-16 13:34:36 +00:00
|
|
|
return (CanvasApi*)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-10-15 15:05:28 +00:00
|
|
|
void canvas_api_free(CanvasApi* api) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-15 15:05:28 +00:00
|
|
|
free(api);
|
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-29 07:11:16 +00:00
|
|
|
void canvas_reset(CanvasApi* api) {
|
|
|
|
assert(api);
|
|
|
|
canvas_color_set(api, ColorBlack);
|
|
|
|
canvas_font_set(api, FontSecondary);
|
|
|
|
}
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
void canvas_commit(CanvasApi* api) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SetPowerSave(&canvas->fb, 0); // wake up display
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_frame_set(
|
2020-10-15 15:05:28 +00:00
|
|
|
CanvasApi* api,
|
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-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:34:36 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
|
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-10-15 15:05:28 +00:00
|
|
|
uint8_t canvas_width(CanvasApi* api) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
2020-10-16 13:34:36 +00:00
|
|
|
return canvas->width;
|
2020-10-15 15:05:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
uint8_t canvas_height(CanvasApi* api) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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
|
|
|
}
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
void canvas_clear(CanvasApi* api) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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-10-15 15:05:28 +00:00
|
|
|
void canvas_color_set(CanvasApi* api, Color color) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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
|
|
|
}
|
|
|
|
|
2020-10-15 15:05:28 +00:00
|
|
|
void canvas_font_set(CanvasApi* api, Font font) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
2020-10-16 13:34:36 +00:00
|
|
|
u8g2_SetFontMode(&canvas->fb, 1);
|
2020-10-16 13:36:05 +00:00
|
|
|
if(font == FontPrimary) {
|
2020-11-11 06:31:35 +00:00
|
|
|
u8g2_SetFont(&canvas->fb, u8g2_font_helvB08_tf);
|
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);
|
2020-10-16 13:34:36 +00:00
|
|
|
} else {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_check(0);
|
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-10-15 15:05:28 +00:00
|
|
|
void canvas_str_draw(CanvasApi* api, uint8_t x, uint8_t y, const char* str) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
if(!str) return;
|
2020-10-16 13:36:05 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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
|
|
|
|
|
|
|
void canvas_icon_draw(CanvasApi* api, uint8_t x, uint8_t y, Icon* icon) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
if(!icon) return;
|
|
|
|
Canvas* canvas = (Canvas*)api;
|
|
|
|
x += canvas->offset_x;
|
|
|
|
y += canvas->offset_y;
|
|
|
|
u8g2_DrawXBM(
|
|
|
|
&canvas->fb, x, y, icon_get_width(icon), icon_get_height(icon), icon_get_data(icon));
|
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_dot_draw(CanvasApi* api, uint8_t x, uint8_t y) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_box_draw(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_draw_frame(CanvasApi* api, uint8_t x, uint8_t y, uint8_t width, uint8_t height) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
void canvas_draw_line(CanvasApi* api, uint8_t x1, uint8_t y1, uint8_t x2, uint8_t y2) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(api);
|
2020-10-26 17:00:17 +00:00
|
|
|
Canvas* canvas = (Canvas*)api;
|
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);
|
|
|
|
}
|