diff --git a/App/ACZero.cpp b/App/ACZero.cpp index 9f353b9f..154adc51 100644 --- a/App/ACZero.cpp +++ b/App/ACZero.cpp @@ -98,7 +98,7 @@ bool ACZero::Wait(int usDelay) const if (ms < 0 && ms > 40) return false; // 4号继电器作为输出信号 - static OutputPort sign(PB14); + static OutputPort sign(PA5); sign != sign; // 计算下一次零点什么时候到来 diff --git a/Device/SerialPort.cpp b/Device/SerialPort.cpp index dfc7d5f5..c040fb24 100644 --- a/Device/SerialPort.cpp +++ b/Device/SerialPort.cpp @@ -57,9 +57,9 @@ void SerialPort::Set(COM index, int baudRate) if (_baudRate <= 0) { int clock = Sys.Clock; - if (clock >= 72) + if (clock > 72) _baudRate = 2048000; - else if (clock >= 36) + else if (clock > 36) _baudRate = 1024000; else _baudRate = 115200;