Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
9ef1efab77
|
@ -248,7 +248,7 @@ void hg_scanner::set_setting_map(int sn, const char* title)
|
||||||
empty++;
|
empty++;
|
||||||
val.erase(0, empty);
|
val.erase(0, empty);
|
||||||
|
|
||||||
HG_VLOG_MINI_2(HG_LOG_LEVEL_DEBUG_INFO, "title: '%s', val: '%s'\n", title, val.c_str());
|
//HG_VLOG_MINI_2(HG_LOG_LEVEL_DEBUG_INFO, "title: '%s', val: '%s'\n", title, val.c_str());
|
||||||
|
|
||||||
if (val == OPTION_TITLE_HFMRSZ)
|
if (val == OPTION_TITLE_HFMRSZ)
|
||||||
setting_map_[HG_BASE_SETTING_INDEX_RESTORE_DEFAULT_SETTINGS] = sn;
|
setting_map_[HG_BASE_SETTING_INDEX_RESTORE_DEFAULT_SETTINGS] = sn;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -41,6 +41,7 @@ g_supporting_devices[] = { {0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""
|
||||||
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
|
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
|
||||||
|
|
||||||
, {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
|
, {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
|
||||||
|
, {0x2903, 0x1000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}
|
||||||
, {0x2903, 0x8000, SCANNER_NAME_HW_8190F, "HW-8190F", ""}
|
, {0x2903, 0x8000, SCANNER_NAME_HW_8190F, "HW-8190F", ""}
|
||||||
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}
|
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""}
|
||||||
};
|
};
|
||||||
|
@ -404,27 +405,27 @@ hg_err hg_scanner_mgr::hg_scanner_open(scanner_handle* h, const char* name, bool
|
||||||
hg_scanner* scanner = NULL;
|
hg_scanner* scanner = NULL;
|
||||||
if (g_supporting_devices[it->ind].pid == 0x100 || g_supporting_devices[it->ind].pid == 0x200)
|
if (g_supporting_devices[it->ind].pid == 0x100 || g_supporting_devices[it->ind].pid == 0x200)
|
||||||
{
|
{
|
||||||
hg_scanner_200* s200 = new hg_scanner_200(g_supporting_devices[it->ind].name.c_str(), g_supporting_devices[it->ind].pid, io);
|
hg_scanner_200* s200 = new hg_scanner_200(g_supporting_devices[it->ind].name.c_str(), 0x100, io);
|
||||||
|
|
||||||
scanner = dynamic_cast<hg_scanner*>(s200);
|
scanner = dynamic_cast<hg_scanner*>(s200);
|
||||||
*h = (scanner_handle)s200;
|
*h = (scanner_handle)s200;
|
||||||
}
|
}
|
||||||
else if (g_supporting_devices[it->ind].pid == 0x239 || g_supporting_devices[it->ind].pid == 0x139)
|
else if (g_supporting_devices[it->ind].pid == 0x239 || g_supporting_devices[it->ind].pid == 0x139||g_supporting_devices[it->ind].pid == 0x8000)
|
||||||
{
|
{
|
||||||
hg_scanner_239* s239 = new hg_scanner_239(g_supporting_devices[it->ind].name.c_str(), g_supporting_devices[it->ind].pid, io);
|
hg_scanner_239* s239 = new hg_scanner_239(g_supporting_devices[it->ind].name.c_str(),0x239, io);
|
||||||
|
|
||||||
scanner = dynamic_cast<hg_scanner*>(s239);
|
scanner = dynamic_cast<hg_scanner*>(s239);
|
||||||
*h = (scanner_handle)s239;
|
*h = (scanner_handle)s239;
|
||||||
}
|
}
|
||||||
else if (g_supporting_devices[it->ind].pid == 0x400)
|
else if (g_supporting_devices[it->ind].pid == 0x400)
|
||||||
{
|
{
|
||||||
hg_scanner_400* s400 = new hg_scanner_400(g_supporting_devices[it->ind].name.c_str(), g_supporting_devices[it->ind].pid, io);
|
hg_scanner_400* s400 = new hg_scanner_400(g_supporting_devices[it->ind].name.c_str(), 0x400, io);
|
||||||
scanner = dynamic_cast<hg_scanner*>(s400);
|
scanner = dynamic_cast<hg_scanner*>(s400);
|
||||||
*h = (scanner_handle)s400;
|
*h = (scanner_handle)s400;
|
||||||
}
|
}
|
||||||
else if (g_supporting_devices[it->ind].pid == 0x300)
|
else if (g_supporting_devices[it->ind].pid == 0x300 ||g_supporting_devices[it->ind].pid == 0x1000)
|
||||||
{
|
{
|
||||||
hg_scanner_300* s300 = new hg_scanner_300(g_supporting_devices[it->ind].name.c_str(), g_supporting_devices[it->ind].pid, io);
|
hg_scanner_300* s300 = new hg_scanner_300(g_supporting_devices[it->ind].name.c_str(),0x300, io);
|
||||||
scanner = dynamic_cast<hg_scanner*>(s300);
|
scanner = dynamic_cast<hg_scanner*>(s300);
|
||||||
*h = (scanner_handle)s300;
|
*h = (scanner_handle)s300;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue