From e2d281bfdbe18e19cad8232b00a56e3fdc3206ef Mon Sep 17 00:00:00 2001
From: yangjiaxuan <171295266@qq.com>
Date: Fri, 7 Jun 2024 17:55:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0306=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E9=80=9F=E5=BA=A6=E6=A8=A1=E5=BC=8F=EF=BC=9B7010--BUG-971?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/HGProductionTool/dialog_inputserialnum.cpp | 18 +++++++++++++-----
 code/base/test_base.cpp                        | 15 ++++++++++++++-
 2 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/HGProductionTool/dialog_inputserialnum.cpp b/app/HGProductionTool/dialog_inputserialnum.cpp
index 1548d2e..74c9498 100644
--- a/app/HGProductionTool/dialog_inputserialnum.cpp
+++ b/app/HGProductionTool/dialog_inputserialnum.cpp
@@ -199,21 +199,29 @@ int Dialog_InputSerialNum::getSpeedMode()
     const wchar_t G100[6] = { 70,80,90,110 };
     const wchar_t G200[6] = { 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 };
 
     int speed = 0;
+    QString devType = m_devType;
+    if (getDeviceFwVersion().mid(3, 1) == "Z"); //306
+    {
+        devType == "G306";
+    }
 
-    if ((int)speedMode >= 40)
+    if ((int)speedMode >= 30)
         speed = (int)speedMode;
     else
     {
-        if (m_devType == "G100")
+        if (devType == "G100")
             speed = G100[(int)speedMode - 1];
-        else if (m_devType == "G200")
+        else if (devType == "G200")
             speed = G200[(int)speedMode - 1];
-        else if (m_devType == "G300")
+        else if (devType == "G300")
             speed = G300[(int)speedMode - 1];
-        else if (m_devType == "G400")
+        else if (devType == "G306")
+            speed = G306[(int)speedMode - 1];
+        else if (devType == "G400")
             speed = G400[(int)speedMode - 1];
     }
 
diff --git a/code/base/test_base.cpp b/code/base/test_base.cpp
index 6d5fe26..1c3ddf2 100644
--- a/code/base/test_base.cpp
+++ b/code/base/test_base.cpp
@@ -239,6 +239,7 @@ class test
 		const char G139[6] = { 70,80,90,110 };
 		const char G239[6] = { 100,110,120,130 };
 		const char G300[6] = { 40,50,60,70 };
+		const char G306[6] = { 30,40,50,60,70 };
 		const char G400[6] = { 40,50,60,70,80 };
 
 		std::string fv(get_firmware_version());
@@ -247,12 +248,24 @@ class test
 			return -1;
 		}
 		std::string str = fv.substr(0, 4);
+		std::string str2 = fv.substr(3, 1);
 		if (str != "G439" && str != "G239" && str != "G139")
 		{
 			str = fv.substr(0, 2);
 		}
 
-		if (str == "G3" || str == "G4" && speed_mode >= 40 && speed_mode <= 80)
+		if (str2 == "Z" && speed_mode >= 30 && speed_mode <= 70)
+		{
+			for (size_t i = 0; i < sizeof(G306) / sizeof(G306[0]); i++)//306设置速度模式为1 2 3 4 5
+			{
+				if (G306[i] == speed_mode)
+				{
+					speed_mode = i + 1;
+					break;
+				}
+			}
+		}
+		else if (str == "G3" || str == "G4" && speed_mode >= 40 && speed_mode <= 80)
 		{
 			for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)//3288设置速度模式为1 2 3 4 5
 			{