Merge branch 'shihao' into 'dev'

Shihao

See merge request !12

le19源码/Source/Application/Alarm/Popup_Scheduler.c

@@ -25,7 +25,7 @@ const PopupAttributeStruct PopupAttributeTable_1[POPUP_NUMBER_TOTAL] =
 /*  倒车雷达系统故障                     */{  12u,         POPUP_RADAR_SYSTEM_FAILURE,    NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_RADAR_2S,             POPUP_MODE_SINGLE,         30u,              10u,         },
 /*  倒车雷达传感器故障                   */{  12u,         POPUP_RADAR_SENSOR_FAILURE,    NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_RADAR_2S,             POPUP_MODE_SINGLE,         20u,              10u,         },
 /*  雷达开关故障                         */{  0u,         POPUP_RADAR_SWITCH_FAILURE,    NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_RADAR_0S,             POPUP_MODE_SINGLE,         30u,              10u,         },
-/*  雷达自检ok长鸣0.5s                   */{  12u,         POPUP_RADAR_CHECK_OK,         NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_RADAR_OK0S,             POPUP_MODE_SINGLE,         5u,              5u,         },
+/*  雷达自检ok长鸣0.5s                   */{  12u,         POPUP_RADAR_CHECK_OK,         NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_RADAR_OK0S,             POPUP_MODE_MULTI,         5u,              5u,         },
 /*  制动液位低                           */{  2u,         POPUP_EPB_Status,              NULL, 1u,    POPUP_MODE_LONG_HINT,    SND_EPB_Status,           POPUP_MODE_SINGLE,         11u,              10u,         },
 /*  安全带未系 1HZ                       */{  3u,         POPUP_SEATBELT_DR_1HZ,         NULL, 1u,    POPUP_MODE_LONG_HINT,    SND_SEATBELT_DR_1HZ,      POPUP_MODE_MULTI,          0xFFFFu,              10u,         },
 /*  安全带未系 2HZ                       */{  3u,         POPUP_SEATBELT_DR_2HZ,         NULL, 1u,    POPUP_MODE_LONG_HINT,    SND_SEATBELT_DR_2HZ,      POPUP_MODE_MULTI,          0xFFFFu,              10u,         },
@@ -61,7 +61,7 @@ const PopupAttributeStruct PopupAttributeTable_1[POPUP_NUMBER_TOTAL] =
 /*  OTA 报警4                            */{  22u,        POPUP_OTA_4,                   NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_OTA_4,                POPUP_MODE_SINGLE,         11u,              10u,         },
 /*  OTA 报警5                            */{  22u,        POPUP_OTA_5,                   NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_OTA_5,                POPUP_MODE_SINGLE,         11u,              10u,         },
 /*  OTA 报警5                            */{  22u,        POPUP_ESC,                     NULL, 1u,    POPUP_MODE_SHORT_HINT,   SND_ESC,                  POPUP_MODE_SINGLE,         11u,              10u,         },
-/*  超速报警                              */{  13u,       POPUP_Over_Speed,              NULL, 1u,    POPUP_MODE_SHORT_HINT,    SND_Over_Speed,           POPUP_MODE_SINGLE,          11u,             10u,         },
+/*  超速报警                              */{  13u,       POPUP_Over_Speed,              NULL, 1u,    POPUP_MODE_SHORT_HINT,    SND_Over_Speed,           POPUP_MODE_SINGLE,          40u,             10u,         },
 /*==========================================================================================================================================================================================================================================*/
 };                                                                                                                                                                                    
                                                                                                                                                                                       

le19源码/Source/Application/Alarm/Popups.c

@@ -445,6 +445,8 @@ void Popups_Polling(void)
         //超速报警  
         if(IGstPopup1 == IGN_ON)
         {
+            m_Vspeed /= 10;
+            m_Vspeed *= 10;
             if ( m_Vspeed > Over_Speed_Config )
             {
                 Popup_Request(POPUP_Over_Speed);
@@ -504,6 +506,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_Radar_4HZ);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_Radar_1HZ);
+                        Popup_Clear(POPUP_Radar_Changming);
                     }
                     else if ( RADAR_SOUND == POPUP_Radar_2HZ )
                     {
@@ -512,6 +515,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_Radar_4HZ);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_Radar_2HZ);
+                        Popup_Clear(POPUP_Radar_Changming);
                     }
                     else if ( RADAR_SOUND == POPUP_Radar_4HZ )
                     {
@@ -520,6 +524,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_Radar_1HZ);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_Radar_4HZ);
+                        Popup_Clear(POPUP_Radar_Changming);
                     }
                     else if ( RADAR_SOUND == POPUP_Radar_Changming )
                     {
@@ -536,6 +541,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_Radar_4HZ);
                         PopupAndSound_Delete(POPUP_Radar_1HZ);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
+                        Popup_Clear(POPUP_Radar_Changming);
                     }
                 }
                 else
@@ -544,6 +550,7 @@ void Popups_Polling(void)
                     PopupAndSound_Delete(POPUP_Radar_4HZ);
                     PopupAndSound_Delete(POPUP_Radar_1HZ);
                     PopupAndSound_Delete(POPUP_Radar_Changming); 
+                    Popup_Clear(POPUP_Radar_Changming);
                 }
             }
             else
@@ -552,6 +559,7 @@ void Popups_Polling(void)
                 PopupAndSound_Delete(POPUP_Radar_4HZ);
                 PopupAndSound_Delete(POPUP_Radar_1HZ);
                 PopupAndSound_Delete(POPUP_Radar_Changming); 
+                Popup_Clear(POPUP_Radar_Changming);
             }
         }
         else if(Val_EOL_F102_RadarType() == 3)
@@ -566,6 +574,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_Radar_2HZ);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                     case 2://4hz
                         PopupAndSound_Delete(POPUP_Radar_2HZ);
@@ -573,6 +582,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
                         PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
                         Popup_Request(POPUP_Radar_4HZ);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                     case 3://长鸣
                         PopupAndSound_Delete(POPUP_Radar_2HZ);
@@ -587,6 +597,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
                         Popup_Request(POPUP_RADAR_CHECK_OK);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                     case 5://雷达故障 长鸣2s
                         PopupAndSound_Delete(POPUP_Radar_2HZ);
@@ -594,6 +605,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_RADAR_SENSOR_FAILURE);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                     case 6://雷达数据超时 长鸣2s
                         PopupAndSound_Delete(POPUP_Radar_2HZ);
@@ -601,6 +613,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         Popup_Request(POPUP_RADAR_SENSOR_FAILURE);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                     default://0 不报警
                         PopupAndSound_Delete(POPUP_Radar_2HZ);
@@ -608,6 +621,7 @@ void Popups_Polling(void)
                         PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
                         PopupAndSound_Delete(POPUP_Radar_Changming);
                         PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
+                        Popup_Clear(POPUP_Radar_Changming);
                         break;
                 }
             }
@@ -618,6 +632,7 @@ void Popups_Polling(void)
                 PopupAndSound_Delete(POPUP_RADAR_CHECK_OK);
                 PopupAndSound_Delete(POPUP_Radar_Changming);
                 PopupAndSound_Delete(POPUP_RADAR_SENSOR_FAILURE);
+                Popup_Clear(POPUP_Radar_Changming);
             }
         }
         else

le19源码/Source/Application/Display/Gauge_Display.c

@@ -290,10 +290,10 @@ void Gauge_Power_Display(void)
 			                }
                             BattCurr.Value = Batt_Curr; //100倍
 
-                            BattCurr.Value *= 100;//乘100%
-                            BattCurr.Value /= 200;//除200
-                            BattCurr.Value += 90;//大于等于10进1 0.1*100=10
-                            BattCurr.Value /= 100;//1倍,留整数
+                            BattCurr.Value *= 1;//乘100%
+                            BattCurr.Value /= 2;//除200
+                            //BattCurr.Value += 90;//大于等于10进1 0.1*100=10
+                            //BattCurr.Value /= 100;//1倍,留整数
                         }
                         else
                         {
@@ -311,14 +311,14 @@ void Gauge_Power_Display(void)
                         {
                             if(BattCurr.Value == 0)
                             {
-                                SEG_SET_PowerDial(1u, 0u, 0u, 255u);
+                                SEG_SET_PowerDial(1u, 0u, 0u, 0u);
                             }
                             else
                             {
                                 //-1格和-50%
                                 SEG_SET_PowerDial(1u, 0x81u, 1u, 50u);
 
-                                if(BattCurr.Value > 50)
+                                if(BattCurr.Value > 5000)
                                 {
                                     //-1 -2格和-100%
                                     SEG_SET_PowerDial(1u, 0x82u, 1u, 100u);
@@ -426,8 +426,8 @@ void Gauge_Clock_Display(void)
     if ( SYS_OPR_STAT_IGN_ON )
     {
         //��ȡʱ��
-        RTCTimeCurrent.Hour   = Get_RTC_HOUR( );
-        RTCTimeCurrent.Minute = Get_RTC_MINUTE( );
+        RTCTimeCurrent.Hour   = Get_ID_18FEE69F_Sig_TBOX_Hour( );
+        RTCTimeCurrent.Minute = Get_ID_18FEE69F_Sig_TBOX_Minute( );
 
         //ʱ����ʾ
         if(Factory_ClearOdo_Display_Flag == 0)

le19源码/Source/Application/System/src/Tasks.c

@@ -172,7 +172,7 @@ void Sys_Run_Mode_100ms_Tasks_Group0(void)
     
     
     
-    SERVICE_Time_Calibration_Service(); //时钟更新服务
+    //SERVICE_Time_Calibration_Service(); //时钟更新服务
     //RTE_RTC_Services_100Ms_Cbk();   //时钟服务函数
     Services_ODO_100MS_Cbk();
     // Services_ODO_100MS_Cbk1();/*程序内部使用,里程备份增加专用里程,非显示里程*/

le19源码/Source/Application/UDS/APP/Common/UDS_Common.c

@@ -181,7 +181,7 @@ void Ser27_ChangeSessionHandle(void)
 void UDS_RESET(void)
 {
     ControlMessageCommunication(networkManagementMsgAndnormalMsg, disableRxAndTx);
-    UDS_Delay(3000u);
+    UDS_Delay(30000u);
     RESET();
 }
 
@@ -750,22 +750,22 @@ void ReadAllDFlashData(void)
     }
 
 
-    if(memcmp(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112))!=0)
+    /*if(memcmp(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112))!=0)
     {
         flag2E=1;
         memset(Ser2EToDFlashInfo.DID_F112, 0x20, 8u);
         memcpy(Ser2EToDFlashInfo.DID_F112,DID_F112,sizeof(DID_F112));
     }
-    /*if(memcmp(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,sizeof(Ser22_DID_F1A2))!=0)
+    if(memcmp(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,sizeof(Ser22_DID_F1A2))!=0)
     {   
         flag2E=1;
         memcpy(Ser2EToDFlashInfo.DID_F1A2,Ser22_DID_F1A2,4);
-    }*/
+    }
 
     if (flag2E==1)
     {
        WriteDFlashData(0x04u, (uint32_t *)&Ser2EToDFlashInfo.Flag, sizeof(Ser2EToDFlashInfo) / 4u, NeedWait);
-    }
+    }*/
     
     if (Ser27_FlowCtrlCnt.LV1ReqSeedCnt >= SER27_MAX_REQ_SEED_NUM )
     {