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

Compare commits

base: lmh188:c31a80d5eac499c703e1dea0fb6b3bd0ea330e29
Branches Tags
lmh188:master
lmh188:dev
lmh188:newtx
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523
...
compare: lmh188:d112659a7c8a608a2d7dc81808821876640c9cae
Branches Tags
lmh188:dev
lmh188:newtx
lmh188:master
lmh188:twain
lmh188:conservative
lmh188:release
lmh188:v4.52
lmh188:qiming_v.4.51.23297
lmh188:v4.51
lmh188:v4.50
lmh188:hw-2022.0523

3 Commits
c31a80d5ea ... d112659a7c

Author SHA1 Message Date
13038267101 d112659a7c 微调 2023-03-01 15:19:15 +08:00
13038267101 831fcb5f2e 调整对固件版本的判断 2023-03-01 15:07:47 +08:00
13038267101 f6c7e01854 更新畸变算法 2023-03-01 11:04:07 +08:00
2 changed files with 45 additions and 20 deletions
Show Stats Expand all files Collapse all files

17
hgdriver/ImageProcess/CISTestImageProcess.cpp
View File

@ -89,6 +89,23 @@ int CISTestImageProcess::test(const cv::Mat& image, CISTestResult& result)
box.size.width = box.size.height;
box.size.height = temp;
}
if (box.angle < -45)
{
box.angle += 90;
float temp = box.size.width;
box.size.width = box.size.height;
box.size.height = temp;
}
if (box.angle > 45)
{
box.angle -= 90;
float temp = box.size.width;
box.size.width = box.size.height;
box.size.height = temp;
}
if (box.angle > 45)
{
box.angle -= 90;

48
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -432,10 +432,7 @@ void hg_scanner_239::init_version(void)
is_kernelsnap_devsislock = true;
}
}
if (year >= "3C")
{
is_kernelsnap_3C_cccc = true;
}
}
else if (dev == "G4" && ver == "393")
{
@ -452,25 +449,36 @@ void hg_scanner_239::init_version(void)
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1209))
is_kernelsnap_211209_ = atoi(get_fpga().c_str()) >= 35211210;
else
is_kernelsnap_211209_ = false;
if (dev == "G1" || dev == "G2" || dev == "G4")
{
is_kernelsnap_211209_ = date >= "A1209" ? (is_kernelsnap_211209_ = atoi(get_fpga().c_str()) >= 35211210) : false;//基本用不到了
is_kernelsnap_220830_ = date >= "A0830" ? true: false;
is_kernelsnap_221027_ = date >= "A1027" ? true : false;
is_kernelsnap_220430_ = date >= "A0430" ? true : false;
is_kernelsnap_3C_cccc = year >= "3C" ? true : false;
}
VLOG_MINI_5(LOG_LEVEL_DEBUG_INFO, "Firmware version : %s,is_kernelsnap_211209_:%d ,is_kernelsnap_220830_:%d,is_kernelsnap_221027_:%d,is_kernelsnap_220430_:%d\n",
fv.c_str(), is_kernelsnap_211209_, is_kernelsnap_220830_, is_kernelsnap_221027_, is_kernelsnap_220430_);
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 830))
is_kernelsnap_220830_ = true;
else
is_kernelsnap_220830_ = false;
//if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1209))
// is_kernelsnap_211209_ = atoi(get_fpga().c_str()) >= 35211210;
//else
// is_kernelsnap_211209_ = false;
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1027))
is_kernelsnap_221027_ = true;
else
is_kernelsnap_221027_ = false;
//if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 830))
// is_kernelsnap_220830_ = true;
//else
// is_kernelsnap_220830_ = false;
if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 430))
is_kernelsnap_220430_ = true;
else
is_kernelsnap_220430_ = false;
//if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 1027))
// is_kernelsnap_221027_ = true;
//else
// is_kernelsnap_221027_ = false;
//if (fv.length() >= 10 && (fv[5] > 'A' && atoi(fv.substr(6, 4).c_str()) >= 430))
// is_kernelsnap_220430_ = true;
//else
// is_kernelsnap_220430_ = false;
}
int hg_scanner_239::writedown_device_configuration(bool type, setting_hardware::HGSCANCONF_3399* dev_conf)
{