From 01b14d580f9372497a0bd4b532cbfe13ca938a82 Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 12 Jul 2024 18:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83439=E9=80=9F=E5=BA=A6?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=BC=82=E5=B8=B8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/dialog_inputserialnum.cpp |  2 +-
 app/HGProductionTool/form_maininterface.cpp    |  2 +-
 code/base/test_base.cpp                        | 16 ++++++++++------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp
index 99b9693..52006cf 100644
--- a/app/HGProductionTool/dialog_inputserialnum.cpp
+++ b/app/HGProductionTool/dialog_inputserialnum.cpp
@@ -200,7 +200,7 @@ int Dialog_InputSerialNum::getSpeedMode()
     const wchar_t G200[6] = { 90,100,110,120,130 };
     const wchar_t G300[6] = { 40,50,60,70,80,90 };
     const wchar_t G306[6] = { 30,40,50,60,70 };
-    const wchar_t G400[6] = { 40,50,60,70,80,90 };
+    const wchar_t G400[6] = { 40,50,60,70,80 };
 
     int speed = 0;
     QString devType = m_devType;
diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp
index 0ef18ec..d9c1a74 100644
--- a/app/HGProductionTool/form_maininterface.cpp
+++ b/app/HGProductionTool/form_maininterface.cpp
@@ -611,7 +611,7 @@ QString Form_mainInterface::getSpeedMode()
     const wchar_t G200[6] = { 90,100,110,120,130 };
     const wchar_t G300[6] = { 40,50,60,70,80,90 };
     const wchar_t G306[6] = { 30,40,50,60,70 };
-    const wchar_t G400[6] = { 40,50,60,70,80,90 };
+    const wchar_t G400[6] = { 40,50,60,70,80 };
 
     int speed = 0;
     QString devType = m_devType;
diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp
index ad9f76f..510b8dd 100644
--- a/code/base/test_base.cpp
+++ b/code/base/test_base.cpp
@@ -253,10 +253,11 @@ class test
 		{
 			return -1;
 		}
-		std::string str = fv.substr(0, 2);
+		std::string str = fv.substr(0, 2); 
+		std::string str1 = fv.substr(0, 4);
 		std::string str2 = fv.substr(3, 1);
 
-		//139和239设备直接设置实际速度，其它设备设置速度模式为1 2 3 4 5
+		//3399设备直接设置实际速度，3288设备设置速度模式为1 2 3 4 5
 		if (str2 == "Z" && speed_mode >= 30 && speed_mode <= 70)
 		{
 			for (size_t i = 0; i < sizeof(G306) / sizeof(G306[0]); i++)
@@ -281,12 +282,15 @@ class test
 		}
 		else if (str == "G4" && speed_mode >= 40 && speed_mode <= 80)
 		{
-			for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)
+			if (str1 != "G439")
 			{
-				if (G400[i] == speed_mode)
+				for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)
 				{
-					speed_mode = i + 1;
-					break;
+					if (G400[i] == speed_mode)
+					{
+						speed_mode = i + 1;
+						break;
+					}
 				}
 			}
 		}