This commit is contained in:
parent
4c25d3d983
commit
d1b7e1c752
|
@ -470,7 +470,7 @@ int hg_scanner::set_server_blacklist_lock()
|
||||||
|
|
||||||
string sn = get_serial_num();
|
string sn = get_serial_num();
|
||||||
string fv = get_firmware_version();
|
string fv = get_firmware_version();
|
||||||
if (fv.empty())
|
if (fv.empty() || sn.empty())
|
||||||
return -1;
|
return -1;
|
||||||
strcpy(snbuffer, sn.c_str());
|
strcpy(snbuffer, sn.c_str());
|
||||||
strcpy(fvbuffer, fv.c_str());
|
strcpy(fvbuffer, fv.c_str());
|
||||||
|
@ -3311,6 +3311,10 @@ int hg_scanner::device_io_control(unsigned long code, void* data, unsigned* len)
|
||||||
{
|
{
|
||||||
|
|
||||||
std::string fw = get_firmware_version();
|
std::string fw = get_firmware_version();
|
||||||
|
if (fw.empty())
|
||||||
|
{
|
||||||
|
return SCANNER_ERR_NO_DATA;
|
||||||
|
}
|
||||||
if (*len < fw.size() + 1)
|
if (*len < fw.size() + 1)
|
||||||
{
|
{
|
||||||
*len = fw.size() + 1;
|
*len = fw.size() + 1;
|
||||||
|
|
|
@ -81,8 +81,6 @@ namespace settingsdsp_200
|
||||||
hg_scanner_200::hg_scanner_200(const char* dev_name,int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io,pid)
|
hg_scanner_200::hg_scanner_200(const char* dev_name,int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io,pid)
|
||||||
{
|
{
|
||||||
//pid_ = pid;
|
//pid_ = pid;
|
||||||
string fw = get_firmware_version();
|
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "get_firmware_version is: %s\n",fw.c_str());
|
|
||||||
initdevice();
|
initdevice();
|
||||||
|
|
||||||
dsp_config_.value = 0;
|
dsp_config_.value = 0;
|
||||||
|
|
|
@ -298,6 +298,10 @@ int hg_scanner_239::set_auto_flat(void)
|
||||||
int color = 0,
|
int color = 0,
|
||||||
ret = SCANNER_ERR_OK;
|
ret = SCANNER_ERR_OK;
|
||||||
auto fw = get_firmware_version();
|
auto fw = get_firmware_version();
|
||||||
|
if (fw.empty())
|
||||||
|
{
|
||||||
|
return SCANNER_ERR_NO_DATA;
|
||||||
|
}
|
||||||
if ((fw[5] == 'A' && atoi(fw.substr(6, 4).c_str()) <= 9999))
|
if ((fw[5] == 'A' && atoi(fw.substr(6, 4).c_str()) <= 9999))
|
||||||
{
|
{
|
||||||
color = 0 == 1 ? 1 : 0; //暂时没有用。
|
color = 0 == 1 ? 1 : 0; //暂时没有用。
|
||||||
|
@ -396,7 +400,7 @@ void hg_scanner_239::init_version(void)
|
||||||
{
|
{
|
||||||
std::string fv(get_firmware_version()),
|
std::string fv(get_firmware_version()),
|
||||||
sn(get_serial_num());
|
sn(get_serial_num());
|
||||||
if (fv.empty())
|
if (fv.empty() || sn.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
string dev = fv.substr(0, 2);
|
string dev = fv.substr(0, 2);
|
||||||
|
|
|
@ -411,7 +411,7 @@ void hg_scanner_302::init_version(void)
|
||||||
{
|
{
|
||||||
std::string fv(get_firmware_version()),
|
std::string fv(get_firmware_version()),
|
||||||
sn(get_serial_num());
|
sn(get_serial_num());
|
||||||
if (fv.empty())
|
if (fv.empty() || sn.empty())
|
||||||
return;
|
return;
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Serial number: %s\n", sn.c_str());
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Serial number: %s\n", sn.c_str());
|
||||||
|
|
|
@ -74,9 +74,6 @@ namespace settingsdsp_400
|
||||||
}
|
}
|
||||||
hg_scanner_400::hg_scanner_400(const char* dev_name, int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io, pid), papersize(pid)
|
hg_scanner_400::hg_scanner_400(const char* dev_name, int pid, usb_io* io) : hg_scanner(G100Serial, dev_name, io, pid), papersize(pid)
|
||||||
{
|
{
|
||||||
//pid_ = pid;
|
|
||||||
string fw = get_firmware_version();
|
|
||||||
|
|
||||||
initdevice();
|
initdevice();
|
||||||
#ifndef MAPPING_FUNCTION_IN_BASE
|
#ifndef MAPPING_FUNCTION_IN_BASE
|
||||||
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
|
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
|
||||||
|
|
|
@ -379,7 +379,7 @@ void hg_scanner_402::init_version(void)
|
||||||
{
|
{
|
||||||
std::string fv(get_firmware_version()),
|
std::string fv(get_firmware_version()),
|
||||||
sn(get_serial_num());
|
sn(get_serial_num());
|
||||||
if (fv.empty())
|
if (fv.empty() || sn.empty())
|
||||||
return;
|
return;
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Firmware version: %s\n", fv.c_str());
|
||||||
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Serial number: %s\n", sn.c_str());
|
VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "Serial number: %s\n", sn.c_str());
|
||||||
|
|
Loading…
Reference in New Issue