protofusion-esp32-template Changeset - 7828d6c855c2

Changeset - 7828d6c855c2

Parent rev.

Child rev.

[Not reviewed]

default

0 4 2

Ethan Zonca - 16 months ago 2024-01-25 18:50:47
ez@ethanzonca.com

Seperate display init from actual ui

6 files changed with 297 insertions and 220 deletions:

main/CMakeLists.txt

main/display.c

215

main/display.h

main/display_gui.c

258

main/display_gui.h

main/main.c

0 comments (0 inline, 0 general)

main/CMakeLists.txt

➞

Show inline comments

 idf_component_register(SRCS "main.c" "wifi.c" "usb_cdc.c" "can.c" "display.c"
+idf_component_register(SRCS "main.c" "wifi.c" "usb_cdc.c" "can.c" "display.c" "display_gui.c"
                        INCLUDE_DIRS .)

main/display.c

➞

Show inline comments

 //
 // display
+// display: initialize lcd and lvgl
 //
 #include "display.h"
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_check.h"
@@ @@ -10,44 +10,29 @@ @@
 #include "driver/gpio.h"
 #include "driver/spi_master.h"
 #include "esp_lcd_panel_io.h"
 #include "esp_lcd_panel_vendor.h"
 #include "esp_lcd_panel_ops.h"
 #include "esp_lvgl_port.h"
 #include <stdio.h>
 #include "esp_timer.h"
 #include "esp_heap_caps.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 // #include "ui_helpers.h"
 static const char *TAG = "LVGL_SETUP";
 static void lvgl_timer_task(void *arg);
 static lv_obj_t *ui_Screen1;
 static lv_obj_t *ui_redsquare;
 // Private variables
 static const char *TAG = "display";
 static void lvgl_timer_task(void *arg);
 static SemaphoreHandle_t lvgl_mux;  // LVGL mutex
 static SemaphoreHandle_t touch_mux; // Touch mutex
 static lv_obj_t *meter;
 static lv_obj_t *ue_img_logo;
 static lv_obj_t *esp_img_logo;
 static lv_obj_t *ui_Dropdown2;
 LV_IMG_DECLARE(ue_logo)
 LV_IMG_DECLARE(esp_logo)
 LV_IMG_DECLARE(red_square)
 #define BSP_NULL_CHECK(x, ret) assert(x)
 static SemaphoreHandle_t lvgl_mux;  // LVGL mutex
 static SemaphoreHandle_t touch_mux; // Touch mutex
 #if USE_TOUCH_DISPLAY
 static void bsp_touchpad_read(lv_indev_drv_t *drv, lv_indev_data_t *data)
+{
     uint16_t touchpad_x[1] = {0};
@@ @@ -86,41 +71,45 @@ static void touch_callback(esp_lcd_touch @@
         portYIELD_FROM_ISR();
+    }
+}
 #endif
 static void set_value(void *indic, int32_t v)
+{
     lv_meter_set_indicator_end_value(meter, indic, v);
+}
 // Flush ready
 static bool example_notify_lvgl_flush_ready(esp_lcd_panel_io_handle_t panel_io, esp_lcd_panel_io_event_data_t *edata, void *user_ctx)
+{
     lv_disp_drv_t *disp_driver = (lv_disp_drv_t *)user_ctx;
     lv_disp_flush_ready(disp_driver);
     return false;
+}
 // Flush buffer to display
 static void example_lvgl_flush_cb(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *color_map)
+{
     esp_lcd_panel_handle_t panel_handle = (esp_lcd_panel_handle_t)drv->user_data;
     int offsetx1 = area->x1;
     int offsetx2 = area->x2;
     int offsety1 = area->y1;
     int offsety2 = area->y2;
     // copy a buffer's content to a specific area of the display
     esp_lcd_panel_draw_bitmap(panel_handle, offsetx1, offsety1, offsetx2 + 1, offsety2 + 1, color_map);
+}
 // Tick handler
 static void example_increase_lvgl_tick(void *arg)
+{
     /* Tell LVGL how many milliseconds has elapsed */
     lv_tick_inc(EXAMPLE_LVGL_TICK_PERIOD_MS);
+}
 // Initialize display
 void display_init()
+{
     static lv_disp_draw_buf_t disp_buf; // contains internal graphic buffer(s) called draw buffer(s)
     static lv_disp_drv_t disp_drv;      // contains callback functions
@@ @@ -321,228 +310,47 @@ void display_init() @@
     indev_drv.user_data = tp;
     indev_touchpad = lv_indev_drv_register(&indev_drv);
     BSP_NULL_CHECK(indev_touchpad, ESP_ERR_NO_MEM);
 #endif
     xTaskCreatePinnedToCore(lvgl_timer_task, "lvgl Timer", 10000, NULL, 4, NULL, 1);
+}
+}
 // Task for lvgl timer
 static void lvgl_timer_task(void *arg)
+{
     ESP_LOGI(TAG, "Starting LVGL task");
     while (1)
+    {
-        bsp_display_lock(0);
+        display_lock(0);
         uint32_t task_delay_ms = lv_timer_handler();
-        bsp_display_unlock();
+        display_unlock();
         if (task_delay_ms > 500)
+        {
             task_delay_ms = 500;
+        }
         else if (task_delay_ms < 5)
+        {
             task_delay_ms = 5;
+        }
         vTaskDelay(pdMS_TO_TICKS(task_delay_ms));
+    }
+}
 void display_meter()
+{
     meter = lv_meter_create(lv_scr_act());
     lv_obj_center(meter);
     lv_obj_set_size(meter, 170, 170);
     /*Remove the circle from the middle*/
     lv_obj_remove_style(meter, NULL, LV_PART_INDICATOR);
     /*Add a scale first*/
     lv_meter_scale_t *scale = lv_meter_add_scale(meter);
     lv_meter_set_scale_ticks(meter, scale, 11, 2, 10, lv_palette_main(LV_PALETTE_GREY));
     lv_meter_set_scale_major_ticks(meter, scale, 1, 2, 15, lv_color_hex3(0xeee), 10);
     lv_meter_set_scale_range(meter, scale, 0, 100, 270, 90);
     /*Add a three arc indicator*/
     lv_meter_indicator_t *indic1 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x00F), 0);
     // lv_meter_indicator_t *indic2 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x0F0), -10);
     // lv_meter_indicator_t *indic3 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0xF00), -20);
     /*Create an animation to set the value*/
     lv_anim_t a;
     lv_anim_init(&a);
     lv_anim_set_exec_cb(&a, set_value);
     lv_anim_set_values(&a, 0, 100);
     lv_anim_set_repeat_delay(&a, 100);
     lv_anim_set_playback_delay(&a, 2000);
     lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE);
     lv_anim_set_time(&a, 2000);
     lv_anim_set_playback_time(&a, 500);
     lv_anim_set_var(&a, indic1);
     lv_anim_start(&a);
     /*
         lv_anim_set_time(&a, 1000);
         lv_anim_set_playback_time(&a, 1000);
         lv_anim_set_var(&a, indic2);
         lv_anim_start(&a);
         lv_anim_set_time(&a, 1000);
         lv_anim_set_playback_time(&a, 2000);
         lv_anim_set_var(&a, indic3);
         lv_anim_start(&a);
         */
     /* page 3 */
+}
 static void dropdown_event_handler(lv_event_t *e)
+{
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t *obj = lv_event_get_target(e);
     if (code == LV_EVENT_VALUE_CHANGED)
+    {
         char buf[32];
         lv_dropdown_get_selected_str(obj, buf, sizeof(buf));
         LV_LOG_USER("Option: %s", buf);
+    }
+}
 /**
  * @brief dispaly dropdown is rotated 180 degrees (USB to the right is the orentation)
+ *
  */
 void display_dropdown()
+{
     lv_disp_t *dispp = lv_disp_get_default();
     ui_Dropdown2 = lv_dropdown_create(lv_scr_act());
     lv_dropdown_set_options(ui_Dropdown2, "Apple\n"
                                           "Banana\n"
                                           "Orange\n"
                                           "Melon\n"
                                           "Grape\n"
                                           "Raspberry");
     lv_obj_set_width(ui_Dropdown2, 150);
     lv_obj_set_height(ui_Dropdown2, LV_SIZE_CONTENT); /// 1
     lv_obj_set_x(ui_Dropdown2, 0);
     lv_obj_set_y(ui_Dropdown2, -20);
     lv_obj_set_align(ui_Dropdown2, LV_ALIGN_CENTER);
     lv_obj_add_flag(ui_Dropdown2, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
     lv_obj_add_event_cb(ui_Dropdown2, dropdown_event_handler, LV_EVENT_ALL, NULL);
+}
 void display_window()
+{
     lv_obj_t *win = lv_win_create(lv_scr_act(), 40);
     assert(win);
     lv_win_add_title(win, "test123!");
+}
 void display_image()
+{
     esp_img_logo = lv_img_create(lv_scr_act());
     lv_img_set_src(esp_img_logo, &esp_logo);
     lv_obj_center(esp_img_logo);
+}
 void display_red_square()
+{
     // ui_Screen1 = lv_obj_create(NULL);
     // lv_obj_clear_flag(ui_Screen1, LV_OBJ_FLAG_SCROLLABLE);      /// Flags
     ui_redsquare = lv_img_create(lv_scr_act());
     lv_img_set_src(ui_redsquare, &red_square);
     lv_obj_set_width(ui_redsquare, LV_SIZE_CONTENT);  /// 1
     lv_obj_set_height(ui_redsquare, LV_SIZE_CONTENT); /// 1
     lv_obj_set_align(ui_redsquare, LV_ALIGN_CENTER);
     lv_obj_add_flag(ui_redsquare, LV_OBJ_FLAG_ADV_HITTEST);  /// Flags
     lv_obj_clear_flag(ui_redsquare, LV_OBJ_FLAG_SCROLLABLE); /// Flags
+}
 static void slider_event_cb(lv_event_t *e);
 static lv_obj_t *slider_label;
 void display_slider()
+{
     lv_disp_t *dispp = lv_disp_get_default();
     /*Create a slider in the center of the display*/
     lv_obj_t *slider = lv_slider_create(lv_scr_act());
     lv_obj_set_x(slider, 0);
     lv_obj_set_y(slider, -40);
     lv_obj_set_align(slider, LV_ALIGN_CENTER);
     lv_obj_add_event_cb(slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
     /*Create a label below the slider*/
     slider_label = lv_label_create(lv_scr_act());
     lv_label_set_text(slider_label, "0%");
     lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+}
 static void slider_event_cb(lv_event_t *e)
+{
     lv_obj_t *slider = lv_event_get_target(e);
     char buf[8];
     lv_snprintf(buf, sizeof(buf), "%d%%", (int)lv_slider_get_value(slider));
     lv_label_set_text(slider_label, buf);
     lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+}
 void get_img_color()
+{
     lv_color_t pixel_color = lv_img_buf_get_px_color(&red_square, 50, 50, lv_color_make(0, 0, 0));
     uint32_t c32 = lv_color_to32(pixel_color);
     printf("Pixel color: %lu \n", c32);
+}
 bool bsp_display_lock(uint32_t timeout_ms)
 // Semaphore-based locking of display
 bool display_lock(uint32_t timeout_ms)
+{
     BSP_NULL_CHECK(lvgl_mux, NULL);
     const TickType_t timeout_ticks = (timeout_ms == 0) ? portMAX_DELAY : pdMS_TO_TICKS(timeout_ms);
     return xSemaphoreTake(lvgl_mux, timeout_ticks) == pdTRUE;
+}
 void bsp_display_unlock(void)
 // Semaphore-based unlocking of display
 void display_unlock(void)
+{
     BSP_NULL_CHECK(lvgl_mux, NULL);
     xSemaphoreGive(lvgl_mux);
+}
 lv_obj_t *label;
 void display_update_text(char* str)
+{
     bsp_display_lock(0);
     lv_label_set_text(label, str);
     bsp_display_unlock();
+}
 // make a display task that listens for messages from a queue that change visual elements
 void display_process(void)
+{
     bsp_display_lock(0);
     label = lv_label_create(lv_scr_act());
     lv_label_set_text(label, "Yup");
     // lv_obj_align_to(label, lv_scr_act(), LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
     // display_slider();
     //Call one at a time to see examples
     display_meter();
     // display_image();
     // display_window();
     //display_dropdown();
     bsp_display_unlock();
+}

main/display.h

➞

Show inline comments

@@ @@ -63,14 +63,14 @@ void display_image(); @@
 void display_slider();
 void display_red_square();
 void display_dropdown();
 void get_img_color();
 void bsp_display_unlock(void);
 bool bsp_display_lock(uint32_t timeout_ms);
 void display_unlock(void);
 bool display_lock(uint32_t timeout_ms);
 typedef struct _display_update_s
+{
     uint32_t element;
     char text[64];
 } display_update_t;

main/display_gui.c

➞

Show inline comments

@@ new file 100644 @@
 //
 // display_gui: display elements onscreen
 //
 #include "display_gui.h"
 #include "display.h"
 #include "esp_lvgl_port.h"
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_check.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 static lv_obj_t *ui_Screen1;
 static lv_obj_t *ui_redsquare;
 static lv_obj_t *meter;
 static lv_meter_indicator_t *meter_indic1;
 static lv_obj_t *ue_img_logo;
 static lv_obj_t *esp_img_logo;
 static lv_obj_t *label;
 static lv_obj_t *ui_Dropdown2;
 LV_IMG_DECLARE(ue_logo)
 LV_IMG_DECLARE(esp_logo)
 LV_IMG_DECLARE(red_square)
 void display_gui_homescreen(void)
+{
     // Actually create homescreen widgets
     display_lock(0);
     label = lv_label_create(lv_scr_act());
     lv_label_set_text(label, "Yup");
     // lv_obj_align_to(label, lv_scr_act(), LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
     // display_slider();
     //Call one at a time to see examples
     display_meter();
     // display_image();
     // display_window();
     //display_dropdown();
     display_unlock();
+}
 void display_meter()
+{
     meter = lv_meter_create(lv_scr_act());
     lv_obj_center(meter);
     lv_obj_set_size(meter, 140, 140);
     /*Remove the circle from the middle*/
     lv_obj_remove_style(meter, NULL, LV_PART_INDICATOR);
     /*Add a scale first*/
     lv_meter_scale_t *scale = lv_meter_add_scale(meter);
     lv_meter_set_scale_ticks(meter, scale, 11, 2, 10, lv_palette_main(LV_PALETTE_GREY));
     lv_meter_set_scale_major_ticks(meter, scale, 1, 2, 15, lv_color_hex3(0xeee), 10);
     lv_meter_set_scale_range(meter, scale, 0, 100, 270, 90);
     /*Add a three arc indicator*/
      meter_indic1 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x00F), 0);
     // lv_meter_indicator_t *indic2 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0x0F0), -10);
     // lv_meter_indicator_t *indic3 = lv_meter_add_arc(meter, scale, 10, lv_color_hex3(0xF00), -20);
     /*Create an animation to set the value*/
     /*lv_anim_t a;
     lv_anim_init(&a);
     lv_anim_set_exec_cb(&a, set_value);
     lv_anim_set_values(&a, 0, 100);
     lv_anim_set_repeat_delay(&a, 100);
     lv_anim_set_playback_delay(&a, 2000);
     lv_anim_set_repeat_count(&a, LV_ANIM_REPEAT_INFINITE);
     lv_anim_set_time(&a, 2000);
     lv_anim_set_playback_time(&a, 500);
     lv_anim_set_var(&a, indic1);
     lv_anim_start(&a); */
     /*
         lv_anim_set_time(&a, 1000);
         lv_anim_set_playback_time(&a, 1000);
         lv_anim_set_var(&a, indic2);
         lv_anim_start(&a);
         lv_anim_set_time(&a, 1000);
         lv_anim_set_playback_time(&a, 2000);
         lv_anim_set_var(&a, indic3);
         lv_anim_start(&a);
         */
     /* page 3 */
+}
 static void dropdown_event_handler(lv_event_t *e)
+{
     lv_event_code_t code = lv_event_get_code(e);
     lv_obj_t *obj = lv_event_get_target(e);
     if (code == LV_EVENT_VALUE_CHANGED)
+    {
         char buf[32];
         lv_dropdown_get_selected_str(obj, buf, sizeof(buf));
         LV_LOG_USER("Option: %s", buf);
+    }
+}
 /**
  * @brief dispaly dropdown is rotated 180 degrees (USB to the right is the orentation)
+ *
  */
 void display_dropdown()
+{
     lv_disp_t *dispp = lv_disp_get_default();
     ui_Dropdown2 = lv_dropdown_create(lv_scr_act());
     lv_dropdown_set_options(ui_Dropdown2, "Apple\n"
                                           "Banana\n"
                                           "Orange\n"
                                           "Melon\n"
                                           "Grape\n"
                                           "Raspberry");
     lv_obj_set_width(ui_Dropdown2, 150);
     lv_obj_set_height(ui_Dropdown2, LV_SIZE_CONTENT); /// 1
     lv_obj_set_x(ui_Dropdown2, 0);
     lv_obj_set_y(ui_Dropdown2, -20);
     lv_obj_set_align(ui_Dropdown2, LV_ALIGN_CENTER);
     lv_obj_add_flag(ui_Dropdown2, LV_OBJ_FLAG_SCROLL_ON_FOCUS); /// Flags
     lv_obj_add_event_cb(ui_Dropdown2, dropdown_event_handler, LV_EVENT_ALL, NULL);
+}
 void display_window()
+{
     lv_obj_t *win = lv_win_create(lv_scr_act(), 40);
     assert(win);
     lv_win_add_title(win, "test123!");
+}
 void display_image()
+{
     esp_img_logo = lv_img_create(lv_scr_act());
     lv_img_set_src(esp_img_logo, &esp_logo);
     lv_obj_center(esp_img_logo);
+}
 void display_red_square()
+{
     // ui_Screen1 = lv_obj_create(NULL);
     // lv_obj_clear_flag(ui_Screen1, LV_OBJ_FLAG_SCROLLABLE);      /// Flags
     ui_redsquare = lv_img_create(lv_scr_act());
     lv_img_set_src(ui_redsquare, &red_square);
     lv_obj_set_width(ui_redsquare, LV_SIZE_CONTENT);  /// 1
     lv_obj_set_height(ui_redsquare, LV_SIZE_CONTENT); /// 1
     lv_obj_set_align(ui_redsquare, LV_ALIGN_CENTER);
     lv_obj_add_flag(ui_redsquare, LV_OBJ_FLAG_ADV_HITTEST);  /// Flags
     lv_obj_clear_flag(ui_redsquare, LV_OBJ_FLAG_SCROLLABLE); /// Flags
+}
 static void slider_event_cb(lv_event_t *e);
 static lv_obj_t *slider_label;
 void display_slider()
+{
     lv_disp_t *dispp = lv_disp_get_default();
     /*Create a slider in the center of the display*/
     lv_obj_t *slider = lv_slider_create(lv_scr_act());
     lv_obj_set_x(slider, 0);
     lv_obj_set_y(slider, -40);
     lv_obj_set_align(slider, LV_ALIGN_CENTER);
     lv_obj_add_event_cb(slider, slider_event_cb, LV_EVENT_VALUE_CHANGED, NULL);
     /*Create a label below the slider*/
     slider_label = lv_label_create(lv_scr_act());
     lv_label_set_text(slider_label, "0%");
     lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+}
 static void slider_event_cb(lv_event_t *e)
+{
     lv_obj_t *slider = lv_event_get_target(e);
     char buf[8];
     lv_snprintf(buf, sizeof(buf), "%d%%", (int)lv_slider_get_value(slider));
     lv_label_set_text(slider_label, buf);
     lv_obj_align_to(slider_label, slider, LV_ALIGN_OUT_BOTTOM_MID, 0, 10);
+}
 void get_img_color()
+{
     lv_color_t pixel_color = lv_img_buf_get_px_color(&red_square, 50, 50, lv_color_make(0, 0, 0));
     uint32_t c32 = lv_color_to32(pixel_color);
     printf("Pixel color: %lu \n", c32);
+}
 static void set_value(void *indic, int32_t v)
+{
     lv_meter_set_indicator_end_value(meter, indic, v);
+}
 void display_update_text(char* str)
+{
     display_lock(0);
     lv_label_set_text(label, str);
     display_unlock();
+}
 // make a display task that listens for messages from a queue that change visual elements
 uint32_t value = 0;
 void display_gui_process(void)
+{
     display_lock(0);
     set_value(meter_indic1, value);
     value = (value + 1) % 100;
     display_unlock();
+}

main/display_gui.h

➞

Show inline comments

@@ new file 100644 @@
 #ifndef _DISPLAY_GUI_H_
 #define _DISPLAY_GUI_H_
 void display_gui_process(void);
 void display_gui_homescreen(void);
 #endif
@@ \ No newline at end of file @@

main/main.c

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ @@
 #include "sdkconfig.h"
 #include "wifi.h"
 // #include "usb_cdc.h"
 #include "can.h"
 #include "display.h"
 #include "display_gui.h"
 // Private variables
 static const char *TAG = "main";
@@ @@ -38,22 +39,23 @@ void app_main(void) @@
     //vTaskDelay(pdTICKS_TO_MS(3000));
     // Initialize display
     display_init();
     display_process();
     display_gui_homescreen();
     // Connect to wifi
     wifi_init();
     // Initialize canbus
     //can_init();
     while(1)
+    {
         display_gui_process();
         vTaskDelay(pdMS_TO_TICKS(1000));
+    }
+}

0 comments (0 inline, 0 general)