应用增加日志调试，数据匹配

TSCP/src/APP/ciapp/2oo2/2oo2DataTransferManage.c

@@ -895,7 +895,11 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
 		/*拷贝OC站（集中站和非集中站）指示器结构体*/
 		(void)memcpy(pCiAppDataPointer + curIndex, g_OCStationIndicDataStru, (INDICATOR_SUM_MAX) * sizeof(OCStationIndicDataStru));
 		curIndex = curIndex + (UINT32)((INDICATOR_SUM_MAX) * sizeof(OCStationIndicDataStru));
-
+		/*计算一次CRC*/
+		crcLength = curIndex - crcIndex;
+		crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
+		debug_infor_printf((const)"2oo2 IndicatorDataStru-g_OCStationIndicDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
+		crcIndex = curIndex;
         /*拷贝错误数据结构体*/
 		(void)memcpy(pCiAppDataPointer + curIndex, ErrorDataStru, (ERROR_DATA_SUM_MAX)*sizeof(ErrorDataStruct));
 	    curIndex = curIndex + (UINT32)((ERROR_DATA_SUM_MAX)*sizeof(ErrorDataStruct));
@@ -906,7 +910,11 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
 		curIndex = curIndex + (ROUTE_LONG_SUM_MAX)*sizeof(LongRouteDataStruct);
 #endif
 		curIndex += CopyValidGetDataStru(pCiAppDataPointer + curIndex, (void *)LongRouteDataStru, ROUTE_LONG_SUM_MAX, (UINT16)sizeof(LongRouteDataStruct));
-
+		/*计算一次CRC*/
+		crcLength = curIndex - crcIndex;
+		crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
+		debug_infor_printf((const)"2oo2 g_OCStationIndicDataStru-LongRouteDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
+		crcIndex = curIndex;
 		/*拷贝通信状态结构体*/
 		(void)memcpy(pCiAppDataPointer + curIndex, TransmitStateDataStru, (TRANSMIT_OBJECT_SUM_MAX * TRANSMIT_OBJECT_DEVICE_SUM_MAX)*sizeof(TransmitStateDataStruct));
 		curIndex = curIndex + (UINT32)((TRANSMIT_OBJECT_SUM_MAX * TRANSMIT_OBJECT_DEVICE_SUM_MAX)*sizeof(TransmitStateDataStruct));
@@ -918,7 +926,11 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
         /*拷贝CI发送到其他联锁命令结构体数组*/
         (void)memcpy(pCiAppDataPointer + curIndex, SendCiCmdDataStru, (SENDCI_CMD_DATA_STRU_SUM_MAX)*sizeof(ToCiCommandDataStruct));
 		curIndex = curIndex + (UINT32)((SENDCI_CMD_DATA_STRU_SUM_MAX)*sizeof(ToCiCommandDataStruct));
-
+		/*计算一次CRC*/
+		crcLength = curIndex - crcIndex;
+		crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
+		debug_infor_printf((const)"2oo2 LongRouteDataStru-SendCiCmdDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
+		crcIndex = curIndex;
         /*拷贝与联锁通信的Vobc信息*/
 		curResult = CopyValidGetVobcDataStru(pCiAppDataPointer + curIndex, VobcToCiDataStru, VOBC_TO_CI_SUM_MAX);
 		curIndex = curIndex + curResult;
@@ -926,7 +938,10 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
 		/*拷贝使用后备模式与联锁通信的Vobc信息*/
 		curResult = CopyValidGetDataStru(pCiAppDataPointer + curIndex, (void *)VobcBackUpToCiDataStru, VOBC_BACKUP_TO_CI_SUM_MAX, (UINT16)sizeof(VobcBackUpToCiDataStruct));
 		curIndex = curIndex + curResult;
-
+		/*计算一次CRC*/
+		crcLength = curIndex - crcIndex;
+		crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
+		debug_infor_printf((const)"2oo2 SendCiCmdDataStru-VobcBackUpToCiDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
 		/*拷贝与联锁通信的ITE信息*/
 		curResult = CopyValidGetIteDataStru(pCiAppDataPointer + curIndex, IteToCiDataStru, ITE_TO_CI_SUM_MAX);
 		curIndex = curIndex + curResult;
@@ -942,7 +957,7 @@ UINT32 GetCiAppData(UINT8 *pCiAppDataPointer)
 		/*计算一次CRC*/
 		crcLength = curIndex - crcIndex;
 		crcResult = Tioc_CommonCrc32(pCiAppDataPointer + crcIndex, crcLength);
-		debug_infor_printf((const)"2oo2 IndicatorDataStru-AllAutoReturnDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
+		debug_infor_printf((const)"2oo2 VobcBackUpToCiDataStru-AllAutoReturnDataStru CRC:%x, Length:%d\n", crcResult, crcLength);
 		crcIndex = curIndex;
 
         /*拷贝车库门数据结构体*/

TSCP/src/APP/ciapp/System/SystemConfigDefine.h

@@ -84,7 +84,7 @@
 #define VER_1_PUBLIC_FS_1            ((UINT8)30)
 #define VER_1_PUBLIC_FS_2            ((UINT8)21)
 #define VER_1_PUBLIC_FS_3            ((UINT8)0)
-#define VER_1_PUBLIC_FS_4            ((UINT8)0)
+#define VER_1_PUBLIC_FS_4            ((UINT8)2)
 
 #define VER_2_PUBLIC_FS_1            ((UINT8)0)
 #define VER_2_PUBLIC_FS_2            ((UINT8)0)