lmh188
/
code_production
mirror of http://192.168.10.5:8099/sane/code_production.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

微调439速度模式设置异常的问题

This commit is contained in:
yangjiaxuan 2024-07-12 18:04:07 +08:00
parent e1f08110b1
commit 01b14d580f
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -200,7 +200,7 @@ int Dialog_InputSerialNum::getSpeedMode()
const wchar_t G200[6] = { 90,100,110,120,130 }; const wchar_t G200[6] = { 90,100,110,120,130 };
const wchar_t G300[6] = { 40,50,60,70,80,90 }; const wchar_t G300[6] = { 40,50,60,70,80,90 };
const wchar_t G306[6] = { 30,40,50,60,70 }; 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; int speed = 0;
QString devType = m_devType; QString devType = m_devType;

2
app/HGProductionTool/form_maininterface.cpp
View File

@ -611,7 +611,7 @@ QString Form_mainInterface::getSpeedMode()
const wchar_t G200[6] = { 90,100,110,120,130 }; const wchar_t G200[6] = { 90,100,110,120,130 };
const wchar_t G300[6] = { 40,50,60,70,80,90 }; const wchar_t G300[6] = { 40,50,60,70,80,90 };
const wchar_t G306[6] = { 30,40,50,60,70 }; 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; int speed = 0;
QString devType = m_devType; QString devType = m_devType;

16
code/base/test_base.cpp
View File

@ -253,10 +253,11 @@ class test
{ {
return -1; 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); 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) if (str2 == "Z" && speed_mode >= 30 && speed_mode <= 70)
{ {
for (size_t i = 0; i < sizeof(G306) / sizeof(G306[0]); i++) 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) 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; if (G400[i] == speed_mode)
break; {
speed_mode = i + 1;
break;
}
} }
} }
} }