diff --git a/app/HGProductionTool/form_maininterface.cpp b/app/HGProductionTool/form_maininterface.cpp index e8524f3..f3c72e0 100644 --- a/app/HGProductionTool/form_maininterface.cpp +++ b/app/HGProductionTool/form_maininterface.cpp @@ -610,21 +610,29 @@ QString Form_mainInterface::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 (m_devFwNum.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]; }