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; + } } } }