lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

调整扫描前异常判断流程

This commit is contained in:
masayume_ht 2021-08-17 16:53:45 +08:00
parent 7e4bcca9df
commit 2f5fb1c2d3
3 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
huagao/Device/GScanO1003399.cpp
View File

@ -346,13 +346,24 @@ void GScanO1003399::Scanner_StartScan(UINT16 count)
scanflag = false; scanflag = false;
return; return;
} }
if (!Get_Scanner_PaperOn()) //int val = scanner_read_reg(m_usb, SR_GET_MBSTATUS);
{ //if (val)
devState = DEV_WRONG; //{
Set_ErrorCode(NO_FEED); // devState = DEV_WRONG;
scanflag = false; // HGEIntInfo info;
return; // info.From = MtBoard;
} // info.Code = val == 0x14 ? 4 : val;
// Set_ErrorCode(codeconvter(info));
// scanflag = false;
// return;
//}
//if (!Get_Scanner_PaperOn())
//{
// devState = DEV_WRONG;
// Set_ErrorCode(NO_FEED);
// scanflag = false;
// return;
//}
start(); start();
bool procmode = (m_param.resolution_dst > 200.0f || m_param.papertype == 52 || m_param.papertype == 54 || m_param.papertype == 131); bool procmode = (m_param.resolution_dst > 200.0f || m_param.papertype == 52 || m_param.papertype == 54 || m_param.papertype == 131);

7
huagao/Device/IConfig.h
View File

@ -196,7 +196,12 @@ enum Scanner_Reg_Defs
SR_UPDATA_RECOVERY = 0x103, SR_UPDATA_RECOVERY = 0x103,
SR_UPDATA_REBOOT = 0x104, SR_UPDATA_REBOOT = 0x104,
SR_POWEROFF = 0x105, SR_POWEROFF = 0x105,
SR_REBOOT = 0x106 SR_REBOOT = 0x106,
SR_FLAT_CLR_MAX_BRIGHT,
SR_FLAT_GRAY_MAX_BRIGHT,
SR_KERNEL_VERSION_INFO_LENGTH,
SR_GET_KERNEL_VERSION,
SR_GET_MBSTATUS
}; };
enum Scanner_Cmd_Defs enum Scanner_Cmd_Defs

2
huagao/huagaods.cpp
View File

@ -1854,7 +1854,7 @@ Result HuagaoDs::identityOpenDs(const Identity&) {
} }
/*if (Msg::Set == msg) { /*if (Msg::Set == msg) {
auto mech = data.currentItem<UInt16>(); auto mech = data.currentItem<UInt16>();
m_scanparam->hardwarecaps.en_doublefeed = mech ? 0 : 1; m_scanparam->hardwarecaps.en_doublefeed = mech ? 1 : 0;
return success(); return success();
} }
return CapSupGetAllResetEx<BYTE, UInt16, CapType::DoubleFeedDetection>(msg, data, m_scanparam->hardwarecaps.en_doublefeed, TRUE);*/ return CapSupGetAllResetEx<BYTE, UInt16, CapType::DoubleFeedDetection>(msg, data, m_scanparam->hardwarecaps.en_doublefeed, TRUE);*/