chore: 源码编码GB2312统一转换为UTF-8
25个含有中文注释的.c/.h文件编码格式从GB2312转为UTF-8(无BOM)。中文字符从2字节编码变为3字节编码,注释内容保持不变。
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
#include "spiflash.h"
|
||||
|
||||
|
||||
//雅下: 81-00-00-06-00-01
|
||||
//雅下: 81-00-00-06-00-01
|
||||
// 81-00-00-06-00-02
|
||||
// 81-00-00-06-00-03
|
||||
// 81-00-00-06-00-04
|
||||
@@ -60,10 +60,10 @@ int toPercentage(int voltage)
|
||||
}
|
||||
|
||||
/*****************************************************************************************
|
||||
* 函数名称: MainDBGOnOff
|
||||
* 功能描述: 主调试信息开关函数
|
||||
* 参 数: OnOff,开关
|
||||
* 返 回 值: 无
|
||||
* 函数名称: MainDBGOnOff
|
||||
* 功能描述: 主调试信息开关函数
|
||||
* 参 数: OnOff,开关
|
||||
* 返 回 值: 无
|
||||
*****************************************************************************************/
|
||||
void MainDBGOnOff(bool OnOff)
|
||||
{
|
||||
@@ -143,7 +143,7 @@ void GateWayInit(void)
|
||||
memset((uint8_t *)&GateWay.ConfigPara, 0x00, sizeof(GWConfigPara_t));
|
||||
GateWay.ConfigPara.SavFlag = LOG_SAV_FLAG;
|
||||
GateWay.ConfigPara.Comm = CATONE_COMM;
|
||||
#if MAC_ADDR_TYPE == 0//测试服务器
|
||||
#if MAC_ADDR_TYPE == 0//测试服务器
|
||||
GateWay.ConfigPara.LTENet.DestAddr[0] = 39;
|
||||
GateWay.ConfigPara.LTENet.DestAddr[1] = 106;
|
||||
GateWay.ConfigPara.LTENet.DestAddr[2] = 103;
|
||||
@@ -157,7 +157,7 @@ void GateWayInit(void)
|
||||
GateWay.ConfigPara.LTENet.DestPort = 12111;
|
||||
#endif
|
||||
|
||||
GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;//非低功耗设备
|
||||
GateWay.ConfigPara.CommUnitReadInterval = COMMUNIT_READ_SENSOR_INTERVAL_MAX;//非低功耗设备
|
||||
memset(GateWay.ConfigPara.CommUnitArray, 0x00, sizeof(CommUnitData_t) * COMMUNIT_NUM_MAX);
|
||||
GateWay.ConfigPara.Rs485Ch1.Enable = true;
|
||||
GateWay.ConfigPara.Rs485Ch1.CommUnitEnable = false;
|
||||
@@ -340,16 +340,16 @@ void OutageUpdate(uint8_t AlarmType, bool AlarmState, uint8_t Batt)
|
||||
Alarm->AlarmType = AlarmType;
|
||||
Alarm->AlarmState = AlarmState;
|
||||
Alarm->AlarmPara = Batt;
|
||||
CatOneEthSendQueue(MegData, 6); //发送报警信息
|
||||
CatOneEthSendQueue(MegData, 6); //发送报警信息
|
||||
}
|
||||
|
||||
/*****************************************************************************************
|
||||
* 函数名称: main
|
||||
* 功能描述: 主函数
|
||||
* 参 数: 无
|
||||
* 返 回 值: 运行错误返回-1
|
||||
* 函数名称: main
|
||||
* 功能描述: 主函数
|
||||
* 参 数: 无
|
||||
* 返 回 值: 运行错误返回-1
|
||||
*****************************************************************************************/
|
||||
static uint8_t LastBattery = 0xff; //上一次电池电压
|
||||
static uint8_t LastBattery = 0xff; //上一次电池电压
|
||||
int main(void)
|
||||
{
|
||||
uint16_t OneSecondDlyCnt = 0;
|
||||
@@ -456,15 +456,15 @@ int main(void)
|
||||
|
||||
uint16_t ADValue = GetADCBuffPoint();
|
||||
//V = (AD * 3.3 / 4096) * (R1+R2) / R1; R1 = 200, R2 = 120
|
||||
//计算出常数为0.0021484375,扩大1000倍
|
||||
//计算出常数为0.0021484375,扩大1000倍
|
||||
float Voltage = ADValue * 2.1484375;
|
||||
GateWay.Battery = toPercentage(Voltage);
|
||||
|
||||
//上电判断电量
|
||||
//上电判断电量
|
||||
if(LastBattery == 0xff) {
|
||||
LastBattery = GateWay.Battery;
|
||||
|
||||
if(GateWay.ConfigPara.OutageFlag == true) { //有报警
|
||||
if(GateWay.ConfigPara.OutageFlag == true) { //有报警
|
||||
AlarmType = 1;
|
||||
}
|
||||
else {
|
||||
@@ -474,7 +474,7 @@ int main(void)
|
||||
BatteryUpdateDlyCnt = 10;
|
||||
}
|
||||
else {
|
||||
if(GateWay.ConfigPara.OutageFlag == false) { //没有告警,判断电池电压是否降低
|
||||
if(GateWay.ConfigPara.OutageFlag == false) { //没有告警,判断电池电压是否降低
|
||||
if(GateWay.Battery <= LastBattery) {
|
||||
if(LastBattery <= 5) {
|
||||
GateWay.ConfigPara.OutageFlag = true;
|
||||
@@ -495,7 +495,7 @@ int main(void)
|
||||
BatteryUpdateDlyCnt = 20 * 60;
|
||||
}
|
||||
}
|
||||
else { //充电,更新上一次电池电压
|
||||
else { //充电,更新上一次电池电压
|
||||
LastBattery = GateWay.Battery;
|
||||
}
|
||||
}
|
||||
@@ -522,14 +522,14 @@ int main(void)
|
||||
AlarmType = 0;
|
||||
}
|
||||
}
|
||||
else { //电池继续放电,更新上一次电池电压
|
||||
else { //电池继续放电,更新上一次电池电压
|
||||
LastBattery = GateWay.Battery;
|
||||
}
|
||||
}
|
||||
}
|
||||
BatteryUpdateDlyCnt--;
|
||||
if(BatteryUpdateDlyCnt == 0) {
|
||||
if(GateWay.ConfigPara.OutageFlag) { //有报警
|
||||
if(GateWay.ConfigPara.OutageFlag) { //有报警
|
||||
BatteryUpdateDlyCnt = 20 * 60;
|
||||
}
|
||||
else {
|
||||
|
||||
Reference in New Issue
Block a user