From 85fb296aa957e27280434e3d5ee91d0a293fe26a Mon Sep 17 00:00:00 2001 From: yangjiaxuan <171295266@qq.com> Date: Tue, 12 Dec 2023 14:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=AD=E6=99=B6pid?= =?UTF-8?q?=EF=BC=9A9222=E5=92=8C9223=EF=BC=8C=E5=88=86=E5=88=AB=E5=AF=B9?= =?UTF-8?q?=E5=BA=94139=E5=92=8C239=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_all.bat | 6 +++++- sane/scanner.cpp | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/build_all.bat b/build_all.bat index 1e8c5dd..3a06beb 100644 --- a/build_all.bat +++ b/build_all.bat @@ -198,7 +198,11 @@ EXIT /B 0 :compile_zj call build_base.bat %1 %2 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% - call build_ds.bat %1 %2 9200 + call build_ds.bat %1 %2 9220 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 9222 + if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% + call build_ds.bat %1 %2 9223 if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL% EXIT /B 0 diff --git a/sane/scanner.cpp b/sane/scanner.cpp index 858db4d..9ec8f9a 100644 --- a/sane/scanner.cpp +++ b/sane/scanner.cpp @@ -707,6 +707,10 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial) { return GET_SCANNER_VID(serial) == vid && GET_SCANNER_PID(serial) == pid; } + else if (vid == PRODUCT_VENDOR_ZJ) + { + return GET_SCANNER_VID(serial) == vid && GET_SCANNER_PID(serial) == pid; + } return true; }