Merge branch 'master' of https://gitee.com/zyjzjs/g0b1vetx-board

# Conflicts:
#	Board/data.c
#	Board/data.h
#	Board/di-board.c
#	Board/di-board.h
#	MDK-ARM/GB01VETx.uvguix.Memory

Board/data.h

@@ -20,6 +20,9 @@
 
 
 
+
+
+
 extern uint32_t g_ifconfig;
 extern uint32_t g_ifupdate;
 
@@ -93,7 +96,11 @@ typedef struct SOFTRTC_t
 	uint8_t hour;
 	uint8_t minutes;
 	uint8_t second;
+<<<<<<< HEAD
 } SOFTRTC_t;
+=======
+}SOFTRTC_t;
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 
 
@@ -115,7 +122,11 @@ typedef struct WaterData_t
 	int32_t thisSpeed;  // 流速
 	int32_t thisPress;  // 压力
 	int32_t thisTemp;   // 温度
+<<<<<<< HEAD
 	int retry ;  		// 重试次数
+=======
+	int retry ;  		// 重试次数		
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 } WaterData_t;
 
 
@@ -183,7 +194,11 @@ typedef enum SiteType_t
 	SiteServer,     // 串口服务器
 	SiteLevel,    	// 水位站
 	SiteSkew    	// 测斜仪
+<<<<<<< HEAD
 } SiteType_t;
+=======
+}SiteType_t;
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 
 typedef enum DownDataType_t
@@ -199,7 +214,11 @@ typedef enum DownDataType_t
 	DownConfig		= 8,  // 修改参数
 	DownRead		= 9,  // 读取参数
 	DownFact		= 10,  // 读取参数
+<<<<<<< HEAD
 } DownDataType_t;
+=======
+}DownDataType_t;
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 
 
@@ -217,11 +236,19 @@ typedef struct TypeIndexMail_t
 
 extern SluiceData_t  SluiceData[SLUICE_COUTN];
 extern WaterData_t  WaterData[WATER_COUTN];
+<<<<<<< HEAD
 extern InclinometerData_t  IncData[6];
 extern SysData_t SysData;
 extern const WaterLeveInfo_t LeveInfo;
 extern const ParShallInfo_t ParShallTale[];
 extern SOFTRTC_t g_SoftRtc;
+=======
+extern InclinometerData_t  IncData[6]; 
+extern SysData_t SysData;
+extern const WaterLeveInfo_t LeveInfo;
+extern const ParShallInfo_t ParShallTale[];
+extern SOFTRTC_t g_SoftRtc; 
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 
 int cMotorGetType (char * str);
@@ -242,7 +269,11 @@ int cDownType2Index (char * str);
 int cSiteType2Index (char * str);
 
 
+<<<<<<< HEAD
 void *GetVersion (void);
+=======
+void *GetVersion(void);
+>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
 
 
 #endif