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

取消在start时做获取设备是否锁定状态，取消锁定状态对固件的判断（有一定风险）

This commit is contained in:
13038267101 2022-12-05 15:33:56 +08:00
parent f5f6882ebd
commit ac1f6310b6
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hgdriver/hgdev/hg_scanner.cpp
View File

@ -1882,7 +1882,7 @@ int hg_scanner::setting_auto_pick_paper(void* data)
return ret;
}
int hg_scanner:: setting_auto_pick_paper_threshold(void* data)
int hg_scanner::setting_auto_pick_paper_threshold(void* data)
{
int ret = SCANNER_ERR_OK;
double threshold = *((double*)data);
@ -1890,7 +1890,7 @@ int hg_scanner:: setting_auto_pick_paper_threshold(void* data)
return ret;
}
int hg_scanner:: setting_auto_paper_scan(void* data)
int hg_scanner::setting_auto_paper_scan(void* data)
{
is_auto_paper_scan = *((bool *)data);
if (!is_kernelsnap_220430_ && is_auto_paper_scan)

27
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -54,6 +54,9 @@ namespace settings
case 0x20000:
code = SCANNER_ERR_DEVICE_SIZE_CHECK;
break;
case 0x00100:
code = SCANNER_ERR_DEVICE_ISLOCK;
break;
default:
break;
}
@ -1013,7 +1016,7 @@ void hg_scanner_239::thread_handle_usb_read(void)
this_thread::sleep_for(chrono::milliseconds(10));
}
if (status_ == SCANNER_ERR_DEVICE_STOPPED)
if (status_ == SCANNER_ERR_DEVICE_STOPPED && !user_cancel_)
{
SANE_Bool b = false;
status_ = ret = get_scanner_paperon(&b);
@ -1056,11 +1059,11 @@ int hg_scanner_239::start(void)
status_ = SCANNER_ERR_DEVICE_COUNT_MODE;
return status_;
}
else if ((get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK)
{
status_ = SCANNER_ERR_DEVICE_ISLOCK;
return status_;
}
//else if ((get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK)
//{
// status_ = SCANNER_ERR_DEVICE_ISLOCK;
// return status_;
//}
notify_ui_working_status(STATU_DESC_REWRITE_CONFIGURATION);
if(ret == SCANNER_ERR_OK)
@ -1350,8 +1353,8 @@ int hg_scanner_239::set_devshtudown()
}
int hg_scanner_239::set_scan_islock(SANE_Bool set_islock)
{
if (!is_kernelsnap_220830_)
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
//if (!is_kernelsnap_220830_)
// return SCANNER_ERR_DEVICE_NOT_SUPPORT;
if (set_islock != 0 && set_islock != 1)
return SCANNER_ERR_INVALID_PARAMETER;
@ -1364,8 +1367,8 @@ int hg_scanner_239::set_scan_islock(SANE_Bool set_islock)
}
int hg_scanner_239::get_scan_islock(SANE_Bool& islock)
{
if (!is_kernelsnap_220830_)
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
//if (!is_kernelsnap_220830_)
// return SCANNER_ERR_DEVICE_NOT_SUPPORT;
int val = 0,
ret = read_register(setting3399::SR_GET_LOCK_STATES, &val);
@ -1381,8 +1384,8 @@ int hg_scanner_239::get_scan_islock(SANE_Bool& islock)
}
int hg_scanner_239::set_scan_lock_check_val(string check_str)
{
if (!is_kernelsnap_220830_)
return SCANNER_ERR_DEVICE_NOT_SUPPORT;
//if (!is_kernelsnap_220830_)
// return SCANNER_ERR_DEVICE_NOT_SUPPORT;
#if defined(WIN32) || defined(_WIN64)
if (check_str.empty())
{