canon_dr v56

- add initial support for P-150M (and probably P-150)

backend/canon_dr.c

@@ -333,6 +333,8 @@
          - fixed-width scanners were calculating left-side offset incorrectly in color
          - initial support for DR-F120
          - rename all DUPLEX_INTERLACE_* to indicate start and end of line
+      v56 2016-08-23, MAN
+         - initial support for P-150
 
    SANE FLOW DIAGRAM
 
@@ -383,7 +385,7 @@
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 55
+#define BUILD 56
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5
@@ -1457,6 +1459,23 @@ init_model (struct scanner *s)
     s->can_color = 0;
   }
 
+  /* all copied from P-215 */
+  else if (strstr (s->model_name, "P-150")) {
+    s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_rRgGbB;
+    s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_RRGGBB;
+    s->gray_interlace[SIDE_FRONT] = GRAY_INTERLACE_gG;
+    s->duplex_interlace = DUPLEX_INTERLACE_FBfb;
+    s->need_ccal = 1;
+    s->invert_tly = 1;
+    s->unknown_byte2 = 0x88;
+    s->rgb_format = 1;
+    s->has_ssm_pay_head_len = 1;
+    s->ppl_mod = 8;
+    s->ccal_version = 3;
+    s->can_read_sensors = 1;
+    s->has_card = 1;
+  }
+
   else if (strstr (s->model_name, "P-208")) {
     s->color_interlace[SIDE_FRONT] = COLOR_INTERLACE_RRGGBB;
     s->color_interlace[SIDE_BACK] = COLOR_INTERLACE_rRgGbB;

backend/canon_dr.conf.in

@@ -134,6 +134,9 @@ usb 0x1083 0x1626
 # CR-190i
 usb 0x1083 0x162b
 
+# P-150M
+usb 0x1083 0x162c
+
 # DR-6030C
 usb 0x1083 0x1638
 

doc/descriptions/canon_dr.desc

@@ -326,11 +326,12 @@
 :interface "USB"
 ;:usbid "0x1083" "0x"
 :status :untested
+:comment "Same as P-150M?"
 
 :model "P-150M"
 :interface "USB"
-;:usbid "0x1083" "0x"
-:status :untested
+:usbid "0x1083" "0x162c"
+:status :good
 
 :model "P-201"
 :interface "USB"