dnpds40: Apparently the Citizen CX/CY use the same USB IDs as the DNP

models.

README

@@ -26,14 +26,13 @@
    Shinko CHC-S2145 (aka "Sinfonia S2")
    Sony UP-DR150
    Sony UP-DR200
-   DNP DS40
-   DNP DS80 
+   DNP DS40/DS80/DS-RX1
+   Citizen CX/CX-W/CY
 
  Work-in-progress printers:
 
    Mitsubishi CP-D70DW, CP-D707DW and CP-K60DW
-   DNP DSRX1
-   Citizen CX/CX-W/CY/CW-01/OP900/CW-02/OP900II
+   Citizen CW-01/OP900/CW-02/OP900II
    Olmec OP900
    ICI Imagedata OP900
    Mitsubishi CP-3800DW
@@ -353,10 +352,14 @@
 
     DNP DS40
     DNP DS80
+    DNP DS-RX1
+    Citizen CX
+    Citizen CX-W
+    Citizen CY
  
    Work-in-progress (Unknown USB IDs):
 
-    Citizen CX/CX-W/CY/CW-02/OP900II
+    Citizen CW-01/OP900/CW-02/OP900II
     Olmec OP900
     ICI Imagedata OP900
     Mitsubishi CP-3800DW

backend_dnpds40.c

@@ -42,13 +42,10 @@
 #include "backend_common.h"
 
 #define USB_VID_DNP       0x1343
-#define USB_PID_DNP_DS40  0x0003
-#define USB_PID_DNP_DS80  0x0004
+#define USB_PID_DNP_DS40  0x0003 // Also Citizen CX
+#define USB_PID_DNP_DS80  0x0004 // Also Citizen CX-W
+#define USB_PID_DNP_DSRX1 0x0005 // Also Citizen CY
 
-//#define USB_VID_CITIZEN XXXXX
-//#define USB_PID_CITIZEN_CX XXXXX
-//#define USB_PID_CITIZEN_CX-W XXXXX
-//#define USB_PID_CITIZEN_CY XXXXX
 //#define USB_PID_CITIZEN_CW-01 XXXXX
 //#define USB_PID_CITIZEN_OP900 XXXXX
 //#define USB_PID_CITIZEN_CW-02 XXXXX
@@ -963,7 +960,7 @@ static int dnpds40_cmdline_arg(void *vctx, int run, char *arg1, char *arg2)
 /* Exported */
 struct dyesub_backend dnpds40_backend = {
 	.name = "DNP DS40/DS80",
-	.version = "0.25",
+	.version = "0.26",
 	.uri_prefix = "dnpds40",
 	.cmdline_usage = dnpds40_cmdline,
 	.cmdline_arg = dnpds40_cmdline_arg,
@@ -976,9 +973,7 @@ struct dyesub_backend dnpds40_backend = {
 	.devices = {
 	{ USB_VID_DNP, USB_PID_DNP_DS40, P_DNP_DS40, ""},
 	{ USB_VID_DNP, USB_PID_DNP_DS80, P_DNP_DS80, ""},
-//	{ USB_VID_CITIZEN, USB_PID_CITIZEN_CX, P_DNP_DS80, ""},
-//	{ USB_VID_CITIZEN, USB_PID_CITIZEN_CX-W, P_DNP_DS80, ""},
-//	{ USB_VID_CITIZEN, USB_PID_CITIZEN_CY, P_DNP_DS40, ""},
+	{ USB_VID_DNP, USB_PID_DNP_DSRX1, P_DNP_DS40, ""},
 //	{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW-02, P_DNP_DS40, ""},
 //	{ USB_VID_CITIZEN, USB_PID_CITIZEN_OP900II, P_DNP_DS40, ""},
 //	{ USB_VID_CITIZEN, USB_PID_CITIZEN_CW-01, P_DNP_DS40, ""},