diff --git a/hgdriver/hgdev/char_const.h b/hgdriver/hgdev/char_const.h index 03d9254..ba09028 100644 --- a/hgdriver/hgdev/char_const.h +++ b/hgdriver/hgdev/char_const.h @@ -157,3 +157,10 @@ // #define SCANNER_NAME_HW_7039F "汉王扫描仪—HW7039F" #define SCANNER_NAME_HW_7039F "\346\261\211\347\216\213\346\211\253\346\217\217\344\273\252HW7039F" +#define SCANNER_NAME_HW_1000 "Hanvon HW-1000NS" +#define SCANNER_NAME_HW_1002 "Hanvon HW-1000" +#define SCANNER_NAME_HW_7000 "Hanvon HW-7000NS" +#define SCANNER_NAME_HW_7002 "Hanvon HW-7000" +#define SCANNER_NAME_HW_7039 "Hanvon HW-7000NS" +#define SCANNER_NAME_HW_8000 "Hanvon HW-8000" +#define SCANNER_NAME_HW_9000 "Hanvon HW-9000" \ No newline at end of file diff --git a/hgdriver/hgdev/scanner_manager.cpp b/hgdriver/hgdev/scanner_manager.cpp index f63eb72..91177b7 100644 --- a/hgdriver/hgdev/scanner_manager.cpp +++ b/hgdriver/hgdev/scanner_manager.cpp @@ -42,13 +42,13 @@ g_supporting_devices[] = { , {0x31c9, 0x8429, SCANNER_NAME_LSC_G42S, "G42x0F", "", &hg_scanner_mgr::create_scanner_empty} #elif defined(OEM_HANWANG) - {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", "", &hg_scanner_mgr::create_scanner_g400} + {0x2903, 0x1000, SCANNER_NAME_HW_1000, "HW-1060A", "",& hg_scanner_mgr::create_scanner_g300} + , {0x2903, 0x1002, SCANNER_NAME_HW_1002, "HW-1060A", "", &hg_scanner_mgr::create_scanner_g302} + , {0x2903, 0x7000, SCANNER_NAME_HW_7000, "HW-74x0WA", "", &hg_scanner_mgr::create_scanner_g400} , {0x2903, 0x7002, SCANNER_NAME_HW_7002, "HW-7002", "", &hg_scanner_mgr::create_scanner_g402} - , {0x2903, 0x1000, SCANNER_NAME_HW_1060A, "HW-1060A", "", &hg_scanner_mgr::create_scanner_g300} - , {0x2903, 0x1002, SCANNER_NAME_HW_1060A, "HW-1060A", "", &hg_scanner_mgr::create_scanner_g302} - , {0x2903, 0x8000, SCANNER_NAME_HW_8090F, "HW-8090F", "", &hg_scanner_mgr::create_scanner_g239} - , {0x2903, 0x9000, SCANNER_NAME_HW_9110F, "HW-9110F", "", &hg_scanner_mgr::create_scanner_g239} - , {0x2903, 0x7039, SCANNER_NAME_HW_7039F, "HW-7039F", "", &hg_scanner_mgr::create_scanner_g239} + , {0x2903, 0x7039, SCANNER_NAME_HW_7039, "HW-7039F", "", &hg_scanner_mgr::create_scanner_g239} + , {0x2903, 0x8000, SCANNER_NAME_HW_8000, "HW-8090F", "", &hg_scanner_mgr::create_scanner_g239} + , {0x2903, 0x9000, SCANNER_NAME_HW_9000, "HW-9110E", "", &hg_scanner_mgr::create_scanner_g239} #else {0x3072, 0x100, SCANNER_NAME_HG_G100, "GScanO200", "", &hg_scanner_mgr::create_scanner_g100} , {0x3072, 0x200, SCANNER_NAME_HG_G200, "GScanO200", "", &hg_scanner_mgr::create_scanner_g100}