Merge pull request #174 from rzeldent/develop

Develop into Main
rzeldent · Jun 16, 2024 · 01cbcbd · 01cbcbd
2 parents 3b5f816 + 760e386
commit 01cbcbd
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 9 deletions.
diff --git a/include/esp32_smartdisplay.h b/include/esp32_smartdisplay.h
@@ -39,6 +39,10 @@ extern "C"
     // Set the adaptive brightness callback
     typedef float (*smartdisplay_lcd_adaptive_brightness_cb_t)();
     void smartdisplay_lcd_set_brightness_cb(smartdisplay_lcd_adaptive_brightness_cb_t cb, uint interval);
+#ifdef BOARD_HAS_CDS
+    // Read CdS sensor and return a value for the screen brightness (to be used in smartdisplay_lcd_set_brightness_cb)
+    float smartdisplay_lcd_adaptive_brightness_cds();
+#endif    
 #ifdef BOARD_HAS_RGB_LED
     void smartdisplay_led_set_rgb(bool r, bool g, bool b);
 #endif

diff --git a/src/lvgl_panel_ili9341_spi.c b/src/lvgl_panel_ili9341_spi.c
@@ -28,7 +28,7 @@ static void ili9341_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is supported
     drv->sw_rotate = 0;

diff --git a/src/lvgl_panel_st7262_par.c b/src/lvgl_panel_st7262_par.c
@@ -20,7 +20,7 @@ void direct_io_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *c
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is NOT supported
     drv->sw_rotate = 1;

diff --git a/src/lvgl_panel_st7701_par.c b/src/lvgl_panel_st7701_par.c
@@ -22,7 +22,7 @@ void direct_io_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *c
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is NOT supported
     drv->sw_rotate = 1;

diff --git a/src/lvgl_panel_st7789_i80.c b/src/lvgl_panel_st7789_i80.c
@@ -27,7 +27,7 @@ void st7789_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *colo
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is NOT supported
     drv->sw_rotate = 1;

diff --git a/src/lvgl_panel_st7789_spi.c b/src/lvgl_panel_st7789_spi.c
@@ -28,7 +28,7 @@ void st7789_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *colo
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is supported
     drv->sw_rotate = 0;

diff --git a/src/lvgl_panel_st7796_spi.c b/src/lvgl_panel_st7796_spi.c
@@ -29,7 +29,7 @@ void st7796_lv_flush(lv_disp_drv_t *drv, const lv_area_t *area, lv_color_t *colo
 
 void lvgl_lcd_init(lv_disp_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Hardware rotation is supported
     drv->sw_rotate = 0;

diff --git a/src/lvgl_touch_cst816s_i2c.c b/src/lvgl_touch_cst816s_i2c.c
@@ -29,7 +29,7 @@ void cst816s_lvgl_touch_cb(lv_indev_drv_t *drv, lv_indev_data_t *data)
 
 void lvgl_touch_init(lv_indev_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Create I2C bus
     const i2c_config_t i2c_config = {

diff --git a/src/lvgl_touch_gt911_i2c.c b/src/lvgl_touch_gt911_i2c.c
@@ -30,7 +30,7 @@ void gt911_lvgl_touch_cb(lv_indev_drv_t *drv, lv_indev_data_t *data)
 
 void lvgl_touch_init(lv_indev_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Create I2C bus
     const i2c_config_t i2c_config = {

diff --git a/src/lvgl_touch_xpt2046_spi.c b/src/lvgl_touch_xpt2046_spi.c
@@ -29,7 +29,7 @@ void xpt2046_lvgl_touch_cb(lv_indev_drv_t *drv, lv_indev_data_t *data)
 
 void lvgl_touch_init(lv_indev_drv_t *drv)
 {
-    log_v("drv:0x%08x");
+    log_v("drv:0x%08x", drv);
 
     // Create SPI bus only if not already initialized (S035R shares the SPI bus)
     const spi_bus_config_t spi_bus_config = {