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
This commit is contained in:
2584532475@qq.com committed
commit
555025be10
5 files changed
+142
-1
No files matched your search
@@ -14,6 +14,7 @@ char _versionTemp[64];
|
||||
|
||||
|
||||
|
||||
<<<<<<< HEAD
|
||||
const StrIndex_t cDownDataType[] =
|
||||
{
|
||||
{"run", DownRun},
|
||||
@@ -27,12 +28,28 @@ const StrIndex_t cDownDataType[] =
|
||||
{"config", DownConfig},
|
||||
{"read", DownRead},
|
||||
{"fact", DownFact}
|
||||
=======
|
||||
const StrIndex_t cDownDataType[] =
|
||||
{
|
||||
{"run",DownRun} ,
|
||||
{"stop",DownStop} ,
|
||||
{"open",DownOpen} ,
|
||||
{"close",DownClose} ,
|
||||
{"reg_ans",DownRegistAns} ,
|
||||
{"heart_ans",DownHeartAns},
|
||||
{"update",DownUpdate},
|
||||
{"reboot",DownReboot},
|
||||
{"config",DownConfig},
|
||||
{"read",DownRead} ,
|
||||
{"fact",DownFact}
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
};
|
||||
|
||||
|
||||
|
||||
const StrIndex_t cSiteType[] =
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
{"sluice", SiteSluice},
|
||||
{"flow", SiteFlow},
|
||||
{"press", SiteSee},
|
||||
@@ -40,16 +57,33 @@ const StrIndex_t cSiteType[] =
|
||||
{"trans", SiteServer},
|
||||
{"level", SiteLevel},
|
||||
{"skew", SiteSkew} //测斜仪
|
||||
=======
|
||||
{"sluice",SiteSluice} ,
|
||||
{"flow",SiteFlow} ,
|
||||
{"press",SiteSee} ,
|
||||
{"auto",SiteColl} , // 自动化采集站
|
||||
{"trans",SiteServer} ,
|
||||
{"level",SiteLevel},
|
||||
{"skew",SiteSkew} //测斜仪
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
};
|
||||
|
||||
|
||||
const StrIndex_t cMotorType[] =
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
{"mg1000", MT_MG_1000},
|
||||
{"qh100", MT_QH_V100},
|
||||
{"qh200", MT_QH_V200},
|
||||
{"zs100", MT_ZS_V100},
|
||||
{"jz200", MT_JZ_V200}, // 金志 4-20 ma
|
||||
=======
|
||||
{"mg1000",MT_MG_1000} ,
|
||||
{"qh100", MT_QH_V100} ,
|
||||
{"qh200", MT_QH_V200} ,
|
||||
{"zs100", MT_ZS_V100} ,
|
||||
{"jz200", MT_JZ_V200} , // 金志 4-20 ma
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
{"dy100", MT_DY_V100}, // 大禹锥型阀
|
||||
{"kg100", MT_KG_V100}, // 开关量模块
|
||||
{"kr100", MT_KR_V100}, // 闸位计
|
||||
@@ -59,6 +93,7 @@ const StrIndex_t cMotorType[] =
|
||||
|
||||
const StrIndex_t c4851Type[] =
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
{"mg1000", ST_MG_1000},
|
||||
{"qh100", ST_QH_V100},
|
||||
{"qh200", ST_QH_V200},
|
||||
@@ -67,6 +102,14 @@ const StrIndex_t c4851Type[] =
|
||||
{"kg100", ST_KG_V100},
|
||||
{"at100", ST_AT_V100},
|
||||
{"kr100", ST_KR_V100},
|
||||
=======
|
||||
{"mg1000",ST_MG_1000} ,
|
||||
{"qh100",ST_QH_V100} ,
|
||||
{"qh200",ST_QH_V200} ,
|
||||
{"dy100",ST_DY_V100} ,
|
||||
{"kg100",ST_KG_V100} ,
|
||||
{"at100",ST_AT_V100} ,
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
};
|
||||
|
||||
const StrIndex_t cU485Type[] =
|
||||
@@ -75,6 +118,7 @@ const StrIndex_t cU485Type[] =
|
||||
};
|
||||
|
||||
// 485 2 通道
|
||||
<<<<<<< HEAD
|
||||
const StrIndex_t c4852Type[] =
|
||||
{
|
||||
{"rds600", ST_RDS_600},
|
||||
@@ -84,6 +128,17 @@ const StrIndex_t c4852Type[] =
|
||||
{"djx100", ST_DJX_100},
|
||||
{"rds300", ST_RDS_300},
|
||||
{"mi600", ST_MI_600} // 测斜仪
|
||||
=======
|
||||
const StrIndex_t c4852Type[] =
|
||||
{
|
||||
{"rds600",ST_RDS_600} ,
|
||||
{"tds300",ST_TDS_300} ,
|
||||
{"ht100",ST_HT_V100} ,
|
||||
{"zkjszk",ST_ZK_JSZK},
|
||||
{"djx100",ST_DJX_100},
|
||||
{"rds300",ST_RDS_300},
|
||||
{"mi600",ST_MI_600} // 测斜仪
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
};
|
||||
|
||||
|
||||
@@ -124,9 +179,14 @@ WaterData_t WaterData[WATER_COUTN];
|
||||
InclinometerData_t IncData[6]; // 测斜仪数据
|
||||
|
||||
SysData_t SysData;
|
||||
<<<<<<< HEAD
|
||||
SOFTRTC_t g_SoftRtc =
|
||||
{
|
||||
23, 10, 1, 0, 0, 0
|
||||
=======
|
||||
SOFTRTC_t g_SoftRtc = {
|
||||
23,10,1,0,0,0
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
};
|
||||
|
||||
uint32_t g_ifconfig = 0;
|
||||
@@ -218,11 +278,19 @@ int cSiteType2Index (char * str)
|
||||
/**********************************************
|
||||
获取boot版本信息
|
||||
**********************************************/
|
||||
<<<<<<< HEAD
|
||||
void *GetVersion (void)
|
||||
{
|
||||
int i = rt_sprintf (_versionTemp, "%s-%s %s", cBootv, _makeData, _makeTime);
|
||||
_versionTemp[i] = 0;
|
||||
return (void*) _versionTemp;
|
||||
=======
|
||||
void *GetVersion(void)
|
||||
{
|
||||
int i = rt_sprintf(_versionTemp,"%s-%s %s",cBootv, _makeData, _makeTime);
|
||||
_versionTemp[i] = 0;
|
||||
return (void*)_versionTemp;
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -14,22 +14,38 @@ DIState_t MX_Din_Pull (int chann)
|
||||
}
|
||||
case 2:
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
ret = (DIState_t) HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin);
|
||||
=======
|
||||
ret = (DIState_t)HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin);
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
ret = (DIState_t) HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin);
|
||||
=======
|
||||
ret = (DIState_t)HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin);
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
break;
|
||||
}
|
||||
case 4:
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
ret = (DIState_t) HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin);
|
||||
=======
|
||||
ret = (DIState_t)HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin);
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
break;
|
||||
}
|
||||
case 5:
|
||||
{
|
||||
<<<<<<< HEAD
|
||||
ret = (DIState_t) HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin);
|
||||
=======
|
||||
ret = (DIState_t)HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin);
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
break;
|
||||
}
|
||||
case 6:
|
||||
|
||||
@@ -5,7 +5,11 @@ typedef enum DIState_t
|
||||
{
|
||||
DI_HIGH = 1,
|
||||
DI_LOW = 0
|
||||
<<<<<<< HEAD
|
||||
} DIState_t;
|
||||
=======
|
||||
}DIState_t;
|
||||
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||
|
||||
void DiInit (void);
|
||||
DIState_t MX_Din_Pull (int chann);
|
||||
|
||||
Reference in new issue
Block a user