summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2017-03-26 23:15:35 -0400
committerSolomon Peachy <pizza@shaftnet.org>2017-03-26 23:15:35 -0400
commit521c5ca06d975e43132b28a1a786e508c3d5884e (patch)
tree0b814b66e7573d1380a8cad24ddd58dfb3141a17
parent8f10720a8c9f2bbd35722514e313c8c0753f8dbf (diff)
downloadselphy_print-521c5ca06d975e43132b28a1a786e508c3d5884e.tar.gz
selphy_print-521c5ca06d975e43132b28a1a786e508c3d5884e.tar.bz2
selphy_print-521c5ca06d975e43132b28a1a786e508c3d5884e.zip
selphyneo: Add in the USB ID for the SELPHY CP820
-rw-r--r--README7
-rw-r--r--backend_canonselphyneo.c6
-rw-r--r--blacklist3
3 files changed, 7 insertions, 9 deletions
diff --git a/README b/README
index 0657708..203fc98 100644
--- a/README
+++ b/README
@@ -52,7 +52,6 @@
Work-in-progress Printers:
- Canon SELPHY CP820
Citizen CW-02 and CX2
DNP DS80DX
Fujifilm ASK-300
@@ -230,11 +229,7 @@
Untested, but expected to work:
- CP910
-
- Unknown VID/PIDs, but should work:
-
- CP820
+ CP820, CP910
Valid commands:
diff --git a/backend_canonselphyneo.c b/backend_canonselphyneo.c
index da40cbd..5f38974 100644
--- a/backend_canonselphyneo.c
+++ b/backend_canonselphyneo.c
@@ -41,7 +41,7 @@
/* Exported */
#define USB_VID_CANON 0x04a9
-#define USB_PID_CANON_CP820 XXX
+#define USB_PID_CANON_CP820 0x327b
#define USB_PID_CANON_CP910 0x327a
#define USB_PID_CANON_CP1000 0x32ae
#define USB_PID_CANON_CP1200 0x32b1
@@ -388,7 +388,7 @@ static void selphyneo_cmdline(void)
struct dyesub_backend canonselphyneo_backend = {
.name = "Canon SELPHY CPneo",
- .version = "0.06",
+ .version = "0.07",
.uri_prefix = "canonselphyneo",
.cmdline_usage = selphyneo_cmdline,
.cmdline_arg = selphyneo_cmdline_arg,
@@ -398,7 +398,7 @@ struct dyesub_backend canonselphyneo_backend = {
.read_parse = selphyneo_read_parse,
.main_loop = selphyneo_main_loop,
.devices = {
-// { USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, ""},
+ { USB_VID_CANON, USB_PID_CANON_CP820, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP910, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP1000, P_CP910, ""},
{ USB_VID_CANON, USB_PID_CANON_CP1200, P_CP910, ""},
diff --git a/blacklist b/blacklist
index 6b0f567..191e97d 100644
--- a/blacklist
+++ b/blacklist
@@ -75,6 +75,9 @@
# Canon SELPHY CP810
0x04a9 0x3256 blacklist
+# Canon SELPHY CP820
+0x04a9 0x327b blacklist
+
# Canon SELPHY CP900
0x04a9 0x3255 blacklist