Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
6cb30489bb
3
build.sh
3
build.sh
|
@ -83,7 +83,8 @@ fi
|
|||
|
||||
cd ../
|
||||
if [ -f ./build/CMakeCache.txt ]; then
|
||||
rm -rf ./build/*
|
||||
echo ""
|
||||
#rm -rf ./build/*
|
||||
else
|
||||
mkdir build
|
||||
fi
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -24,20 +24,20 @@ static struct
|
|||
std::string rsc; // USB resource, version-addr. e.g. "USB2.0-1"
|
||||
}
|
||||
g_supporting_devices[] = {
|
||||
#ifdef OEM_LISICHENG
|
||||
//#ifdef OEM_LISICHENG
|
||||
{0x31c9, 0x8420, SCANNER_NAME_LSC_G42S, "G426xF", ""}
|
||||
, {0x31c9, 0x8520, SCANNER_NAME_LSC_G52S, "G52x0F", ""}
|
||||
, {0x31c9, 0x8620, SCANNER_NAME_LSC_G62S, "G6290U", ""}
|
||||
, {0x31c9, 0x8629, SCANNER_NAME_LSC_G62S, "G6290U", ""}
|
||||
, {0x31c9, 0x8730, SCANNER_NAME_LSC_G73S, "G73x0U", ""}
|
||||
, {0x31c9, 0x8739, SCANNER_NAME_LSC_G73S, "G73x0U", ""},
|
||||
#endif
|
||||
#ifdef OEM_HANWANG
|
||||
//#endif
|
||||
//#ifdef OEM_HANWANG
|
||||
{0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", ""}
|
||||
, {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", ""}
|
||||
, {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", ""}
|
||||
, {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", ""},
|
||||
#endif
|
||||
//#endif
|
||||
{0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", ""}
|
||||
, {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", ""}
|
||||
, {0x3072, 0x300, SCANNER_NAME_HG_G300, "GScanO400", ""}
|
||||
|
|
Loading…
Reference in New Issue