Compare commits

..

No commits in common. "e0466376254927de7008e6ab699ba640f8f6a7d8" and "1b4971d3f3f775ea1fe0ff7fb0708bdcfa12e7db" have entirely different histories.

View File

@ -3,9 +3,7 @@
typedef enum
{
OUT_INIT=0,
OUT_CELI,
OUT_START,
OUT_INIT = 0,
OUT_RUNNING,
OUT_AUTOSTOP,
OUT_ERR,
@ -95,9 +93,6 @@ unsigned int ADC_Average(unsigned int *buff, unsigned int num, unsigned int thre
// new
void OutPutCtrl(void);
unsigned char code BUILD_DATA[] = __DATE__ ;
unsigned char code BUILD_TIME[] = __TIME__ ;
/***************变量定义**************/
bit busy = 0;
bit SendEN = 0;
@ -111,7 +106,7 @@ bit AcqInitFlag = 0;
bit AD_Refresh = 0;
bit Save_Flag = 0;
bit STOP_FLAG = 0;
bit PWM_ON_EN = 0;
unsigned char xdata Rxbuff[20];
unsigned char xdata aRxBufferTemp = 0;
@ -190,7 +185,7 @@ float xdata OutGain = 0; // 输出增益调节
// new
OUTSTATE_t xdata OutPutState;
unsigned int xdata InitTimeCnt,ErrTimeCnt;
unsigned int xdata InitTimeCnt;
unsigned int xdata TimeBaseCnt, TimeBaseCntLast;
bit ledState;
unsigned int xdata TargetCurrent;
@ -202,7 +197,7 @@ void main()
PWM_Init();
UART1_Init();
ADC_Init();
P25 = 0;
ES = 1;
EA = 1;
UartCnt = 0;
@ -215,7 +210,7 @@ void main()
Delay10ms();
Delay10ms();
EEPROM_read_n(IAP_ADDRESS, TableRead, 4); // 从EEPROM读取数据
EEPROM_read_n(IAP_ADDRESS, TableRead, 18); // 从EEPROM读取数据
if (TableRead[0] == 0x55 && TableRead[1] == 0xaa)
{
TargetCurrent = (TableRead[2] << 8) + TableRead[3];
@ -247,18 +242,17 @@ void main()
AcqError = 100;
OutSet = 10000;
DisSet = 16146;
InitError = 0;
OutGain = (float)OutSet / 10000;
CalibrationVoltage = SetVoltage;
//PWM_TO_DAC(5000, (unsigned int)(CalibrationVoltage * OutGain) + (unsigned int)IA); // 供电电压为5000MV负载端输出电压为CalibrationVoltage单片机口输出电压为SetOutVoltage/3
PWM_TO_DAC(5000, (unsigned int)(CalibrationVoltage * OutGain) + (unsigned int)IA); // 供电电压为5000MV负载端输出电压为CalibrationVoltage单片机口输出电压为SetOutVoltage/3
AcqInitCnt = 0;
InitTimeCnt = 0;
TimeBaseCnt = 0;
TimeBaseCntLast = 0;
OutPutState = OUT_INIT;
ErrTimeCnt = 0;
while (1)
{
@ -276,8 +270,8 @@ void main()
}
if (TimeBaseCntLast % 1000 == 0)
{
//ledState = !ledState;
//P16 = ledState;
ledState = !ledState;
P16 = ledState;
}
if (TimeBaseCnt >= 10000)
{
@ -308,82 +302,25 @@ void OutPutCtrl(void)
switch (OutPutState)
{
case OUT_INIT:
PWM_TO_DAC(5000, 0);
P25 = 0;
PWM_TO_DAC(5000, 1000);
InitTimeCnt++;
if (InitTimeCnt > 100)
{
InitTimeCnt = 0;
OutPutState = OUT_CELI;
InitError = 0;
}
break;
case OUT_CELI:
PWM_TO_DAC(5000, 0);
InitTimeCnt++;
InitError += OutCurrent;
if (InitTimeCnt >= 10)
{
InitError /= 10;
InitTimeCnt = 0;
OutPutState = OUT_START;
OutputVol = 500;
}
if (OutCurrent > 30000)
{
ErrTimeCnt++;
if (ErrTimeCnt > 3)
{
OutPutState = OUT_ERR;
}
}
else
{
ErrTimeCnt = 0;
}
break;
case OUT_START:
PWM_TO_DAC(5000, OutputVol);
InitTimeCnt++;
if (InitTimeCnt > 40)
{
InitTimeCnt = 0;
OutPutState = OUT_RUNNING;
}
if (OutCurrent > 30000)
{
ErrTimeCnt++;
if (ErrTimeCnt > 50)//500ms
{
OutPutState = OUT_ERR;
}
}
else
{
ErrTimeCnt = 0;
OutputVol = 1000;
}
break;
case OUT_RUNNING:
if (OutCurrent > InitError)
{
OutCurrent -= InitError;
}
else
{
OutCurrent = 0;
}
if (OutCurrent > TargetCurrent + 10)
if (OutCurrent > TargetCurrent + 20)
{
if (OutputVol > 100)
{
OutputVol--;
}
}
else if (OutCurrent < TargetCurrent - 10)
else if (OutCurrent < TargetCurrent - 20)
{
if (OutputVol < 5000)
{
@ -391,42 +328,19 @@ void OutPutCtrl(void)
}
}
PWM_TO_DAC(5000, OutputVol);
if (OutCurrent >= 100 && OutCurrent <= 10000)
{
LED_ON;
}
else
{
LED_OFF;
}
if (OutCurrent > 30000)
{
ErrTimeCnt++;
if (ErrTimeCnt > 50)//500ms
{
OutPutState = OUT_ERR;
}
}
else
{
ErrTimeCnt = 0;
}
break;
case OUT_AUTOSTOP:
break;
case OUT_ERR:
LED_OFF;
break;
default:
break;
}
}
void turnOFFOutput(void)
void turnOFFOutput(void)
{
STOP_FLAG = 1;
PWM_ON_EN = 1;
Shut_Hour = 0;
Shut_Min = 0;
Shut_Sec = 0;
@ -438,7 +352,7 @@ void turnOFFOutput(void)
void AutoAction(void)
{
if (STOP_FLAG == 0) // PWM输出使能
if (PWM_ON_EN == 0) // PWM输出使能
{
if (AcqVolatage >= Limitvoltage) // 采集电压大于1500mV,或电流小于0.5mA,关闭输出
{
@ -1591,10 +1505,14 @@ void DataParsing(void)
{
if (Uart1Ready_R == 1) // 数据接收完成,处理接收到的数据
{
// 按键返回
if (Rxbuff[0] == 0x02)
{
TargetCurrent = (Rxbuff[1] << 8) + Rxbuff[2];
// 参数复位
TargetCurrent = Rxbuff[1] << 8 + Rxbuff[2];
// 参数掉电保存(直接调用函数)
Save_Flag = 1;
// Parameter_Save();
}
}
Uart1Ready_R = 0;
@ -1624,8 +1542,8 @@ void UartSendData(void)
SendBuffer[2] = RunTime >> 8; // 运行时间H
SendBuffer[3] = RunTime; // 运行时间L
SendBuffer[4] = InitError >> 8; // 输入电压H
SendBuffer[5] = InitError; // 输入电压L
SendBuffer[4] = InVoltage >> 8; // 输入电压H
SendBuffer[5] = InVoltage; // 输入电压L
SendBuffer[6] = OutVoltage >> 8; // 输出电压H
SendBuffer[7] = OutVoltage; // 输出电压L
SendBuffer[8] = OutCurrent >> 8; // 输出电流H
@ -1719,7 +1637,7 @@ void TM0_Isr() interrupt 1 using 1
AcqInitCnt++;
TimeBaseCnt++;
/*** 新增2019-11-14 ***/
if (STOP_FLAG)
if (PWM_ON_EN)
{
Shut_MS++;
if (Shut_MS >= 1000)
@ -1736,7 +1654,7 @@ void TM0_Isr() interrupt 1 using 1
if (Shut_Min >= 180) // 大于3小时恢复工作
{
STOP_FLAG = 0;
PWM_ON_EN = 0;
Shut_Hour = 0;
Shut_Min = 0;
Shut_Sec = 0;
@ -1763,6 +1681,13 @@ void TM0_Isr() interrupt 1 using 1
{
Time_Min = 0;
RunTime++;
Save_Cnt++;
if ((Save_Cnt > 0) && ((Save_Cnt % 5) == 0))
{
Save_Flag = 1; // 运行参数1个小时保存一次
Save_Cnt = 0;
}
}
}
}