Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev
This commit is contained in:
commit
e5a395d1fc
|
@ -87,14 +87,6 @@ hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) :
|
|||
,papersize(pid)
|
||||
,is_devs_sleep_(false)
|
||||
{
|
||||
if (init_settings(pid_))
|
||||
{
|
||||
if (pid_ == 0x300)
|
||||
init_settings((jsontext1 + jsontext2 + jsontext3).c_str());
|
||||
else
|
||||
init_settings((jsontext4 + jsontext5 + jsontext6).c_str());
|
||||
}
|
||||
|
||||
dsp_config.value = 0;
|
||||
dsp_config.params_3288.enableLed = 1; //默认值
|
||||
dsp_config.params_3288.isCorrect = 1;
|
||||
|
@ -128,6 +120,14 @@ hg_scanner_300::hg_scanner_300(const char* dev_name,int pid, usb_io* io) :
|
|||
init_setting_map(setting_map_, ARRAY_SIZE(setting_map_));//优先初始化
|
||||
#endif
|
||||
|
||||
if (init_settings(pid_))
|
||||
{
|
||||
if (pid_ == 0x300)
|
||||
init_settings((jsontext1 + jsontext2 + jsontext3).c_str());
|
||||
else
|
||||
init_settings((jsontext4 + jsontext5 + jsontext6).c_str());
|
||||
}
|
||||
|
||||
if (firmware_sup_boardTime)
|
||||
update_boarddatetime();//暂未考虑版本兼容情况
|
||||
//wait_read_int.notify();
|
||||
|
|
Loading…
Reference in New Issue