dominic/Tactiliest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

renamed struct types

Browse Source
This commit is contained in:
Ken Van Hoeylandt 2023-12-28 13:07:01 +01:00
parent 6282011634
commit 1cafa1ec1a
38 changed files with 120 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/board_2432s024/board_2432s024_display.c
View File

@ -31,7 +31,7 @@ IRAM_ATTR static bool prv_on_color_trans_done(esp_lcd_panel_io_handle_t io_handl
return (need_yield == pdTRUE); return (need_yield == pdTRUE);
} }
static bool prv_create_display(NbDisplay* display) { static bool prv_create_display(DisplayDevice* display) {
ESP_LOGI(TAG, "creating display"); ESP_LOGI(TAG, "creating display");
gpio_config_t io_conf = { gpio_config_t io_conf = {
@ -121,8 +121,8 @@ static bool prv_create_display(NbDisplay* display) {
return true; return true;
} }
NbDisplayDriver board_2432s024_create_display_driver() { DisplayDriver board_2432s024_create_display_driver() {
return (NbDisplayDriver) { return (DisplayDriver) {
.name = "ili9341_2432s024", .name = "ili9341_2432s024",
.create_display = &prv_create_display .create_display = &prv_create_display
}; };

2
components/board_2432s024/board_2432s024_display.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern NbDisplayDriver board_2432s024_create_display_driver(); extern DisplayDriver board_2432s024_create_display_driver();
#ifdef __cplusplus #ifdef __cplusplus
} }

4
components/board_2432s024/board_2432s024_touch.c
View File

@ -64,8 +64,8 @@ static bool prv_create_touch(esp_lcd_panel_io_handle_t* io_handle, esp_lcd_touch
return true; return true;
} }
NbTouchDriver board_2432s024_create_touch_driver() { TouchDriver board_2432s024_create_touch_driver() {
return (NbTouchDriver) { return (TouchDriver) {
.name = "cst816s_2432s024", .name = "cst816s_2432s024",
.create_touch = &prv_create_touch .create_touch = &prv_create_touch
}; };

2
components/board_2432s024/board_2432s024_touch.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern NbTouchDriver board_2432s024_create_touch_driver(); extern TouchDriver board_2432s024_create_touch_driver();
#ifdef __cplusplus #ifdef __cplusplus
} }

4
components/furi/src/record.h
View File

@ -19,8 +19,8 @@ extern "C" {
* @param code the code to execute: consider putting it between {} * @param code the code to execute: consider putting it between {}
*/ */
#define FURI_RECORD_TRANSACTION(record_name, variable_name, code) \ #define FURI_RECORD_TRANSACTION(record_name, variable_name, code) \
{ \ { \
NbGui*(variable_name) = (NbGui*)furi_record_open(record_name); \ Gui*(variable_name) = (Gui*)furi_record_open(record_name); \
code; \ code; \
furi_record_close(record_name); \ furi_record_close(record_name); \
} }

20
components/nanobake/src/applications/nb_applications.c
View File

@ -1,28 +1,28 @@
#include "nb_applications.h" #include "nb_applications.h"
// System services // System services
extern const NbApp desktop_app; extern const App desktop_app;
extern const NbApp gui_app; extern const App gui_app;
extern const NbApp loader_app; extern const App loader_app;
// System apps // System apps
extern const NbApp system_info_app; extern const App system_info_app;
const NbApp* const FLIPPER_SERVICES[] = { const App* const FLIPPER_SERVICES[] = {
&desktop_app, &desktop_app,
&gui_app, &gui_app,
&loader_app &loader_app
}; };
const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(NbApp*); const size_t FLIPPER_SERVICES_COUNT = sizeof(FLIPPER_SERVICES) / sizeof(App*);
const NbApp* const FLIPPER_SYSTEM_APPS[] = { const App* const FLIPPER_SYSTEM_APPS[] = {
&system_info_app &system_info_app
}; };
const size_t FLIPPER_SYSTEM_APPS_COUNT = sizeof(FLIPPER_SYSTEM_APPS) / sizeof(NbApp*); const size_t FLIPPER_SYSTEM_APPS_COUNT = sizeof(FLIPPER_SYSTEM_APPS) / sizeof(App*);
const NbOnSystemStart FLIPPER_ON_SYSTEM_START[] = { const OnSystemStart FLIPPER_ON_SYSTEM_START[] = {
}; };
const size_t FLIPPER_ON_SYSTEM_START_COUNT = sizeof(FLIPPER_ON_SYSTEM_START) / sizeof(NbOnSystemStart); const size_t FLIPPER_ON_SYSTEM_START_COUNT = sizeof(FLIPPER_ON_SYSTEM_START) / sizeof(OnSystemStart);

10
components/nanobake/src/applications/nb_applications.h
View File

@ -1,21 +1,21 @@
#pragma once #pragma once
#include "devices.h"
#include "nb_app.h" #include "nb_app.h"
#include "nb_hardware.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
typedef void (*NbOnSystemStart)(NbHardware* hardware); typedef void (*OnSystemStart)(Devices* hardware);
extern const NbApp* const FLIPPER_SERVICES[]; extern const App* const FLIPPER_SERVICES[];
extern const size_t FLIPPER_SERVICES_COUNT; extern const size_t FLIPPER_SERVICES_COUNT;
extern const NbApp* const FLIPPER_SYSTEM_APPS[]; extern const App* const FLIPPER_SYSTEM_APPS[];
extern const size_t FLIPPER_SYSTEM_APPS_COUNT; extern const size_t FLIPPER_SYSTEM_APPS_COUNT;
extern const NbOnSystemStart FLIPPER_ON_SYSTEM_START[]; extern const OnSystemStart FLIPPER_ON_SYSTEM_START[];
extern const size_t FLIPPER_ON_SYSTEM_START_COUNT; extern const size_t FLIPPER_ON_SYSTEM_START_COUNT;
#ifdef __cplusplus #ifdef __cplusplus

4
components/nanobake/src/applications/services/desktop/desktop.c
View File

@ -1,6 +1,6 @@
#include "desktop.h" #include "desktop.h"
#include "core_defines.h" #include "core_defines.h"
#include "nb_hardware.h" #include "devices.h"
static int32_t prv_desktop_main(void* param) { static int32_t prv_desktop_main(void* param) {
UNUSED(param); UNUSED(param);
@ -8,7 +8,7 @@ static int32_t prv_desktop_main(void* param) {
return 0; return 0;
} }
const NbApp desktop_app = { const App desktop_app = {
.id = "desktop", .id = "desktop",
.name = "Desktop", .name = "Desktop",
.type = SERVICE, .type = SERVICE,

2
components/nanobake/src/applications/services/desktop/desktop.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern const NbApp desktop_app; extern const App desktop_app;
#ifdef __cplusplus #ifdef __cplusplus
} }

30
components/nanobake/src/applications/services/gui/gui.c
View File

@ -6,8 +6,8 @@
#define TAG "gui" #define TAG "gui"
// Forward declarations from gui_draw.c // Forward declarations from gui_draw.c
bool gui_redraw_fs(NbGui* gui); bool gui_redraw_fs(Gui* gui);
void gui_redraw(NbGui* gui); void gui_redraw(Gui* gui);
ViewPort* gui_view_port_find_enabled(ViewPortArray_t array) { ViewPort* gui_view_port_find_enabled(ViewPortArray_t array) {
// Iterating backward // Iterating backward
@ -23,7 +23,7 @@ ViewPort* gui_view_port_find_enabled(ViewPortArray_t array) {
return NULL; return NULL;
} }
size_t gui_active_view_port_count(NbGui* gui, GuiLayer layer) { size_t gui_active_view_port_count(Gui* gui, GuiLayer layer) {
furi_assert(gui); furi_assert(gui);
furi_check(layer < GuiLayerMAX); furi_check(layer < GuiLayerMAX);
size_t ret = 0; size_t ret = 0;
@ -43,23 +43,23 @@ size_t gui_active_view_port_count(NbGui* gui, GuiLayer layer) {
return ret; return ret;
} }
void gui_update(NbGui* gui) { void gui_update(Gui* gui) {
ESP_LOGI(TAG, "gui_update"); ESP_LOGI(TAG, "gui_update");
furi_assert(gui); furi_assert(gui);
furi_thread_flags_set(gui->thread_id, GUI_THREAD_FLAG_DRAW); furi_thread_flags_set(gui->thread_id, GUI_THREAD_FLAG_DRAW);
} }
void gui_lock(NbGui* gui) { void gui_lock(Gui* gui) {
furi_assert(gui); furi_assert(gui);
furi_check(furi_mutex_acquire(gui->mutex, FuriWaitForever) == FuriStatusOk); furi_check(furi_mutex_acquire(gui->mutex, FuriWaitForever) == FuriStatusOk);
} }
void gui_unlock(NbGui* gui) { void gui_unlock(Gui* gui) {
furi_assert(gui); furi_assert(gui);
furi_check(furi_mutex_release(gui->mutex) == FuriStatusOk); furi_check(furi_mutex_release(gui->mutex) == FuriStatusOk);
} }
void gui_add_view_port(NbGui* gui, ViewPort* view_port, GuiLayer layer) { void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer) {
furi_assert(gui); furi_assert(gui);
furi_assert(view_port); furi_assert(view_port);
furi_check(layer < GuiLayerMAX); furi_check(layer < GuiLayerMAX);
@ -83,7 +83,7 @@ void gui_add_view_port(NbGui* gui, ViewPort* view_port, GuiLayer layer) {
gui_update(gui); gui_update(gui);
} }
void gui_remove_view_port(NbGui* gui, ViewPort* view_port) { void gui_remove_view_port(Gui* gui, ViewPort* view_port) {
furi_assert(gui); furi_assert(gui);
furi_assert(view_port); furi_assert(view_port);
@ -111,7 +111,7 @@ void gui_remove_view_port(NbGui* gui, ViewPort* view_port) {
gui_update(gui); gui_update(gui);
} }
void gui_view_port_send_to_front(NbGui* gui, ViewPort* view_port) { void gui_view_port_send_to_front(Gui* gui, ViewPort* view_port) {
furi_assert(gui); furi_assert(gui);
furi_assert(view_port); furi_assert(view_port);
@ -140,7 +140,7 @@ void gui_view_port_send_to_front(NbGui* gui, ViewPort* view_port) {
gui_update(gui); gui_update(gui);
} }
void gui_view_port_send_to_back(NbGui* gui, ViewPort* view_port) { void gui_view_port_send_to_back(Gui* gui, ViewPort* view_port) {
furi_assert(gui); furi_assert(gui);
furi_assert(view_port); furi_assert(view_port);
@ -169,7 +169,7 @@ void gui_view_port_send_to_back(NbGui* gui, ViewPort* view_port) {
gui_update(gui); gui_update(gui);
} }
void gui_set_lockdown(NbGui* gui, bool lockdown) { void gui_set_lockdown(Gui* gui, bool lockdown) {
furi_assert(gui); furi_assert(gui);
gui_lock(gui); gui_lock(gui);
@ -180,8 +180,8 @@ void gui_set_lockdown(NbGui* gui, bool lockdown) {
gui_update(gui); gui_update(gui);
} }
NbGui* gui_alloc() { Gui* gui_alloc() {
NbGui* gui = malloc(sizeof(NbGui)); Gui* gui = malloc(sizeof(Gui));
gui->thread_id = furi_thread_get_current_id(); gui->thread_id = furi_thread_get_current_id();
gui->mutex = furi_mutex_alloc(FuriMutexTypeNormal); gui->mutex = furi_mutex_alloc(FuriMutexTypeNormal);
gui->lvgl_parent = lv_scr_act(); gui->lvgl_parent = lv_scr_act();
@ -204,7 +204,7 @@ NbGui* gui_alloc() {
__attribute((__noreturn__)) int32_t prv_gui_main(void* parameter) { __attribute((__noreturn__)) int32_t prv_gui_main(void* parameter) {
UNUSED(parameter); UNUSED(parameter);
NbGui* gui = gui_alloc(); Gui* gui = gui_alloc();
furi_record_create(RECORD_GUI, gui); furi_record_create(RECORD_GUI, gui);
@ -231,7 +231,7 @@ __attribute((__noreturn__)) int32_t prv_gui_main(void* parameter) {
} }
} }
const NbApp gui_app = { const App gui_app = {
.id = "gui", .id = "gui",
.name = "GUI", .name = "GUI",
.type = SERVICE, .type = SERVICE,

14
components/nanobake/src/applications/services/gui/gui.h
View File

@ -8,7 +8,7 @@
extern "C" { extern "C" {
#endif #endif
extern const NbApp gui_app; extern const App gui_app;
/** Canvas Orientation */ /** Canvas Orientation */
typedef enum { typedef enum {
@ -42,7 +42,7 @@ typedef void (*GuiCanvasCommitCallback)(
#define RECORD_GUI "gui" #define RECORD_GUI "gui"
typedef struct NbGui NbGui; typedef struct Gui Gui;
/** Add view_port to view_port tree /** Add view_port to view_port tree
* *
@ -52,7 +52,7 @@ typedef struct NbGui NbGui;
* @param view_port ViewPort instance * @param view_port ViewPort instance
* @param[in] layer GuiLayer where to place view_port * @param[in] layer GuiLayer where to place view_port
*/ */
void gui_add_view_port(NbGui* gui, ViewPort* view_port, GuiLayer layer); void gui_add_view_port(Gui* gui, ViewPort* view_port, GuiLayer layer);
/** Remove view_port from rendering tree /** Remove view_port from rendering tree
* *
@ -61,7 +61,7 @@ void gui_add_view_port(NbGui* gui, ViewPort* view_port, GuiLayer layer);
* @param gui Gui instance * @param gui Gui instance
* @param view_port ViewPort instance * @param view_port ViewPort instance
*/ */
void gui_remove_view_port(NbGui* gui, ViewPort* view_port); void gui_remove_view_port(Gui* gui, ViewPort* view_port);
/** Send ViewPort to the front /** Send ViewPort to the front
* *
@ -70,7 +70,7 @@ void gui_remove_view_port(NbGui* gui, ViewPort* view_port);
* @param gui Gui instance * @param gui Gui instance
* @param view_port ViewPort instance * @param view_port ViewPort instance
*/ */
void gui_view_port_send_to_front(NbGui* gui, ViewPort* view_port); void gui_view_port_send_to_front(Gui* gui, ViewPort* view_port);
/** Send ViewPort to the back /** Send ViewPort to the back
* *
@ -79,7 +79,7 @@ void gui_view_port_send_to_front(NbGui* gui, ViewPort* view_port);
* @param gui Gui instance * @param gui Gui instance
* @param view_port ViewPort instance * @param view_port ViewPort instance
*/ */
void gui_view_port_send_to_back(NbGui* gui, ViewPort* view_port); void gui_view_port_send_to_back(Gui* gui, ViewPort* view_port);
/** Set lockdown mode /** Set lockdown mode
* *
@ -89,7 +89,7 @@ void gui_view_port_send_to_back(NbGui* gui, ViewPort* view_port);
* @param gui Gui instance * @param gui Gui instance
* @param lockdown bool, true if enabled * @param lockdown bool, true if enabled
*/ */
void gui_set_lockdown(NbGui* gui, bool lockdown); void gui_set_lockdown(Gui* gui, bool lockdown);
#ifdef __cplusplus #ifdef __cplusplus
} }

10
components/nanobake/src/applications/services/gui/gui_draw.c
View File

@ -1,7 +1,7 @@
#include "check.h" #include "check.h"
#include "gui_i.h" #include "gui_i.h"
static void gui_redraw_status_bar(NbGui* gui, bool need_attention) { static void gui_redraw_status_bar(Gui* gui, bool need_attention) {
/* /*
ViewPortArray_it_t it; ViewPortArray_it_t it;
uint8_t left_used = 0; uint8_t left_used = 0;
@ -149,7 +149,7 @@ static void gui_redraw_status_bar(NbGui* gui, bool need_attention) {
*/ */
} }
static bool gui_redraw_window(NbGui* gui) { static bool gui_redraw_window(Gui* gui) {
/* /*
canvas_frame_set(gui->lvgl_parent, GUI_WINDOW_X, GUI_WINDOW_Y, GUI_WINDOW_WIDTH, GUI_WINDOW_HEIGHT); canvas_frame_set(gui->lvgl_parent, GUI_WINDOW_X, GUI_WINDOW_Y, GUI_WINDOW_WIDTH, GUI_WINDOW_HEIGHT);
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerWindow]); ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerWindow]);
@ -161,7 +161,7 @@ static bool gui_redraw_window(NbGui* gui) {
return false; return false;
} }
static bool gui_redraw_desktop(NbGui* gui) { static bool gui_redraw_desktop(Gui* gui) {
/* /*
canvas_frame_set(gui->lvgl_parent, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT); canvas_frame_set(gui->lvgl_parent, 0, 0, GUI_DISPLAY_WIDTH, GUI_DISPLAY_HEIGHT);
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerDesktop]); ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerDesktop]);
@ -174,7 +174,7 @@ static bool gui_redraw_desktop(NbGui* gui) {
return false; return false;
} }
bool gui_redraw_fs(NbGui* gui) { bool gui_redraw_fs(Gui* gui) {
ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]); ViewPort* view_port = gui_view_port_find_enabled(gui->layers[GuiLayerFullscreen]);
if (view_port) { if (view_port) {
view_port_draw(view_port, gui->lvgl_parent); view_port_draw(view_port, gui->lvgl_parent);
@ -184,7 +184,7 @@ bool gui_redraw_fs(NbGui* gui) {
} }
} }
void gui_redraw(NbGui* gui) { void gui_redraw(Gui* gui) {
furi_assert(gui); furi_assert(gui);
gui_lock(gui); gui_lock(gui);

10
components/nanobake/src/applications/services/gui/gui_i.h
View File

@ -44,7 +44,7 @@ typedef struct {
} CanvasCallbackPair; } CanvasCallbackPair;
/** Gui structure */ /** Gui structure */
struct NbGui { struct Gui {
// Thread and lock // Thread and lock
FuriThreadId thread_id; FuriThreadId thread_id;
FuriMutex* mutex; FuriMutex* mutex;
@ -75,7 +75,7 @@ ViewPort* gui_view_port_find_enabled(ViewPortArray_t array);
* *
* @param gui Gui instance * @param gui Gui instance
*/ */
void gui_update(NbGui* gui); void gui_update(Gui* gui);
///** Input event callback ///** Input event callback
// * // *
@ -91,16 +91,16 @@ void gui_update(NbGui* gui);
* @param gui The Gui instance * @param gui The Gui instance
* @param[in] layer GuiLayer that we want to get count of view ports * @param[in] layer GuiLayer that we want to get count of view ports
*/ */
size_t gui_active_view_port_count(NbGui* gui, GuiLayer layer); size_t gui_active_view_port_count(Gui* gui, GuiLayer layer);
/** Lock GUI /** Lock GUI
* *
* @param gui The Gui instance * @param gui The Gui instance
*/ */
void gui_lock(NbGui* gui); void gui_lock(Gui* gui);
/** Unlock GUI /** Unlock GUI
* *
* @param gui The Gui instance * @param gui The Gui instance
*/ */
void gui_unlock(NbGui* gui); void gui_unlock(Gui* gui);

2
components/nanobake/src/applications/services/gui/view_port.c
View File

@ -68,7 +68,7 @@ void view_port_update(ViewPort* view_port) {
furi_mutex_release(view_port->mutex); furi_mutex_release(view_port->mutex);
} }
void view_port_gui_set(ViewPort* view_port, NbGui* gui) { void view_port_gui_set(ViewPort* view_port, Gui* gui) {
furi_assert(view_port); furi_assert(view_port);
furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk); furi_check(furi_mutex_acquire(view_port->mutex, FuriWaitForever) == FuriStatusOk);
view_port->gui = gui; view_port->gui = gui;

4
components/nanobake/src/applications/services/gui/view_port_i.h
View File

@ -5,7 +5,7 @@
#include "view_port.h" #include "view_port.h"
struct ViewPort { struct ViewPort {
NbGui* gui; Gui* gui;
FuriMutex* mutex; FuriMutex* mutex;
bool is_enabled; bool is_enabled;
@ -25,7 +25,7 @@ struct ViewPort {
* @param view_port ViewPort instance * @param view_port ViewPort instance
* @param gui gui instance pointer * @param gui gui instance pointer
*/ */
void view_port_gui_set(ViewPort* view_port, NbGui* gui); void view_port_gui_set(ViewPort* view_port, Gui* gui);
/** Process draw call. Calls draw callback. /** Process draw call. Calls draw callback.
* *

2
components/nanobake/src/applications/services/loader/loader.c
View File

@ -7,7 +7,7 @@ static int32_t prv_loader_main(void* param) {
return 0; return 0;
} }
const NbApp loader_app = { const App loader_app = {
.id = "loader", .id = "loader",
.name = "Loader", .name = "Loader",
.type = SERVICE, .type = SERVICE,

2
components/nanobake/src/applications/services/loader/loader.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern const NbApp loader_app; extern const App loader_app;
#ifdef __cplusplus #ifdef __cplusplus
} }

2
components/nanobake/src/applications/system/system_info/system_info.c
View File

@ -29,7 +29,7 @@ static int32_t system_info_entry_point(void* param) {
return 0; return 0;
} }
NbApp system_info_app = { App system_info_app = {
.id = "systeminfo", .id = "systeminfo",
.name = "System Info", .name = "System Info",
.type = SYSTEM, .type = SYSTEM,

2
components/nanobake/src/applications/system/system_info/system_info.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern NbApp system_info_app; extern App system_info_app;
#ifdef __cplusplus #ifdef __cplusplus
} }

12
components/nanobake/src/nb_hardware.c → components/nanobake/src/devices.c
View File

@ -5,16 +5,16 @@
#define TAG "hardware" #define TAG "hardware"
NbHardware nb_hardware_create(NbConfig _Nonnull* config) { Devices nb_hardware_create(Config _Nonnull* config) {
furi_check(config->display_driver != NULL, "no display driver configured"); furi_check(config->display_driver != NULL, "no display driver configured");
NbDisplayDriver display_driver = config->display_driver(); DisplayDriver display_driver = config->display_driver();
ESP_LOGI(TAG, "display with driver %s", display_driver.name); ESP_LOGI(TAG, "display with driver %s", display_driver.name);
NbDisplay* display = nb_display_alloc(&display_driver); DisplayDevice* display = nb_display_alloc(&display_driver);
NbTouch* touch = NULL; TouchDevice* touch = NULL;
if (config->touch_driver != NULL) { if (config->touch_driver != NULL) {
NbTouchDriver touch_driver = config->touch_driver(); TouchDriver touch_driver = config->touch_driver();
ESP_LOGI(TAG, "touch with driver %s", touch_driver.name); ESP_LOGI(TAG, "touch with driver %s", touch_driver.name);
touch = nb_touch_alloc(&touch_driver); touch = nb_touch_alloc(&touch_driver);
} else { } else {
@ -22,7 +22,7 @@ NbHardware nb_hardware_create(NbConfig _Nonnull* config) {
touch = NULL; touch = NULL;
} }
return (NbHardware) { return (Devices) {
.display = display, .display = display,
.touch = touch .touch = touch
}; };

6
components/nanobake/src/nb_hardware.h → components/nanobake/src/devices.h
View File

@ -8,9 +8,9 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
NbDisplay* _Nonnull display; DisplayDevice* _Nonnull display;
NbTouch* _Nullable touch; TouchDevice* _Nullable touch;
} NbHardware; } Devices;
#ifdef __cplusplus #ifdef __cplusplus
} }

6
components/nanobake/src/nanobake.c
View File

@ -35,7 +35,7 @@ size_t nanobake_get_app_thread_count() {
return thread_ids_size(prv_thread_ids); return thread_ids_size(prv_thread_ids);
} }
static void prv_start_app(const NbApp _Nonnull* app) { static void prv_start_app(const App _Nonnull* app) {
ESP_LOGI(TAG, "Starting %s app \"%s\"", nb_app_type_to_string(app->type), app->name); ESP_LOGI(TAG, "Starting %s app \"%s\"", nb_app_type_to_string(app->type), app->name);
FuriThread* thread = furi_thread_alloc_ex( FuriThread* thread = furi_thread_alloc_ex(
@ -57,10 +57,10 @@ static void prv_start_app(const NbApp _Nonnull* app) {
thread_ids_push_back(prv_thread_ids, thread_id); thread_ids_push_back(prv_thread_ids, thread_id);
} }
__attribute__((unused)) extern void nanobake_start(NbConfig _Nonnull* config) { __attribute__((unused)) extern void nanobake_start(Config _Nonnull* config) {
prv_furi_init(); prv_furi_init();
NbHardware hardware = nb_hardware_create(config); Devices hardware = nb_hardware_create(config);
/*NbLvgl lvgl =*/nb_lvgl_init(&hardware); /*NbLvgl lvgl =*/nb_lvgl_init(&hardware);
thread_ids_init(prv_thread_ids); thread_ids_init(prv_thread_ids);

4
components/nanobake/src/nanobake.h
View File

@ -1,8 +1,8 @@
#pragma once #pragma once
#include "devices.h"
#include "nb_app.h" #include "nb_app.h"
#include "nb_config.h" #include "nb_config.h"
#include "nb_hardware.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -11,7 +11,7 @@ extern "C" {
// Forward declarations // Forward declarations
typedef void* FuriThreadId; typedef void* FuriThreadId;
__attribute__((unused)) extern void nanobake_start(NbConfig _Nonnull* config); __attribute__((unused)) extern void nanobake_start(Config _Nonnull* config);
extern FuriThreadId nanobake_get_app_thread_id(size_t index); extern FuriThreadId nanobake_get_app_thread_id(size_t index);
extern size_t nanobake_get_app_thread_count(); extern size_t nanobake_get_app_thread_count();

2
components/nanobake/src/nb_app.c
View File

@ -5,7 +5,7 @@ const char* prv_type_service = "service";
const char* prv_type_system = "system"; const char* prv_type_system = "system";
const char* prv_type_user = "user"; const char* prv_type_user = "user";
const char* nb_app_type_to_string(NbAppType type) { const char* nb_app_type_to_string(AppType type) {
switch (type) { switch (type) {
case SERVICE: case SERVICE:
return prv_type_service; return prv_type_service;

18
components/nanobake/src/nb_app.h
View File

@ -15,26 +15,26 @@ typedef enum {
SERVICE, SERVICE,
SYSTEM, SYSTEM,
USER USER
} NbAppType; } AppType;
typedef enum { typedef enum {
NB_TASK_PRIORITY_DEFAULT = 10 NB_TASK_PRIORITY_DEFAULT = 10
} NbTaskPriority; } AppPriority;
typedef enum { typedef enum {
NB_TASK_STACK_SIZE_DEFAULT = 2048 NB_TASK_STACK_SIZE_DEFAULT = 2048
} NbStackSize; } AppStackSize;
typedef int32_t (*NbAppEntryPoint)(void _Nonnull* parameter); typedef int32_t (*AppEntryPoint)(void _Nonnull* parameter);
typedef struct { typedef struct {
const char id[NB_APP_ID_LENGTH]; const char id[NB_APP_ID_LENGTH];
const char name[NB_APP_NAME_LENGTH]; const char name[NB_APP_NAME_LENGTH];
const NbAppType type; const AppType type;
const NbAppEntryPoint _Nullable entry_point; const AppEntryPoint _Nullable entry_point;
const NbStackSize stack_size; const AppStackSize stack_size;
const NbTaskPriority priority; const AppPriority priority;
} NbApp; } App;
#ifdef __cplusplus #ifdef __cplusplus
} }

2
components/nanobake/src/nb_app_i.h
View File

@ -6,7 +6,7 @@
extern "C" { extern "C" {
#endif #endif
extern const char* nb_app_type_to_string(NbAppType type); extern const char* nb_app_type_to_string(AppType type);
#ifdef __cplusplus #ifdef __cplusplus
} }

8
components/nanobake/src/nb_config.h
View File

@ -8,8 +8,8 @@
extern "C" { extern "C" {
#endif #endif
typedef NbTouchDriver (*CreateTouchDriver)(); typedef TouchDriver (*CreateTouchDriver)();
typedef NbDisplayDriver (*CreateDisplayDriver)(); typedef DisplayDriver (*CreateDisplayDriver)();
typedef struct { typedef struct {
// Required driver for display // Required driver for display
@ -18,8 +18,8 @@ typedef struct {
const CreateTouchDriver _Nullable touch_driver; const CreateTouchDriver _Nullable touch_driver;
// List of user applications // List of user applications
const size_t apps_count; const size_t apps_count;
const NbApp* const apps[]; const App* const apps[];
} NbConfig; } Config;
#ifdef __cplusplus #ifdef __cplusplus
} }

6
components/nanobake/src/nb_display.c
View File

@ -1,9 +1,9 @@
#include "nb_display.h" #include "nb_display.h"
#include "check.h" #include "check.h"
NbDisplay _Nonnull* nb_display_alloc(NbDisplayDriver _Nonnull* driver) { DisplayDevice _Nonnull* nb_display_alloc(DisplayDriver _Nonnull* driver) {
NbDisplay _Nonnull* display = malloc(sizeof(NbDisplay)); DisplayDevice _Nonnull* display = malloc(sizeof(DisplayDevice));
memset(display, 0, sizeof(NbDisplay)); memset(display, 0, sizeof(DisplayDevice));
furi_check(driver->create_display(display), "failed to create display"); furi_check(driver->create_display(display), "failed to create display");
furi_check(display->io_handle != NULL); furi_check(display->io_handle != NULL);
furi_check(display->display_handle != NULL); furi_check(display->display_handle != NULL);

12
components/nanobake/src/nb_display.h
View File

@ -7,29 +7,29 @@ extern "C" {
#endif #endif
typedef struct { typedef struct {
esp_lcd_panel_io_handle_t _Nonnull io_handle;
esp_lcd_panel_handle_t _Nonnull display_handle;
uint16_t horizontal_resolution; uint16_t horizontal_resolution;
uint16_t vertical_resolution; uint16_t vertical_resolution;
uint16_t draw_buffer_height; uint16_t draw_buffer_height;
uint16_t bits_per_pixel; uint16_t bits_per_pixel;
esp_lcd_panel_io_handle_t _Nonnull io_handle;
esp_lcd_panel_handle_t _Nonnull display_handle;
bool mirror_x; bool mirror_x;
bool mirror_y; bool mirror_y;
bool swap_xy; bool swap_xy;
} NbDisplay; } DisplayDevice;
typedef bool (*CreateDisplay)(NbDisplay* display); typedef bool (*CreateDisplay)(DisplayDevice* display);
typedef struct { typedef struct {
char name[32]; char name[32];
CreateDisplay create_display; CreateDisplay create_display;
} NbDisplayDriver; } DisplayDriver;
/** /**
* @param[in] driver * @param[in] driver
* @return allocated display object * @return allocated display object
*/ */
NbDisplay _Nonnull* nb_display_alloc(NbDisplayDriver _Nonnull* driver); DisplayDevice _Nonnull* nb_display_alloc(DisplayDriver _Nonnull* driver);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
components/nanobake/src/nb_hardware_i.h
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include "devices.h"
#include "nb_config.h" #include "nb_config.h"
#include "nb_hardware.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern NbHardware nb_hardware_create(NbConfig _Nonnull* config); extern Devices nb_hardware_create(Config _Nonnull* config);
#ifdef __cplusplus #ifdef __cplusplus
} }

6
components/nanobake/src/nb_lvgl.c
View File

@ -4,7 +4,7 @@
#define TAG "lvgl" #define TAG "lvgl"
NbLvgl nb_lvgl_init(NbHardware _Nonnull* hardware) { Lvgl nb_lvgl_init(Devices _Nonnull* hardware) {
const lvgl_port_cfg_t lvgl_cfg = { const lvgl_port_cfg_t lvgl_cfg = {
.task_priority = 4, .task_priority = 4,
.task_stack = 4096, .task_stack = 4096,
@ -14,7 +14,7 @@ NbLvgl nb_lvgl_init(NbHardware _Nonnull* hardware) {
}; };
furi_check(lvgl_port_init(&lvgl_cfg) == ESP_OK, "lvgl port init failed"); furi_check(lvgl_port_init(&lvgl_cfg) == ESP_OK, "lvgl port init failed");
NbDisplay _Nonnull* display = hardware->display; DisplayDevice _Nonnull* display = hardware->display;
// Add display // Add display
ESP_LOGD(TAG, "lvgl add display"); ESP_LOGD(TAG, "lvgl add display");
@ -49,7 +49,7 @@ NbLvgl nb_lvgl_init(NbHardware _Nonnull* hardware) {
furi_check(touch_indev != NULL, "failed to add touch to lvgl"); furi_check(touch_indev != NULL, "failed to add touch to lvgl");
} }
return (NbLvgl) { return (Lvgl) {
.disp = disp, .disp = disp,
.touch_indev = touch_indev .touch_indev = touch_indev
}; };

2
components/nanobake/src/nb_lvgl.h
View File

@ -9,7 +9,7 @@ extern "C" {
typedef struct { typedef struct {
lv_disp_t* _Nonnull disp; lv_disp_t* _Nonnull disp;
lv_indev_t* _Nullable touch_indev; lv_indev_t* _Nullable touch_indev;
} NbLvgl; } Lvgl;
#ifdef __cplusplus #ifdef __cplusplus
} }

4
components/nanobake/src/nb_lvgl_i.h
View File

@ -1,13 +1,13 @@
#pragma once #pragma once
#include "nb_hardware.h" #include "devices.h"
#include "nb_lvgl.h" #include "nb_lvgl.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
extern NbLvgl nb_lvgl_init(NbHardware _Nonnull* hardware); extern Lvgl nb_lvgl_init(Devices _Nonnull* hardware);
#ifdef __cplusplus #ifdef __cplusplus

4
components/nanobake/src/nb_touch.c
View File

@ -1,8 +1,8 @@
#include "nb_touch.h" #include "nb_touch.h"
#include "check.h" #include "check.h"
NbTouch _Nonnull* nb_touch_alloc(NbTouchDriver _Nonnull* driver) { TouchDevice _Nonnull* nb_touch_alloc(TouchDriver _Nonnull* driver) {
NbTouch _Nonnull* touch = malloc(sizeof(NbTouch)); TouchDevice _Nonnull* touch = malloc(sizeof(TouchDevice));
bool success = driver->create_touch( bool success = driver->create_touch(
&(touch->io_handle), &(touch->io_handle),
&(touch->touch_handle) &(touch->touch_handle)

6
components/nanobake/src/nb_touch.h
View File

@ -12,18 +12,18 @@ typedef bool (*CreateTouch)(esp_lcd_panel_io_handle_t* io_handle, esp_lcd_touch_
typedef struct { typedef struct {
char name[32]; char name[32];
CreateTouch create_touch; CreateTouch create_touch;
} NbTouchDriver; } TouchDriver;
typedef struct { typedef struct {
esp_lcd_panel_io_handle_t _Nonnull io_handle; esp_lcd_panel_io_handle_t _Nonnull io_handle;
esp_lcd_touch_handle_t _Nonnull touch_handle; esp_lcd_touch_handle_t _Nonnull touch_handle;
} NbTouch; } TouchDevice;
/** /**
* @param[in] driver * @param[in] driver
* @return a newly allocated instance * @return a newly allocated instance
*/ */
NbTouch _Nonnull* nb_touch_alloc(NbTouchDriver _Nonnull* driver); TouchDevice _Nonnull* nb_touch_alloc(TouchDriver _Nonnull* driver);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
main/src/hello_world/hello_world.c
View File

@ -55,7 +55,7 @@ static int32_t app_main(void* param) {
return 0; return 0;
} }
const NbApp hello_world_app = { const App hello_world_app = {
.id = "helloworld", .id = "helloworld",
.name = "Hello World", .name = "Hello World",
.type = USER, .type = USER,

2
main/src/hello_world/hello_world.h
View File

@ -2,4 +2,4 @@
#include "nb_app.h" #include "nb_app.h"
extern const NbApp hello_world_app; extern const App hello_world_app;

2
main/src/main.c
View File

@ -7,7 +7,7 @@
#include "hello_world/hello_world.h" #include "hello_world/hello_world.h"
__attribute__((unused)) void app_main(void) { __attribute__((unused)) void app_main(void) {
static NbConfig config = { static Config config = {
.display_driver = &board_2432s024_create_display_driver, .display_driver = &board_2432s024_create_display_driver,
.touch_driver = &board_2432s024_create_touch_driver, .touch_driver = &board_2432s024_create_touch_driver,
.apps = { .apps = {