修复隐藏功能缺陷、管控高压开启条件

DevOp.cpp

@@ -3324,9 +3324,7 @@ void DevOp::writeFpgaCalandar(bool Enable){
     fpgaWr(WRITE_COUNTER3_ADDR,(unsigned char *)&sysPara->para.Counter3,sizeof(sysPara->para.Counter3));
     sysPara->para.Counter4.cnt4CurrValue= QString::number(sysPara->para.cnt4CurrValue).toUInt(0,16); //计数器4当前值用于隐藏功能
 
-    #ifndef COUNTER2_BY_GROUP
+    fpgaWr(WRITE_COUNTER4_ADDR,(unsigned char *)&sysPara->para.Counter4, 4);
-    fpgaWr(WRITE_COUNTER4_ADDR,(unsigned char *)&sysPara->para.Counter4,sizeof(sysPara->para.Counter4));
-    #endif
 
     sysPara->status.cnt3CurrentValueInitDoneFlag = true;
     sysPara->status.cnt2CurrentValueInitDoneFlag = true;

VerBVersion.h

@@ -1,29 +1,29 @@
-#ifndef VERBVERSION_H
+#ifndef VERBVERSION_H
-#define VERBVERSION_H
+#define VERBVERSION_H
-#include "myinclude.h"
+#include "myinclude.h"
-/*
+/*
-  VX5.D.0826.0100_Std(-C)
+  VX5.D.0826.0100_Std(-C)
-  MACHINAE_VER.PUMP_VER.MMdd.SUB_VER+SUB_RFID
+  MACHINAE_VER.PUMP_VER.MMdd.SUB_VER+SUB_RFID
-*/
+*/
-#define MACHINAE_VER "VX5"
+#define MACHINAE_VER "VX5"
-#define PUMP_VER "D"
+#define PUMP_VER "D"
-//#define SUB_VER "0100"
+//#define SUB_VER "0100"
-#define SUB_VER "GuiLin"
+#define SUB_VER "GuiLin"
-
+
-#ifdef __RFID_OLD
+#ifdef __RFID_OLD
-#define SUB_RFID "_RO"
+#define SUB_RFID "_RO"
-#else
+#else
-#define SUB_RFID "_Std"
+#define SUB_RFID "_Std"
-#endif
+#endif
-
+
-#ifdef __RFID_CARD
+#ifdef __RFID_CARD
-#undef SUB_RFID
+#undef SUB_RFID
-#define SUB_RFID "-C"
+#define SUB_RFID "-C"
-#endif
+#endif
-
+
-
+
-#define VERNONBACH_VERSION(a,b,c) (((a)<<16) + ((b)<<8) + (c))
+#define VERNONBACH_VERSION(a,b,c) (((a)<<16) + ((b)<<8) + (c))
-
+
-#define VERNONBACH_VERSION_CODE VERNONBACH_VERSION(UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER, UP_PRINTER_RIVISION_VER)
+#define VERNONBACH_VERSION_CODE VERNONBACH_VERSION(UP_PRINTER_MAJOR_VER, UP_PRINTER_MINOR_VER, UP_PRINTER_RIVISION_VER)
-
+
-#endif // VERBVERSION_H
+#endif // VERBVERSION_H