diff --git a/ChangeLog b/ChangeLog index c426f8702..c9b5e0eaa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-08-08 Henning Meier-Geinitz + + * backend/gt68xx.c backend/gt68xx.conf backend/gt68xx_devices.c doc/descriptions/gt68xx.desc + doc/gt68xx/gt68xx.CHANGES tools/hotplug/libsane.usermap: + Added Mustek ScanExpress 1248 UB and new version of Mustek + BearPaw 1200 CU Plus. + 2004-08-05 Gerard Klaver * backend/teco2.c backend/teco2.h: changed to SANE_VALUE_SCAN_MODE_LINEART, _GRAY, and _COLOR, diff --git a/backend/gt68xx.c b/backend/gt68xx.c index e5960f277..021f24d5b 100644 --- a/backend/gt68xx.c +++ b/backend/gt68xx.c @@ -48,7 +48,7 @@ #include "../include/sane/config.h" -#define BUILD 61 +#define BUILD 62 #define MAX_DEBUG #define WARMUP_TIME 60 #define CALIBRATION_HEIGHT 2.5 diff --git a/backend/gt68xx.conf b/backend/gt68xx.conf index e8ec8618f..89c6b5bcc 100644 --- a/backend/gt68xx.conf +++ b/backend/gt68xx.conf @@ -95,6 +95,10 @@ usb 0x055f 0x021a # Autodetect Mustek BearPaw 2400 CU Plus usb 0x055f 0x021d +############################################################################## +# Autodetect Mustek ScanExpress 1248 UB +usb 0x055f 0x021f + ############################################################################## # Autodetect Mustek Bearpaw 1200 CU Plus and Packard Bell Diamond 1200 usb 0x055f 0x021c @@ -105,6 +109,9 @@ usb 0x055f 0x021c #vendor "Packard Bell" #model "Diamond 1200" +# Another Mustek BearPaw 1200 CU Plus version? +usb 0x055f 0x021b + ############################################################################## # Autodetect Mustek ScanExpress A3 USB usb 0x055f 0x0210 diff --git a/backend/gt68xx_devices.c b/backend/gt68xx_devices.c index 3fce62244..78ef0fc3a 100644 --- a/backend/gt68xx_devices.c +++ b/backend/gt68xx_devices.c @@ -567,6 +567,57 @@ static GT68xx_Model mustek_scanexpress1200ubplus_model = { /* Setup and tested */ }; +static GT68xx_Model mustek_scanexpress1248ub_model = { + "mustek-scanexpress-1248-ub", /* Name */ + "Mustek", /* Device vendor string */ + "ScanExpress 1248 UB", /* Device model name */ + "PS1Dfw.usb", /* Name of the firmware file */ + SANE_FALSE, /* Dynamic allocation flag */ + + &mustek_gt6816_command_set, /* Command set used by this scanner */ + + 600, /* maximum optical sensor resolution */ + 1200, /* maximum motor resolution */ + 600, /* base x-res used to calculate geometry */ + 600, /* base y-res used to calculate geometry */ + 1200, /* if ydpi is equal or higher, use linemode */ + 1200, /* if ydpi is equal or higher, disable backtracking */ + SANE_FALSE, /* Use base_ydpi for all resolutions */ + + {600, 300, 150, 75, 50, 0}, /* possible x-resolutions */ + {1200, 600, 300, 150, 75, 50, 0}, /* possible y-resolutions */ + {16, 12, 8, 0}, /* possible depths in gray mode */ + {16, 12, 8, 0}, /* possible depths in color mode */ + + SANE_FIX (0.0), /* Start of scan area in mm (x) */ + SANE_FIX (13.0), /* Start of scan area in mm (y) */ + SANE_FIX (217.0), /* Size of scan area in mm (x) */ + SANE_FIX (299.0), /* Size of scan area in mm (y) */ + + SANE_FIX (9.0), /* Start of white strip in mm (y) */ + SANE_FIX (0.0), /* Start of black mark in mm (x) */ + + SANE_FIX (0.0), /* Start of scan area in TA mode in mm (x) */ + SANE_FIX (0.0), /* Start of scan area in TA mode in mm (y) */ + SANE_FIX (100.0), /* Size of scan area in TA mode in mm (x) */ + SANE_FIX (100.0), /* Size of scan area in TA mode in mm (y) */ + + SANE_FIX (0.0), /* Start of white strip in TA mode in mm (y) */ + + 0, 0, 0, /* RGB CCD Line-distance correction in pixel */ + 0, /* CCD distcance for CCD with 6 lines) */ + + COLOR_ORDER_BGR, /* Order of the CCD/CIS colors */ + {0x14, 0x07, 0x14, 0x07, 0x14, 0x07}, /* Default offset/gain */ + {0x157, 0x157, 0x157}, /* Default exposure parameters */ + SANE_FIX (2.0), /* Default gamma value */ + + SANE_TRUE, /* Is this a CIS scanner? */ + GT68XX_FLAG_UNTESTED | GT68XX_FLAG_NO_STOP /* Which flags are needed for this scanner? */ + /* Completely untested, seems to use gt6816 CIS, details unknown */ +}; + + static GT68xx_Model artec_ultima2000_model = { "artec-ultima-2000", /* Name */ "Artec", /* Device vendor string */ @@ -1383,8 +1434,10 @@ static GT68xx_USB_Device_Entry gt68xx_usb_device_list[] = { {0x055f, 0x0218, &mustek_2400ta_model}, {0x055f, 0x0219, &mustek_2400taplus_model}, {0x055f, 0x021c, &mustek_1200cuplus_model}, + {0x055f, 0x021b, &mustek_1200cuplus_model}, /* Different id? New */ {0x055f, 0x021d, &mustek_2400cuplus_model}, {0x055f, 0x021e, &mustek_1200ta_model}, + {0x055f, 0x021f, &mustek_scanexpress1248ub_model}, {0x05d8, 0x4002, &mustek_1200cu_model}, {0x05d8, 0x4002, &mustek_scanexpress1200ubplus_model}, /* manual override */ {0x05d8, 0x4002, &artec_ultima2000_model}, /* manual override */ diff --git a/doc/descriptions/gt68xx.desc b/doc/descriptions/gt68xx.desc index 72c0b5c1a..a0b6ae7ed 100644 --- a/doc/descriptions/gt68xx.desc +++ b/doc/descriptions/gt68xx.desc @@ -1,5 +1,5 @@ :backend "gt68xx" -:version "1.0-61" +:version "1.0-62" :manpage "sane-gt68xx" :url "http://www.meier-geinitz.de/sane/gt68xx-backend/" :comment "Only the USB scanners mentioned below are supported. For other Mustek BearPaws, look at the Plustek and the MA-1509 backend." @@ -148,6 +148,12 @@ :model "BearPaw 1200 CU Plus" :interface "USB" :status :good +:comment "Product id 0x021c" + +:model "BearPaw 1200 CU Plus" +:interface "USB" +:status :untested +:comment "Procuct id 0x021b" :model "BearPaw 1200 TA" :interface "USB" @@ -207,6 +213,11 @@ :interface "USB" :status :good +:model "ScanExpress 1248 UB" +:interface "USB" +:status :untested +:comment "Is detected now but is completely untested. Please contact me if you own such a device." + :model "ScanExpress A3 USB" :interface "USB" :status :basic diff --git a/doc/gt68xx/gt68xx.CHANGES b/doc/gt68xx/gt68xx.CHANGES index 3b6c17357..6015f9d93 100644 --- a/doc/gt68xx/gt68xx.CHANGES +++ b/doc/gt68xx/gt68xx.CHANGES @@ -1,5 +1,11 @@ gt68xx.CHANGES -*-text-*- +V 1.0.62 (2004-08-08) + +* Added detection for Mustek ScanExpress 1248 UB. It's untested however and I + don't even know the name of the firmware. +* Added new id for Mustek BearPaw 1200 CU Plus (0x021b). It's completely untested. + V 1.0-61 (2004-06-18) * General: diff --git a/tools/hotplug/libsane.usermap b/tools/hotplug/libsane.usermap index 84c956b8a..afda8dd45 100644 --- a/tools/hotplug/libsane.usermap +++ b/tools/hotplug/libsane.usermap @@ -293,6 +293,8 @@ libusbscanner 0x0003 0x055f 0x0218 0x0000 0x0000 libusbscanner 0x0003 0x055f 0x0219 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Mustek Systems Inc.|BearPaw 2448 TA Plus libusbscanner 0x0003 0x055f 0x021A 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 +# Mustek Systems Inc.|BearPaw 1200 CU Plus (another one?) +libusbscanner 0x0003 0x055f 0x021b 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Mustek Systems Inc.|BearPaw 1200 CU Plus libusbscanner 0x0003 0x055f 0x021c 0x0000 0x0000 0x00 0x00 0x00 0x00 0x00 0x00 0x00000000 # Mustek Systems Inc.|Bearpaw 2400 CU Plus