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

增加306设备速度模式；7010--BUG-971

This commit is contained in:
yangjiaxuan 2024-06-07 17:55:30 +08:00
parent 84f99e07d9
commit e2d281bfdb
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/HGProductionTool/dialog_inputserialnum.cpp
View File

@ -199,21 +199,29 @@ int Dialog_InputSerialNum::getSpeedMode()
const wchar_t G100[6] = { 70,80,90,110 }; const wchar_t G100[6] = { 70,80,90,110 };
const wchar_t G200[6] = { 100,110,120,130 }; const wchar_t G200[6] = { 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 G400[6] = { 40,50,60,70,80,90 }; const wchar_t G400[6] = { 40,50,60,70,80,90 };
int speed = 0; 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; speed = (int)speedMode;
else else
{ {
if (m_devType == "G100") if (devType == "G100")
speed = G100[(int)speedMode - 1]; speed = G100[(int)speedMode - 1];
else if (m_devType == "G200") else if (devType == "G200")
speed = G200[(int)speedMode - 1]; speed = G200[(int)speedMode - 1];
else if (m_devType == "G300") else if (devType == "G300")
speed = G300[(int)speedMode - 1]; 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]; speed = G400[(int)speedMode - 1];
} }

15
code/base/test_base.cpp
View File

@ -239,6 +239,7 @@ class test
const char G139[6] = { 70,80,90,110 }; const char G139[6] = { 70,80,90,110 };
const char G239[6] = { 100,110,120,130 }; const char G239[6] = { 100,110,120,130 };
const char G300[6] = { 40,50,60,70 }; 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 }; const char G400[6] = { 40,50,60,70,80 };
std::string fv(get_firmware_version()); std::string fv(get_firmware_version());
@ -247,12 +248,24 @@ class test
return -1; return -1;
} }
std::string str = fv.substr(0, 4); std::string str = fv.substr(0, 4);
std::string str2 = fv.substr(3, 1);
if (str != "G439" && str != "G239" && str != "G139") if (str != "G439" && str != "G239" && str != "G139")
{ {
str = fv.substr(0, 2); 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 for (size_t i = 0; i < sizeof(G400) / sizeof(G400[0]); i++)//3288设置速度模式为1 2 3 4 5
{ {