fix bug-703
This commit is contained in:
gb
parent
3ff93b1dca
commit
e2939d5c46
|
|
@ -109,7 +109,7 @@ namespace settings
|
|||
{200.0f, 1},
|
||||
{240.0f, 1},
|
||||
{300.0f, 0},
|
||||
{600.0f, 1} //临时版本发1 原来发2
|
||||
{600.0f, 1} //临时版本å<EFBFBD>? 原æ<C5B8>¥å<C2A5>?
|
||||
};
|
||||
bool is_equal(float l, float r)
|
||||
{
|
||||
|
|
@ -333,7 +333,7 @@ int hg_scanner_239::set_auto_flat(int data)
|
|||
}
|
||||
if ((fw[5] == 'A' && atoi(fw.substr(6, 4).c_str()) <= 9999))
|
||||
{
|
||||
data = data == 1 ? 1 : 0; //暂时没有用。
|
||||
data = data == 1 ? 1 : 0; //暂时没有用�
|
||||
}
|
||||
if (!wait_usb_.is_waiting())
|
||||
{
|
||||
|
|
@ -571,7 +571,7 @@ void hg_scanner_239::init_version(void)
|
|||
{
|
||||
firmware_sup_wait_paper_ = year_date.compare("3B0629") >= 0 ? true : false;
|
||||
firmware_sup_log_export_ = true;
|
||||
firmware_sup_pick_strength_ = false; //不支持
|
||||
firmware_sup_pick_strength_ = false; //ä¸<EFBFBD>支æŒ?
|
||||
firmware_sup_wake_device_ = year_date.compare("3C0518") >= 0 ? true : false;
|
||||
firmware_sup_color_corr_ = year.compare("3C") >= 0 ? true : false;
|
||||
firmware_sup_double_img = year_date.compare("3C1021") >= 0 ? true : false;
|
||||
|
|
@ -603,7 +603,7 @@ int hg_scanner_239::writedown_device_configuration(bool type, setting_hardware:
|
|||
int ret = SCANNER_ERR_OK;
|
||||
if (!type)
|
||||
return ret;
|
||||
setting_hardware::HGSCANCONF_3399 p = dev_conf_; //不得改变外部的值
|
||||
setting_hardware::HGSCANCONF_3399 p = dev_conf_; //ä¸<EFBFBD>得改å<EFBFBD>˜å¤–部的å€?
|
||||
p.params_3399.is_autopaper = is_auto_scan();
|
||||
if (!dev_conf)
|
||||
dev_conf = &p;
|
||||
|
|
@ -624,7 +624,7 @@ int hg_scanner_239::writedown_device_configuration(bool type, setting_hardware:
|
|||
dev_conf->params_3399.is_fixedpaper = false;
|
||||
dev_conf->params_3399.en_autosize = true;
|
||||
}
|
||||
if (!firmware_sup_auto_speed_ && image_prc_param_.bits.paper == PAPER_AUTO_MATCH)//3399 ,在3C之前的版本 匹配原始尺寸设置 12
|
||||
if (!firmware_sup_auto_speed_ && image_prc_param_.bits.paper == PAPER_AUTO_MATCH)//3399 ,åœ?C之å‰<C3A5>的版æœ?匹é…<C3A9>原始尺寸设置 12
|
||||
{
|
||||
dev_conf->params_3399.paper = 12;
|
||||
}
|
||||
|
|
@ -799,7 +799,7 @@ int hg_scanner_239::read_one_image_from_usb(SANE_Image_Statu statu)
|
|||
int hg_scanner_239::discard_all_images(void)
|
||||
{
|
||||
int block = 1024 * 512,
|
||||
oto = 0, pre_img = 0,
|
||||
oto = io_->set_timeout(100), pre_img = 0,
|
||||
pre_int = 0,
|
||||
ret = SCANNER_ERR_OK;
|
||||
string str;
|
||||
|
|
@ -831,8 +831,9 @@ int hg_scanner_239::discard_all_images(void)
|
|||
ret = io_->read_interrupt(buf, &size);
|
||||
}
|
||||
}
|
||||
io_->set_timeout(oto);
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(1000));
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(200));
|
||||
|
||||
if (pre_int)
|
||||
VLOG_MINI_2(LOG_LEVEL_DEBUG_INFO, "prev-connection has left %d interrupt packet(s) && %d image(s).\n", pre_int, pre_img);
|
||||
|
|
@ -919,7 +920,7 @@ int hg_scanner_239::on_resolution_changed(int& dpi)
|
|||
else
|
||||
dev_conf_.params_3399.dpi = dpi >= 500 ? 3 : (dpi < 500 && dpi> 299) ? 2 : 1;
|
||||
|
||||
//dev_conf_.params_3399.dpi = 1; //dpi 华凌cis和敦南cis 默认发1无需改变
|
||||
//dev_conf_.params_3399.dpi = 1; //dpi å<EFBFBD>Žå‡Œcis和敦å<EFBFBD>—cis 默认å<C2A4>?æ— éœ€æ”¹å<C2B9>˜
|
||||
int ret = writedown_device_configuration();
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -977,7 +978,7 @@ int hg_scanner_239::on_skew_check_changed(bool& check)
|
|||
int hg_scanner_239::on_skew_check_level_changed(int& check)
|
||||
{
|
||||
int ret = SCANNER_ERR_OK,
|
||||
val = check - 1,//上面设置的是1 - 5 ，接受范围值为0 - 4，默认2
|
||||
val = check - 1,//上é<EFBFBD>¢è®¾ç½®çš„是1 - 5 ，接å<C2A5>—范围值为0 - 4，默è®?
|
||||
old = dev_conf_.params_3399.screw_detect_level;
|
||||
setting_hardware::HGSCANCONF_3399 cf;
|
||||
|
||||
|
|
@ -1414,7 +1415,7 @@ void hg_scanner_239::thread_get_dves_image(void)
|
|||
}
|
||||
|
||||
//break;
|
||||
//杩欎釜鏃跺€欓€€鍑虹殑璇濇秷鎭氨杩樻病璇诲畬锛岄敊璇俊鎭厛淇濆瓨涓嬫潵锛屽彧鏈夎幏鍙栧埌stop鏃舵墠閫€鍑猴紝濡傛灉娌¤幏鍙栧畬閫€鍑猴紝鍙兘浼氬鑷寸浜屾鎵弿鐩存帴杩斿洖鎵弿瀹屾垚
|
||||
//æ<EFBFBD>©æ¬Žé‡œé<EFBFBD>ƒè·ºâ‚¬æ¬“€€é<EFBFBD>‘虹殑璇濇秷éŽîˆšæ°¨æ<EFBFBD>©æ¨»ç—…璇诲畬锛岄敊璇俊éŽîˆšåŽ›æ·‡æ¿†ç“¨æ¶“嬫潵锛屽彧é<EFBFBD>ˆå¤Žå¹<EFBFBD>é<EFBFBD>™æ §åŸŒstopé<EFBFBD>ƒèˆµå¢ 閫€é<EFBFBD>‘猴ç´<EFBFBD>æ¿¡å‚›ç<EFBFBD>‰å¨ŒÂ¤å¹<EFBFBD>é<EFBFBD>™æ §ç•¬é–«â‚¬é<EFBFBD>‘猴ç´<EFBFBD>é<EFBFBD>™îˆ<EFBFBD>兘浼氬鑷寸浜屾鎵弿é<EFBFBD>©å˜å¸´æ<EFBFBD>©æ–¿æ´–鎵弿瀹屾åž?
|
||||
}
|
||||
if (info->From == setting3399::IMG)
|
||||
{
|
||||
|
|
@ -1437,8 +1438,8 @@ void hg_scanner_239::thread_get_dves_image(void)
|
|||
//else
|
||||
// VLOG_MINI_1(LOG_LEVEL_DEBUG_INFO, "status(0x%x) is not accept in usb thread\n", status);
|
||||
}
|
||||
else if (info->From == setting3399::STOPSCAN)//鍥轰欢鐗堟湰:3B0326鑾峰彇鏃犵焊鏃讹紝涓嬮潰涓柇淇℃伅浼氬厛鍙戞棤绾稿湪鍋滄鎵弿,鐒跺悗鍦ㄥ彂鏃犵焊
|
||||
{ //姝ゆ椂int绔偣杩樿淇℃伅娌℃湁璇诲彇瀹岋紝鑰屼笖閫€鍑虹偣鍑荤户缁壂鎻忥紝涓嬮潰璁惧杩樻湭缁撴潫鎵弿
|
||||
else if (info->From == setting3399::STOPSCAN)//é<EFBFBD>¥è½°æ¬¢é<EFBFBD>—å Ÿæ¹°:3B0326鑾峰彇é<E280A1>ƒçŠµç„Šé<C5A0>ƒè®¹ç´<C3A7>涓嬮潰涓柇淇℃伅浼氬厛é<E280BA>™æˆžæ£¤ç»¾ç¨¿æ¹ªé<C2AA>‹æ»„鎵å¼?é<>’跺悗é<E28094>¦ã„¥å½‚é<E2809A>ƒçŠµç„?
|
||||
{ //å§<EFBFBD>ゆ椂int绔å<EFBFBD>£æ<EFBFBD>©æ¨¿î›¦æ·‡â„ƒä¼…娌℃æ¹<EFBFBD>璇诲彇瀹岋ç´<EFBFBD>鑰屼笖閫€é<EFBFBD>‘虹å<EFBFBD>£é<EFBFBD>‘è<EFBFBD>¤æˆ·ç¼<EFBFBD>壂鎻忥ç´<EFBFBD>涓嬮潰ç’<EFBFBD>惧æ<EFBFBD>©æ¨»æ¹ç¼<EFBFBD>撴潫鎵å¼?
|
||||
if (!svdevs_err_.empty())
|
||||
{
|
||||
status_ = svdevs_err_.front();
|
||||
|
|
@ -1564,7 +1565,7 @@ int hg_scanner_239::do_start(void)
|
|||
|
||||
reset();
|
||||
|
||||
//211220固件版本不支持返回
|
||||
//211220固件版本ä¸<EFBFBD>支æŒ<EFBFBD>è¿”å›?
|
||||
ret = get_scan_is_sleep(val);
|
||||
if (!val && ret == SCANNER_ERR_OK)
|
||||
{
|
||||
|
|
@ -1854,7 +1855,7 @@ int hg_scanner_239::get_scan_is_sleep(SANE_Bool& type)
|
|||
std::lock_guard<std::mutex> lock(io_lock_);
|
||||
|
||||
int ret = 0,val;
|
||||
ret = read_register(setting3399::SR_GET_SLEEP_STAUTUS, &val); //0休眠 1唤醒状态
|
||||
ret = read_register(setting3399::SR_GET_SLEEP_STAUTUS, &val); //0ä¼‘çœ 1唤醒状æ€?
|
||||
if (ret == SCANNER_ERR_OK)
|
||||
{
|
||||
type = val == 1 ? true : false;
|
||||
|
|
@ -2026,7 +2027,7 @@ int hg_scanner_239::set_scan_lock_check_val(string check_str)
|
|||
{
|
||||
return SCANNER_ERR_INVALID_PARAMETER;
|
||||
}
|
||||
int num = 32 - keys.size(); //保持32位下发
|
||||
int num = 32 - keys.size(); //ä¿<EFBFBD>æŒ<EFBFBD>32ä½<EFBFBD>下å<EFBFBD>?
|
||||
if (num > 0)
|
||||
{
|
||||
std::string str(num, '0');
|
||||
|
|
@ -2086,7 +2087,7 @@ int hg_scanner_239::set_firmware_upgrade(std::string filename)
|
|||
return SCANNER_ERR_OPEN_FILE_FAILED;
|
||||
}
|
||||
fwname.seekg(0, std::ios::end);
|
||||
int total = fwname.tellg();//记录总长度
|
||||
int total = fwname.tellg();//记录总长�
|
||||
fwname.seekg(0, std::ios::beg);
|
||||
int pos = fwname.tellg();//记录pos位置
|
||||
|
||||
|
|
@ -2125,7 +2126,7 @@ int hg_scanner_239::set_firmware_upgrade(std::string filename)
|
|||
return SCANNER_ERR_DEVICE_UPGRADE_FAIL;
|
||||
|
||||
int to_cnt = 0;
|
||||
// 到这个位置已经能够升级成功了 后面对升级结果做下判断
|
||||
// 到这个ä½<EFBFBD>置已ç»<EFBFBD>能够å<EFBFBD>‡çº§æˆ<EFBFBD>功了 å<>Žé<C5BD>¢å¯¹å<C2B9>‡çº§ç»“æžœå<C593>šä¸‹åˆ¤æ–?
|
||||
auto now = std::chrono::steady_clock::now();
|
||||
while (std::chrono::duration<double>(std::chrono::steady_clock::now() - now).count() < 70)
|
||||
{
|
||||
|
|
@ -2196,7 +2197,7 @@ int hg_scanner_239::set_dev_islock_file(int islockfile)
|
|||
}
|
||||
if (islockfile != 0 && islockfile != 1)
|
||||
{
|
||||
return SCANNER_ERR_INVALID_PARAMETER; //这个地方设置的参数必须保证正确
|
||||
return SCANNER_ERR_INVALID_PARAMETER; //这个地方设置的å<EFBFBD>‚æ•°å¿…é¡»ä¿<EFBFBD>è¯<EFBFBD>æ£ç¡?
|
||||
}
|
||||
string device_log_path = "/var/log/black_list_file.txt";
|
||||
string str = std::to_string(islockfile);
|
||||
|
|
|
|||
Loading…
Reference in New Issue