Merge branch 'dev' of http://tyw-server.synology.me:12345/ty/tianying_ty100 into ZMY

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/TianYing200.BAT

 SET PATH=C:\Keil_v5\ARM\ARMCC\Bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Users\tyw05\AppData\Local\Microsoft\WindowsApps;
+SET ARMCC5_ASMOPT=--diag_suppress=9931
+SET ARMCC5_CCOPT=--diag_suppress=9931
+SET ARMCC5_LINKOPT=--diag_suppress=9931
 SET CPU_TYPE=BAT32G139GK64FB
 SET CPU_VENDOR=Cmsemicon
 SET UV2_TARGET=TianYing200
@@ -55,36 +58,4 @@ SET CPU_CLOCK=0x00B71B00
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\adc.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\can.__i"
 "C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\cgc.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\cmp.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\dac.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\delay.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\dma.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\elc.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\epwm.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\flash.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\gpio.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\i2c.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\i2ca.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\interval.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\intp.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\key.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\pcbz.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\pga.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\rtc.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sci_common.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\sspi.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tim.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\tima.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timb.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\timm.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uart.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\wdt.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\docan_iso15765.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uds_iso14229_server.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\uds_iso14229_services.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\isr_bat32g139.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmAsm" --Via ".\objects\startup_bat32g139._ia"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmCC" --Via ".\objects\system_bat32g139.__i"
-"C:\Keil_v5\ARM\ARMCC\Bin\ArmLink" --Via ".\Objects\TianYing.lnp"
-"C:\Keil_v5\ARM\ARMCC\Bin\fromelf.exe" ".\Objects\TianYing.axf" --i32combined --output ".\Objects\TianYing.hex"
+"C:\Keil
\ No newline at end of file

Firmware/Source/Application/FaultCode/code.c

@@ -151,9 +151,9 @@ void FaultCode_Init(void)
         stFaultCodetemp[i].u16FaultCodeCount = 0;
     }
 
-    FaultCodeInit.callbacks[DTC1] = Get_FaultCodeDtc1;
-    FaultCodeInit.callbacks[DTC2] = Get_FaultCodeDtc2;
-    FaultCodeInit.callbacks[DTC3] = NULL;
+    FaultCodeInit.callbacks[DTC_1] = Get_FaultCodeDtc1;
+    FaultCodeInit.callbacks[DTC_2] = Get_FaultCodeDtc2;
+    FaultCodeInit.callbacks[DTC_3] = NULL;
     FaultCodeInit.FaultCodeVaildCbk = Get_FaultCodeValid;
     FaultCodeInit.FaultCodeNumCbk = Get_FaultCodeNum;
 
@@ -227,19 +227,19 @@ void FaultCode_Service(uint16_t Cycle)
     uint32_t tempFaultCode = 0;
     uint16_t Vaild = 0;
 
-    if (FaultCodeInit.callbacks[DTC1] != NULL)
+    if (FaultCodeInit.callbacks[DTC_1] != NULL)
     {
-        Dtc1 = FaultCodeInit.callbacks[DTC1]();
+        Dtc1 = FaultCodeInit.callbacks[DTC_1]();
     }
 
-    if (FaultCodeInit.callbacks[DTC2] != NULL)
+    if (FaultCodeInit.callbacks[DTC_2] != NULL)
     {
-        Dtc2 = FaultCodeInit.callbacks[DTC2]();
+        Dtc2 = FaultCodeInit.callbacks[DTC_2]();
     }
 
-    if (FaultCodeInit.callbacks[DTC3] != NULL)
+    if (FaultCodeInit.callbacks[DTC_3] != NULL)
     {
-        Dtc3 = FaultCodeInit.callbacks[DTC3]();
+        Dtc3 = FaultCodeInit.callbacks[DTC_3]();
     }
 
     if (FaultCodeInit.FaultCodeVaildCbk != NULL)

Firmware/Source/Application/FaultCode/code.h

@@ -18,9 +18,9 @@
 
 typedef enum
 {
-    DTC1,
-    DTC2,
-    DTC3,
+    DTC_1,
+    DTC_2,
+    DTC_3,
     NUM_FAULT_TYPES,
 } FaultCodeType_Num;
 

Firmware/Source/Component/BU98R10/BU98R10.c

@@ -275,6 +275,7 @@ BU98R10DDRAMUnion BU98R10Chip1DDRAMBackup;
 #endif
 
 BU98R10UpdateCtrlStruct BU98R10Update;
+uint32_t u32BU98R10ForcedUpdate = 0UL;
 
 void BU98R10_Init(void)
 {
@@ -283,6 +284,8 @@ void BU98R10_Init(void)
 #if BU98R10_WRITE_AT_SAME_TIME
 #if BU98R10_COLORFUL_LCD_MODE
 
+	Gen_TimeDelay(120 * 1000u, 50u);
+
 	BU98R10_All_Command_Write(BU98R10_CMD_SWRST);
 
 	Gen_TimeDelay(20*1000, 50U);
@@ -545,7 +548,7 @@ void BU98R10_Init(void)
 #endif
 #endif
 #endif
-
+	u32BU98R10ForcedUpdate = 0UL;
 	BU98R10Update.En = 0;
 	BU98R10Update.Step = 0;
 	BU98R10Update.Cont = 0;
@@ -575,25 +578,23 @@ void BU98R10_Shutdown(void)
 #endif
 }
 
-uint8_t u8BU98R10CheckCount = 0;
+#define BU98R10_FORCED_SEG_NUM 2U
 void BU98R10_Update_Request(void)
 {
-	// if (g_sysFlag.Bits.AccSaveState)
-	//{
-	//	//if (u8BU98R10CheckCount < 20)
-	//	//{
-	//	//	BU98R10Update.En = 1;
-	//	//	u8BU98R10CheckCount++;
-	//	//}
-	//	BU98R10Update.En = 1;
-	// }
-	// else
+	if (BU98R10Update.En == 0)
 	{
-
-		u8BU98R10CheckCount = 0;
-		BU98R10Update.En = 1;
+		if (u32BU98R10ForcedUpdate <= (BU98R10_DDRAM_SIZE - BU98R10_FORCED_SEG_NUM))
+		{
+			u32BU98R10ForcedUpdate += BU98R10_FORCED_SEG_NUM;
+		}
+		else
+		{
+			u32BU98R10ForcedUpdate = 0UL;
+		}
 	}
 
+	BU98R10Update.En = 1;
+
 #if USE_BU98R10_CHIP_0
 	BU98R10Update.Chip = 0;
 #elif USE_BU98R10_CHIP_1
@@ -613,7 +614,9 @@ void BU98R10_Update_Service(void)
 		{
 		case 0:
 			if ((BU98R10Chip0DDRAM.Byte[BU98R10Update.Addr] != BU98R10Chip0DDRAMBackup.Byte[BU98R10Update.Addr]) ||
-				(BU98R10Chip1DDRAM.Byte[BU98R10Update.Addr] != BU98R10Chip1DDRAMBackup.Byte[BU98R10Update.Addr]))
+				(BU98R10Chip1DDRAM.Byte[BU98R10Update.Addr] != BU98R10Chip1DDRAMBackup.Byte[BU98R10Update.Addr]) ||
+				((u32BU98R10ForcedUpdate <= BU98R10Update.Addr) &&
+				 ((u32BU98R10ForcedUpdate + BU98R10_FORCED_SEG_NUM) >= BU98R10Update.Addr)))
 			{
 				BU98R10Chip0DDRAMBackup.Byte[BU98R10Update.Addr] = BU98R10Chip0DDRAM.Byte[BU98R10Update.Addr];
 				BU98R10Chip1DDRAMBackup.Byte[BU98R10Update.Addr] = BU98R10Chip1DDRAM.Byte[BU98R10Update.Addr];

Firmware/Source/Component/Service_Interval/Service_Interval.c

 #include "Service_Interval.h"
-
+#include <stdio.h>
+#include <string.h>
+#include "Components.h"
 /**
  * @file        Service_Interval.c
  * @brief       保养里程