调整得力DS的生成

This commit is contained in:
yangjiaxuan 2023-07-20 09:21:31 +08:00
parent 6a96c3ff8a
commit a7688c6d1e
2 changed files with 24 additions and 20 deletions

View File

@ -217,32 +217,12 @@ EXIT /B 0
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401C
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401D
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401E
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401F
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4020
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4021
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4022
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4015
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4016
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4017
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4018
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 4019
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401A
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 401B
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
EXIT /B 0

View File

@ -572,6 +572,30 @@ bool scanner::is_belong_serial(int vid, int pid, SCANNERID serial)
}
return false;
}
else if (vid == PRODUCT_VENDOR_DL)
{
if (GET_SCANNER_VID(serial) == PRODUCT_VENDOR_DL)
{
if (GET_SCANNER_PID(serial) == 0x401C)
{
return pid == 0x401C || pid == 0x401D || pid == 0x401E || pid == 0x401F;
}
else if (GET_SCANNER_PID(serial) == 0x4020)
{
return pid == 0x4020 || pid == 0x4021 || pid == 0x4022;
}
else if (GET_SCANNER_PID(serial) == 0x4015)
{
return pid == 0x4015 || pid == 0x4016 || pid == 0x4017 || pid == 0x4018;
}
else if (GET_SCANNER_PID(serial) == 0x4019)
{
return pid == 0x4019 || pid == 0x401A || pid == 0x401B;
}
}
return false;
}
return true;
}
void scanner::get_scanner_name(SCANNERID id, std::vector<std::string>& names)