improvements to apps and drivers

This commit is contained in:
Ken Van Hoeylandt
2023-12-25 18:43:48 +01:00
parent e6525364c6
commit 0cf7829a2d
16 changed files with 108 additions and 114 deletions
@@ -23,14 +23,11 @@ static void prv_on_create(nb_platform_t _Nonnull* platform, lv_obj_t _Nonnull* l
lvgl_port_unlock();
}
nb_app_config_t system_info_app_config() {
nb_app_config_t config = {
.id = "systeminfo",
.name = "System Info",
.type = SYSTEM,
.on_create = &prv_on_create,
.on_update = NULL,
.on_destroy = NULL
};
return config;
}
nb_app_t system_info_app = {
.id = "systeminfo",
.name = "System Info",
.type = SYSTEM,
.on_create = &prv_on_create,
.on_update = NULL,
.on_destroy = NULL
};
@@ -3,6 +3,6 @@
#include "nb_app.h"
nb_app_config_t system_info_app_config();
extern nb_app_t system_info_app;
#endif // NANOBAKE_SYSTEM_INFO_H
+5 -4
View File
@@ -1,14 +1,15 @@
#include "nanobake.h"
#include "applications/main/system_info/system_info.h"
void nb_app_start(nb_platform_t _Nonnull* platform, nb_app_config_t _Nonnull* config) {
void nb_app_start(nb_platform_t _Nonnull* platform, nb_app_t _Nonnull* config) {
lv_obj_t* scr = lv_scr_act();
ESP_ERROR_CHECK(nb_app_config_validate(config));
ESP_ERROR_CHECK(nb_app_validate(config));
config->on_create(platform, scr);
}
extern void nanobake_run(nb_platform_config_t _Nonnull* config) {
nb_platform_t _Nonnull* platform = nb_platform_create(config);
nb_app_config_t app_config = system_info_app_config();
nb_app_start(platform, &app_config);
nb_app_start(platform, config->apps[0]);
// nb_app_start(platform, &system_info_app);
}
+1 -1
View File
@@ -4,7 +4,7 @@
static const char* TAG = "nb_app";
esp_err_t nb_app_config_validate(nb_app_config_t* _Nonnull app) {
esp_err_t nb_app_validate(nb_app_t* _Nonnull app) {
ESP_RETURN_ON_FALSE(
strlen(app->id) < NB_APP_ID_LENGTH,
ESP_FAIL,
+1 -1
View File
@@ -3,6 +3,6 @@
nb_display_t _Nonnull* nb_display_create(nb_display_driver_t _Nonnull* driver) {
nb_display_t _Nonnull* display = malloc(sizeof(nb_display_t));
NB_ASSERT(driver->create_display(display) == ESP_OK, "failed to create display");
NB_ASSERT(driver->create_display(display), "failed to create display");
return display;
}
+1 -1
View File
@@ -75,7 +75,7 @@ nb_platform_t _Nonnull* nb_platform_create(nb_platform_config_t _Nonnull* config
platform->touch = NULL;
}
ESP_ERROR_CHECK(prv_lvgl_init(platform));
NB_ASSERT(prv_lvgl_init(platform) == ESP_OK, "failed to init lvgl");
return platform;
}
+6 -2
View File
@@ -1,9 +1,13 @@
#include "nb_touch.h"
#include "nb_assert.h"
#include <esp_check.h>
nb_touch_t _Nonnull* nb_touch_create(nb_touch_driver_t _Nonnull* driver) {
nb_touch_t _Nonnull* touch = malloc(sizeof(nb_touch_t));
assert(driver->init_io(&(touch->io_handle)) == ESP_OK);
driver->create_touch(touch->io_handle, &(touch->touch_handle));
bool success = driver->create_touch(
&(touch->io_handle),
&(touch->touch_handle)
);
NB_ASSERT(success, "touch driver failed");
return touch;
}