From d2b5ac090b18fb664568a97dc2268afd0602dcea Mon Sep 17 00:00:00 2001 From: masayume <1936714878@qq.com> Date: Wed, 9 Nov 2022 17:29:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A7=A3=E9=94=81=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0get=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- huagao/Device/GScanO1003399.cpp | 4 ++-- huagao/Device/IConfig.h | 1 + huagao/huagaods.cpp | 10 ++++++++-- huagao/stdafx.h | Bin 25538 -> 25534 bytes 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/huagao/Device/GScanO1003399.cpp b/huagao/Device/GScanO1003399.cpp index 7f71a2f9..d563c4a1 100644 --- a/huagao/Device/GScanO1003399.cpp +++ b/huagao/Device/GScanO1003399.cpp @@ -282,12 +282,11 @@ void GScanO1003399::config_params(GScanCap& param) // cfg.g200params.paper = SupPaperTyps_39.count(ps) > 0 ? SupPaperTyps_39[ps] : 0; //} - if (param.filter != 3 || param.enhance_color != 0 || param.hsvcorrect) + if ( param.enhance_color != 0 || param.hsvcorrect || param.filter != 3 ) cfg.g200params.color = 1;//color else { cfg.g200params.color = SupPixelTypes.count(param.pixtype) > 0 ? SupPixelTypes[param.pixtype] : 2; - } cfg.g200params.dpi = SupResolutions.count(param.resolution_native)>0 ? SupResolutions[param.resolution_native] : 1; cfg.g200params.double_feed_enbale = (unsigned int)param.hardwarecaps.en_doublefeed; @@ -401,6 +400,7 @@ void GScanO1003399::Scanner_StartScan(UINT16 count) scanner_write_reg(m_usb, SR_IM_CLEAR, 0); reset(); devState = DEV_ISRUNNING; + if (scanner_read_reg(m_usb, SR_GET_SLEEP_STAUTUS) != 1) { devState = DEV_WRONG; diff --git a/huagao/Device/IConfig.h b/huagao/Device/IConfig.h index f9dc1c81..fcd347cb 100644 --- a/huagao/Device/IConfig.h +++ b/huagao/Device/IConfig.h @@ -205,6 +205,7 @@ enum Scanner_Reg_Defs SR_SET_TOKEN, SR_GET_TOKEN_LENGHT, SR_DECODE_TOKEN, + SR_CLEAN_PAPER_ROAD, SR_GET_CUO_ERROR = 0x50, SR_GET_DOU_ERROR, SR_GET_JAM_ERROR, diff --git a/huagao/huagaods.cpp b/huagao/huagaods.cpp index 0673895f..770b4ddb 100644 --- a/huagao/huagaods.cpp +++ b/huagao/huagaods.cpp @@ -1470,11 +1470,17 @@ Result HuagaoDs::identityOpenDs(const Identity&) { m_query[CapType(CapTypeEx::TwEx_SETTOKEN)] = MsgSupport::Set; m_caps[CapType(CapTypeEx::TwEx_SETTOKEN)] = [this](Msg msg, Capability& data) -> Result { CapabilityPrintf(msg, enum2str(CapTypeEx::SETTOKEN)); - if(msg != Msg::Set) - return { ReturnCode::Failure, ConditionCode::CapBadOperation }; + if (msg != Msg::Set) + { + Str32 str; + str.setData("This operation is not supported ", 32); + data = Capability::createOneValue(CapType(CapTypeEx::TwEx_SETTOKEN), str); + return success(); + } auto str = data.currentItem(); if(str.size()!=32) return { ReturnCode::Failure, ConditionCode::CapBadOperation }; + //MessageBox(NULL, L"ÄÚ´æ²»×ã", L"", MB_OK | MB_SYSTEMMODAL); scanner->set_token(std::string(str.data())); return success(); //return CapSupGetAll(msg, data, Bool(scanner->Get_Scanner_PaperOn()), Bool(scanner->Get_Scanner_PaperOn())); diff --git a/huagao/stdafx.h b/huagao/stdafx.h index 72789f414d4300e9c121c9f25e03b5a259a1d4e5..5431d2c3e4f93f4c31aabc649413eef27d75bd01 100644 GIT binary patch delta 18 acmX?foN?cA#to;qCf}15*nE%cNdy2`%?Stq delta 18 acmdmYobk|c#to;qCcoem*?f!ZNdy2`n+X5_