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[] =
|
const StrIndex_t cDownDataType[] =
|
||||||
{
|
{
|
||||||
{"run", DownRun},
|
{"run", DownRun},
|
||||||
@@ -27,12 +28,28 @@ const StrIndex_t cDownDataType[] =
|
|||||||
{"config", DownConfig},
|
{"config", DownConfig},
|
||||||
{"read", DownRead},
|
{"read", DownRead},
|
||||||
{"fact", DownFact}
|
{"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[] =
|
const StrIndex_t cSiteType[] =
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
{"sluice", SiteSluice},
|
{"sluice", SiteSluice},
|
||||||
{"flow", SiteFlow},
|
{"flow", SiteFlow},
|
||||||
{"press", SiteSee},
|
{"press", SiteSee},
|
||||||
@@ -40,16 +57,33 @@ const StrIndex_t cSiteType[] =
|
|||||||
{"trans", SiteServer},
|
{"trans", SiteServer},
|
||||||
{"level", SiteLevel},
|
{"level", SiteLevel},
|
||||||
{"skew", SiteSkew} //测斜仪
|
{"skew", SiteSkew} //测斜仪
|
||||||
|
=======
|
||||||
|
{"sluice",SiteSluice} ,
|
||||||
|
{"flow",SiteFlow} ,
|
||||||
|
{"press",SiteSee} ,
|
||||||
|
{"auto",SiteColl} , // 自动化采集站
|
||||||
|
{"trans",SiteServer} ,
|
||||||
|
{"level",SiteLevel},
|
||||||
|
{"skew",SiteSkew} //测斜仪
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
const StrIndex_t cMotorType[] =
|
const StrIndex_t cMotorType[] =
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
{"mg1000", MT_MG_1000},
|
{"mg1000", MT_MG_1000},
|
||||||
{"qh100", MT_QH_V100},
|
{"qh100", MT_QH_V100},
|
||||||
{"qh200", MT_QH_V200},
|
{"qh200", MT_QH_V200},
|
||||||
{"zs100", MT_ZS_V100},
|
{"zs100", MT_ZS_V100},
|
||||||
{"jz200", MT_JZ_V200}, // 金志 4-20 ma
|
{"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}, // 大禹锥型阀
|
{"dy100", MT_DY_V100}, // 大禹锥型阀
|
||||||
{"kg100", MT_KG_V100}, // 开关量模块
|
{"kg100", MT_KG_V100}, // 开关量模块
|
||||||
{"kr100", MT_KR_V100}, // 闸位计
|
{"kr100", MT_KR_V100}, // 闸位计
|
||||||
@@ -59,6 +93,7 @@ const StrIndex_t cMotorType[] =
|
|||||||
|
|
||||||
const StrIndex_t c4851Type[] =
|
const StrIndex_t c4851Type[] =
|
||||||
{
|
{
|
||||||
|
<<<<<<< HEAD
|
||||||
{"mg1000", ST_MG_1000},
|
{"mg1000", ST_MG_1000},
|
||||||
{"qh100", ST_QH_V100},
|
{"qh100", ST_QH_V100},
|
||||||
{"qh200", ST_QH_V200},
|
{"qh200", ST_QH_V200},
|
||||||
@@ -67,6 +102,14 @@ const StrIndex_t c4851Type[] =
|
|||||||
{"kg100", ST_KG_V100},
|
{"kg100", ST_KG_V100},
|
||||||
{"at100", ST_AT_V100},
|
{"at100", ST_AT_V100},
|
||||||
{"kr100", ST_KR_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[] =
|
const StrIndex_t cU485Type[] =
|
||||||
@@ -75,6 +118,7 @@ const StrIndex_t cU485Type[] =
|
|||||||
};
|
};
|
||||||
|
|
||||||
// 485 2 通道
|
// 485 2 通道
|
||||||
|
<<<<<<< HEAD
|
||||||
const StrIndex_t c4852Type[] =
|
const StrIndex_t c4852Type[] =
|
||||||
{
|
{
|
||||||
{"rds600", ST_RDS_600},
|
{"rds600", ST_RDS_600},
|
||||||
@@ -84,6 +128,17 @@ const StrIndex_t c4852Type[] =
|
|||||||
{"djx100", ST_DJX_100},
|
{"djx100", ST_DJX_100},
|
||||||
{"rds300", ST_RDS_300},
|
{"rds300", ST_RDS_300},
|
||||||
{"mi600", ST_MI_600} // 测斜仪
|
{"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]; // 测斜仪数据
|
InclinometerData_t IncData[6]; // 测斜仪数据
|
||||||
|
|
||||||
SysData_t SysData;
|
SysData_t SysData;
|
||||||
|
<<<<<<< HEAD
|
||||||
SOFTRTC_t g_SoftRtc =
|
SOFTRTC_t g_SoftRtc =
|
||||||
{
|
{
|
||||||
23, 10, 1, 0, 0, 0
|
23, 10, 1, 0, 0, 0
|
||||||
|
=======
|
||||||
|
SOFTRTC_t g_SoftRtc = {
|
||||||
|
23,10,1,0,0,0
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
};
|
};
|
||||||
|
|
||||||
uint32_t g_ifconfig = 0;
|
uint32_t g_ifconfig = 0;
|
||||||
@@ -218,11 +278,19 @@ int cSiteType2Index (char * str)
|
|||||||
/**********************************************
|
/**********************************************
|
||||||
获取boot版本信息
|
获取boot版本信息
|
||||||
**********************************************/
|
**********************************************/
|
||||||
|
<<<<<<< HEAD
|
||||||
void *GetVersion (void)
|
void *GetVersion (void)
|
||||||
{
|
{
|
||||||
int i = rt_sprintf (_versionTemp, "%s-%s %s", cBootv, _makeData, _makeTime);
|
int i = rt_sprintf (_versionTemp, "%s-%s %s", cBootv, _makeData, _makeTime);
|
||||||
_versionTemp[i] = 0;
|
_versionTemp[i] = 0;
|
||||||
return (void*) _versionTemp;
|
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_ifconfig;
|
||||||
extern uint32_t g_ifupdate;
|
extern uint32_t g_ifupdate;
|
||||||
|
|
||||||
@@ -93,7 +96,11 @@ typedef struct SOFTRTC_t
|
|||||||
uint8_t hour;
|
uint8_t hour;
|
||||||
uint8_t minutes;
|
uint8_t minutes;
|
||||||
uint8_t second;
|
uint8_t second;
|
||||||
|
<<<<<<< HEAD
|
||||||
} SOFTRTC_t;
|
} SOFTRTC_t;
|
||||||
|
=======
|
||||||
|
}SOFTRTC_t;
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -115,7 +122,11 @@ typedef struct WaterData_t
|
|||||||
int32_t thisSpeed; // 流速
|
int32_t thisSpeed; // 流速
|
||||||
int32_t thisPress; // 压力
|
int32_t thisPress; // 压力
|
||||||
int32_t thisTemp; // 温度
|
int32_t thisTemp; // 温度
|
||||||
|
<<<<<<< HEAD
|
||||||
int retry ; // 重试次数
|
int retry ; // 重试次数
|
||||||
|
=======
|
||||||
|
int retry ; // 重试次数
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
} WaterData_t;
|
} WaterData_t;
|
||||||
|
|
||||||
|
|
||||||
@@ -183,7 +194,11 @@ typedef enum SiteType_t
|
|||||||
SiteServer, // 串口服务器
|
SiteServer, // 串口服务器
|
||||||
SiteLevel, // 水位站
|
SiteLevel, // 水位站
|
||||||
SiteSkew // 测斜仪
|
SiteSkew // 测斜仪
|
||||||
|
<<<<<<< HEAD
|
||||||
} SiteType_t;
|
} SiteType_t;
|
||||||
|
=======
|
||||||
|
}SiteType_t;
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
|
|
||||||
|
|
||||||
typedef enum DownDataType_t
|
typedef enum DownDataType_t
|
||||||
@@ -199,7 +214,11 @@ typedef enum DownDataType_t
|
|||||||
DownConfig = 8, // 修改参数
|
DownConfig = 8, // 修改参数
|
||||||
DownRead = 9, // 读取参数
|
DownRead = 9, // 读取参数
|
||||||
DownFact = 10, // 读取参数
|
DownFact = 10, // 读取参数
|
||||||
|
<<<<<<< HEAD
|
||||||
} DownDataType_t;
|
} DownDataType_t;
|
||||||
|
=======
|
||||||
|
}DownDataType_t;
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -217,11 +236,19 @@ typedef struct TypeIndexMail_t
|
|||||||
|
|
||||||
extern SluiceData_t SluiceData[SLUICE_COUTN];
|
extern SluiceData_t SluiceData[SLUICE_COUTN];
|
||||||
extern WaterData_t WaterData[WATER_COUTN];
|
extern WaterData_t WaterData[WATER_COUTN];
|
||||||
|
<<<<<<< HEAD
|
||||||
extern InclinometerData_t IncData[6];
|
extern InclinometerData_t IncData[6];
|
||||||
extern SysData_t SysData;
|
extern SysData_t SysData;
|
||||||
extern const WaterLeveInfo_t LeveInfo;
|
extern const WaterLeveInfo_t LeveInfo;
|
||||||
extern const ParShallInfo_t ParShallTale[];
|
extern const ParShallInfo_t ParShallTale[];
|
||||||
extern SOFTRTC_t g_SoftRtc;
|
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);
|
int cMotorGetType (char * str);
|
||||||
@@ -242,7 +269,11 @@ int cDownType2Index (char * str);
|
|||||||
int cSiteType2Index (char * str);
|
int cSiteType2Index (char * str);
|
||||||
|
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
void *GetVersion (void);
|
void *GetVersion (void);
|
||||||
|
=======
|
||||||
|
void *GetVersion(void);
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -14,22 +14,38 @@ DIState_t MX_Din_Pull (int chann)
|
|||||||
}
|
}
|
||||||
case 2:
|
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);
|
||||||
|
=======
|
||||||
|
ret = (DIState_t)HAL_GPIO_ReadPin (DI2_GPIO_Port, DI2_Pin);
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 3:
|
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);
|
||||||
|
=======
|
||||||
|
ret = (DIState_t)HAL_GPIO_ReadPin (DI3_GPIO_Port, DI3_Pin);
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 4:
|
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);
|
||||||
|
=======
|
||||||
|
ret = (DIState_t)HAL_GPIO_ReadPin (DI4_GPIO_Port, DI4_Pin);
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 5:
|
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);
|
||||||
|
=======
|
||||||
|
ret = (DIState_t)HAL_GPIO_ReadPin (DI5_GPIO_Port, DI5_Pin);
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 6:
|
case 6:
|
||||||
|
|||||||
@@ -5,7 +5,11 @@ typedef enum DIState_t
|
|||||||
{
|
{
|
||||||
DI_HIGH = 1,
|
DI_HIGH = 1,
|
||||||
DI_LOW = 0
|
DI_LOW = 0
|
||||||
|
<<<<<<< HEAD
|
||||||
} DIState_t;
|
} DIState_t;
|
||||||
|
=======
|
||||||
|
}DIState_t;
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
|
|
||||||
void DiInit (void);
|
void DiInit (void);
|
||||||
DIState_t MX_Din_Pull (int chann);
|
DIState_t MX_Din_Pull (int chann);
|
||||||
|
|||||||
@@ -97,10 +97,17 @@
|
|||||||
<yPos>-1</yPos>
|
<yPos>-1</yPos>
|
||||||
</MaxPosition>
|
</MaxPosition>
|
||||||
<NormalPosition>
|
<NormalPosition>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Top>306</Top>
|
<Top>306</Top>
|
||||||
<Left>2035</Left>
|
<Left>2035</Left>
|
||||||
<Right>3475</Right>
|
<Right>3475</Right>
|
||||||
<Bottom>1065</Bottom>
|
<Bottom>1065</Bottom>
|
||||||
|
=======
|
||||||
|
<Top>133</Top>
|
||||||
|
<Left>1960</Left>
|
||||||
|
<Right>3400</Right>
|
||||||
|
<Bottom>892</Bottom>
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
</NormalPosition>
|
</NormalPosition>
|
||||||
</WindowPosition>
|
</WindowPosition>
|
||||||
<MDIClientArea>
|
<MDIClientArea>
|
||||||
@@ -1801,8 +1808,13 @@
|
|||||||
<RegID>59392</RegID>
|
<RegID>59392</RegID>
|
||||||
<Name>File</Name>
|
<Name>File</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
|
<<<<<<< HEAD
|
||||||
<Len>2873</Len>
|
<Len>2873</Len>
|
||||||
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000007436865636B52549600000000000000140007436865636B525401420B4669785F52616D2E4B76320B4669785F52616D2E4B7630074669785F52616D0646697852616D0B57617465725F77726974651373765F656570726F6D5F6F7065726174696F6E1943756D756C61746976655F57617465725F4261636B776172640C4170704D6F64654465627567165343422D3E56544F52203D20464C4153485F4241534510434F4C4C454354494F4E5F54494D45520C464C4F575F53554D5F4D415804393939390973343835327479706504594731390B4D41494C5F43545F4F50540B736C756963655F6F70656E10555345525F4A534F4E5F5041434B45540E5061636B657455705265676973740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E7300000000000000000000000001000000010000000000000000000Line truncated
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000007436865636B52549600000000000000140007436865636B525401420B4669785F52616D2E4B76320B4669785F52616D2E4B7630074669785F52616D0646697852616D0B57617465725F77726974651373765F656570726F6D5F6F7065726174696F6E1943756D756C61746976655F57617465725F4261636B776172640C4170704D6F64654465627567165343422D3E56544F52203D20464C4153485F4241534510434F4C4C454354494F4E5F54494D45520C464C4F575F53554D5F4D415804393939390973343835327479706504594731390B4D41494C5F43545F4F50540B736C756963655F6F70656E10555345525F4A534F4E5F5041434B45540E5061636B657455705265676973740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E7300000000000000000000000001000000010000000000000000000Line truncated
|
||||||
|
=======
|
||||||
|
<Len>2605</Len>
|
||||||
|
<Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000114A736F6E363531556E7061636B496E666F96000000000000000300114A736F6E363531556E7061636B496E666F04656C73650F4E455453656E6444617461556E6966000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000Line truncated
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>1423</Len>
|
<Len>1423</Len>
|
||||||
@@ -1834,7 +1846,7 @@
|
|||||||
<Name>Debug</Name>
|
<Name>Debug</Name>
|
||||||
<Buttons>
|
<Buttons>
|
||||||
<Len>2373</Len>
|
<Len>2373</Len>
|
||||||
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
|
<Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
|
||||||
</Buttons>
|
</Buttons>
|
||||||
<OriginalItems>
|
<OriginalItems>
|
||||||
<Len>898</Len>
|
<Len>898</Len>
|
||||||
@@ -3638,9 +3650,15 @@
|
|||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>../Core/Src/main.c</Name>
|
<Name>../Core/Src/main.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>1</ColumnNumber>
|
<ColumnNumber>1</ColumnNumber>
|
||||||
<TopLine>178</TopLine>
|
<TopLine>178</TopLine>
|
||||||
<CurrentLine>190</CurrentLine>
|
<CurrentLine>190</CurrentLine>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>4</ColumnNumber>
|
||||||
|
<TopLine>178</TopLine>
|
||||||
|
<CurrentLine>188</CurrentLine>
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
<ContractedFolders></ContractedFolders>
|
<ContractedFolders></ContractedFolders>
|
||||||
<PaneID>0</PaneID>
|
<PaneID>0</PaneID>
|
||||||
@@ -3674,7 +3692,11 @@
|
|||||||
</Doc>
|
</Doc>
|
||||||
<Doc>
|
<Doc>
|
||||||
<Name>../Core/Src/usart.c</Name>
|
<Name>../Core/Src/usart.c</Name>
|
||||||
|
<<<<<<< HEAD
|
||||||
<ColumnNumber>22</ColumnNumber>
|
<ColumnNumber>22</ColumnNumber>
|
||||||
|
=======
|
||||||
|
<ColumnNumber>19</ColumnNumber>
|
||||||
|
>>>>>>> 3a537f633c99d30fa3fe5d01105f6525a48d3d72
|
||||||
<TopLine>97</TopLine>
|
<TopLine>97</TopLine>
|
||||||
<CurrentLine>98</CurrentLine>
|
<CurrentLine>98</CurrentLine>
|
||||||
<Folding>1</Folding>
|
<Folding>1</Folding>
|
||||||
|
|||||||
Reference in new issue
Block a user