Fix error / warning due to wrong order of structure initialization

luc-github · Jan 6, 2024 · e586638 · e586638
1 parent 0ecea7a
commit e586638
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/hardware/ESP32S3_4827S043C/components/bsp/disp_def.h b/hardware/ESP32S3_4827S043C/components/bsp/disp_def.h
@@ -111,9 +111,9 @@ const esp_lcd_rgb_panel_config_t disp_panel_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 20  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 2, // GPIO 2
     .pwm_control = true,
     .output_invert = false,
+    .gpio_num = 2, 
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32S3_8048S043C/components/bsp/disp_def.h b/hardware/ESP32S3_8048S043C/components/bsp/disp_def.h
@@ -111,9 +111,9 @@ const esp_lcd_rgb_panel_config_t disp_panel_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 20  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 2, // GPIO 2
     .pwm_control = true,
-    .output_invert = false,
+    .output_invert = false, 
+    .gpio_num = 2,
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32S3_8048S050C/components/bsp/disp_def.h b/hardware/ESP32S3_8048S050C/components/bsp/disp_def.h
@@ -111,9 +111,9 @@ const esp_lcd_rgb_panel_config_t disp_panel_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 20  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 2, // GPIO 2
     .pwm_control = true,
     .output_invert = false,
+    .gpio_num = 2, 
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32S3_8048S070C/components/bsp/disp_def.h b/hardware/ESP32S3_8048S070C/components/bsp/disp_def.h
@@ -111,9 +111,9 @@ const esp_lcd_rgb_panel_config_t disp_panel_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 20  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 2, // GPIO 2
     .pwm_control = true,
     .output_invert = false,
+    .gpio_num = 2, 
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32_2432S028R/components/bsp/disp_def.h b/hardware/ESP32_2432S028R/components/bsp/disp_def.h
@@ -68,13 +68,14 @@ esp_lcd_panel_io_spi_config_t disp_spi_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 100  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 21, // GPIO 21
     .pwm_control = false,
     .output_invert = false,
+    .gpio_num = 21, 
     .timer_idx = 0,
     .channel_idx = 0
 };
 
+
 #ifdef __cplusplus
 } /* extern "C" */
 #endif
diff --git a/hardware/ESP32_3248S035C/components/bsp/disp_def.h b/hardware/ESP32_3248S035C/components/bsp/disp_def.h
@@ -68,9 +68,9 @@ esp_lcd_panel_io_spi_config_t disp_spi_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 100  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 27, // GPIO 27
     .pwm_control = false,
     .output_invert = false,
+    .gpio_num = 27,
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32_3248S035R/components/bsp/disp_def.h b/hardware/ESP32_3248S035R/components/bsp/disp_def.h
@@ -60,9 +60,9 @@ esp_lcd_panel_io_spi_config_t disp_spi_cfg = {
 #define DISP_BCKL_DEFAULT_DUTY 100  //%
 
 const disp_backlight_config_t disp_bcklt_cfg = {
-    .gpio_num = 27, // GPIO 27
     .pwm_control = false,
     .output_invert = false,
+    .gpio_num = 27, 
     .timer_idx = 0,
     .channel_idx = 0
 };

diff --git a/hardware/ESP32_ROTRICS_DEXARM35/components/lcd_backlight/esp_lcd_backlight.h b/hardware/ESP32_ROTRICS_DEXARM35/components/lcd_backlight/esp_lcd_backlight.h
@@ -33,7 +33,6 @@ typedef struct {
     bool pwm_control;
     bool output_invert;
     int gpio_num; // see gpio_num_t
-
     // Relevant only for PWM controlled backlight
     // Ignored for switch (ON/OFF) backlight control
     int timer_idx;   // ledc_timer_t