*** empty log message ***

ChangeLog

@@ -1,3 +1,10 @@
+2003-05-06  Michael Herder <crapsite@gmx.net>
+
+        * doc/descriptions/artec_eplus48u.desc:
+          Added comment about different product ID of MEM 48U
+        * backend/artec_eplus48u.conf:
+          Added new model Memorex MEM 48U
+
 2003-05-05 Oliver Rauch <Oliver.Rauch@XSane.org>
 	* backend/umax.c: solved bug that broke compilation for OS2
 

backend/artec_eplus48u.conf

@@ -2,7 +2,7 @@
 # For use with the Artec E+ 48U scanner
 # This scanner is also sold as
 # Tevion MD 9693, Medion MD 9705, Medion MD 9693,
-# Trust Easy Webscan 19200 or Umax AstraSlim SE.
+# Trust Easy Webscan 19200, Memorex Mem 48U or Umax AstraSlim SE.
 #
 # The USB section:
 # each device needs at least the following line:
@@ -78,10 +78,10 @@ option artecFirmwareFile <path>/Artec48.usb
 # for adjusting the default gamma values
 #
 
-option redGamma         3.0
-option greenGamma       3.0
-option blueGamma        3.0
-option masterGamma      3.9
+option redGamma         1.0
+option greenGamma       1.0
+option blueGamma        1.0
+option masterGamma      1.9
 
 #Use this options to set the default offset and exposure time values.
 #If calibrate device is set to 0, this values are used instead of the values
@@ -115,6 +115,64 @@ option modelString "Easy Webscan 19200"
 #If you are using the scanner module (kernel driver), a device looks like this:
 #device /dev/usbscanner
 
+# Another USB section:
+# each device needs at least the following line:
+# usb vendor-ID and product-ID
+# Every device configuration in this file must begin with an usb entry.
+# Since the Memorex Mem48U uses a different product id, we add
+# another usb section here.
+
+usb 0x05d8 0x4005
+
+#
+# Path to the firmware file
+# This file comes with the Windows driver
+# The scanner won't work without it
+#
+
+option artecFirmwareFile <path>/Artec48.usb
+
+#
+# for adjusting the default gamma values
+#
+
+option redGamma         1.0
+option greenGamma       1.0
+option blueGamma        1.0
+option masterGamma      1.9
+
+#Use this options to set the default offset and exposure time values.
+#If calibrate device is set to 0, this values are used instead of the values
+#which were calculated during calibration.
+
+option redOffset        0x28
+option greenOffset      0x2f
+option blueOffset       0x2f
+option redExposure      0xa7
+option greenExposure    0x116
+option blueExposure     0xdc
+
+# The vendor and model string
+# This string is displayed by the frontends. The Umax AstraSlim SE
+# has a different product id, therefore we can overwrite the vendor and model
+# string here.
+
+option vendorString "Memorex"
+option modelString "MEM 48U"
+
+#
+# device-name
+#
+# If autodetection does not work, then you can specify the device here
+# The device entry must be the last one in this config file (or the last one before a
+# new usb entry).
+
+#If you are using libusb, a device looks like this:
+#device libusb:001:002
+
+#If you are using the scanner module (kernel driver), a device looks like this:
+#device /dev/usbscanner
+
 # Another USB section:
 # each device needs at least the following line:
 # usb vendor-ID and product-ID
@@ -136,10 +194,10 @@ option artecFirmwareFile <path>/Artec48.usb
 # for adjusting the default gamma values
 #
 
-option redGamma         3.0
-option greenGamma       3.0
-option blueGamma        3.0
-option masterGamma      3.9
+option redGamma         1.0
+option greenGamma       1.0
+option blueGamma        1.0
+option masterGamma      1.9
 
 #Use this options to set the default offset and exposure time values.
 #If calibrate device is set to 0, this values are used instead of the values

doc/descriptions/artec_eplus48u.desc

@@ -37,8 +37,10 @@
 :comment "Different product id: 0x4006"
 
 :mfg "Memorex"
-:model "Mem 48 u"
+:url "http://www.artecusa.com/"
+:model "MEM 48U"
 :interface "USB"
+:comment "Different product id: 0x4005"
 
 :mfg "UMAX"
 :url "http://www.umax.com/"