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:9fa14c284014e3110c65b99bd5328d5a1d01c6cc
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:c31a80d5eac499c703e1dea0fb6b3bd0ea330e29
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
9fa14c2840 ... c31a80d5ea

Author SHA1 Message Date
13038267101 c31a80d5ea 调整G239 之前没有包括3C的固件版本号，导致色偏校正不能使用 2023-02-28 16:03:50 +08:00
13038267101 ed96123b0e 发现G300设备可能会随机出现操作超时，所以加了一些日志，和微调取图超时的信息 2023-02-28 15:33:50 +08:00
13038267101 c44e989eca 设备睡眠时的异常状态，畸变值设置dpi不对 2023-02-28 14:00:27 +08:00
4 changed files with 115 additions and 71 deletions
Show Stats Expand all files Collapse all files

8
hgdriver/hgdev/hg_scanner.cpp
View File

@ -3877,11 +3877,15 @@ void hg_scanner::image_process(std::shared_ptr<tiny_buffer>& buffer, uint32_t id
if (is_dpi_color_check)
{
CISTestImageProcess::CISTestResult res;
distortion_val.h = 0;
distortion_val.w =0;
distortion_val.scaleXY = 0;
save_dpi_color_check_val = 0;
err = hg_imgproc::cis_test_image(ImagePrc_pHandle_, res);
distortion_val.h = res.h;
distortion_val.w = res.w;
distortion_val.scaleXY = res.scaleXY;
save_dpi_color_check_val = res.scaleXY;
save_dpi_color_check_val = distortion_val.scaleXY = res.scaleXY;
is_dpi_color_check = false;
VLOG_MINI_3(LOG_LEVEL_DEBUG_INFO, "Set distortion val is:h:%f w:%f distortion val is:%f\n", distortion_val.h, distortion_val.w, distortion_val.scaleXY);

2
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -432,7 +432,7 @@ void hg_scanner_239::init_version(void)
is_kernelsnap_devsislock = true;
}
}
if (year > "3C")
if (year >= "3C")
{
is_kernelsnap_3C_cccc = true;
}

173
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -74,38 +74,32 @@ namespace settingsdsp_300
return code;
}
}
hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io,pid),papersize(pid)
hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io,pid),papersize(pid), is_devs_sleep_(false)
{
initdevice();
#ifndef MAPPING_FUNCTION_IN_BASE
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
#endif
initdevice();
if (init_settings(pid_))
{
if (pid_ == 0x300)
{
init_settings((jsontext1 + jsontext2).c_str());
string fw = get_firmware_version();
if (fw.size() > 5)
{
if (atoi(fw.substr(4, 6).c_str()) >= 221106 && atoi(fw.substr(4, 6).c_str()) < 230210)
is_kernelsnap3288_221106_ = true;
else if (atoi(fw.substr(4, 6).c_str()) >= 230210)
is_kernelsnap3288_230210_ = true;
else
{
is_kernelsnap3288_221106_ = false;
is_kernelsnap3288_230210_ = false;
}
}
}
else
init_settings((jsontext3 + jsontext4).c_str());
}
//printf_devconfig();
int val = 0;
int ret = get_scan_is_sleep(val);
if (!val && ret == SCANNER_ERR_OK)
{
is_devs_sleep_ = status_ = SCANNER_ERR_DEVICE_SLEEPING;
VLOG_MINI_1(LOG_LEVEL_WARNING, "init device start status is(%s)\n", hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_SLEEPING));
}
if (pid_ == 0x400 || is_devs_sleep_)
return;
//目前300才做处理
set_kernelsnap_ver();
is_devs_sleep_ = false;
}
hg_scanner_300::~hg_scanner_300()
{}
@ -128,8 +122,8 @@ void hg_scanner_300::thread_handle_usb_read(void)
USBCB usb={0};
ret = get_scanner_status(usb);
//printf("usb.u32_Data = %d ret = %d\r\n",usb.u32_Data,ret);
////如果设备出现卡纸 或者双张等设备信息问题，需要等到设备进行发送stop才能停止。 所以始终以 "停止" 消息为结束信号
////如果有图的情况下，并且卡纸或双张等，设备会先发送卡纸双张信息。所以接受到错误信息之后，仍需要把图像取出来。
//如果设备出现卡纸 或者双张等设备信息问题，需要等到设备进行发送stop才能停止。 所以始终以 "停止" 消息为结束信号
//如果有图的情况下，并且卡纸或双张等，设备会先发送卡纸双张信息。所以接受到错误信息之后，仍需要把图像取出来。
if (ret == SCANNER_ERR_DEVICE_STOPPED)
{
status_ = !savestatus_.empty() ? savestatus_[0] : SCANNER_ERR_OK;//以第一个消息为准
@ -214,19 +208,25 @@ void hg_scanner_300::thread_handle_usb_read(void)
}
else
{
//3288固件 获取有纸无纸问题的bug，如果是打开盖子在start之前【主动】获取的话，会先报无纸，而不是开盖。
//但是在【端点】又获取不到有纸还是无纸的状态，所以只能通过等待超时，再来【主动】获取有无纸张。
status_ = !savestatus_.empty() ? savestatus_[0] : SCANNER_ERR_TIMEOUT;//以第一个消息为准
if (!savestatus_.empty())//以第一个消息为准
{
status_ = savestatus_[0];
}
savestatus_.clear();
hg_log::log(LOG_LEVEL_WARNING, "get status timeout,get image out 30S\n");
hg_log::log(LOG_LEVEL_WARNING, "Get Status TimeOut,get image out 30S\n");
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, status_); // 取图通信超时
break;
}
}
if (sw.elapsed_ms() > 60000)
{
status_ = !savestatus_.empty() ? savestatus_[0] : SCANNER_ERR_TIMEOUT;//以第一个消息为准
if (!savestatus_.empty())//以第一个消息为准
{
status_ = savestatus_[0];
}
savestatus_.clear();
hg_log::log(LOG_LEVEL_WARNING, "MaxSize OutTime 60S\n");
hg_log::log(LOG_LEVEL_WARNING, "MaxSize TimeOut,Get Image 60S\n");
notify_ui_working_status(hg_log::lang_load(ID_STATU_DESC_SCANNER_ERR_DEVICE_GET_IMAGE_OUTTIME), SANE_EVENT_ERROR, status_); // 取图通信超时
break;
}
if (ret == SCANNER_ERR_OK && usb.u32_Count > 0)
@ -281,14 +281,6 @@ int hg_scanner_300::start(void)
if (handled)
return ret;
ret = writedown_device_configuration(true);
if (ret == SCANNER_ERR_OK)
writedown_image_configuration();
else
{
status_ = ret;
return ret;
}
ret = get_scan_is_sleep(val);
if (!val && ret == SCANNER_ERR_OK)
{
@ -310,6 +302,23 @@ int hg_scanner_300::start(void)
{
return ret;
}
if (is_devs_sleep_)//设备在睡眠的状态当中获取固件是失败的，所以在这个地方进行标志位设置。（总感觉不保险）
{
is_devs_sleep_ = false;
set_kernelsnap_ver();
int paper = image_prc_param_.bits.paper;
on_paper_changed(paper);
int dpi = resolution_;
on_resolution_changed(dpi);
}
ret = writedown_device_configuration(true);
if (ret == SCANNER_ERR_OK)
writedown_image_configuration();
else
{
status_ = ret;
return ret;
}
//printf_devconfig();
USBCB usb = { setting3288dsp::START_COMMAND, img_conf_.scannum, 0};
ret = writeusb(usb);
@ -392,15 +401,18 @@ int hg_scanner_300::get_scanner_status(USBCB &usb)
int ret = SCANNER_ERR_OK;
usb = { setting3288dsp::GET_DSP_STATUS, 0, 0};
io_->set_timeout(2000);
ret = writeusb(usb);
if (ret != SCANNER_ERR_OK)
{
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_status write usb: %s\n", hg_scanner_err_name(ret));
return ret;
}
ret = readusb(usb);
if (ret != SCANNER_ERR_OK)
{
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_status read usb: %s\n", hg_scanner_err_name(ret));
status_ = ret;
return ret;
}
@ -418,6 +430,7 @@ int hg_scanner_300::get_img_data(std::shared_ptr<tiny_buffer> &imagedata)
ret = writeusb(usb);
if (ret != SCANNER_ERR_OK)
{
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_img_data setting3288dsp::GET_IMAGE write usb: %s\n", hg_scanner_err_name(ret));
status_ = ret;
return ret;
}
@ -445,6 +458,7 @@ int hg_scanner_300::get_img_data(std::shared_ptr<tiny_buffer> &imagedata)
if (ret != SCANNER_ERR_OK)
{
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_img_data read_bulk : %s\n", hg_scanner_err_name(ret));
status_ = ret;
return ret;
}
@ -488,8 +502,9 @@ int hg_scanner_300::writedown_device_configuration(bool type,setting_hardware::H
//d->params_3288.pageSize = setting3288dsp::G400_MAXSIZE;
}
if (is_quality_ == IMG_SPEED && resolution_ >= 300)
if ((is_quality_ == IMG_SPEED) && (resolution_ >= 300))
{
VLOG_MINI_1(LOG_LEVEL_WARNING, "writedown_device_configuration is_quality_ is .(%d)\n", is_quality_)
d->params_3288.dpi = 1;
}
if (image_prc_param_.bits.paper == PAPER_AUTO_MATCH
@ -587,7 +602,7 @@ int hg_scanner_300::on_resolution_changed(int& dpi)
else
dsp_config.params_3288.dpi = 1;
VLOG_MINI_3(LOG_LEVEL_WARNING, "on_resolution_changed is dpi:%d .set device dpi(%d),is_kernelsnap3288_221106_ is :%d\n", dpi, dsp_config.params_3288.dpi, is_kernelsnap3288_221106_);
ret = writedown_device_configuration();
return ret;
@ -609,6 +624,30 @@ int hg_scanner_300::on_ultrasonic_check_changed(bool& check)
return ret;
}
int hg_scanner_300::set_kernelsnap_ver()
{
int ret = SCANNER_ERR_OK;
string fw = get_firmware_version();
if (!fw.empty())
{
if (atoi(fw.substr(4, 6).c_str()) >= 221106 && atoi(fw.substr(4, 6).c_str()) < 230210)
is_kernelsnap3288_221106_ = true;
else if (atoi(fw.substr(4, 6).c_str()) >= 230210)
is_kernelsnap3288_230210_ = true;
else
{
is_kernelsnap3288_221106_ = false;
is_kernelsnap3288_230210_ = false;
}
}
else
{
ret = SCANNER_ERR_NO_DATA;
}
VLOG_MINI_2(LOG_LEVEL_WARNING, "hg_scanner_300 is_kernelsnap3288_221106_ :%d ,is_kernelsnap3288_230210_:%d\n", is_kernelsnap3288_221106_, is_kernelsnap3288_230210_);
return SCANNER_ERR_OK;
}
int hg_scanner_300::agreement(TwSS tw,int align)
{
int ret = SCANNER_ERR_OK;
@ -629,7 +668,6 @@ int hg_scanner_300::initdevice()
dsp_config.params_3288.enableSizeDetect =0;
//writedown_device_configuration(true);
//printf_devconfig();
return SCANNER_ERR_OK;
}
void hg_scanner_300::writedown_image_configuration(void)
@ -688,9 +726,12 @@ std::string hg_scanner_300::get_firmware_version()
len = 10; //协议定义长度为10 100 200 =8
USBCB cmd = { setting3288dsp::GET_FW_VERSION,len,0,};
ret = writeusb(cmd);
ret = writeusb(cmd);
std::lock_guard<std::mutex> lock(io_lock_);
ret = io_->read_bulk(buf, &len);
string fw = buf;
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_firmware_version:%s\n", !fw.empty() ? fw.c_str() : "not find devs firmware_version");
return buf;
}
std::string hg_scanner_300::get_serial_num()
@ -700,16 +741,13 @@ std::string hg_scanner_300::get_firmware_version()
len = 14;
SerialNum.resize(len);
USBCB cmd = { setting3288dsp::GET_SERIAL,len,0,};
ret = writeusb(cmd);
USBCB cmd = { setting3288dsp::GET_SERIAL,len,0,};
ret = writeusb(cmd);
std::lock_guard<std::mutex> lock(io_lock_);
ret = io_->read_bulk(&SerialNum[0],&len);
if (ret != SCANNER_ERR_OK)
{
return "0000000000000000000";
}
std::lock_guard<std::mutex> lock(io_lock_);
ret = io_->read_bulk(&SerialNum[0],&len);
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_serial_num:%s\n", !SerialNum.empty() ? SerialNum.c_str() : "not find devs get_serial_num");
return SerialNum;
}
std::string hg_scanner_300::get_ip(void)
@ -748,11 +786,11 @@ int hg_scanner_300::get_sleep_time(int &data)
}
len = sizeof(usbcb);
ret = io_->read_bulk(&usbcb, &len);
printf("usbcb.u32_Data = %d\r\n", usbcb.u32_Data);
if (ret == SCANNER_ERR_OK)
{
data = (SANE_Power)usbcb.u32_Data;
}
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_serial_num:%d\n", data);
return ret;
}
int hg_scanner_300::set_sleep_time(int data)
@ -782,7 +820,7 @@ int hg_scanner_300::get_scanner_paperon(SANE_Bool& type)
// ret = SCANNER_ERR_DEVICE_NO_PAPER;
//else
// ret = SCANNER_ERR_OK;
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_paperon is(%s)\n", hg_scanner_err_name(ret));
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scanner_paperon is(%s)\n", !type ? hg_scanner_err_name(SCANNER_ERR_DEVICE_NO_PAPER) : hg_scanner_err_name(SCANNER_ERR_OK));
return ret;
}
@ -810,7 +848,7 @@ int hg_scanner_300::get_scan_is_sleep(SANE_Bool& type)
type = false;
//return SCANNER_ERR_DEVICE_SLEEPING;
}
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scan_is_sleep is(%s)\n",hg_scanner_err_name(ret));
VLOG_MINI_1(LOG_LEVEL_WARNING, "get_scan_is_sleep is(%s)\n", !type ? hg_scanner_err_name(SCANNER_ERR_DEVICE_SLEEPING) : hg_scanner_err_name(SCANNER_ERR_OK));
return ret;
}
///此款设备无此功能
@ -930,32 +968,34 @@ int hg_scanner_300::set_distortion_check_val(int data)
{
int ret = SCANNER_ERR_OK,
len = 0;
USBCB usbcb = { setting3288dsp::SET_JUST_COF_V ,data,resolution_ };
len = sizeof(usbcb);
io_->write_bulk(&usbcb, &len);
//USBCB cmd = { setting3288dsp::GET_JUST_COF_H ,0,resolution_ };
//len = sizeof(cmd);
//io_->write_bulk(&cmd, &len);
//io_->read_bulk(&cmd, &len);
//int ratio = cmd.u32_Data;
int protocol_dpi = resolution_ == 200 ? 1 : (resolution_ == 300 ? 2 : 3);
USBCB usbcb = { setting3288dsp::SET_JUST_COF_V ,data,protocol_dpi };
len = sizeof(usbcb);
float f = *(float*)&(data);
VLOG_MINI_3(LOG_LEVEL_WARNING, "set_distortion_check_val dpi is:%d,config dpi = %d,distortion_check_val(%f)\n", resolution_, protocol_dpi,f);
io_->set_timeout(5000);
ret = io_->write_bulk(&usbcb, &len);
return ret;
}
int hg_scanner_300::get_devs_distortion_check_val(int& data)
{
int ret = SCANNER_ERR_OK,
len = 0;
USBCB usbcb = { setting3288dsp::GET_JUST_COF_V ,0,resolution_ };
int protocol_dpi = resolution_ == 200 ? 1 : (resolution_ == 300 ? 2 : 3);
USBCB usbcb = { setting3288dsp::GET_JUST_COF_V ,0,protocol_dpi };
len = sizeof(usbcb);
ret = io_->write_bulk(&usbcb, &len);
if (ret == SCANNER_ERR_OK)
{
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
io_->set_timeout(3000);
ret = io_->read_bulk(&usbcb, &len);
data = usbcb.u32_Data;
}
float f = *(float *) & data;
VLOG_MINI_3(LOG_LEVEL_WARNING, "get_distortion_check_val dpi is:%d,protocol_dpi = %d get_distortion_check_val(%f)\n", resolution_, protocol_dpi, f);
return ret;
}
int hg_scanner_300::set_auto_flat(void)
@ -991,7 +1031,6 @@ int hg_scanner_300::set_serial_num(string str)
ret = io_->write_bulk(&str, &len);
}
return ret;
}
int hg_scanner_300::set_vid_pid(int data)
{

3
hgdriver/hgdev/hg_scanner_300.h
View File

@ -49,6 +49,7 @@ public:
virtual int start(void)override;
virtual int stop(void)override;
private:
int set_kernelsnap_ver();
int agreement(TwSS tw,int align);
int initdevice();
int writeusb(USBCB &usb);
@ -59,11 +60,11 @@ private:
int writedown_device_configuration(bool type =false,setting_hardware::HGSCANCONF_3288 *d = NULL);
void writedown_image_configuration(void);
void printf_devconfig(setting_hardware::HGSCANCONF_3288 *d = NULL);
private:
std::vector<int> savestatus_;
setting_hardware::HGSCANCONF_3288 dsp_config;
Device::PaperSize papersize;
bool is_devs_sleep_;
public:
//////////////固定的硬件信息设置或获取//////////////
virtual std::string get_firmware_version(void)override;