aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorm. allan noah <kitno455@gmail.com>2016-09-11 19:03:23 -0400
committerm. allan noah <kitno455@gmail.com>2016-09-11 19:04:34 -0400
commit9d388c35937b75cf5f47410ead07ef2226ac8005 (patch)
tree167b67ac44dd44ce6effe90e3020c1f7ad9a8051
parent39ceeae616a2e1638c2760d4364adcaa210a413b (diff)
canon_dr v56
- add initial support for P-150M (and probably P-150)
-rw-r--r--backend/canon_dr.c21
-rw-r--r--backend/canon_dr.conf.in3
-rw-r--r--doc/descriptions/canon_dr.desc5
3 files changed, 26 insertions, 3 deletions
diff --git a/backend/canon_dr.c b/backend/canon_dr.c
index ad5e95d..3c058ab 100644
--- a/backend/canon_dr.c
+++ b/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;
diff --git a/backend/canon_dr.conf.in b/backend/canon_dr.conf.in
index bb50993..29b6db1 100644
--- a/backend/canon_dr.conf.in
+++ b/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
diff --git a/doc/descriptions/canon_dr.desc b/doc/descriptions/canon_dr.desc
index 0a02ff7..96d6913 100644
--- a/doc/descriptions/canon_dr.desc
+++ b/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"