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

Merge branch 'dev' of http://192.168.10.5:8099/sane/code_device into dev

This commit is contained in:
13038267101 2023-11-27 16:53:59 +08:00
parent 0d2f75d070 2d1d10f722
commit e5a395d1fc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hgdriver/hgdev/hg_scanner_300.cpp
View File

@ -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();