summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2018-02-20 07:56:07 -0500
committerSolomon Peachy <pizza@shaftnet.org>2018-02-20 07:56:07 -0500
commit8df5bb8b833e6ee2ee9a2e73f196d3eb2470ba52 (patch)
tree4dab95db0c7750b1dfd7e721a64179a215df439e
parented650abded40f8b01cfb091e45aabbfaf6445e2a (diff)
downloadselphy_print-8df5bb8b833e6ee2ee9a2e73f196d3eb2470ba52.tar.gz
selphy_print-8df5bb8b833e6ee2ee9a2e73f196d3eb2470ba52.tar.bz2
selphy_print-8df5bb8b833e6ee2ee9a2e73f196d3eb2470ba52.zip
dnpds40: Add in missing USB PIDs for Citizen printers.
-rw-r--r--README17
-rw-r--r--backend_dnpds40.c9
2 files changed, 13 insertions, 13 deletions
diff --git a/README b/README
index 1adee6f..f6c69eb 100644
--- a/README
+++ b/README
@@ -28,10 +28,11 @@
Canon SELPHY CP series
Ciaat Brava 21
Citizen CW-01
+ Citizen CW-02 / OP900II
DNP DS40 / Citizen CX
DNP DS80 / Citizen CX-W
- DNP DS-RX1 / DS-RX1HS / Citizen CY
- DNP DS620 / DS620A
+ DNP DS-RX1 / DS-RX1HS / Citizen CY / CY-02
+ DNP DS620 / DS620A / Citizen CX-02
DNP DS820 / DS820A
Kodak Professional 1400
Kodak 305 Photo Printer
@@ -57,7 +58,6 @@
Work-in-progress Printers:
- Citizen CW-02, CY-02, and CX2
DNP DS80DX
HiTi P910L
ICI Imagedata OP900
@@ -68,7 +68,7 @@
Mitsubishi CP-9800DW, CP-9800DW-S, CP-9810DW, and CP-9820DW-S
Mitsubishi CP-D707DW
Mitsubishi CP-D90DW
- Olmec OP900 and OP900II
+ Olmec OP900
Shinko CHC-S6245 (aka Sinfonia CE1)
Sony UP-CR10L (aka DNP DS-SL10)
Shinko CHC-S6145-5A (aka Sinfonia CS2-c)
@@ -721,18 +721,15 @@
DNP DS80 (aka Citizen CX-W)
DNP DS620 / DS620A
DNP DS820 / DS820A
- DNP DS-RX1 / DNP DS-RX1HS (aka Citizen CY)
+ DNP DS-RX1 / DNP DS-RX1HS (aka Citizen CY and CY-02)
Theoretically supported printers: (Untested)
- Citizen CW-02/OP900II
+ Citizen CW-02 / OP900II
+ Citizen CX-02
DNP DS80DX
Mitsubishi CP-3800DW
- Work-in-progress printers: (USB PIDs unknown)
-
- Citizen CX2, CY-02, and CW-02
-
Development was sponsored in part by:
Marco Di Antonio
diff --git a/backend_dnpds40.c b/backend_dnpds40.c
index 53cc08c..ac2b051 100644
--- a/backend_dnpds40.c
+++ b/backend_dnpds40.c
@@ -58,10 +58,12 @@
#define USB_PID_DNP_DS40 0x0003 // Also Citizen CX
#define USB_PID_DNP_DS80 0x0004 // Also Citizen CX-W, and Mitsubishi CP-3800DW
#define USB_PID_DNP_DSRX1 0x0005 // Also Citizen CY
-#define USB_PID_CITIZEN_CW02 0x0006
#define USB_PID_DNP_DS80D 0x0007
#define USB_PID_DNP_DS620_OLD 0x0008
+#define USB_PID_CITIZEN_CW02 0x0006 // Also OP900II
+#define USB_PID_CITIZEN_CX02 0x000A
+
#define USB_VID_DNP 0x1452
#define USB_PID_DNP_DS620 0x8b01
#define USB_PID_DNP_DS820 0x9001
@@ -2487,8 +2489,8 @@ static int dnpds40_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend dnpds40_backend = {
- .name = "DNP DS40/DS80/DSRX1/DS620",
- .version = "0.93",
+ .name = "DNP DS40/DS80/DSRX1/DS620/DS820",
+ .version = "0.94",
.uri_prefix = "dnpds40",
.cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg,
@@ -2506,6 +2508,7 @@ struct dyesub_backend dnpds40_backend = {
{ USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, NULL},
{ USB_VID_DNP, USB_PID_DNP_DS80D, P_DNP_DS80D, NULL},
{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW02, P_DNP_DS40, NULL},
+ { USB_VID_CITIZEN, USB_PID_CITIZEN_CX02, P_DNP_DS620, NULL},
{ USB_VID_DNP, USB_PID_DNP_DS820, P_DNP_DS820, NULL},
{ 0, 0, 0, NULL}
}