✨ feat:增加超速报警配置和雷达配置

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

@@ -40,7 +40,7 @@ uint16_t SelfCheck_time = 50;
 
 uint16_t Door_Warningtimer;
 
-
+extern uint16_t Over_Speed_Config;
 
 
 void SetRADAR_SOUND(uint8_t Level)
@@ -445,11 +445,11 @@ void Popups_Polling(void)
         //超速报警  
         if(IGstPopup1 == IGN_ON)
         {
-            if ( m_Vspeed >= 810 )
+            if ( m_Vspeed > Over_Speed_Config )
             {
                 Popup_Request(POPUP_Over_Speed);
             }
-            if(m_Vspeed < 780)
+            if(m_Vspeed <= (Over_Speed_Config - 30))
             {
                 PopupAndSound_Delete(POPUP_Over_Speed);
             }
@@ -460,7 +460,7 @@ void Popups_Polling(void)
         }
         /*雷达距离声音提示*/
         
-        if(/*EOL_GetF101() == */2)//can雷达
+        if(Val_EOL_F102_RadarType() == 2)//can雷达
         {
             if(IGstPopup1 == IGN_ON)
             {
@@ -547,7 +547,7 @@ void Popups_Polling(void)
                 PopupAndSound_Delete(POPUP_Radar_Changming); 
             }
         }
-        else if(/*EOL_GetF101() ==*/ 3)
+        else if(Val_EOL_F102_RadarType() == 3)
         {
             if(IGstPopup1 == IGN_ON)
             {
@@ -750,31 +750,31 @@ void Popups_Sound_Playing(uint8_t PopupSnd)
         case SND_RADAR:
             if ( RADAR_SOUND == RADAR_SND_CONTINUOUS )
             {
-                // Sound_Delete(SND_RADAR_1HZ);
-                // Sound_Delete(SND_RADAR_2HZ);
-                // Sound_Delete(SND_RADAR_4HZ);
-                // Sound_Request(SND_RADAR_Changming, ReqCode);
+                Sound_Delete(SND_RADAR_1HZ);
+                Sound_Delete(SND_RADAR_2HZ);
+                Sound_Delete(SND_RADAR_4HZ);
+                Sound_Request(SND_RADAR_Changming, ReqCode);
             }
             else if ( RADAR_SOUND == RADAR_SND_2Hz )
             {
-                // Sound_Delete(SND_RADAR_1HZ);
-                // Sound_Delete(SND_RADAR_4HZ);
-                // Sound_Delete(SND_RADAR_Changming);
-                // Sound_Request(SND_RADAR_2HZ, ReqCode);
+                Sound_Delete(SND_RADAR_1HZ);
+                Sound_Delete(SND_RADAR_4HZ);
+                Sound_Delete(SND_RADAR_Changming);
+                Sound_Request(SND_RADAR_2HZ, ReqCode);
             }
             else if ( RADAR_SOUND == RADAR_SND_4Hz )
             {
-                // Sound_Delete(SND_RADAR_1HZ);
-                // Sound_Delete(SND_RADAR_2HZ);
-                // Sound_Delete(SND_RADAR_Changming);
-                // Sound_Request(SND_RADAR_4HZ, ReqCode);
+                Sound_Delete(SND_RADAR_1HZ);
+                Sound_Delete(SND_RADAR_2HZ);
+                Sound_Delete(SND_RADAR_Changming);
+                Sound_Request(SND_RADAR_4HZ, ReqCode);
             }
             else
             {
-                // Sound_Delete(SND_RADAR_1HZ);
-                // Sound_Delete(SND_RADAR_2HZ);
-                // Sound_Delete(SND_RADAR_4HZ);
-                // Sound_Delete(SND_RADAR_Changming);
+                Sound_Delete(SND_RADAR_1HZ);
+                Sound_Delete(SND_RADAR_2HZ);
+                Sound_Delete(SND_RADAR_4HZ);
+                Sound_Delete(SND_RADAR_Changming);
             }
             break;
         default:

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

@@ -78,7 +78,7 @@ const SndAttributeStruct SndAttributeTable [ SND_SRC_TOTAL_NUM ] = {
     {        /*  雷达 1HZ          */         0x03,     12u,        SND_CYCLE_NONSTOP,        SND_MODE_SINGLE,          1000u,    },
     {        /*  雷达 2HZ          */         0x03,     12u,        SND_CYCLE_NONSTOP,        SND_MODE_SINGLE,          500u,    },
     {        /*  雷达 4HZ          */         0x04,     12u,        SND_CYCLE_NONSTOP,        SND_MODE_SINGLE,          250u,    },
-    {        /*  雷达 2S           */         0x02,     12u,        1u,                        SND_MODE_SINGLE,        2000u,    },
+    {        /*  雷达 2S           */         0x02,     12u,        1u,                        SND_MODE_LOOP,        2000u,    },
     {        /*  雷达 4S           */         0x02,     3u,        1u,                        SND_MODE_SINGLE,        4000u,    },
     {        /*  雷达 0.5S         */         0x02,     3u,        1u,                        SND_MODE_SINGLE,        500u,    },
     {        /*  雷达自检ok长鸣0.5S */         0x02,     12u,        1u,                        SND_MODE_SINGLE,        500u,    },

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

@@ -76,6 +76,7 @@ uint16_t PowerOn_Scan_Timing = 0;
 uint16_t PowerOn_Scan_Flag   = 1;
 //uint16_t Gauge_VSpeed_Display_Flag   = 0;
 uint16_t Gauge_VSpeed_Display_Flag = 0;
+uint16_t Over_Speed_Config = 0;
 /**************************************************************************
  * \brief      ���ٱ���ʾ����
  * \attention  �÷��������뱻ʵʱ����
@@ -85,8 +86,7 @@ void Gauge_VSpeed_Display(void)
 {
     uint16_t VSpeedDisplayValue  = 0;
     // static uint16_t refresh_timer=0;
-    uint16_t Over_Speed_Config = 0;
-    Over_Speed_Config = Get_Over_Speed_Config(0);
+    Over_Speed_Config = Get_Over_Speed_Config(Val_EOL_F102_MaximumSpeedLimit());
     if ( SYS_OPR_STAT_IGN_ON )
     {
         if ( Common_Get_Disp_V_Speed_Valid( ) == 1u )

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

@@ -43,7 +43,7 @@ void EOL_InitVal(void)
     {
         EOL_F102.F102_Byte[i] = 0x00u;
     }
-    EOL_F102.F102_Byte[21] = 0x60;
+    EOL_F102.F102_Byte[21] = 0x50;
 
 
 }