2021-11-26 12:19:30 +00:00
|
|
|
#include "gui/canvas.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 "gui_i.h"
|
|
|
|
|
2021-11-12 13:04:35 +00:00
|
|
|
#define TAG "GuiSrv"
|
|
|
|
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPort* gui_view_port_find_enabled(ViewPortArray_t array) {
|
2021-02-10 09:06:29 +00:00
|
|
|
// Iterating backward
|
|
|
|
ViewPortArray_it_t it;
|
|
|
|
ViewPortArray_it_last(it, array);
|
|
|
|
while(!ViewPortArray_end_p(it)) {
|
|
|
|
ViewPort* view_port = *ViewPortArray_ref(it);
|
2021-01-29 13:52:16 +00:00
|
|
|
if(view_port_is_enabled(view_port)) {
|
|
|
|
return view_port;
|
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-10 09:06:29 +00:00
|
|
|
ViewPortArray_previous(it);
|
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
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2021-02-14 23:46:59 +00:00
|
|
|
void gui_update(Gui* gui) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(gui);
|
2021-02-14 23:46:59 +00:00
|
|
|
osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_DRAW);
|
2021-02-10 09:06:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void gui_input_events_callback(const void* value, void* ctx) {
|
|
|
|
furi_assert(value);
|
|
|
|
furi_assert(ctx);
|
|
|
|
|
|
|
|
Gui* gui = ctx;
|
|
|
|
|
|
|
|
osMessageQueuePut(gui->input_queue, value, 0, osWaitForever);
|
|
|
|
osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_INPUT);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
|
2021-05-19 09:43:15 +00:00
|
|
|
// Only Fullscreen supports vertical display for now
|
2020-10-15 15:05:28 +00:00
|
|
|
bool gui_redraw_fs(Gui* gui) {
|
2021-09-01 21:05:00 +00:00
|
|
|
canvas_set_orientation(gui->canvas, CanvasOrientationHorizontal);
|
|
|
|
canvas_frame_set(gui->canvas, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT);
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]);
|
|
|
|
if(view_port) {
|
|
|
|
view_port_draw(view_port, gui->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
|
|
|
return true;
|
|
|
|
} else {
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-10-29 07:11:16 +00:00
|
|
|
void gui_redraw_status_bar(Gui* gui) {
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_it_t it;
|
2020-10-29 07:11:16 +00:00
|
|
|
uint8_t x;
|
|
|
|
uint8_t x_used = 0;
|
|
|
|
uint8_t width;
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPort* view_port;
|
2021-05-19 09:43:15 +00:00
|
|
|
canvas_set_orientation(gui->canvas, CanvasOrientationHorizontal);
|
2021-03-25 17:48:58 +00:00
|
|
|
canvas_frame_set(
|
|
|
|
gui->canvas, GUI_STATUS_BAR_X, GUI_STATUS_BAR_Y, GUI_DISPLAY_WIDTH, GUI_STATUS_BAR_HEIGHT);
|
2021-11-26 12:19:30 +00:00
|
|
|
|
|
|
|
/* for support black theme - paint white area and
|
|
|
|
* draw icon with transparent white color
|
|
|
|
*/
|
|
|
|
canvas_set_color(gui->canvas, ColorWhite);
|
|
|
|
canvas_draw_box(gui->canvas, 1, 1, 9, 7);
|
|
|
|
canvas_draw_box(gui->canvas, 7, 3, 58, 6);
|
|
|
|
canvas_draw_box(gui->canvas, 61, 1, 32, 7);
|
|
|
|
canvas_draw_box(gui->canvas, 89, 3, 38, 6);
|
|
|
|
canvas_set_color(gui->canvas, ColorBlack);
|
|
|
|
canvas_set_bitmap_mode(gui->canvas, 1);
|
2021-07-07 08:57:49 +00:00
|
|
|
canvas_draw_icon(gui->canvas, 0, 0, &I_Background_128x11);
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_set_bitmap_mode(gui->canvas, 0);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
2020-10-29 07:11:16 +00:00
|
|
|
// Right side
|
2021-03-25 17:48:58 +00:00
|
|
|
x = GUI_DISPLAY_WIDTH;
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_it(it, gui->layers[GuiLayerStatusBarRight]);
|
|
|
|
while(!ViewPortArray_end_p(it) && x_used < GUI_STATUS_BAR_WIDTH) {
|
|
|
|
// Render view_port;
|
|
|
|
view_port = *ViewPortArray_ref(it);
|
|
|
|
if(view_port_is_enabled(view_port)) {
|
|
|
|
width = view_port_get_width(view_port);
|
2020-10-29 07:11:16 +00:00
|
|
|
if(!width) width = 8;
|
|
|
|
x_used += width;
|
2020-12-14 10:50:32 +00:00
|
|
|
x -= (width + 2);
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_frame_set(
|
|
|
|
gui->canvas, x - 3, GUI_STATUS_BAR_Y, width + 5, GUI_STATUS_BAR_HEIGHT);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
|
|
|
canvas_set_color(gui->canvas, ColorWhite);
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_draw_box(gui->canvas, 2, 1, width + 2, 10);
|
2021-03-25 17:48:58 +00:00
|
|
|
canvas_set_color(gui->canvas, ColorBlack);
|
|
|
|
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_draw_rframe(
|
|
|
|
gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas), 1);
|
|
|
|
canvas_draw_line(gui->canvas, 1, 1, 1, canvas_height(gui->canvas) - 2);
|
|
|
|
canvas_draw_line(
|
|
|
|
gui->canvas,
|
|
|
|
2,
|
|
|
|
canvas_height(gui->canvas) - 2,
|
|
|
|
canvas_width(gui->canvas) - 2,
|
|
|
|
canvas_height(gui->canvas) - 2);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
2021-11-24 18:19:34 +00:00
|
|
|
canvas_frame_set(
|
|
|
|
gui->canvas, x, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
2021-01-29 13:52:16 +00:00
|
|
|
view_port_draw(view_port, gui->canvas);
|
2020-10-29 07:11:16 +00:00
|
|
|
}
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_next(it);
|
2020-10-29 07:11:16 +00:00
|
|
|
}
|
|
|
|
// Left side
|
|
|
|
x = 0;
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_it(it, gui->layers[GuiLayerStatusBarLeft]);
|
|
|
|
while(!ViewPortArray_end_p(it) && x_used < GUI_STATUS_BAR_WIDTH) {
|
|
|
|
// Render view_port;
|
|
|
|
view_port = *ViewPortArray_ref(it);
|
|
|
|
if(view_port_is_enabled(view_port)) {
|
|
|
|
width = view_port_get_width(view_port);
|
2020-10-29 07:11:16 +00:00
|
|
|
if(!width) width = 8;
|
|
|
|
x_used += width;
|
2021-03-25 17:48:58 +00:00
|
|
|
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_frame_set(
|
|
|
|
gui->canvas, 0, GUI_STATUS_BAR_Y, x + width + 5, GUI_STATUS_BAR_HEIGHT);
|
|
|
|
canvas_draw_rframe(
|
|
|
|
gui->canvas, 0, 0, canvas_width(gui->canvas), canvas_height(gui->canvas), 1);
|
|
|
|
canvas_draw_line(gui->canvas, 1, 1, 1, canvas_height(gui->canvas) - 2);
|
|
|
|
canvas_draw_line(
|
|
|
|
gui->canvas,
|
|
|
|
2,
|
|
|
|
canvas_height(gui->canvas) - 2,
|
|
|
|
canvas_width(gui->canvas) - 2,
|
|
|
|
canvas_height(gui->canvas) - 2);
|
|
|
|
|
|
|
|
canvas_frame_set(gui->canvas, x, GUI_STATUS_BAR_Y, width + 5, GUI_STATUS_BAR_HEIGHT);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
|
|
|
canvas_set_color(gui->canvas, ColorWhite);
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_draw_box(gui->canvas, 2, 1, width + 2, 10);
|
2021-03-25 17:48:58 +00:00
|
|
|
canvas_set_color(gui->canvas, ColorBlack);
|
|
|
|
|
|
|
|
canvas_frame_set(
|
2021-11-24 18:19:34 +00:00
|
|
|
gui->canvas, x + 3, GUI_STATUS_BAR_Y + 2, width, GUI_STATUS_BAR_WORKAREA_HEIGHT);
|
2021-01-29 13:52:16 +00:00
|
|
|
view_port_draw(view_port, gui->canvas);
|
2021-03-25 17:48:58 +00:00
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
x += (width + 2);
|
2020-10-29 07:11:16 +00:00
|
|
|
}
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_next(it);
|
2020-10-26 17:00:17 +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
|
|
|
}
|
|
|
|
|
2021-11-24 16:21:12 +00:00
|
|
|
bool gui_redraw_window(Gui* gui) {
|
2021-05-19 09:43:15 +00:00
|
|
|
canvas_set_orientation(gui->canvas, CanvasOrientationHorizontal);
|
2021-11-24 16:21:12 +00:00
|
|
|
canvas_frame_set(gui->canvas, GUI_WINDOW_X, GUI_WINDOW_Y, GUI_WINDOW_WIDTH, GUI_WINDOW_HEIGHT);
|
|
|
|
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerWindow]);
|
2021-01-29 13:52:16 +00:00
|
|
|
if(view_port) {
|
|
|
|
view_port_draw(view_port, gui->canvas);
|
2020-10-26 17:00:17 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
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-11-24 16:21:12 +00:00
|
|
|
bool gui_redraw_desktop(Gui* gui) {
|
2021-05-19 09:43:15 +00:00
|
|
|
canvas_set_orientation(gui->canvas, CanvasOrientationHorizontal);
|
2021-11-26 12:19:30 +00:00
|
|
|
canvas_frame_set(gui->canvas, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT);
|
2021-11-24 16:21:12 +00:00
|
|
|
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerDesktop]);
|
2021-01-29 13:52:16 +00:00
|
|
|
if(view_port) {
|
|
|
|
view_port_draw(view_port, gui->canvas);
|
2020-10-26 17:00:17 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
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 gui_redraw(Gui* gui) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(gui);
|
2020-10-26 17:00:17 +00:00
|
|
|
gui_lock(gui);
|
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
|
|
|
canvas_reset(gui->canvas);
|
2020-10-29 07:11:16 +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
|
|
|
if(!gui_redraw_fs(gui)) {
|
2021-11-24 16:21:12 +00:00
|
|
|
if(!gui_redraw_window(gui)) {
|
|
|
|
gui_redraw_desktop(gui);
|
2020-10-26 17:00:17 +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
|
|
|
gui_redraw_status_bar(gui);
|
|
|
|
}
|
|
|
|
|
2020-12-14 10:50:32 +00:00
|
|
|
canvas_commit(gui->canvas);
|
2021-02-13 11:40:20 +00:00
|
|
|
if(gui->canvas_callback) {
|
|
|
|
gui->canvas_callback(
|
|
|
|
canvas_get_buffer(gui->canvas),
|
|
|
|
canvas_get_buffer_size(gui->canvas),
|
|
|
|
gui->canvas_callback_context);
|
|
|
|
}
|
2020-10-26 17:00:17 +00:00
|
|
|
gui_unlock(gui);
|
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 gui_input(Gui* gui, InputEvent* input_event) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(gui);
|
|
|
|
furi_assert(input_event);
|
|
|
|
|
2021-08-31 08:22:52 +00:00
|
|
|
// Check input complementarity
|
|
|
|
uint8_t key_bit = (1 << input_event->key);
|
|
|
|
if(input_event->type == InputTypeRelease) {
|
|
|
|
gui->ongoing_input &= ~key_bit;
|
|
|
|
} else if(input_event->type == InputTypePress) {
|
|
|
|
gui->ongoing_input |= key_bit;
|
|
|
|
} else if(!(gui->ongoing_input & key_bit)) {
|
2021-11-04 17:26:41 +00:00
|
|
|
FURI_LOG_D(
|
2021-11-12 13:04:35 +00:00
|
|
|
TAG,
|
2021-09-01 21:05:00 +00:00
|
|
|
"non-complementary input, discarding key: %s type: %s, sequence: %p",
|
2021-08-31 08:22:52 +00:00
|
|
|
input_get_key_name(input_event->key),
|
2021-09-01 21:05:00 +00:00
|
|
|
input_get_type_name(input_event->type),
|
|
|
|
input_event->sequence);
|
2021-08-31 08:22:52 +00:00
|
|
|
return;
|
|
|
|
}
|
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-08-31 08:22:52 +00:00
|
|
|
gui_lock(gui);
|
2021-02-10 09:06:29 +00:00
|
|
|
|
2021-08-31 08:22:52 +00:00
|
|
|
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]);
|
2021-11-24 16:21:12 +00:00
|
|
|
if(!view_port) view_port = gui_view_port_find_enabled(gui->layers[GuiLayerWindow]);
|
|
|
|
if(!view_port) view_port = gui_view_port_find_enabled(gui->layers[GuiLayerDesktop]);
|
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-08-31 08:22:52 +00:00
|
|
|
if(!(gui->ongoing_input & ~key_bit) && input_event->type == InputTypePress) {
|
|
|
|
gui->ongoing_input_view_port = view_port;
|
|
|
|
}
|
|
|
|
|
2021-09-01 21:05:00 +00:00
|
|
|
if(view_port && view_port == gui->ongoing_input_view_port) {
|
|
|
|
view_port_input(view_port, input_event);
|
|
|
|
} else if(gui->ongoing_input_view_port && input_event->type == InputTypeRelease) {
|
2021-11-04 17:26:41 +00:00
|
|
|
FURI_LOG_D(
|
2021-11-12 13:04:35 +00:00
|
|
|
TAG,
|
2021-09-01 21:05:00 +00:00
|
|
|
"ViewPort changed while key press %p -> %p. Sending key: %s, type: %s, sequence: %p to previous view port",
|
|
|
|
gui->ongoing_input_view_port,
|
|
|
|
view_port,
|
|
|
|
input_get_key_name(input_event->key),
|
|
|
|
input_get_type_name(input_event->type),
|
|
|
|
input_event->sequence);
|
|
|
|
view_port_input(gui->ongoing_input_view_port, input_event);
|
|
|
|
} else {
|
2021-11-04 17:26:41 +00:00
|
|
|
FURI_LOG_D(
|
2021-11-12 13:04:35 +00:00
|
|
|
TAG,
|
2021-09-01 21:05:00 +00:00
|
|
|
"ViewPort changed while key press %p -> %p. Discarding key: %s, type: %s, sequence: %p",
|
|
|
|
gui->ongoing_input_view_port,
|
|
|
|
view_port,
|
|
|
|
input_get_key_name(input_event->key),
|
|
|
|
input_get_type_name(input_event->type),
|
|
|
|
input_event->sequence);
|
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
|
|
|
|
|
|
|
gui_unlock(gui);
|
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 gui_lock(Gui* gui) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(gui);
|
|
|
|
furi_check(osMutexAcquire(gui->mutex, osWaitForever) == osOK);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void gui_unlock(Gui* gui) {
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_assert(gui);
|
|
|
|
furi_check(osMutexRelease(gui->mutex) == osOK);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
|
2021-02-13 11:40:20 +00:00
|
|
|
void gui_cli_screen_stream_callback(uint8_t* data, size_t size, void* context) {
|
|
|
|
furi_assert(data);
|
|
|
|
furi_assert(size == 1024);
|
|
|
|
furi_assert(context);
|
|
|
|
|
|
|
|
Gui* gui = context;
|
2021-08-31 08:22:52 +00:00
|
|
|
const uint8_t magic[] = {0xF0, 0xE1, 0xD2, 0xC3};
|
2021-02-13 11:40:20 +00:00
|
|
|
cli_write(gui->cli, magic, sizeof(magic));
|
|
|
|
cli_write(gui->cli, data, size);
|
|
|
|
}
|
|
|
|
|
2021-05-18 13:57:39 +00:00
|
|
|
void gui_cli_screen_stream(Cli* cli, string_t args, void* context) {
|
2021-02-13 11:40:20 +00:00
|
|
|
furi_assert(context);
|
|
|
|
Gui* gui = context;
|
2021-11-01 16:26:37 +00:00
|
|
|
gui_set_framebuffer_callback(gui, gui_cli_screen_stream_callback, gui);
|
2021-05-04 13:21:16 +00:00
|
|
|
gui_redraw(gui);
|
2021-07-09 02:16:54 +00:00
|
|
|
|
|
|
|
// Wait for control events
|
|
|
|
while(true) {
|
|
|
|
char c = cli_getc(gui->cli);
|
|
|
|
if(c == CliSymbolAsciiEsc) {
|
|
|
|
c = cli_getc(gui->cli);
|
|
|
|
if(c == 'i') {
|
|
|
|
InputEvent input_event;
|
|
|
|
input_event.key = cli_getc(gui->cli);
|
|
|
|
input_event.type = cli_getc(gui->cli);
|
|
|
|
osMessageQueuePut(gui->input_queue, &input_event, 0, osWaitForever);
|
|
|
|
osThreadFlagsSet(gui->thread, GUI_THREAD_FLAG_INPUT);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-11-01 16:26:37 +00:00
|
|
|
gui_set_framebuffer_callback(gui, NULL, NULL);
|
2021-02-13 11:40:20 +00:00
|
|
|
}
|
|
|
|
|
2021-01-29 13:52:16 +00:00
|
|
|
void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer) {
|
2020-12-14 10:50:32 +00:00
|
|
|
furi_assert(gui);
|
2021-01-29 13:52:16 +00:00
|
|
|
furi_assert(view_port);
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_check(layer < GuiLayerMAX);
|
2021-05-19 09:43:15 +00:00
|
|
|
// Only fullscreen supports Vertical orientation for now
|
|
|
|
furi_assert(
|
|
|
|
(layer == GuiLayerFullscreen) || (view_port->orientation != ViewPortOrientationVertical));
|
2020-10-26 17:00:17 +00:00
|
|
|
|
|
|
|
gui_lock(gui);
|
2021-02-10 09:06:29 +00:00
|
|
|
// Verify that view port is not yet added
|
|
|
|
ViewPortArray_it_t it;
|
|
|
|
for(size_t i = 0; i < GuiLayerMAX; i++) {
|
|
|
|
ViewPortArray_it(it, gui->layers[i]);
|
|
|
|
while(!ViewPortArray_end_p(it)) {
|
|
|
|
furi_assert(*ViewPortArray_ref(it) != view_port);
|
|
|
|
ViewPortArray_next(it);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Add view port and link with gui
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_push_back(gui->layers[layer], view_port);
|
|
|
|
view_port_gui_set(view_port, gui);
|
2020-10-26 17:00:17 +00:00
|
|
|
gui_unlock(gui);
|
2021-02-10 09:06:29 +00:00
|
|
|
|
2021-02-14 23:46:59 +00:00
|
|
|
gui_update(gui);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
|
2021-01-29 13:52:16 +00:00
|
|
|
void gui_remove_view_port(Gui* gui, ViewPort* view_port) {
|
2020-12-14 10:50:32 +00:00
|
|
|
furi_assert(gui);
|
2021-01-29 13:52:16 +00:00
|
|
|
furi_assert(view_port);
|
2020-10-26 17:00:17 +00:00
|
|
|
|
|
|
|
gui_lock(gui);
|
|
|
|
|
2021-01-29 13:52:16 +00:00
|
|
|
view_port_gui_set(view_port, NULL);
|
|
|
|
ViewPortArray_it_t it;
|
2020-10-26 17:00:17 +00:00
|
|
|
for(size_t i = 0; i < GuiLayerMAX; i++) {
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_it(it, gui->layers[i]);
|
|
|
|
while(!ViewPortArray_end_p(it)) {
|
|
|
|
if(*ViewPortArray_ref(it) == view_port) {
|
|
|
|
ViewPortArray_remove(gui->layers[i], it);
|
2021-02-10 09:06:29 +00:00
|
|
|
} else {
|
|
|
|
ViewPortArray_next(it);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-10-16 15:25:06 +00:00
|
|
|
|
2021-09-01 21:05:00 +00:00
|
|
|
if(gui->ongoing_input_view_port == view_port) {
|
|
|
|
gui->ongoing_input_view_port = NULL;
|
|
|
|
}
|
|
|
|
|
2020-10-26 17:00:17 +00:00
|
|
|
gui_unlock(gui);
|
|
|
|
}
|
2020-10-15 08:32:48 +00:00
|
|
|
|
2021-10-06 15:41:22 +00:00
|
|
|
void gui_view_port_send_to_front(Gui* gui, ViewPort* view_port) {
|
2021-02-10 09:06:29 +00:00
|
|
|
furi_assert(gui);
|
|
|
|
furi_assert(view_port);
|
|
|
|
|
|
|
|
gui_lock(gui);
|
|
|
|
// Remove
|
|
|
|
GuiLayer layer = GuiLayerMAX;
|
|
|
|
ViewPortArray_it_t it;
|
|
|
|
for(size_t i = 0; i < GuiLayerMAX; i++) {
|
|
|
|
ViewPortArray_it(it, gui->layers[i]);
|
|
|
|
while(!ViewPortArray_end_p(it)) {
|
|
|
|
if(*ViewPortArray_ref(it) == view_port) {
|
|
|
|
ViewPortArray_remove(gui->layers[i], it);
|
|
|
|
furi_assert(layer == GuiLayerMAX);
|
|
|
|
layer = i;
|
|
|
|
} else {
|
|
|
|
ViewPortArray_next(it);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
furi_assert(layer != GuiLayerMAX);
|
|
|
|
// Return to the top
|
|
|
|
ViewPortArray_push_back(gui->layers[layer], view_port);
|
|
|
|
gui_unlock(gui);
|
|
|
|
}
|
|
|
|
|
2021-10-06 15:41:22 +00:00
|
|
|
void gui_view_port_send_to_back(Gui* gui, ViewPort* view_port) {
|
2021-02-10 09:06:29 +00:00
|
|
|
furi_assert(gui);
|
|
|
|
furi_assert(view_port);
|
|
|
|
|
|
|
|
gui_lock(gui);
|
|
|
|
// Remove
|
|
|
|
GuiLayer layer = GuiLayerMAX;
|
|
|
|
ViewPortArray_it_t it;
|
|
|
|
for(size_t i = 0; i < GuiLayerMAX; i++) {
|
|
|
|
ViewPortArray_it(it, gui->layers[i]);
|
|
|
|
while(!ViewPortArray_end_p(it)) {
|
|
|
|
if(*ViewPortArray_ref(it) == view_port) {
|
|
|
|
ViewPortArray_remove(gui->layers[i], it);
|
|
|
|
furi_assert(layer == GuiLayerMAX);
|
|
|
|
layer = i;
|
|
|
|
} else {
|
|
|
|
ViewPortArray_next(it);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
furi_assert(layer != GuiLayerMAX);
|
|
|
|
// Return to the top
|
|
|
|
ViewPortArray_push_at(gui->layers[layer], 0, view_port);
|
|
|
|
gui_unlock(gui);
|
|
|
|
}
|
|
|
|
|
2021-11-01 16:26:37 +00:00
|
|
|
void gui_set_framebuffer_callback(Gui* gui, GuiCanvasCommitCallback callback, void* context) {
|
2021-02-13 11:40:20 +00:00
|
|
|
furi_assert(gui);
|
2021-11-01 16:26:37 +00:00
|
|
|
gui_lock(gui);
|
2021-02-13 11:40:20 +00:00
|
|
|
gui->canvas_callback = callback;
|
|
|
|
gui->canvas_callback_context = context;
|
2021-11-01 16:26:37 +00:00
|
|
|
gui_unlock(gui);
|
2021-02-13 11:40:20 +00:00
|
|
|
}
|
|
|
|
|
2020-10-26 17:00:17 +00:00
|
|
|
Gui* gui_alloc() {
|
|
|
|
Gui* gui = furi_alloc(sizeof(Gui));
|
2021-02-10 09:06:29 +00:00
|
|
|
// Thread ID
|
|
|
|
gui->thread = osThreadGetId();
|
2020-10-26 17:00:17 +00:00
|
|
|
// Allocate mutex
|
2021-02-14 23:46:59 +00:00
|
|
|
gui->mutex = osMutexNew(NULL);
|
2020-10-29 06:27:17 +00:00
|
|
|
furi_check(gui->mutex);
|
2021-02-10 09:06:29 +00:00
|
|
|
// Layers
|
2020-10-26 17:00:17 +00:00
|
|
|
for(size_t i = 0; i < GuiLayerMAX; i++) {
|
2021-01-29 13:52:16 +00:00
|
|
|
ViewPortArray_init(gui->layers[i]);
|
2020-10-26 17:00:17 +00:00
|
|
|
}
|
2021-02-10 09:06:29 +00:00
|
|
|
// Drawing canvas
|
|
|
|
gui->canvas = canvas_init();
|
|
|
|
// Input
|
|
|
|
gui->input_queue = osMessageQueueNew(8, sizeof(InputEvent), NULL);
|
|
|
|
gui->input_events = furi_record_open("input_events");
|
|
|
|
furi_check(gui->input_events);
|
2021-11-01 20:35:54 +00:00
|
|
|
furi_pubsub_subscribe(gui->input_events, gui_input_events_callback, gui);
|
2021-02-13 11:40:20 +00:00
|
|
|
// Cli
|
|
|
|
gui->cli = furi_record_open("cli");
|
2021-07-18 18:09:00 +00:00
|
|
|
cli_add_command(
|
|
|
|
gui->cli, "screen_stream", CliCommandFlagParallelSafe, gui_cli_screen_stream, gui);
|
2020-10-16 15:25:06 +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
|
|
|
return gui;
|
|
|
|
}
|
|
|
|
|
2021-08-07 16:54:42 +00:00
|
|
|
int32_t gui_srv(void* p) {
|
2020-10-15 15:05:28 +00:00
|
|
|
Gui* gui = gui_alloc();
|
2020-10-15 08:32:48 +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
|
|
|
furi_record_create("gui", gui);
|
2020-10-15 08:32:48 +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
|
|
|
while(1) {
|
2021-02-10 09:06:29 +00:00
|
|
|
uint32_t flags = osThreadFlagsWait(GUI_THREAD_FLAG_ALL, osFlagsWaitAny, osWaitForever);
|
|
|
|
// Process and dispatch input
|
|
|
|
if(flags & GUI_THREAD_FLAG_INPUT) {
|
|
|
|
// Process till queue become empty
|
|
|
|
InputEvent input_event;
|
|
|
|
while(osMessageQueueGet(gui->input_queue, &input_event, NULL, 0) == osOK) {
|
|
|
|
gui_input(gui, &input_event);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Process and dispatch draw call
|
|
|
|
if(flags & GUI_THREAD_FLAG_DRAW) {
|
|
|
|
// Clear flags that arrived on input step
|
|
|
|
osThreadFlagsClear(GUI_THREAD_FLAG_DRAW);
|
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
|
|
|
gui_redraw(gui);
|
|
|
|
}
|
|
|
|
}
|
2021-02-12 17:24:34 +00:00
|
|
|
|
|
|
|
return 0;
|
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
|
|
|
}
|