fritz/drumz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: put all display code into namespace; use camel case

Browse Source
This commit is contained in:
Fritz Heiden 2025-05-24 15:27:01 +02:00
parent bbfc082095
commit fffd9c6b5d
4 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/encoder.cpp
View File

@ -51,7 +51,7 @@ namespace Encoder
void handlePress() void handlePress()
{ {
Serial.println("Encoder pressed"); Serial.println("Encoder pressed");
Display::set_label_text("Button pressed."); Display::setLabelText("Button pressed.");
} }
void handleRelease() void handleRelease()
@ -74,6 +74,6 @@ namespace Encoder
Serial.print("Frequency: "); Serial.print("Frequency: ");
Serial.println(frequency); Serial.println(frequency);
Display::set_label_text("Frequency: " + String(frequency) + "Hz"); Display::setLabelText("Frequency: " + String(frequency) + "Hz");
} }
} }

2
src/main.cpp
View File

@ -35,7 +35,7 @@ void setup()
Display::init(); Display::init();
Serial.println("setup complete"); Serial.println("setup complete");
Display::set_label_text("Boot complete."); Display::setLabelText("Boot complete.");
} }
void loop() void loop()

62
src/ui/display.cpp
View File

@ -12,25 +12,25 @@
#endif #endif
#define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8)) #define DRAW_BUF_SIZE (SCREEN_WIDTH * SCREEN_HEIGHT / 10 * (LV_COLOR_DEPTH / 8))
uint32_t draw_buf[DRAW_BUF_SIZE / 4];
uint32_t get_time();
void handle_lvgl_logs(lv_log_level_t level, const char *buf);
void handle_update_values(lv_timer_t *timer);
String label_text;
lv_obj_t *label;
lv_timer_t *update_values_timer;
namespace Display namespace Display
{ {
uint32_t draw_buf[DRAW_BUF_SIZE / 4];
uint32_t getTime();
void handleLvglLogs(lv_log_level_t level, const char *buf);
void handleUpdateValues(lv_timer_t *timer);
String label_text;
lv_obj_t *label;
lv_timer_t *update_values_timer;
void init() void init()
{ {
lv_init(); lv_init();
lv_log_register_print_cb(handle_lvgl_logs); lv_log_register_print_cb(handleLvglLogs);
lv_tick_set_cb(get_time); lv_tick_set_cb(getTime);
update_values_timer = lv_timer_create(handle_update_values, 5, NULL); update_values_timer = lv_timer_create(handleUpdateValues, 5, NULL);
lv_timer_ready(update_values_timer); lv_timer_ready(update_values_timer);
lv_display_t *display; lv_display_t *display;
@ -45,27 +45,27 @@ namespace Display
{ {
lv_timer_handler(); lv_timer_handler();
} }
void set_label_text(String text) void setLabelText(String text)
{ {
label_text = text; label_text = text;
} }
}
void handle_lvgl_logs(lv_log_level_t level, const char *buf) void handleLvglLogs(lv_log_level_t level, const char *buf)
{
Serial.printf("LVGL: %s\r\n", buf);
}
uint32_t get_time()
{
return esp_timer_get_time() / 1000;
}
void handle_update_values(lv_timer_t *timer)
{
if (label != NULL && lv_label_get_text(label) != label_text.c_str())
{ {
lv_label_set_text(label, label_text.c_str()); Serial.printf("LVGL: %s\r\n", buf);
} }
}
uint32_t getTime()
{
return esp_timer_get_time() / 1000;
}
void handleUpdateValues(lv_timer_t *timer)
{
if (label != NULL && lv_label_get_text(label) != label_text.c_str())
{
lv_label_set_text(label, label_text.c_str());
}
}
}

2
src/ui/display.hpp
View File

@ -4,7 +4,7 @@
namespace Display { namespace Display {
void init(); void init();
void update(); void update();
void set_label_text(String text); void setLabelText(String text);
} }
#endif // DRUMZ_UI_DISPLAY_HPP #endif // DRUMZ_UI_DISPLAY_HPP