Merge pull request #13 from Forairaaaaa/add-display-driver-label

update v0.3

Author: Forairaaaaa

app/apps/app_launcher/view/panel_lcd_backlight.cpp

@@ -18,12 +18,14 @@ using namespace smooth_ui_toolkit::lvgl_cpp;
 
 static const std::string _tag = "panel-lcd-bl";
 
-static constexpr int16_t _label_pos_x    = 591;
-static constexpr int16_t _label_pos_y    = 94;
-static constexpr int16_t _btn_up_pos_x   = 499;
-static constexpr int16_t _btn_up_pos_y   = 166;
-static constexpr int16_t _btn_down_pos_x = 593;
-static constexpr int16_t _btn_down_pos_y = 166;
+static constexpr int16_t _label_pos_x      = 595;
+static constexpr int16_t _label_pos_y      = 107;
+static constexpr int16_t _label_panel_ic_x = -7;
+static constexpr int16_t _label_panel_ic_y = 74;
+static constexpr int16_t _btn_up_pos_x     = 505;
+static constexpr int16_t _btn_up_pos_y     = 176;
+static constexpr int16_t _btn_down_pos_x   = 599;
+static constexpr int16_t _btn_down_pos_y   = 176;
 
 static constexpr int16_t _midi_up     = 64 + 24;
 static constexpr int16_t _midi_down   = 60 + 24;
@@ -38,6 +40,12 @@ void PanelLcdBacklight::init()
     _label_brightness->setTextColor(lv_color_hex(0xFEFEFE));
     _label_brightness->setText(fmt::format("{}", GetHAL()->getDisplayBrightness()));
 
+    _label_panel_ic = std::make_unique<Label>(lv_screen_active());
+    _label_panel_ic->align(LV_ALIGN_RIGHT_MID, _label_panel_ic_x, _label_panel_ic_y);
+    _label_panel_ic->setTextFont(&lv_font_montserrat_16);
+    _label_panel_ic->setTextColor(lv_color_hex(0x55866D));
+    _label_panel_ic->setText(fmt::format("LCD IC: {}", GetHAL()->getDisplayPanelIc()));
+
     _btn_up = std::make_unique<Container>(lv_screen_active());
     _btn_up->align(LV_ALIGN_CENTER, _btn_up_pos_x, _btn_up_pos_y);
     _btn_up->setSize(81, 85);

app/apps/app_launcher/view/panel_spk_volume.cpp

@@ -18,12 +18,12 @@ using namespace smooth_ui_toolkit::lvgl_cpp;
 
 static const std::string _tag = "panel-spk-vol";
 
-static constexpr int16_t _label_pos_x    = 605;
-static constexpr int16_t _label_pos_y    = 240;
-static constexpr int16_t _btn_up_pos_x   = 499;
-static constexpr int16_t _btn_up_pos_y   = 312;
-static constexpr int16_t _btn_down_pos_x = 593;
-static constexpr int16_t _btn_down_pos_y = 312;
+static constexpr int16_t _label_pos_x    = 606;
+static constexpr int16_t _label_pos_y    = 247;
+static constexpr int16_t _btn_up_pos_x   = 505;
+static constexpr int16_t _btn_up_pos_y   = 314;
+static constexpr int16_t _btn_down_pos_x = 599;
+static constexpr int16_t _btn_down_pos_y = 314;
 
 static constexpr int16_t _midi_up   = 64 + 24;
 static constexpr int16_t _midi_down = 60 + 24;

app/apps/app_launcher/view/view.h

@@ -56,6 +56,7 @@ class PanelLcdBacklight : public PanelBase {
 
 private:
     std::unique_ptr<smooth_ui_toolkit::lvgl_cpp::Label> _label_brightness;
+    std::unique_ptr<smooth_ui_toolkit::lvgl_cpp::Label> _label_panel_ic;
     std::unique_ptr<smooth_ui_toolkit::lvgl_cpp::Container> _btn_up;
     std::unique_ptr<smooth_ui_toolkit::lvgl_cpp::Container> _btn_down;
     smooth_ui_toolkit::AnimateValue _label_y_anim;

app/apps/app_startup_anim/app_startup_anim.cpp

@@ -13,7 +13,7 @@ using namespace mooncake;
 using namespace smooth_ui_toolkit;
 using namespace smooth_ui_toolkit::lvgl_cpp;
 
-#define FIRMWARE_VERSION "V0.2"
+#define FIRMWARE_VERSION "V0.3"
 
 AppStartupAnim::AppStartupAnim()
 {

app/assets/images/launcher_bg.c

@@ -73,6 +73,11 @@ class HalBase {
     {
         return 0;
     }
+    virtual std::string getDisplayPanelIc()
+    {
+        return "ILI9881C";
+        // return "ST7123";
+    }
 
     /* ---------------------------------- Lvgl ---------------------------------- */
     lv_indev_t* lvTouchpad = nullptr;

app/hal/hal.h

@@ -0,0 +1,6 @@
+idf_component_register(SRCS "esp_lcd_st7121.c"
+                       INCLUDE_DIRS "include"
+                       REQUIRES "esp_lcd")
+
+include(package_manager)
+cu_pkg_define_version(${CMAKE_CURRENT_LIST_DIR})

platforms/tab5/components/esp_lcd_st7121/CMakeLists.txt

@@ -0,0 +1 @@
+# ST7121