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

新增部分协议走sane流程，调整紫光日志路径

This commit is contained in:
13038267101 2023-04-03 09:00:33 +08:00
parent dcc4dc0a2e
commit 79852bd992
3 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
hgdriver/hgdev/hg_scanner.cpp
View File

@ -607,6 +607,13 @@ void hg_scanner::init_setting_func_map(void)
setting_map_[SANE_STD_OPT_NAME_FOLD_TYPE] = &hg_scanner::setting_fold_type;
setting_map_[SANE_STD_OPT_NAME_COLOR_CORRECTION] = &hg_scanner::setting_color_correction;
setting_map_[SANE_STD_OPT_NAME_WAIT_SCAN_EXIT] = &hg_scanner::setting_auto_paper_scan_exit_time;
setting_map_[SANE_STD_OPT_NAME_DEVICE_SERIAL_NO] = &hg_scanner::setting_get_dev_sn;
setting_map_[SANE_STD_OPT_NAME_FIRMWARE_VERSION] = &hg_scanner::setting_get_dev_fmver;
setting_map_[SANE_STD_OPT_NAME_DEVICE_IP_ADDR] = &hg_scanner::setting_get_dev_ip;
setting_map_[SANE_STD_OPT_NAME_ROLLER_COUNT] = &hg_scanner::setting_get_roller_count;
setting_map_[SANE_STD_OPT_NAME_TOTAL_COUNT] = &hg_scanner::setting_get_history_count;
setting_map_[SANE_STD_OPT_NAME_GET_DEVS_L0G] = &hg_scanner::setting_get_devs_log;
}
std::string hg_scanner::setting_name_from(const char* n_or_id, int* id)
{
@ -2269,6 +2276,60 @@ int hg_scanner::setting_auto_paper_scan_exit_time(void* data)
//VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "set paper_scan_exit_time from (%d)min to (%s)min = %d\n", is_auto_paper_scan_exit_time, (char*)data);
return 0;
}
int hg_scanner::setting_get_dev_sn(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
strcpy((char*)data, get_serial_num().c_str());
return SCANNER_ERR_OK;
}
int hg_scanner::setting_get_dev_fmver(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
strcpy((char*)data, get_firmware_version().c_str());
return SCANNER_ERR_OK;
}
int hg_scanner::setting_get_dev_ip(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
strcpy((char*)data, get_ip().c_str());
return SCANNER_ERR_OK;
}
int hg_scanner::setting_get_roller_count(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
return get_roller_num(*((int*)data));
}
int hg_scanner::setting_get_history_count(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
return get_history_scan_count(*((int*)data));
}
int hg_scanner::setting_get_devs_log(void* data)
{
if (!data)
{
return SCANNER_ERR_NO_DATA;
}
string str;
get_device_log(str);
strcpy((char*)data, str.c_str());
return 0;
}
int hg_scanner::on_color_mode_changed(int& color_mode)
{
return SCANNER_ERR_DEVICE_NOT_SUPPORT;

7
hgdriver/hgdev/hg_scanner.h
View File

@ -256,7 +256,12 @@ protected:
int setting_fold_type(void* data);
int setting_color_correction(void* data);
int setting_auto_paper_scan_exit_time(void* data);
int setting_get_dev_sn(void* data);
int setting_get_dev_fmver(void* data);
int setting_get_dev_ip(void* data);
int setting_get_roller_count(void* data);
int setting_get_history_count(void* data);
int setting_get_devs_log(void* data);
virtual void on_device_reconnected(void);

2
hgdriver/wrapper/hg_log.cpp
View File

@ -647,7 +647,7 @@ extern "C"
#elif defined(OEM_ZHONGJING)
home += "MicrotekScan";
#elif defined(OEM_ZIGUANG)
home += "UnisScan";
home += "UniScan";
#else
home += "HuaGoScan";
#endif;