main: code refactoring

Author: redchenjs

components/ugfx/src/gdriver/gdriver_mk.c

@@ -9,7 +9,7 @@
 
 #undef GDISP_DRIVER_LIST
 
-#ifdef CONFIG_SCREEN_PANEL_ST7735
+#ifdef CONFIG_LCD_TYPE_ST7735
     #define GDISP_DRIVER_LIST GDISPVMT_ST7735
     #include "drivers/gdisp/ST7735/gdisp_lld_ST7735.c"
 #else

main/Kconfig.projbuild

@@ -113,31 +113,49 @@ config ENABLE_GUI
     help
         Select this to enable gui.
 
-choice SCREEN_PANEL
-    prompt "Screen Panel"
-    default SCREEN_PANEL_ST7789
+choice LCD_TYPE
+    prompt "LCD Type"
+    default LCD_TYPE_ST7789
     depends on ENABLE_GUI
     help
-        Select which screen panel to use.
+        Select which LCD type to use.
 
-config SCREEN_PANEL_ST7735
+config LCD_TYPE_ST7735
     bool "ST7735 80x160 LCD Panel"
-config SCREEN_PANEL_ST7789
+config LCD_TYPE_ST7789
     bool "ST7789 135x240 LCD Panel"
 endchoice
 
-config DEV_RST_PIN
-    int "Device RST Pin"
+choice LCD_ORIENTATION
+    prompt "LCD Orientation"
+    default LCD_ORIENTATION_NORMAL
+    depends on ENABLE_GUI
+    help
+        Select LCD orientation.
+
+config LCD_ORIENTATION_NORMAL
+    bool "Normal"
+config LCD_ORIENTATION_UPSIDE_DOWN
+    bool "Upside Down"
+endchoice
+
+config LCD_ROTATION_DEGREE
+    int
+    default  90 if LCD_ORIENTATION_NORMAL
+    default 270 if LCD_ORIENTATION_UPSIDE_DOWN
+
+config LCD_RST_PIN
+    int "LCD RST Pin"
     default 14
     depends on ENABLE_GUI
 
-config DEV_DC_PIN
-    int "Device DC Pin"
+config LCD_DC_PIN
+    int "LCD DC Pin"
     default 23
     depends on ENABLE_GUI
 
-config DEV_BL_PIN
-    int "Device BL Pin"
+config LCD_BL_PIN
+    int "LCD BL Pin"
     default 4
     depends on ENABLE_GUI
 

main/inc/user/audio_player.h

@@ -10,13 +10,13 @@
 
 typedef enum {
     MP3_FILE_IDX_NOTIFY    = 0x00,
-    MP3_FILE_IDX_AUTH_DONE = 0x01,
-    MP3_FILE_IDX_AUTH_FAIL = 0x02,
-    MP3_FILE_IDX_CONN_TOUT = 0x03,
-    MP3_FILE_IDX_CONN_FAIL = 0x04,
-    MP3_FILE_IDX_WIFI_DOWN = 0x05,
-    MP3_FILE_IDX_WIFI_CFG  = 0x06,
-    MP3_FILE_IDX_SRVC_ERR  = 0x07,
+    MP3_FILE_IDX_ERROR_REQ = 0x01,
+    MP3_FILE_IDX_ERROR_RSP = 0x02,
+    MP3_FILE_IDX_AUTH_DONE = 0x03,
+    MP3_FILE_IDX_AUTH_FAIL = 0x04,
+    MP3_FILE_IDX_CONN_TOUT = 0x05,
+    MP3_FILE_IDX_CONN_FAIL = 0x06,
+    MP3_FILE_IDX_WIFI_CFG  = 0x07,
 
     MP3_FILE_IDX_MAX
 } mp3_file_t;

main/inc/user/gui.h

@@ -10,12 +10,12 @@
 
 typedef enum {
     GUI_MODE_IDX_GIF_WIFI = 0x00,
-    GUI_MODE_IDX_GIF_BUSY = 0x01,
-    GUI_MODE_IDX_GIF_DONE = 0x02,
-    GUI_MODE_IDX_GIF_SCAN = 0x03,
-    GUI_MODE_IDX_GIF_PWR  = 0x04,
-    GUI_MODE_IDX_GIF_CLK  = 0x05,
-    GUI_MODE_IDX_GIF_ERR  = 0x06,
+    GUI_MODE_IDX_GIF_SCAN = 0x01,
+    GUI_MODE_IDX_GIF_BUSY = 0x02,
+    GUI_MODE_IDX_GIF_DONE = 0x03,
+    GUI_MODE_IDX_GIF_FAIL = 0x04,
+    GUI_MODE_IDX_GIF_PWR  = 0x05,
+    GUI_MODE_IDX_GIF_CLK  = 0x06,
     GUI_MODE_IDX_GIF_CFG  = 0x07,
     GUI_MODE_IDX_GIF_UPD  = 0x08,
 
@@ -25,7 +25,7 @@ typedef enum {
     GUI_MODE_IDX_OFF   = 0xFF
 } gui_mode_t;
 
-#ifdef CONFIG_SCREEN_PANEL_ST7735
+#ifdef CONFIG_LCD_TYPE_ST7735
     // ani0.gif
     extern const char ani0_160x80_gif_ptr[] asm("_binary_ani0_160x80_gif_start");
     extern const char ani0_160x80_gif_end[] asm("_binary_ani0_160x80_gif_end");