继续测试修改

jinlicong

2024-05-30 a1810b89e66f184c62a0588ae7d57c91d0c376e8

 Function/LCD/lcd.c

@@ -28,7 +28,8 @@
uint8_t LCD_SYSTEM_MODE_ON_OFF[1] = {2};  //  ÄÚ²¿ÏµÍ³Õñµ´Æ÷ON£¬LCDÏÔʾOFF
uint8_t LCD_SYSTEM_MODE_ON_ON[1] = {3};   //  ÄÚ²¿ÏµÍ³Õñµ´Æ÷ON£¬LCDÏÔʾON

uint8_t lcd_wake_up_flag_g = 0;  //ΪÁË°´¼üÏÔʾûÓÐÑÓ³Ù¸Ð
FlagStatus lcd_wake_up_flag_g = RESET;  //ΪÁË°´¼üÏÔʾûÓÐÑÓ³Ù¸Ð
FlagStatus lcd_first_wake_up_flag_g = SET; //³õʼҪΪSET£¬ÆÁÁÁ

SYS_DISPLAY_PAPA_T sys_display_para_g ={      \
   .sys_and_display_mode = NORMAL_MODE,                         \
@@ -147,51 +148,51 @@
  LCD_DISPLAY_SEG(_LCD_YUAN_2_23A);
  LCD_DISPLAY_SEG(_LCD_YUAN_M3_23A);

  LCD_DISPLAY_SEG(_LCD_POINT1_23A);
  LCD_DISPLAY_SEG(_LCD_POINT2_23A);
  LCD_DISPLAY_SEG(_LCD_POINT3_23A);
  LCD_DISPLAY_SEG(_LCD_POINT4_23A);
  LCD_DISPLAY_SEG(_LCD_POINT5_23A);
  LCD_DISPLAY_SEG(_LCD_POINT6_23A);
  LCD_DISPLAY_SEG(_LCD_POINT7_23A);
  LCD_DISPLAY_SEG(_LCD_POINT8_23A);
  LCD_DISPLAY_SEG(_LCD_POINT9_23A);
  LCD_DISPLAY_SEG(_LCD_POINT10_23A);
  LCD_DISPLAY_SEG(_LCD_POINT11_23A);
  LCD_DISPLAY_SEG(_LCD_POINT12_23A);
  LCD_DISPLAY_SEG(_LCD_POINT13_23A);
  LCD_DISPLAY_SEG(_LCD_POINT14_23A);
  LCD_DISPLAY_SEG(_LCD_POINT15_23A);
  LCD_DISPLAY_SEG(_LCD_POINT16_23A);
  LCD_DISPLAY_SEG(_LCD_POINT17_23A);
  LCD_DISPLAY_SEG(_LCD_POINT18_23A);
  LCD_DISPLAY_SEG(_LCD_POINT19_23A);
  LCD_DISPLAY_SEG(_LCD_POINT20_23A);
  LCD_DISPLAY_SEG(_LCD_POINT21_23A);
  LCD_DISPLAY_SEG(_LCD_POINT22_23A);
  LCD_DISPLAY_SEG(_LCD_POINT23_23A);
  LCD_DISPLAY_SEG(_LCD_POINT24_23A);
  LCD_DISPLAY_SEG(_LCD_POINT25_23A);
  LCD_DISPLAY_SEG(_LCD_POINT26_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT1_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT2_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT3_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT4_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT5_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT6_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT7_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT8_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT9_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT10_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT11_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT12_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT13_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT14_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT15_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT16_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT17_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT18_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT19_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT20_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT21_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT22_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT23_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT24_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT25_23A);
//  LCD_DISPLAY_SEG(_LCD_POINT26_23A);

  Lcd_DisplayDigit_23A(1 + i, 8);
  Lcd_DisplayDigit_23A(2 + i, 8);
  Lcd_DisplayDigit_23A(3 + i, 8);
  Lcd_DisplayDigit_23A(4 + i, 8);
  Lcd_DisplayDigit_23A(5 + i, 8);
  Lcd_DisplayDigit_23A(6 + i, 8);
  Lcd_DisplayDigit_23A(7 + i, 8);
  Lcd_DisplayDigit_23A(8 + i, 8);
  Lcd_DisplayDigit_23A(9 + i, 8);
  Lcd_DisplayDigit_23A(10 + i, 8);
  Lcd_DisplayDigit_23A(11 + i, 8);
  Lcd_DisplayDigit_23A(12 + i, 8);
  Lcd_DisplayDigit_23A(13 + i, 8);
  Lcd_DisplayDigit_23A(14 + i, 8);
  Lcd_DisplayDigit_23A(15 + i, 8);
  Lcd_DisplayDigit_23A(16 + i, 8);
  Lcd_DisplayDigit_23A(17 + i, 8);
  Lcd_DisplayDigit_23A(18 + i, 8);
//  Lcd_DisplayDigit_23A(1 + i, 8);
//  Lcd_DisplayDigit_23A(2 + i, 8);
//  Lcd_DisplayDigit_23A(3 + i, 8);
//  Lcd_DisplayDigit_23A(4 + i, 8);
//  Lcd_DisplayDigit_23A(5 + i, 8);
//  Lcd_DisplayDigit_23A(6 + i, 8);
//  Lcd_DisplayDigit_23A(7 + i, 8);
//  Lcd_DisplayDigit_23A(8 + i, 8);
//  Lcd_DisplayDigit_23A(9 + i, 8);
//  Lcd_DisplayDigit_23A(10 + i, 8);
//  Lcd_DisplayDigit_23A(11 + i, 8);
//  Lcd_DisplayDigit_23A(12 + i, 8);
//  Lcd_DisplayDigit_23A(13 + i, 8);
//  Lcd_DisplayDigit_23A(14 + i, 8);
//  Lcd_DisplayDigit_23A(15 + i, 8);
//  Lcd_DisplayDigit_23A(16 + i, 8);
//  Lcd_DisplayDigit_23A(17 + i, 8);
//  Lcd_DisplayDigit_23A(18 + i, 8);
  LCD_ALL_DISPLAY;
}

@@ -410,7 +411,7 @@

void Lcd_Show_MenuProcess(void)//? ÐèÒªÍêÉÆ
{
//  lcd_wake_up_flag_g = 0;
//  lcd_wake_up_flag_g = RESET;
   /*ʼÖÕÐèÒªµÄÏÔʾÄÚÈÝ£¨¹«Ë¾LOGO µç³ØµçÁ¿µÈµÈ£©*/
   if(__SYS_FUNC_CFG_BYTES_GET(no_show_logo) == RESET)
      LCD_DISPLAY_SEG(_LCD_SIZHULOG_23A);
@@ -418,8 +419,9 @@
   LCD_DISPLAY_SEG(_LCD_HORIZONTALLINE_2_23A);
   Lcd_Battery(pwr_vol_g);
   if(__SYS_STATUS_BYTES_GET(power_state) == SET)
      LCD_DISPLAY_SEG(_LCD_CHARGE_23A);

   Lcd_ValveShow(valve_ctrl_para_g.valve_status, save_valve_para_g.valve_close_ID, save_valve_para_g.valve_lock_state);
   Lcd_ValveShow(save_valve_para_g.valve_status, save_valve_para_g.valve_close_ID, save_valve_para_g.valve_lock_state);
   Lcd_WrcShow(sys_fun_run_ctrl_g.wrc_ctrl_flag.running_flag,wrc_ctrl_para_g.wrc_result_flag,link_info_g.SIM_Type,link_info_g.net_signal_intensity);
   
   Lcd_WaringShow(alarm_list_cnt,sys_clockBCD_g.sec);
@@ -551,12 +553,13 @@
{
   static uint8_t only_trigger_once_flag = 0;
   
   lcd_wake_up_flag_g = 0;
   lcd_wake_up_flag_g = RESET;
   
   if((__SYS_DELAY_SEC_TIME_GET_(sys_active_time) >0)||(__SYS_STATUS_BYTES_GET(lcd_mode) == LDM_ALWAYS_AWAKEN)||(__SYS_STATUS_BYTES_GET(power_state) == SET))
   {
      if(LCD_PWR_IO_READ==Bit_RESET)
      if(lcd_first_wake_up_flag_g == SET)
      {
         lcd_first_wake_up_flag_g = RESET;
         //Ê×´ÎÉϵç³õʼ»¯
         Lcd_Sys_Init();
      }else