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-06-14 10:32:21 +08:00
parent 52cb243310 9dc57c2f8e
commit 226c0901f2
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hgdriver/hgdev/hg_scanner_239.cpp
View File

@ -1,4 +1,4 @@
#include "hg_scanner_239.h"
#include "hg_scanner_239.h"
#include "../wrapper/hg_log.h"
#include "filetools.h"
@ -292,13 +292,13 @@ int hg_scanner_239::get_devs_distortion_check_val(float& data)
std::lock_guard<std::mutex> lock(io_lock_);
int val = 0;
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_V_200_RATIO;
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_GET_V_200_RATIO;
if (resolution_ <= 200)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
else if (resolution_ > 200 && resolution_ <= 300)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
else if (resolution_ > 300 && resolution_ <= 600)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
int ret = read_register(ratio, &val);
data = *(float*)&val;

20
hgdriver/hgdev/hg_scanner_302.cpp
View File

@ -94,7 +94,7 @@ namespace settings302
{200.0f, 1},
{240.0f, 1},
{300.0f, 0},
{600.0f, 1} //临时版本å<EFBFBD>? 原æ<C5B8>¥å<C2A5>?
{600.0f, 1} //涓存椂鐗堟湰鍙? 鍘熸潵鍙?
};
bool is_equal(float l, float r)
{
@ -527,7 +527,7 @@ int hg_scanner_302::writedown_image_configuration(void)
//ret = io_->write_bulk(&ic, &len);
//this_thread::sleep_for(chrono::milliseconds(500));
//io_->set_timeout(2000);//å¿…è¦<EFBFBD>延时
//io_->set_timeout(2000);//蹇呰寤舵椂
}
return ret;
}
@ -759,7 +759,7 @@ int hg_scanner_302::on_paper_check_changed(bool& check)
}
int hg_scanner_302::on_resolution_changed(int& dpi)
{
dev_conf_.params_3399.dpi = 1; //dpi å<EFBFBD>Žå‡Œcis和敦å<EFBFBD>—cis 默认å<C2A4>?无需改å<C2B9>˜
dev_conf_.params_3399.dpi = 1; //dpi 鍗庡噷cis鍜屾暒鍗梒is 榛樿鍙?鏃犻渶鏀瑰彉
int ret = writedown_device_configuration();
return ret;
}
@ -848,7 +848,7 @@ int hg_scanner_302::on_skew_check_level_changed(int& check)
return ret;
}
int hg_scanner_302::on_get_feedmode(int &feedmode)//获å<EFBFBD>–分纸强度
int hg_scanner_302::on_get_feedmode(int &feedmode)//鑾峰彇鍒嗙焊寮哄害
{
int ret = SCANNER_ERR_OK,
val = 0;
@ -856,7 +856,7 @@ int hg_scanner_302::on_get_feedmode(int &feedmode)//获取分纸强度
ret = read_register(setting3399::SR_GET_FEEDMODE,&feedmode);
return ret;
}
int hg_scanner_302::on_set_feedmode(int feedmode)//设置分纸强度
int hg_scanner_302::on_set_feedmode(int feedmode)//璁剧疆鍒嗙焊寮哄害
{
int ret = SCANNER_ERR_OK,
val = 0;
@ -1266,7 +1266,7 @@ int hg_scanner_302::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;
@ -1360,13 +1360,13 @@ int hg_scanner_302::get_devs_distortion_check_val(float& data)
{
std::lock_guard<std::mutex> lock(io_lock_);
int val = 0;
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_SET_V_200_RATIO;
setting3399::Scanner_Reg_Defs ratio = setting3399::SR_GET_V_200_RATIO;
if (resolution_ <= 200)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
else if (resolution_ > 200 && resolution_ <= 300)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
else if (resolution_ > 300 && resolution_ <= 600)
ratio = setting3399::SR_SET_V_200_RATIO;
ratio = setting3399::SR_GET_V_200_RATIO;
int ret = read_register(ratio, &val);
data = *(float*)&val;