summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-01-27 18:16:36 -0500
committerSolomon Peachy <pizza@shaftnet.org>2018-01-27 18:16:36 -0500
commitdc7882dd8eb6cc091ade60986e71d03bc6e3e7a2 (patch)
treeb17dc1e3da67ad25a31a92c11a6f42bfd67650c7
parent91f531c2efdef86006e4732251f6fd36482ff1a6 (diff)
downloadselphy_print-dc7882dd8eb6cc091ade60986e71d03bc6e3e7a2.tar.gz
selphy_print-dc7882dd8eb6cc091ade60986e71d03bc6e3e7a2.tar.bz2
selphy_print-dc7882dd8eb6cc091ade60986e71d03bc6e3e7a2.zip
selphyneo: Add USB PID for SELPHY CP1300
-rw-r--r--README7
-rw-r--r--backend_canonselphyneo.c4
-rw-r--r--blacklist3
3 files changed, 6 insertions, 8 deletions
diff --git a/README b/README
index f015277..1adee6f 100644
--- a/README
+++ b/README
@@ -57,7 +57,6 @@
Work-in-progress Printers:
- Canon SELPHY CP1300
Citizen CW-02, CY-02, and CX2
DNP DS80DX
HiTi P910L
@@ -262,11 +261,7 @@
Untested, but expected to work:
- CP820, CP910
-
- Unsupported (Unknown USB PIDs):
-
- CP1300
+ CP820, CP910, CP1300
Valid commands:
diff --git a/backend_canonselphyneo.c b/backend_canonselphyneo.c
index 172ef3d..c1d8140 100644
--- a/backend_canonselphyneo.c
+++ b/backend_canonselphyneo.c
@@ -47,7 +47,7 @@
#define USB_PID_CANON_CP910 0x327a
#define USB_PID_CANON_CP1000 0x32ae
#define USB_PID_CANON_CP1200 0x32b1
-#define USB_PID_CANON_CP1300 XXXXX
+#define USB_PID_CANON_CP1300 0x32db
/* Header data structure */
struct selphyneo_hdr {
@@ -443,7 +443,7 @@ struct dyesub_backend canonselphyneo_backend = {
{ USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, NULL},
{ USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, NULL},
-// { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, NULL},
+ { USB_VID_CANON, USB_PID_CANON_CP1300, P_CP910, NULL},
{ 0, 0, 0, NULL}
}
};
diff --git a/blacklist b/blacklist
index 08b0fdf..3e252ca 100644
--- a/blacklist
+++ b/blacklist
@@ -90,6 +90,9 @@
# Canon SELPHY CP1200
0x04a9 0x32b1 blacklist
+# Canon SELPHY CP1300
+0x04a9 0x32db blacklist
+
# Canon SELPHY ES1
0x04a9 0x3141 blacklist