Disabled TE signal handling for now, disabled building of LVGL demos and examples, formatting and small adjustments

Author: BAndiT1983

.clang-format

@@ -18,3 +18,4 @@ SortIncludes: false
 Cpp11BracedListStyle: true
 ColumnLimit: 120
 AllowShortFunctionsOnASingleLine: false
+AlignConsecutiveAssignments: Consecutive

Firmware/CMakeLists.deps.txt

@@ -1,18 +1,16 @@
 include(FetchContent)
 set(FETCHCONTENT_QUIET FALSE)
 set(FETCHCONTENT_BASE_DIR "${CMAKE_SOURCE_DIR}/3rdParty")
+
 set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+
 # Fetch LVGL
+set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "Disable LVGL examples" FORCE)
+set(CONFIG_LV_BUILD_DEMOS  OFF CACHE BOOL "Disable LVGL demos"  FORCE)
+
 FetchContent_Declare(
   lvgl
   GIT_REPOSITORY https://github.com/lvgl/lvgl.git
   GIT_TAG master
 )
 FetchContent_MakeAvailable(lvgl)
-
-#set(CONFIG_LV_BUILD_DEMOS OFF) # for demos
-#set(CONFIG_LV_BUILD_EXAMPLES OFF) # for examples
-#set(CONFIG_LV_USE_THORVG_INTERNAL OFF) # for ThorVG
-
-set(CONFIG_LV_BUILD_EXAMPLES OFF CACHE BOOL "Disable LVGL examples")
-set(CONFIG_LV_BUILD_DEMOS OFF CACHE BOOL "Disable LVGL demos")

Firmware/lv_conf.h

@@ -88,7 +88,7 @@
  *====================*/
 
 /** Default display refresh, input device read and animation step period. */
-#define LV_DEF_REFR_PERIOD  33      /**< [ms] */
+#define LV_DEF_REFR_PERIOD  5      /**< [ms] */
 
 /** Default Dots Per Inch. Used to initialize default sizes such as widgets sized, style paddings.
  * (Not so important, you can adjust it to modify default sizes and spaces.) */
@@ -755,7 +755,7 @@
 
 #define LV_USE_CALENDAR   1
 #if LV_USE_CALENDAR
-    #define LV_CALENDAR_WEEK_STARTS_MONDAY 0
+    #define LV_CALENDAR_WEEK_STARTS_MONDAY 1
     #if LV_CALENDAR_WEEK_STARTS_MONDAY
         #define LV_CALENDAR_DEFAULT_DAY_NAMES {"Mo", "Tu", "We", "Th", "Fr", "Sa", "Su"}
     #else

Firmware/src/Main.cpp

@@ -21,6 +21,8 @@
 extern "C" {
 #endif
 
+#define DEBUG 1
+
 /**
  * @brief A custom idle percentage function for LVGL's system monitor.
  * Since we are on a bare-metal system without a full OS to track idle time,
@@ -47,8 +49,8 @@ extern volatile bool g_request_lvgl_refresh;
 
 std::unique_ptr<LvglUI> lvglUI;
 
-const int LVGL_TICK_PERIOD_MS = 5; // Original
-// const int LVGL_TICK_PERIOD_MS = 17; // Adjusted to match LV_DEF_REFR_PERIOD,
+// const int LVGL_TICK_PERIOD_MS = 10; // Original
+const int LVGL_TICK_PERIOD_MS = 5; // Adjusted to match LV_DEF_REFR_PERIOD,
 // or try 15ms
 
 bool repeating_timer_callback(struct repeating_timer* t)
@@ -137,6 +139,12 @@ void ParseAndProcessCommand(const char* command_str)
     }
 }
 
+uint32_t my_get_millis(void)
+{
+    return timer_hw->timelr / 1000.0f;
+    // return (timer_hw->timehr << 32 | timer_hw->timelr) / 1000.0f;
+}
+
 int main()
 {
     stdio_init_all(); // Initialize all stdio (USB, UART, etc.)
@@ -190,31 +198,30 @@ int main()
         return -1;
     }
     printf("LvglUI created.\n");
+    lv_tick_set_cb(my_get_millis);
 
     // 4. Initialize Theme (if separate from LvglUI creation)
-    InitializeTheme(); // Make sure this is defined and works
-    printf("Theme Initialized.\n");
-
+    InitializeTheme(); // Make sure this is defined and
     // Explicitly invalidate the screen after all UI and theme initialization.
     // This ensures that lv_task_handler() or lv_refr_now() sees a dirty screen
     // for the first frame.
-    if (platformDriver && platformDriver->GetLvDisplay()) {
-        lv_display_t* disp_to_invalidate = platformDriver->GetLvDisplay();
-        lv_obj_t* active_screen_on_disp = lv_display_get_screen_active(disp_to_invalidate);
-        if (active_screen_on_disp) {
-            lv_obj_invalidate(active_screen_on_disp);
-            printf("Main.cpp: Active screen on display explicitly invalidated for "
-                   "initial draw.\n");
-        }
-    }
-    static struct repeating_timer lvgl_tick_timer;
-    if (!add_repeating_timer_ms(-LVGL_TICK_PERIOD_MS, // Negative for repeating, positive for one-shot
-                                repeating_timer_callback,
-                                NULL, // No user data passed to callback
-                                &lvgl_tick_timer)) {
-        printf("FATAL: Failed to add LVGL tick timer\n");
-        // Handle error, perhaps by falling back to main loop ticking or halting
-    }
+    // if (platformDriver && platformDriver->GetLvDisplay()) {
+    //     lv_display_t* disp_to_invalidate = platformDriver->GetLvDisplay();
+    //     lv_obj_t* active_screen_on_disp = lv_display_get_screen_active(disp_to_invalidate);
+    //     if (active_screen_on_disp) {
+    //         lv_obj_invalidate(active_screen_on_disp);
+    //         printf("Main.cpp: Active screen on display explicitly invalidated for "
+    //                "initial draw.\n");
+    //     }
+    // }
+    // static struct repeating_timer lvgl_tick_timer;
+    // if (!add_repeating_timer_ms(LVGL_TICK_PERIOD_MS, // Negative for repeating, positive for one-shot
+    //                             repeating_timer_callback,
+    //                             NULL, // No user data passed to callback
+    //                             &lvgl_tick_timer)) {
+    //     printf("FATAL: Failed to add LVGL tick timer\n");
+    //     // Handle error, perhaps by falling back to main loop ticking or halting
+    // }
 
     // setup_fps_display(); // Create the FPS label
     // fps_last_update_time = std::chrono::steady_clock::now(); // Initialize FPS
@@ -223,68 +230,48 @@ int main()
     // --- Main Loop ---
     printf("Entering main loop...\n");
     while (true) {
-        // --- Handle Serial Input ---
-        int c = getchar_timeout_us(0); // Poll USB, no timeout
-        while (c != PICO_ERROR_TIMEOUT) {
-            if (c == '\n' || c == '\r') { // End of command
-                if (cmd_buffer_idx > 0) {
-                    cmd_buffer[cmd_buffer_idx] = '\0'; // Null terminate
-                    // printf("RX: %s\n", cmd_buffer); // Echo received command
-                    ParseAndProcessCommand(cmd_buffer);
-                }
-                cmd_buffer_idx = 0; // Reset buffer
-            }
-            else if (cmd_buffer_idx < CMD_BUFFER_SIZE - 1 && c >= 32 && c < 127) {
-                // Store printable characters
-                cmd_buffer[cmd_buffer_idx++] = (char)c;
-            }
-            // Check for next character immediately
-            c = getchar_timeout_us(0);
-        }
-
-        uint32_t lv_handler_start_us = time_us_32();
-        lv_task_handler(); // Process LVGL tasks, events, and rendering.
-        uint32_t lv_handler_duration_us = time_us_32() - lv_handler_start_us;
-
-        // Check if TE interrupt requested an LVGL refresh
-        if (g_request_lvgl_refresh) {
-            g_request_lvgl_refresh = false; // Consume the flag
-            if (platformDriver && platformDriver->GetLvDisplay()) {
-                // printf("MainLoop: Calling lv_display_refr_timer() due to TE
-                // pulse.\n"); // Verbose lv_refr_now(platformDriver->GetLvDisplay());
-                // // lv_refr_now is immediate, can be heavy in main loop
-                lv_display_refr_timer(nullptr); // Schedules a refresh for the next lv_task_handler call
-            }
-        }
+        // uint32_t lv_handler_start_us = time_us_32();
+        lv_timer_handler(); // Process LVGL tasks, events, and rendering.
+        // uint32_t lv_handler_duration_us = time_us_32() - lv_handler_start_us;
+        //  printf("LVGL handler took %lu ms\n", lv_handler_duration_us / 1000);
+        //  Check if TE interrupt requested an LVGL refresh
+        //  if (g_request_lvgl_refresh) {
+        //      g_request_lvgl_refresh = false; // Consume the flag
+        //      if (platformDriver && platformDriver->GetLvDisplay()) {
+        //          // printf("MainLoop: Calling lv_display_refr_timer() due to TE
+        //          // pulse.\n"); // Verbose lv_refr_now(platformDriver->GetLvDisplay());
+        //          // // lv_refr_now is immediate, can be heavy in main loop
+        //          lv_display_refr_timer(nullptr); // Schedules a refresh for the next lv_task_handler call
+        //      }
+        //  }
 
         // Periodically print lv_task_handler duration, e.g., once per second along
         // with FPS This will be grouped with the FPS update logic below.
 
         // --- FPS Calculation ---
-        // fps_frame_count++;
-        // auto current_time = std::chrono::steady_clock::now();
-        // auto elapsed_ms =
-        // std::chrono::duration_cast<std::chrono::milliseconds>(current_time -
-        // fps_last_update_time).count();
-
-        // if (elapsed_ms >= 1000) { // Update every second
-        //     float fps_val = static_cast<float>(fps_frame_count * 1000.0f) /
-        //     elapsed_ms; if (fps_label_obj) {
-        //         char fps_buf[32]; // Increased buffer size for handler time
-        //         snprintf(fps_buf, sizeof(fps_buf), "FPS: %.1f\nHandler: %lu us",
-        //         fps_val, lv_handler_duration_us);
-        //         lv_label_set_text(fps_label_obj, fps_buf);
-        //     }
-        //     // Optional: Print to console as well
-        //     // printf("FPS: %.1f, LVGL Handler Time: %lu us\n", fps_val,
-        //     lv_handler_duration_us);
-
-        //     fps_frame_count = 0;
-        //     fps_last_update_time = current_time;
-        // }
-
+        // #ifdef DEBUG
+        //         fps_frame_count++;
+        //         auto current_time = std::chrono::steady_clock::now();
+        //         auto elapsed_ms =
+        //             std::chrono::duration_cast<std::chrono::milliseconds>(current_time -
+        //             fps_last_update_time).count();
+
+        //         if (elapsed_ms >= 1000) { // Update every second
+        //             float fps_val = static_cast<float>(fps_frame_count * 1000.0f) / elapsed_ms;
+        //             if (fps_label_obj) {
+        //                 char fps_buf[32]; // Increased buffer size for handler time
+        //                 snprintf(fps_buf, sizeof(fps_buf), "FPS: %.1f\nHandler: %lu us", fps_val,
+        //                 lv_handler_duration_us); lv_label_set_text(fps_label_obj, fps_buf);
+        //             }
+        //             // Optional: Print to console as well
+        //             // printf("FPS: %.1f, LVGL Handler Time: %lu us\n", fps_val, lv_handler_duration_us);
+
+        //             fps_frame_count = 0;
+        //             fps_last_update_time = current_time;
+        //         }
+        // #endif
         // --- Sleep ---
-        // sleep_ms(1);
+        sleep_ms(LVGL_TICK_PERIOD_MS);
     }
 
     // Should not reach here

Firmware/src/drivers/ili9341/ILI9341Display.h

@@ -15,8 +15,8 @@
 // ctrl_base pins are assumed consecutive: RD, WR, DC, CS
 #define ILI_PIN_RST 0
 #define ILI_PIN_TE 1
-#define ILI_PIN_DB0 2  // Base data pin (D0-D7)
-#define ILI_PIN_RD  10 // Base control pin (RD=ctrl_base+0, WR=ctrl_base+1, DC=ctrl_base+2, CS=ctrl_base+3)
+#define ILI_PIN_DB0 2 // Base data pin (D0-D7)
+#define ILI_PIN_RD 10 // Base control pin (RD=ctrl_base+0, WR=ctrl_base+1, DC=ctrl_base+2, CS=ctrl_base+3)
 // The following are implicitly defined by ILI_PIN_RD being the base for the 4 side-set pins
 // #define ILI_PIN_WR  11 // ctrl_base + 1
 // #define ILI_PIN_DC  12 // ctrl_base + 2
@@ -30,27 +30,24 @@
 // --- Display Dimensions ---
 // Defined in ili_def.h presumably
 
-enum class Orientation : uint8_t
-{
-    PORTRAIT             = 0x48, // MY=0, MX=1, MV=0, ML=0, BGR=1
-    LANDSCAPE_Y_FLIP     = 0x28, // MY=0, MX=0, MV=1, ML=0, BGR=1 (Standard Landscape)
-    LANDSCAPE_X_FLIP     = 0xA8, // MY=1, MX=0, MV=1, ML=0, BGR=1 (Landscape 180) - Check datasheet/experiment
-    LANDSCAPE_90         = 0x28, // Alias for standard landscape
-    LANDSCAPE_270        = 0xA8, // Alias for landscape 180
-    PORTRAIT_INVERTED    = 0x88, // MY=1, MX=0, MV=0, ML=0, BGR=1
+enum class Orientation : uint8_t {
+    PORTRAIT          = 0x48, // MY=0, MX=1, MV=0, ML=0, BGR=1
+    LANDSCAPE_Y_FLIP  = 0x28, // MY=0, MX=0, MV=1, ML=0, BGR=1 (Standard Landscape)
+    LANDSCAPE_X_FLIP  = 0xA8, // MY=1, MX=0, MV=1, ML=0, BGR=1 (Landscape 180) - Check datasheet/experiment
+    LANDSCAPE_90      = 0x28, // Alias for standard landscape
+    LANDSCAPE_270     = 0xA8, // Alias for landscape 180
+    PORTRAIT_INVERTED = 0x88, // MY=1, MX=0, MV=0, ML=0, BGR=1
     // Add other orientations based on MADCTL bits (MY, MX, MV, ML, BGR) if needed
     // The names below might not map directly to the MADCTL values provided.
     // Double-check the MADCTL register description for ILI9341.
     // LANDSCAPE_90_INVERTED = 0x60, // Example, verify
     // LANDSCAPE_270_INVERTED = 0x90  // Example, verify
 };
 
-
-class ILI9341Display
-{
-private:
-    bool pio_initialized = false;
-    uint16_t currentWidth = ILI9341_TFTWIDTH;
+class ILI9341Display {
+  private:
+    bool pio_initialized   = false;
+    uint16_t currentWidth  = ILI9341_TFTWIDTH;
     uint16_t currentHeight = ILI9341_TFTHEIGHT;
 
     // DMA channel and configuration for pixel transfers
@@ -68,13 +65,12 @@ class ILI9341Display
     // void WriteData16(uint16_t data); // Not typically used with DMA approach
     void FillScreenRaw(uint16_t color);
 
-    
-    public:
+  public:
     ILI9341Display();
     ~ILI9341Display();
-    
+
     void WaitForTearingEffect();
-    
+
     /**
      * @brief Initializes the PIO, DMA, and the ILI9341 display controller.
      * Must be called before any other display operations.
@@ -133,4 +129,8 @@ class ILI9341Display
      */
     uint32_t MeasureTEInterval();
 
+    bool IsBusy()
+    {
+        return dma_channel_is_busy(tx_dma_chan);
+    }
 };