Merge branch 'shihao' into 'develop'

Shihao

See merge request !21

source/Appliciation/Sound_Alarm.h

@@ -66,6 +66,7 @@ typedef enum
     SOUND_ALARM_VOLUME = 0U,            /*音量*/
     SOUND_ALARM_DPF,                    /*DPF再生中*/
     SOUND_ALARM_DOOR,                   /*门未关*/
+    SOUND_ALARM_R_Gear,                 /*倒挡*/
     SOUND_ALARM_RADAR_LOOP,             /*倒车雷达*/
     SOUND_ALARM_RADAR_8,                /*倒车雷达*/
     SOUND_ALARM_RADAR_4,                /*倒车雷达*/

source/Appliciation/Sound_Alarm_User.c

@@ -46,6 +46,7 @@ const Sound_Alarm_Attribute_st_t stSoundAlarmAttribute [ SOUND_ALARM_MAX ] = {
 
     /*SOUND_ALARM_DPF*/ {SOUND_VARIETY_1, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
     /*SOUND_ALARM_DOOR*/ {SOUND_VARIETY_2, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
+    /*SOUND_ALARM_R_Gear*/ {SOUND_VARIETY_2, 1U, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_BREAK_NONE, SOUND_ALARM_NUM_FINISH_RESET},
     /*SOUND_ALARM_RADAR_LOOP*/ {SOUND_VARIETY_RADAR_0, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
     /*SOUND_ALARM_RADAR_8*/ {SOUND_VARIETY_RADAR_8, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},
     /*SOUND_ALARM_RADAR_4*/ {SOUND_VARIETY_RADAR_4, 0xFFU, SOUND_ALARM_TRIGGER_NORMAL, SOUND_ALARM_RECOVER_CONTINUE, SOUND_ALARM_NUM_FINISH_RESET},

source/Appliciation/Sound_Alarm_handle.c

@@ -736,6 +736,25 @@ void Sound_Alarm_Trigger_HILL_HOLD_MALF(void)
     }
 }
 
+void Sound_Alarm_Trigger_GEAR_R(void)
+{
+    if ( SYS_OPR_STAT_IGN_ON )
+    {
+        if ( Get_CAN_CH0_ID_10FF1021_Sig_ReverseSts( ) == 1U )
+        {
+            Sound_Alarm_Request_Normal(SOUND_ALARM_R_Gear);
+        }
+        else
+        {
+            Sound_Alarm_Delete_Normal(SOUND_ALARM_R_Gear);
+        }
+    }
+    else
+    {
+        Sound_Alarm_Delete_Normal(SOUND_ALARM_R_Gear);
+    }
+}
+
 void Sound_Alarm_Trigger_Time(void)
 {
     if ( Get_EngSpeed_Start_Flag( ) == 1U )
@@ -849,7 +868,7 @@ void Sound_Alarm_Trigger_Service(void)
         Sound_Alarm_Trigger_SPEED_LIMIT( );
         Sound_Alarm_Trigger_UREA( );
         Sound_Alarm_Trigger_TPMS( );
-
+        Sound_Alarm_Trigger_GEAR_R( );
         Sound_Alarm_Trigger_SAFE_BELT( );
         Sound_Alarm_Trigger_TBox( );
 

source/Appliciation/Task.c

@@ -122,7 +122,6 @@ void Sys_Run_Mode_10ms_Tasks_Group(void)
     //Can_BusOff_Fun( );
 
   
-
     LCDBUS_Check_RealTime( );
 
 }

source/UDS/UDS_22Service_Main.c

@@ -13,7 +13,7 @@ const uint8_t DID_22_F193[8]   = {'V','1','.','0',0x20,0x20,0x20,0x20};
 /*ECUHardwareVersionNumberDataIdentifier（软件号）*/
 const uint8_t DID_22_F194[16]   = {'5','8','0','3','3','1','0','8','1','7',0x20,0x20,0x20,0x20,0x20,0x20};
 /*ECUSoftwareVersionNumberDataIdentifier（软件版本号）*/
-const uint8_t DID_22_F195[8]   = {'V','1','.','0',0x20,0x20,0x20,0x20};
+const uint8_t DID_22_F195[8]   = {'V','1','.','1',0x20,0x20,0x20,0x20};
 /*SystemNameDataIdentifier（ECU名称）*/
 const uint8_t DID_22_F197[10]   = {'I','C','-','N','S','2','0','8','-','2'};
 /*EOLProgrammingDate*/