Merge branch 'master' into 'master'

Added Imageclass MF634Cdw

See merge request sane-project/backends!49

backend/pixma_imageclass.c

@@ -109,6 +109,7 @@
 #define MF230_PID  0x27d1
 #define MF240_PID  0x27d2
 #define MF630_PID  0x27e1
+#define MF634_PID  0x27e2
 #define MF730_PID  0x27e4
 #define MF731_PID  0x27e5
 #define D570_PID   0x27e8
@@ -957,6 +958,7 @@ const pixma_config_t pixma_iclass_devices[] = {
   DEV ("Canon i-SENSYS MF630 Series", "MF630", MF630_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF730 Series", "MF730", MF730_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon i-SENSYS MF731C", "MF731", MF731_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),
+  DEV ("Canon imageCLASS MF634C", "MF632C/634C", MF634_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),
   DEV ("Canon imageCLASS MF733C", "MF731C/733C", MF731_PID, 600, 0, 637, 1050, PIXMA_CAP_ADFDUP),            /* however, we need this for ethernet/wifi */
   DEV ("Canon imageCLASS D570", "D570", D570_PID, 600, 0, 640, 877, 0),
   DEV (NULL, NULL, 0, 0, 0, 0, 0, 0)

doc/descriptions/pixma.desc

@@ -1110,6 +1110,13 @@
 :comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI). Ethernet and WiFi not tested yet"
 
 
+:model "imageCLASS MF634C"
+:interface "USB Ethernet WiFi"
+:usbid "0x04a9" "0x27e2"
+:status :complete
+:comment "Flatbed and ADF scan. All resolutions supported (up to 600DPI)."
+
+
 :model "imageCLASS MF733Cdw"
 :interface "USB Ethernet WiFi"
 :usbid "0x04a9" "0x27e5"

doc/sane-pixma.man

@@ -55,7 +55,7 @@ PIXUS MP10
 .br
 PIXMA TS3100, TS5000, TS6100, TS8000
 .br
-imageCLASS MF733Cdw
+imageCLASS MF634Cdw, MF733Cdw
 .br
 imageCLASS MF3110, MF3240, MF4010, MF4018
 .br