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

设置获取固件版本

This commit is contained in:
13038267101 2022-11-25 00:25:54 +08:00
parent 05eb3748dd
commit 34e8c47228
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1314,21 +1314,22 @@ int hg_scanner_239::start(void)
//ret = get_roller_num(val); //ret = get_roller_num(val);
//211220固件版本不支持返回 //211220固件版本不支持返回
if ((ret = get_scan_is_sleep(val)) == SCANNER_ERR_DEVICE_SLEEPING)
if ((get_scan_is_sleep(val)) == SCANNER_ERR_DEVICE_SLEEPING)
{ {
status_ = ret;; status_ = ret;
VLOG_MINI_1(LOG_LEVEL_WARNING, "device start status is(%s)\n", STATU_DESC_SCANNER_ERR_DEVICE_SLEEPING); VLOG_MINI_1(LOG_LEVEL_WARNING, "device start status is(%s)\n", STATU_DESC_SCANNER_ERR_DEVICE_SLEEPING);
if(is_kernelsnap_220830_) if(is_kernelsnap_220830_)
ret = notify_sleep(); ret = notify_sleep();
notify_ui_working_status(STATU_DESC_SCANNER_ERR_DEVICE_NOTIFY_SLEEP, SANE_EVENT_ERROR, status_); notify_ui_working_status(STATU_DESC_SCANNER_ERR_DEVICE_NOTIFY_SLEEP, SANE_EVENT_ERROR, status_);
return status_; return status_;
} }
else if ((ret = get_scan_mode(val)) == SCANNER_ERR_DEVICE_COUNT_MODE) else if (( get_scan_mode(val)) == SCANNER_ERR_DEVICE_COUNT_MODE)
{ {
status_ = ret; status_ = ret;
return ret; return ret;
} }
else if ((ret = get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK) else if ((get_scan_islock(val)) == SCANNER_ERR_DEVICE_ISLOCK)
{ {
status_ = ret; status_ = ret;
return ret; return ret;

1
hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
View File

@ -293,6 +293,7 @@ extern "C"
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_NO_IMAGE); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_NO_IMAGE);
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_SCANN_ERROR);
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_PC_BUSY); RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_PC_BUSY);
RETURN_DESC_IF(err, SCANNER_ERR_DEVICE_ISLOCK);
// NOTE: multi-thread unsafe here // NOTE: multi-thread unsafe here
static char g_unk_err[80] = { 0 }; static char g_unk_err[80] = { 0 };