Merge branch 'master' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/ASR3603_Z5

diff --cc 2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
index bbe16c8,bbe16c8..b89dd12
--- 1/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
--- 2/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
+++ b/2.sdk/sdk/gui/lv_drivers/display/st7789v2_spi.c
@@@ -32,10 -32,10 +32,198 @@@ struct spi_write_t 
  };
  
  static lv_disp_drv_t * lcd_disp_drv = NULL;
--
++#define DRV_PROJECT_Z5_Z11_2 1
  static lcd_context g_lcd_ctx;
  const static struct spi_write_t spi_init_watch[] = {
--#if DRV_PROJECT_Z5_I7
++#if DRV_PROJECT_Z5_Z11_1
++    { SPI_WRITE_CMD, 0x11, 0 },
++    { SPI_WRITE_DELAY,120, 0 },
++
++    { SPI_WRITE_CMD, 0x36, 1 },
++    { SPI_WRITE_DATA,0x00, 0 },
++
++    { SPI_WRITE_CMD, 0x3A, 1 },
++    { SPI_WRITE_DATA,0x05, 0 },
++
++    { SPI_WRITE_CMD, 0x21, 0 },
++
++    { SPI_WRITE_CMD, 0xB2,5 },     
++    { SPI_WRITE_DATA , 0x05,0 },   
++    { SPI_WRITE_DATA , 0x05,0 },   
++    { SPI_WRITE_DATA , 0x00,0 },   
++    { SPI_WRITE_DATA , 0x33,0 },   
++    { SPI_WRITE_DATA , 0x33,0 },  
++
++    { SPI_WRITE_CMD, 0xB7,1 },     
++    { SPI_WRITE_DATA , 0x23,0 },
++
++    { SPI_WRITE_CMD, 0xBB,1 },     
++    { SPI_WRITE_DATA , 0x22,0 },
++
++    { SPI_WRITE_CMD, 0xC0,1 },     
++    { SPI_WRITE_DATA , 0x2C,0 }, 
++
++    { SPI_WRITE_CMD, 0xC2,1 },     
++    { SPI_WRITE_DATA , 0x01,0 },  
++
++    { SPI_WRITE_CMD, 0xC3,1 },     
++    { SPI_WRITE_DATA , 0x13,0 }, 
++
++    { SPI_WRITE_CMD, 0xC4,1 },     
++    { SPI_WRITE_DATA , 0x20,0 },   //VDV, 0x20:0v
++
++    { SPI_WRITE_CMD, 0xC6,1 },     
++    { SPI_WRITE_DATA , 0x0f,0 },   //0x13:60Hz  
++
++    { SPI_WRITE_CMD, 0xD0,2 },     
++    { SPI_WRITE_DATA , 0xA4,0 },   
++    { SPI_WRITE_DATA , 0xA1,0 }, 
++
++    { SPI_WRITE_CMD, 0xD6,1 },     
++    { SPI_WRITE_DATA , 0xA1,0 },   //sleep in后，gate输出为GND
++
++    
++    { SPI_WRITE_CMD, 0xE0,14 },     
++    { SPI_WRITE_DATA , 0x70,0 },   
++    { SPI_WRITE_DATA , 0x06,0 },   
++    { SPI_WRITE_DATA , 0x0C,0 },   
++    { SPI_WRITE_DATA , 0x08,0 },   
++    { SPI_WRITE_DATA , 0x09,0 },   
++    { SPI_WRITE_DATA , 0x27,0 },   
++    { SPI_WRITE_DATA , 0x2E,0 },
++    { SPI_WRITE_DATA , 0x34,0 },   
++    { SPI_WRITE_DATA , 0x46,0 },   
++    { SPI_WRITE_DATA , 0x37,0 },   
++    { SPI_WRITE_DATA , 0x13,0 },   
++    { SPI_WRITE_DATA , 0x13,0 },   
++    { SPI_WRITE_DATA , 0x25,0 },   
++    { SPI_WRITE_DATA , 0x2A,0 },   
++    //{ SPI_WRITE_DATA , 0x32,0 },   
++
++    { SPI_WRITE_CMD, 0xE1,14 },     
++    { SPI_WRITE_DATA , 0x70,0 },   
++    { SPI_WRITE_DATA , 0x04,0 },   
++    { SPI_WRITE_DATA , 0x08,0 },   
++    { SPI_WRITE_DATA , 0x09,0 },   
++    { SPI_WRITE_DATA , 0x07,0 },   
++    { SPI_WRITE_DATA , 0x03,0 },   
++    { SPI_WRITE_DATA , 0x2C,0 },   
++    { SPI_WRITE_DATA , 0x42,0 },   
++    { SPI_WRITE_DATA , 0x42,0 },   
++    { SPI_WRITE_DATA , 0x3B,0 },   
++    { SPI_WRITE_DATA , 0x14,0 },   
++    { SPI_WRITE_DATA , 0x14,0 },   
++    { SPI_WRITE_DATA , 0x27,0 },   
++    { SPI_WRITE_DATA , 0x2C,0 },
++
++
++    { SPI_WRITE_CMD, 0x29,0},     
++    { SPI_WRITE_CMD, 0x21,0 },     
++    { SPI_WRITE_CMD, 0x2C,0 },    
++
++#elif DRV_PROJECT_Z5_Z11_2
++    { SPI_WRITE_CMD, 0x11, 0 },
++    { SPI_WRITE_DELAY,120, 0 },
++
++    { SPI_WRITE_CMD, 0x36, 1 }, 
++    { SPI_WRITE_DATA,0x00, 0 },
++
++    { SPI_WRITE_CMD, 0x3A, 1 },
++    { SPI_WRITE_DATA,0x05, 0 },
++
++    //{ SPI_WRITE_CMD, 0x21, 0 },
++
++    { SPI_WRITE_CMD, 0xB2,5 },     
++    { SPI_WRITE_DATA , 0x0B,0 },   
++    { SPI_WRITE_DATA , 0x0B,0 },   
++    { SPI_WRITE_DATA , 0x00,0 },   
++    { SPI_WRITE_DATA , 0x33,0 },   
++    { SPI_WRITE_DATA , 0x33,0 },  
++
++    { SPI_WRITE_CMD, 0xB7,1 },     
++    { SPI_WRITE_DATA , 0x11,0 },
++
++    { SPI_WRITE_CMD, 0xBB,1 },     
++    { SPI_WRITE_DATA , 0x2F,0 },
++
++    { SPI_WRITE_CMD, 0xC0,1 },     
++    { SPI_WRITE_DATA , 0x2C,0 }, 
++
++    { SPI_WRITE_CMD, 0xC2,1 },     
++    { SPI_WRITE_DATA , 0x01,0 },  
++
++    { SPI_WRITE_CMD, 0xC3,1 },     
++    { SPI_WRITE_DATA , 0x0D,0 }, 
++
++    { SPI_WRITE_CMD, 0xC4,1 },     
++    { SPI_WRITE_DATA , 0x20,0 },   //VDV, 0x20:0v
++
++    { SPI_WRITE_CMD, 0xC6,1 },     
++    { SPI_WRITE_DATA , 0x18,0 },   //0x13:60Hz  
++
++    { SPI_WRITE_CMD, 0xD0,2 },     
++    { SPI_WRITE_DATA , 0xA4,0 },   
++    { SPI_WRITE_DATA , 0xA1,0 }, 
++
++    { SPI_WRITE_CMD, 0xD6,1 },     
++    { SPI_WRITE_DATA , 0xA1,0 },   //sleep in后，gate输出为GND
++
++    
++    { SPI_WRITE_CMD, 0xE0,14 },     
++    { SPI_WRITE_DATA , 0xF0,0 },   
++    { SPI_WRITE_DATA , 0x06,0 },   
++    { SPI_WRITE_DATA , 0x0B,0 },   
++    { SPI_WRITE_DATA , 0x0A,0 },   
++    { SPI_WRITE_DATA , 0x09,0 },   
++    { SPI_WRITE_DATA , 0x26,0 },   
++    { SPI_WRITE_DATA , 0x29,0 },
++    { SPI_WRITE_DATA , 0x33,0 },   
++    { SPI_WRITE_DATA , 0x41,0 },   
++    { SPI_WRITE_DATA , 0x18,0 },   
++    { SPI_WRITE_DATA , 0x16,0 },   
++    { SPI_WRITE_DATA , 0x15,0 },   
++    { SPI_WRITE_DATA , 0x29,0 },   
++    { SPI_WRITE_DATA , 0x2D,0 },   
++    //{ SPI_WRITE_DATA , 0x32,0 },   
++
++    { SPI_WRITE_CMD, 0xE1,14 },     
++    { SPI_WRITE_DATA , 0xF0,0 },   
++    { SPI_WRITE_DATA , 0x04,0 },   
++    { SPI_WRITE_DATA , 0x08,0 },   
++    { SPI_WRITE_DATA , 0x08,0 },   
++    { SPI_WRITE_DATA , 0x07,0 },   
++    { SPI_WRITE_DATA , 0x03,0 },   
++    { SPI_WRITE_DATA , 0x28,0 },   
++    { SPI_WRITE_DATA , 0x32,0 },   
++    { SPI_WRITE_DATA , 0x40,0 },   
++    { SPI_WRITE_DATA , 0x3B,0 },   
++    { SPI_WRITE_DATA , 0x19,0 },   
++    { SPI_WRITE_DATA , 0x18,0 },   
++    { SPI_WRITE_DATA , 0x2A,0 },   
++    { SPI_WRITE_DATA , 0x2E,0 },
++
++
++    { SPI_WRITE_CMD, 0xE4,3},
++    { SPI_WRITE_DATA , 0x25,0 },   
++    { SPI_WRITE_DATA , 0x00,0 },   
++    { SPI_WRITE_DATA , 0x00,0 },
++
++    { SPI_WRITE_CMD, 0x35,1 },     
++    { SPI_WRITE_DATA, 0x00,0 }, 
++
++    { SPI_WRITE_CMD, 0x44,2 },     
++    { SPI_WRITE_DATA, 0x00,0 },
++    { SPI_WRITE_DATA, 0x20,0 }, 
++
++    { SPI_WRITE_CMD, 0x21,0},   
++
++    { SPI_WRITE_CMD, 0x11,0},  
++
++    { SPI_WRITE_DELAY,120, 0 },
++
++    { SPI_WRITE_CMD, 0x29,0},     
++
++#elif DRV_PROJECT_Z5_I7
      { SPI_WRITE_CMD, 0x11, 0 },
      { SPI_WRITE_DELAY,120, 0 },
  
@@@ -158,7 -158,7 +346,7 @@@
  
      { SPI_WRITE_CMD, 0x3a, 1 },
      { SPI_WRITE_DATA,0x05, 0 },
--#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
++#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB || DRV_PROJECT_Z5_Z11 || DRV_PROJECT_Z5_Z11_2
      { SPI_WRITE_CMD, 0xE7, 1 },//2通道
      { SPI_WRITE_DATA,0x11, 0 },
  #endif
@@@ -265,15 -265,15 +453,15 @@@ const static struct spi_timing lcd_st77
  const static struct spi_info lcd_st7789v2_spi_info_watch = {
  #if DRV_PROJECT_Z5_K6
      4,//4线
--#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
++#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB || DRV_PROJECT_Z5_Z11  || DRV_PROJECT_Z5_Z11_2
      3,//3线
  #else
      3,//3线
  #endif
      1,
--#if DRV_PROJECT_Z5_K6
++#if DRV_PROJECT_Z5_K6 || DRV_PROJECT_Z5_Z11_2
      1,//1通道
--#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 ||DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
++#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 ||DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB || DRV_PROJECT_Z5_Z11 
      2,//2通道
  #else
      2,//2通道
@@@ -389,7 -389,7 +577,7 @@@ static void spi_write_function(const st
  static void st7789v2_panel_invalid(uint32_t start_x,
                                    uint32_t start_y,  uint32_t end_x, uint32_t end_y)
  {
--#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7
++#if DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_Z11 || DRV_PROJECT_Z5_Z11_2
        start_y += 20;
        end_y += 20;
  #endif
@@@ -450,7 -450,7 +638,7 @@@ __attribute__ ((unused)) static int pan
      return 0;
  err:
      cplog_printf("panel detect by readid failed\n");
--#if DRV_PROJECT_Z5_I7
++#if DRV_PROJECT_Z5_Z11 || DRV_PROJECT_Z5_Z11_2
      return 0;
  #else
      return -1;

diff --cc 2.sdk/sdk/product/craneg_modem/lv_gui_main.c
index b4a9fd4,b4a9fd4..3c879ef
--- 1/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
--- 2/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
+++ b/2.sdk/sdk/product/craneg_modem/lv_gui_main.c
@@@ -253,7 -253,7 +253,7 @@@ static uint32_t lcd_poc_mfp_spi_4_1_cfg
      MFP_EOC
  };
  #endif
--#if DRV_PROJECT_Z5_K7 || USE_LCD_PANEL_GC9A01_SPI_WATCH|| DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_K7_EN
++#if DRV_PROJECT_Z5_K7 || USE_LCD_PANEL_GC9A01_SPI_WATCH|| DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_Z11 || DRV_PROJECT_Z5_Z11_2
  static uint32_t lcd_poc_mfp_spi_3_2_cfgs[] = {
      MFP_REG(GPIO_20) | MFP_AF2 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_DCLK */
      MFP_REG(GPIO_21) | MFP_AF3 | MFP_PULL_HIGH | MFP_SLEEP_DIR | MFP_DRIVE_MEDIUM | MFP_LPM_EDGE_NONE, /* SPI_CS1 */
@@@ -297,7 -297,7 +297,7 @@@ static struct lcd_info_t st7789v2_lcd_s
      .mfp = (uint32_t *)lcd_poc_mfp_spi_4_1_cfgs,
      .clk = 312000, /* 104000 */
  };
--#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_K7_EN
++#elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_Z11  || DRV_PROJECT_Z5_Z11_2
  static struct lcd_info_t st7789v2_lcd_spi_3_2_info =
  {
      .mfp = (uint32_t *)lcd_poc_mfp_spi_3_2_cfgs,
@@@ -351,7 -351,7 +351,7 @@@ static struct lcd_info_t *lcd_info_dete
      #if USE_LCD_PANEL_ST7789V2_SPI_WATCH
      #if DRV_PROJECT_Z5_K6
          &st7789v2_lcd_spi_4_1_info,
--    #elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_K7_EN || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB
++    #elif DRV_PROJECT_Z5_K7 || DRV_PROJECT_Z5_Z12 || DRV_PROJECT_Z5_I7 || DRV_PROJECT_Z5_HA_K7 || DRV_PROJECT_Z5_DS_Z12XW_QCB || DRV_PROJECT_Z5_Z11 || DRV_PROJECT_Z5_Z11_2
          &st7789v2_lcd_spi_3_2_info,
      #endif
      #endif