2026年6月22日 :大量更新

2026-06-22 08:51:10 +08:00
parent be39714c5e
commit 0fb69c2897
75 changed files with 1518 additions and 528 deletions
@@ -2559,8 +2559,8 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){
        }
    }
    else if(sysPara->status.build_dat.builTime == 73){
+        writeDacValue2Fpga_No73();
        if(sysPara->status.currVoltageVersion != sysPara->status.lastVoltageVersion){
-            writeDacValue2Fpga_No73();
            sysPara->status.lastVoltageVersion = sysPara->status.currVoltageVersion;
        }
    }
@@ -2639,8 +2639,9 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){
        expected_voltage_DAC += highVoltageStep*(sysPara->para.HighVoltageAmplitude%10)/10;
        if(!expected_voltage_DAC){
            sysPara->para.maxHighVoltageDAC = 0;			//为零时，逻辑将忽略所有高压故障
-            if(!ignoreWarn)
-                QMessageBox::warning(NULL,tr("警告"),tr("字高太小或是高压包数据未初始化，您当前错误将忽略所有高压错误"));
+            if(!ignoreWarn){
+                QMessageBox::warning(nullptr, tr("警告"),tr("字高太小或是高压包数据未初始化，您当前错误将忽略所有高压错误"));
+              }
        }
        else
            sysPara->para.maxHighVoltageDAC = expected_voltage_DAC + sysPara->para.highVoltageLevel;