From fffd9c6b5d24da77276369709532e32484cf7d0d Mon Sep 17 00:00:00 2001 From: Fritz Heiden Date: Sat, 24 May 2025 15:27:01 +0200 Subject: [PATCH] refactor: put all display code into namespace; use camel case --- src/input/encoder.cpp | 4 +-- src/main.cpp | 2 +- src/ui/display.cpp | 62 +++++++++++++++++++++---------------------- src/ui/display.hpp | 2 +- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/input/encoder.cpp b/src/input/encoder.cpp index 31a25bf..1ba1ece 100644 --- a/src/input/encoder.cpp +++ b/src/input/encoder.cpp @@ -51,7 +51,7 @@ namespace Encoder void handlePress() { Serial.println("Encoder pressed"); - Display::set_label_text("Button pressed."); + Display::setLabelText("Button pressed."); } void handleRelease() @@ -74,6 +74,6 @@ namespace Encoder Serial.print("Frequency: "); Serial.println(frequency); - Display::set_label_text("Frequency: " + String(frequency) + "Hz"); + Display::setLabelText("Frequency: " + String(frequency) + "Hz"); } } diff --git a/src/main.cpp b/src/main.cpp index dba9b54..7ef14a5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,7 +35,7 @@ void setup() Display::init(); Serial.println("setup complete"); - Display::set_label_text("Boot complete."); + Display::setLabelText("Boot complete."); } void loop() diff --git a/src/ui/display.cpp b/src/ui/display.cpp index 8504277..4c4ce86 100644 --- a/src/ui/display.cpp +++ b/src/ui/display.cpp @@ -12,25 +12,25 @@ #endif #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 { + 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() { lv_init(); - lv_log_register_print_cb(handle_lvgl_logs); - lv_tick_set_cb(get_time); + lv_log_register_print_cb(handleLvglLogs); + 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_display_t *display; @@ -45,27 +45,27 @@ namespace Display { lv_timer_handler(); } - - void set_label_text(String text) + + void setLabelText(String text) { label_text = text; } -} -void handle_lvgl_logs(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()) + void handleLvglLogs(lv_log_level_t level, const char *buf) { - lv_label_set_text(label, label_text.c_str()); + Serial.printf("LVGL: %s\r\n", buf); } -} \ No newline at end of file + + 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()); + } + } +} diff --git a/src/ui/display.hpp b/src/ui/display.hpp index a080857..5de0b81 100644 --- a/src/ui/display.hpp +++ b/src/ui/display.hpp @@ -4,7 +4,7 @@ namespace Display { void init(); void update(); - void set_label_text(String text); + void setLabelText(String text); } #endif // DRUMZ_UI_DISPLAY_HPP \ No newline at end of file