diff --git a/DevOp.cpp b/DevOp.cpp
index 0cc3fc4..3dab037 100644
--- a/DevOp.cpp
+++ b/DevOp.cpp
@@ -2680,16 +2680,21 @@ int DevOp::writeFpgaPrintPara(bool ignoreWarn){
         {
 #define MIN_CHAR_WIDTH	0.1			//0.1mm/列
 #define MAX_CHAR_WIDTH  4.0			//4.0mm/列
+            // 计算预览区域的总脉冲数 = 0.1+字宽*(4-0.1)/100*(当前列数+3(留白))*同步器脉冲数
             displayAreaTotalSynNum = (int )(
                         (MIN_CHAR_WIDTH +sysPara->para.printColDelay*(MAX_CHAR_WIDTH - MIN_CHAR_WIDTH) /100)
-                        *currPrintCol*sysPara->para.synPulseNumPerMm
-                        );
+                        *currPrintCol*sysPara->para.synPulseNumPerMm);
+
             // 增加判定条件，其实我觉得下面这个 contentLength 才是合理计算内容长度是否超过喷印间隔的方式
             float contentLength = sysPara->para.printColDelay / MAX(sysPara->para.synPulseNumPerMm, 0.000001) * sysPara->status.currPrintCol;
-            if(!ignoreWarn && currPrintCol && contentLength > sysPara->para.synTriggerPrintLenMm){
+
+            // sysPara->para.synTriggerPrintLenMm:毫米脉冲数   之前干嘛拿实际长度contentLength跟毫米脉冲数比较？？？, 现在改为直接拿喷印间隔比较
+            if(!ignoreWarn && sysPara->status.currPrintCol && (contentLength > sysPara->para.synTriggerPrintLenMm)){
                 QMessageBox::warning(NULL,tr("警告"),tr("喷印间隔太短，无法满足同步打印宽度设置，字宽将自动缩短!"));
-                LogInfo::setRunStatusText(QString("displayAreaTotalSynNum warn: L: %1, printColDelay: %2, PPM: %3, Cols: %4").arg(contentLength).arg(sysPara->para.printColDelay).
-                                          arg(sysPara->para.synPulseNumPerMm).arg(sysPara->status.currPrintCol));
+                LogInfo::setRunStatusText(QString("contentLength: %1, printColDelay: %2, PPM: %3, Cols: %4, synTriggerPrintLenMm: %5")
+                                          .arg(contentLength).arg(sysPara->para.printColDelay)
+                                          .arg(sysPara->para.synPulseNumPerMm).arg(sysPara->status.currPrintCol).arg(sysPara->para.synTriggerPrintLenMm));
+                LogInfo::setRunStatusText(tr("needed lenth : %1").arg(contentLength+1));
             }
         }
         else
diff --git a/VerBVersion.h b/VerBVersion.h
index e3a7f41..3536f5f 100644
--- a/VerBVersion.h
+++ b/VerBVersion.h
@@ -8,7 +8,8 @@
 #define MACHINAE_VER "VX5"
 #define PUMP_VER "D"
 //#define SUB_VER "0100"
-#define SUB_VER "IND"
+//#define SUB_VER "IND"
+#define SUB_VER "GuiL"
 
 #ifdef __RFID_OLD
 #define SUB_RFID "_RO"
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 9489473..8285519 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -2076,7 +2076,7 @@ void MainWindow::airPushingProcess()
 
                 setRunStatus(tr("排气结束, 准备打开回收槽."));
                 LogInfo::setRunStatusText(tr("排气结束, 准备打开回收槽."));
-                sysPara->status.isPumpValveControledByHand = false;
+                sysPara->status.isPumpValveControledByHand = false;//切换手动，调节压力
                 return;
             }
         }
diff --git a/myinclude.h b/myinclude.h
index ffc0cc4..ca9390e 100644
--- a/myinclude.h
+++ b/myinclude.h
@@ -12,8 +12,8 @@
 
 // #define FPGATEST        // 给韦工测试时启用，发布版本需要关闭
 // #define NETWORKQRCODE       //二维码允许tcp客户端修改
- #define __RFID_OLD        //旧的加密算法
- #define __RFID_CARD       //刷卡功能
+// #define __RFID_OLD        //旧的加密算法
+// #define __RFID_CARD       //刷卡功能
 // #define __RFID_IND        //允许印度进行二次加密的宏
 //#define EnableArabic      //界面语言切换为英文生效
 //#define EnableBangla      //新孟加拉语