Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
2588a6e1cd
|
@ -277,7 +277,7 @@ void hg_scanner_400::thread_handle_usb_read(void)
|
||||||
|
|
||||||
imagedata->set_image_statu(statu);
|
imagedata->set_image_statu(statu);
|
||||||
ret = get_img_data(imagedata);
|
ret = get_img_data(imagedata);
|
||||||
io_->set_timeout(200);
|
// io_->set_timeout(200);
|
||||||
|
|
||||||
if (ret == SCANNER_ERR_OK)
|
if (ret == SCANNER_ERR_OK)
|
||||||
{
|
{
|
||||||
|
@ -340,7 +340,7 @@ int hg_scanner_400::start(void)
|
||||||
|
|
||||||
USBCB usb = {START_COMMAND, img_conf_.scannum, 0};
|
USBCB usb = {START_COMMAND, img_conf_.scannum, 0};
|
||||||
ret = writeusb(usb);
|
ret = writeusb(usb);
|
||||||
io_->set_timeout(1000);
|
//io_->set_timeout(1000);
|
||||||
VLOG_MINI_1(LOG_LEVEL_WARNING, "device start is.(%s)\n", hg_scanner_err_name(ret));
|
VLOG_MINI_1(LOG_LEVEL_WARNING, "device start is.(%s)\n", hg_scanner_err_name(ret));
|
||||||
|
|
||||||
if(ret == SCANNER_ERR_OK)
|
if(ret == SCANNER_ERR_OK)
|
||||||
|
@ -429,7 +429,7 @@ int hg_scanner_400::get_scanner_status(USBCB &usb)
|
||||||
if (ret != SCANNER_ERR_OK)
|
if (ret != SCANNER_ERR_OK)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
io_->set_timeout(500);
|
//io_->set_timeout(500);
|
||||||
|
|
||||||
ret = readusb(usb);
|
ret = readusb(usb);
|
||||||
if (ret != SCANNER_ERR_OK)
|
if (ret != SCANNER_ERR_OK)
|
||||||
|
@ -454,7 +454,7 @@ int hg_scanner_400::get_img_data(std::shared_ptr<tiny_buffer> &imagedata)
|
||||||
status_ = ret;
|
status_ = ret;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
io_->set_timeout(500);
|
//io_->set_timeout(500);
|
||||||
|
|
||||||
printf_devconfig();
|
printf_devconfig();
|
||||||
|
|
||||||
|
@ -842,7 +842,7 @@ int hg_scanner_400::agreement(TwSS tw,int align)
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = writedown_device_configuration(true,&d);
|
ret = writedown_device_configuration(true,&d);
|
||||||
io_->set_timeout(200);
|
//io_->set_timeout(200);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -1227,7 +1227,7 @@ int hg_scanner_400::get_scanner_paperon(SANE_Bool* paperon)
|
||||||
USBCB usbcb = {GET_PAPER_STATUS, 0, 0};
|
USBCB usbcb = {GET_PAPER_STATUS, 0, 0};
|
||||||
len = sizeof(USBCB);
|
len = sizeof(USBCB);
|
||||||
ret = writeusb(usbcb);
|
ret = writeusb(usbcb);
|
||||||
io_->set_timeout(500);
|
//io_->set_timeout(500);
|
||||||
|
|
||||||
if (ret == SCANNER_ERR_OK)
|
if (ret == SCANNER_ERR_OK)
|
||||||
{
|
{
|
||||||
|
@ -1272,7 +1272,7 @@ int hg_scanner_400::get_scan_is_sleep()
|
||||||
len = sizeof(USBCB);
|
len = sizeof(USBCB);
|
||||||
ret = writeusb(usbcb);
|
ret = writeusb(usbcb);
|
||||||
|
|
||||||
io_->set_timeout(200);
|
//io_->set_timeout(200);
|
||||||
|
|
||||||
if (ret == SCANNER_ERR_OK)
|
if (ret == SCANNER_ERR_OK)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue