dnpds40: Initial support for DNP RX1HS

README

@@ -32,13 +32,15 @@
    Shinko CHC-S2145 (aka "Sinfonia S2")
    Sony UP-DR150
    Sony UP-DR200
-   DNP DS40/DS80/DS-RX1/DS620
-   Citizen CX/CX-W/CY
+   DNP DS40 / Citizen CX
+   DNP DS80 / Citizen CX-W
+   DNP DS-RX1 / DS-RX1HS / Citizen CY 
+   DNP DS620
    Citizen CW-01
    Mitsubishi CP-9550D/DW/DW-S/DZ/DZ-S
    Mitsubishi CP-3800DW
    Shinko CHC-S6145 (aka Sinfonia CS2)
-   Ciaat Brava 21 (Rebadged S6145)
+   Ciaat Brava 21
 
   Work-in-progress Printers:
 
@@ -46,7 +48,7 @@
    Mitsubishi CP-D70DW, CP-D707DW, CP-K60DW-S, and CP-D80DW
    Kodak 305
    Fuji ASK-300
-   Citizen CW-02, and CX2
+   Citizen CW-02 and CX2
    Olmec OP900/OP900II
    ICI Imagedata OP900
    Sony UP-CR10L (aka DNP DS-SL10)
@@ -586,13 +588,10 @@
 
    Verified supported printers:
 
-    DNP DS40
-    DNP DS80
-    DNP DS-RX1
+    DNP DS40 / Citizen CX
+    DNP DS80 / Citizen CX-W
+    DNP DS-RX1 / DNP DS-RX1HS / Citizen CY
     DNP DS620
-    Citizen CX
-    Citizen CX-W
-    Citizen CY
 
    Theoretically supported printers:  (Untested)
 

backend_dnpds40.c

@@ -203,6 +203,8 @@ static void dnpds40_cleanup_string(char *start, int len)
 static char *dnpds40_media_types(int media)
 {
 	switch (media) {
+	case 100: return "UNKNOWN100"; // seen in driver dumps
+	case 110: return "UNKNOWN110"; // seen in driver dumps
 	case 200: return "5x3.5 (L)";
 	case 210: return "5x7 (2L)";
 	case 300: return "6x4 (PC)";
@@ -588,9 +590,13 @@ static void dnpds40_attach(void *vctx, struct libusb_device_handle *dev,
 	case P_DNP_DSRX1:
 		ctx->supports_counterp = 1;
 		ctx->supports_matte = 1;
-		ctx->supports_mqty_default = 1; // 1.10 does. Maybe older too?
 		if (FW_VER_CHECK(1,10))
-			ctx->supports_2x6 = 1;
+			ctx->supports_2x6 = ctx->supports_mqty_default = 1;
+		if (FW_VER_CHECK(2,00)) { /* AKA RX1HS */
+			ctx->supports_iserial = 1;
+			ctx->supports_mqty_default = 0;  /* Yes, removed! */
+			// XXX luster?
+		}
 		break;
 	case P_DNP_DS620:
 		ctx->supports_counterp = 1;
@@ -2085,7 +2091,7 @@ 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.78",
+	.version = "0.79",
 	.uri_prefix = "dnpds40",
 	.cmdline_usage = dnpds40_cmdline,
 	.cmdline_arg = dnpds40_cmdline_arg,