summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDidier Raboud <odyx@debian.org>2016-02-16 15:15:42 +0100
committerDidier Raboud <odyx@debian.org>2016-02-16 15:15:42 +0100
commita313257bdec71bc92a56598e74d9097c16cb6e48 (patch)
treebce77ca349366ab4c81d847e710693fb50d55620 /src
parent82a5e2a21f1cc4ea142514a1a045a63158f10256 (diff)
Imported Upstream version 5.2.11
Diffstat (limited to 'src')
-rw-r--r--src/cups/Makefile.am4
-rw-r--r--src/cups/Makefile.in21
-rw-r--r--src/cups/backend_common.c9
-rw-r--r--src/cups/backend_common.h1
-rw-r--r--src/cups/dnpds40_print.c16
-rw-r--r--src/cups/genppd.c21
-rw-r--r--src/cups/mitsu70x_print.c2
-rw-r--r--src/cups/shinko_s6145_print.c2392
-rw-r--r--src/main/print-olympus.c334
-rw-r--r--src/main/print-pcl.c90
-rw-r--r--src/xml/escp2/model/Makefile.am5
-rw-r--r--src/xml/escp2/model/Makefile.in3
-rw-r--r--src/xml/escp2/model/model_122.xml188
-rw-r--r--src/xml/printers.xml10
14 files changed, 2899 insertions, 197 deletions
diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am
index d4789ad..4e1fd1c 100644
--- a/src/cups/Makefile.am
+++ b/src/cups/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.151 2015/10/05 13:55:40 speachy Exp $
+## $Id: Makefile.am,v 1.152 2015/11/18 13:29:29 speachy Exp $
## Copyright (C) 2000 Roger Leigh
##
## This program is free software; you can redistribute it and/or modify
@@ -115,7 +115,7 @@ commandtoepson_SOURCES = commandtoepson.c
commandtoepson_LDADD = $(CUPS_LIBS)
if BUILD_LIBUSB_BACKENDS
-backend_gutenprint_SOURCES = selphy_print.c kodak1400_print.c kodak6800_print.c kodak605_print.c shinko_s2145_print.c sony_updr150_print.c dnpds40_print.c mitsu70x_print.c citizencw01_print.c mitsu9550_print.c backend_common.c backend_common.h shinko_s1245_print.c shinko_s6245_print.c
+backend_gutenprint_SOURCES = selphy_print.c kodak1400_print.c kodak6800_print.c kodak605_print.c shinko_s2145_print.c sony_updr150_print.c dnpds40_print.c mitsu70x_print.c citizencw01_print.c mitsu9550_print.c backend_common.c backend_common.h shinko_s1245_print.c shinko_s6145_print.c shinko_s6245_print.c
backend_gutenprint_LDADD = $(LIBUSB_LIBS)
backend_gutenprint_CPPFLAGS = $(LIBUSB_CFLAGS) -DURI_PREFIX=\"gutenprint$(GUTENPRINT_MAJOR_VERSION)$(GUTENPRINT_MINOR_VERSION)+usb\" -DLIBUSB_PRE_1_0_10
diff --git a/src/cups/Makefile.in b/src/cups/Makefile.in
index 2074e88..2139d69 100644
--- a/src/cups/Makefile.in
+++ b/src/cups/Makefile.in
@@ -129,7 +129,8 @@ am__backend_gutenprint_SOURCES_DIST = selphy_print.c kodak1400_print.c \
kodak6800_print.c kodak605_print.c shinko_s2145_print.c \
sony_updr150_print.c dnpds40_print.c mitsu70x_print.c \
citizencw01_print.c mitsu9550_print.c backend_common.c \
- backend_common.h shinko_s1245_print.c shinko_s6245_print.c
+ backend_common.h shinko_s1245_print.c shinko_s6145_print.c \
+ shinko_s6245_print.c
@BUILD_LIBUSB_BACKENDS_TRUE@am_backend_gutenprint_OBJECTS = backend_gutenprint-selphy_print.$(OBJEXT) \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-kodak1400_print.$(OBJEXT) \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-kodak6800_print.$(OBJEXT) \
@@ -142,6 +143,7 @@ am__backend_gutenprint_SOURCES_DIST = selphy_print.c kodak1400_print.c \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-mitsu9550_print.$(OBJEXT) \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-backend_common.$(OBJEXT) \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-shinko_s1245_print.$(OBJEXT) \
+@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-shinko_s6145_print.$(OBJEXT) \
@BUILD_LIBUSB_BACKENDS_TRUE@ backend_gutenprint-shinko_s6245_print.$(OBJEXT)
backend_gutenprint_OBJECTS = $(am_backend_gutenprint_OBJECTS)
am__DEPENDENCIES_1 =
@@ -723,7 +725,7 @@ commandtocanon_SOURCES = commandtocanon.c
commandtocanon_LDADD = $(CUPS_LIBS)
commandtoepson_SOURCES = commandtoepson.c
commandtoepson_LDADD = $(CUPS_LIBS)
-@BUILD_LIBUSB_BACKENDS_TRUE@backend_gutenprint_SOURCES = selphy_print.c kodak1400_print.c kodak6800_print.c kodak605_print.c shinko_s2145_print.c sony_updr150_print.c dnpds40_print.c mitsu70x_print.c citizencw01_print.c mitsu9550_print.c backend_common.c backend_common.h shinko_s1245_print.c shinko_s6245_print.c
+@BUILD_LIBUSB_BACKENDS_TRUE@backend_gutenprint_SOURCES = selphy_print.c kodak1400_print.c kodak6800_print.c kodak605_print.c shinko_s2145_print.c sony_updr150_print.c dnpds40_print.c mitsu70x_print.c citizencw01_print.c mitsu9550_print.c backend_common.c backend_common.h shinko_s1245_print.c shinko_s6145_print.c shinko_s6245_print.c
@BUILD_LIBUSB_BACKENDS_TRUE@backend_gutenprint_LDADD = $(LIBUSB_LIBS)
@BUILD_LIBUSB_BACKENDS_TRUE@backend_gutenprint_CPPFLAGS = $(LIBUSB_CFLAGS) -DURI_PREFIX=\"gutenprint$(GUTENPRINT_MAJOR_VERSION)$(GUTENPRINT_MINOR_VERSION)+usb\" -DLIBUSB_PRE_1_0_10
cups_genppd_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
@@ -1123,6 +1125,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-selphy_print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-shinko_s1245_print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-shinko_s2145_print.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-shinko_s6145_print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-shinko_s6245_print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/backend_gutenprint-sony_updr150_print.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandtocanon.Po@am__quote@
@@ -1324,6 +1327,20 @@ backend_gutenprint-shinko_s1245_print.obj: shinko_s1245_print.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backend_gutenprint-shinko_s1245_print.obj `if test -f 'shinko_s1245_print.c'; then $(CYGPATH_W) 'shinko_s1245_print.c'; else $(CYGPATH_W) '$(srcdir)/shinko_s1245_print.c'; fi`
+backend_gutenprint-shinko_s6145_print.o: shinko_s6145_print.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backend_gutenprint-shinko_s6145_print.o -MD -MP -MF $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Tpo -c -o backend_gutenprint-shinko_s6145_print.o `test -f 'shinko_s6145_print.c' || echo '$(srcdir)/'`shinko_s6145_print.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Tpo $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shinko_s6145_print.c' object='backend_gutenprint-shinko_s6145_print.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backend_gutenprint-shinko_s6145_print.o `test -f 'shinko_s6145_print.c' || echo '$(srcdir)/'`shinko_s6145_print.c
+
+backend_gutenprint-shinko_s6145_print.obj: shinko_s6145_print.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backend_gutenprint-shinko_s6145_print.obj -MD -MP -MF $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Tpo -c -o backend_gutenprint-shinko_s6145_print.obj `if test -f 'shinko_s6145_print.c'; then $(CYGPATH_W) 'shinko_s6145_print.c'; else $(CYGPATH_W) '$(srcdir)/shinko_s6145_print.c'; fi`
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Tpo $(DEPDIR)/backend_gutenprint-shinko_s6145_print.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='shinko_s6145_print.c' object='backend_gutenprint-shinko_s6145_print.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o backend_gutenprint-shinko_s6145_print.obj `if test -f 'shinko_s6145_print.c'; then $(CYGPATH_W) 'shinko_s6145_print.c'; else $(CYGPATH_W) '$(srcdir)/shinko_s6145_print.c'; fi`
+
backend_gutenprint-shinko_s6245_print.o: shinko_s6245_print.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(backend_gutenprint_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT backend_gutenprint-shinko_s6245_print.o -MD -MP -MF $(DEPDIR)/backend_gutenprint-shinko_s6245_print.Tpo -c -o backend_gutenprint-shinko_s6245_print.o `test -f 'shinko_s6245_print.c' || echo '$(srcdir)/'`shinko_s6245_print.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/backend_gutenprint-shinko_s6245_print.Tpo $(DEPDIR)/backend_gutenprint-shinko_s6245_print.Po
diff --git a/src/cups/backend_common.c b/src/cups/backend_common.c
index 02aa923..4d682a8 100644
--- a/src/cups/backend_common.c
+++ b/src/cups/backend_common.c
@@ -27,7 +27,7 @@
#include "backend_common.h"
-#define BACKEND_VERSION "0.62G"
+#define BACKEND_VERSION "0.63G"
#ifndef URI_PREFIX
#error "Must Define URI_PREFIX"
#endif
@@ -371,7 +371,7 @@ static int print_scan_output(struct libusb_device *device,
int dlen = 0;
struct deviceid_dict dict[MAX_DICT];
- char *ieee_id;
+ char *ieee_id = NULL;
if (libusb_open(device, &dev)) {
ERROR("Could not open device %04x:%04x (need to be root?)\n", desc->idVendor, desc->idProduct);
@@ -516,8 +516,6 @@ static int print_scan_output(struct libusb_device *device,
descr, descr,
ieee_id? ieee_id : "");
- if (ieee_id)
- free(ieee_id);
}
/* If a serial number was passed down, use it. */
@@ -530,6 +528,7 @@ static int print_scan_output(struct libusb_device *device,
if(manuf) free(manuf);
if(product) free(product);
if(descr) free(descr);
+ if(ieee_id) free(ieee_id);
libusb_close(dev);
abort:
@@ -564,7 +563,7 @@ static struct dyesub_backend *backends[] = {
&kodak1400_backend,
&shinkos1245_backend,
&shinkos2145_backend,
-// &shinkos6145_backend,
+ &shinkos6145_backend,
&shinkos6245_backend,
&updr150_backend,
&mitsu70x_backend,
diff --git a/src/cups/backend_common.h b/src/cups/backend_common.h
index 9b32071..a220f2c 100644
--- a/src/cups/backend_common.h
+++ b/src/cups/backend_common.h
@@ -103,6 +103,7 @@ enum {
P_SHINKO_S1245,
P_SHINKO_S6245,
P_SHINKO_S6145,
+ P_SHINKO_S6145D,
P_SONY_UPDR150,
P_SONY_UPCR10,
P_MITSU_D70X,
diff --git a/src/cups/dnpds40_print.c b/src/cups/dnpds40_print.c
index 47ff498..fdec638 100644
--- a/src/cups/dnpds40_print.c
+++ b/src/cups/dnpds40_print.c
@@ -198,7 +198,7 @@ static char *dnpds40_statuses(int status)
break;
}
- return "Unkown Error";
+ return "Unknown Error";
}
static int dnpds40_do_cmd(struct dnpds40_ctx *ctx,
@@ -720,6 +720,7 @@ static int dnpds40_read_parse(void *vctx, int data_fd) {
ERROR("Incorrect media for job loaded (%d vs %d)\n", ctx->media, ctx->multicut);
return CUPS_BACKEND_CANCEL;
}
+ break;
case 510: //"8x12"
if (ctx->multicut < 6 || ctx->multicut > 21) {
ERROR("Incorrect media for job loaded (%d vs %d)\n", ctx->media, ctx->multicut);
@@ -963,11 +964,12 @@ top:
if (ctx->type != P_DNP_DS620 && i > 0)
i -= 50;
}
-
+#if 0
if (i < 1) {
ERROR("Printer out of media, please correct!\n");
return CUPS_BACKEND_STOP;
}
+#endif
if (i < copies) {
WARNING("Printer does not have sufficient remaining media to complete job..\n");
}
@@ -1056,11 +1058,11 @@ static int dnpds40_get_sensors(struct dnpds40_ctx *ctx)
INFO("Roll Paper End 1 : %s\n", val);
} else if (!strcmp("RP2", tok)) {
INFO("Roll Paper End 2 : %s\n", val);
- } else if (!strcmp("GSR", tok)) {
+ } else if (!strcmp("CSR", tok)) {
INFO("Color Sensor Red : %s\n", val);
- } else if (!strcmp("GSG", tok)) {
+ } else if (!strcmp("CSG", tok)) {
INFO("Color Sensor Green : %s\n", val);
- } else if (!strcmp("GSB", tok)) {
+ } else if (!strcmp("CSB", tok)) {
INFO("Color Sensor Blue : %s\n", val);
} else {
INFO("Unknown Sensor: '%s' '%s'\n",
@@ -1665,7 +1667,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.61",
+ .version = "0.61.2",
.uri_prefix = "dnpds40",
.cmdline_usage = dnpds40_cmdline,
.cmdline_arg = dnpds40_cmdline_arg,
@@ -1680,7 +1682,7 @@ struct dyesub_backend dnpds40_backend = {
{ USB_VID_CITIZEN, USB_PID_DNP_DS80, P_DNP_DS80, ""},
{ USB_VID_CITIZEN, USB_PID_DNP_DSRX1, P_DNP_DSRX1, ""},
{ USB_VID_DNP, USB_PID_DNP_DS620, P_DNP_DS620, ""},
-// { USB_VID_DNP, USB_PID_DNP_DS80D, P_DNP_DS80, ""},
+// { USB_VID_DNP, USB_PID_DNP_DS80D, P_DNP_DS80D, ""},
// { USB_VID_CITIZEN, USB_PID_CITIZEN_CW-02, P_DNP_DS40, ""},
// { USB_VID_CITIZEN, USB_PID_CITIZEN_OP900II, P_DNP_DS40, ""},
{ 0, 0, 0, ""}
diff --git a/src/cups/genppd.c b/src/cups/genppd.c
index 8633611..f026246 100644
--- a/src/cups/genppd.c
+++ b/src/cups/genppd.c
@@ -1,5 +1,5 @@
/*
- * "$Id: genppd.c,v 1.204 2015/09/13 14:37:16 speachy Exp $"
+ * "$Id: genppd.c,v 1.205 2015/10/17 16:27:18 rlk Exp $"
*
* PPD file generation program for the CUPS drivers.
*
@@ -1714,6 +1714,8 @@ print_one_option(gpFile fp, stp_vars_t *v, const stp_string_list_t *po,
print_close_ui = 0;
gpprintf(fp, "*CloseUI: *Stp%s\n\n", desc->name);
+#if 0
+ /* This needs to be enabled if/when dimensions become floating point */
/*
* Add custom option code and value parameter...
*/
@@ -1722,6 +1724,7 @@ print_one_option(gpFile fp, stp_vars_t *v, const stp_string_list_t *po,
gpprintf(fp, "*ParamCustomStp%s Value/%s: 1 points %d %d\n\n",
desc->name, _("Value"), desc->bounds.dimension.lower,
desc->bounds.dimension.upper);
+#endif
break;
case STP_PARAMETER_TYPE_INT:
@@ -1755,15 +1758,6 @@ print_one_option(gpFile fp, stp_vars_t *v, const stp_string_list_t *po,
print_close_ui = 0;
gpprintf(fp, "*CloseUI: *Stp%s\n\n", desc->name);
- /*
- * Add custom option code and value parameter...
- */
-
- gpprintf(fp, "*CustomStp%s True: \"pop\"\n", desc->name);
- gpprintf(fp, "*ParamCustomStp%s Value/%s: 1 int %d %d\n\n", desc->name,
- _("Value"), desc->bounds.dimension.lower,
- desc->bounds.dimension.upper);
-
break;
default:
break;
@@ -1855,8 +1849,11 @@ print_one_localization(gpFile fp, const stp_string_list_t *po,
gpprintf(fp, "*%s.Stp%s %d/%s: \"\"\n", lang,
desc->name, i, dimstr);
}
+#if 0
+ /* This needs to be enabled if/when dimensions are floating point */
gpprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
desc->name, _("Value"));
+#endif
break;
case STP_PARAMETER_TYPE_INT:
@@ -1871,8 +1868,6 @@ print_one_localization(gpFile fp, const stp_string_list_t *po,
gpprintf(fp, "*%s.Stp%s %d/%d: \"\"\n", lang, desc->name, i, i);
}
}
- gpprintf(fp, "*%s.ParamCustomStp%s Value/%s: \"\"\n", lang,
- desc->name, _("Value"));
break;
default:
@@ -2747,5 +2742,5 @@ write_ppd(
/*
- * End of "$Id: genppd.c,v 1.204 2015/09/13 14:37:16 speachy Exp $".
+ * End of "$Id: genppd.c,v 1.205 2015/10/17 16:27:18 rlk Exp $".
*/
diff --git a/src/cups/mitsu70x_print.c b/src/cups/mitsu70x_print.c
index dcff841..18b9218 100644
--- a/src/cups/mitsu70x_print.c
+++ b/src/cups/mitsu70x_print.c
@@ -594,7 +594,7 @@ static int mitsu70x_cmdline_arg(void *vctx, int argc, char **argv)
/* Exported */
struct dyesub_backend mitsu70x_backend = {
.name = "Mitsubishi CP-D70/D707/K60",
- .version = "0.32",
+ .version = "0.32WIP",
.uri_prefix = "mitsu70x",
.cmdline_usage = mitsu70x_cmdline,
.cmdline_arg = mitsu70x_cmdline_arg,
diff --git a/src/cups/shinko_s6145_print.c b/src/cups/shinko_s6145_print.c
new file mode 100644
index 0000000..ee5a45a
--- /dev/null
+++ b/src/cups/shinko_s6145_print.c
@@ -0,0 +1,2392 @@
+/*
+ * Shinko/Sinfonia CHC-S6145 CUPS backend -- libusb-1.0 version
+ *
+ * (c) 2013-2015 Solomon Peachy <pizza@shaftnet.org>
+ *
+ * Low-level documentation was provided by Sinfonia. Thank you!
+ *
+ * The latest version of this program can be found at:
+ *
+ * http://git.shaftnet.org/cgit/selphy_print.git
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * [http://www.gnu.org/licenses/gpl-2.0.html]
+ *
+ * An additional permission is granted, under the GPLv2 section 10, to combine
+ * and/or redistribute this program with the proprietary libS6145ImageProcess
+ * library, providing you have *written permission* from Sinfonia Technology
+ * Co. LTD to use and/or redistribute that library.
+ *
+ * You must still adhere to all other terms of the license to this program
+ * (ie GPLv2) and the license of the libS6145ImageProcess library.
+ *
+ * Please note that the authors of this program *do not* have permission to
+ * redistribute this library, which was provided only in binary form.
+ *
+ * */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <signal.h>
+#include <time.h>
+
+#define BACKEND shinkos6145_backend
+
+#include "backend_common.h"
+
+#if defined(WITH_6145_LIB)
+/* Note that this is a proprietary library, and *NOT* GPL compatible! */
+#include "libS6145ImageProcess.h"
+#endif
+
+enum {
+ S_IDLE = 0,
+ S_PRINTER_READY_CMD,
+ S_PRINTER_SENT_DATA,
+ S_FINISHED,
+};
+
+/* Structure of printjob header. All fields are LITTLE ENDIAN */
+struct s6145_printjob_hdr {
+ uint32_t len1; /* Fixed at 0x10 */
+ uint32_t model; /* Equal to the printer model (eg '6245' or '1245' decimal) */
+ uint32_t media_w; /* 0x02 for 5", 0x03 for 6" */
+ uint32_t unk3; /* Fixed at 0x01 */
+
+ uint32_t len2; /* Fixed at 0x64 */
+ uint32_t unk5;
+ uint32_t media; /* 0x08 5x5, 0x03 5x7, 0x07 2x6, 0x00 4x6, 0x06 6x6/6x6+6x2/4x6*2/6x8 */
+ uint32_t unk6;
+
+ uint32_t method; /* 0x00 normal, 0x02 4x6*2, 0x04 2x6*2, 0x05 6x6+2x6 */
+ uint32_t qual; /* 0x00 default, 0x01 std */
+ uint32_t oc_mode; /* 0x00 default, 0x01 off, 0x02 glossy, 0x03 matte */
+ uint32_t unk8;
+
+ uint32_t unk9;
+ uint32_t columns;
+ uint32_t rows;
+ uint32_t copies;
+
+ uint32_t unk10;
+ uint32_t unk11;
+ uint32_t unk12;
+ uint32_t unk13;
+
+ uint32_t unk14;
+ uint32_t unk15;
+ uint32_t dpi; /* Fixed at '300' (decimal) */
+ uint32_t unk16;
+
+ uint32_t unk17;
+ uint32_t unk18;
+ uint32_t unk19;
+ uint32_t unk20;
+
+ uint32_t unk21;
+} __attribute__((packed));
+
+/* "Image Correction Parameter" File */
+// 128 bytes total, apparently an array of 32-bit values
+struct tankParamTable {
+ uint32_t trdTankSize;
+ uint32_t sndTankSize;
+ uint32_t fstTankSize;
+ uint32_t trdTankIniEnergy;
+ uint32_t sndTankIniEnergy;
+ uint32_t fstTankIniEnergy;
+ uint32_t trdTrdConductivity;
+ uint32_t sndSndConductivity;
+ uint32_t fstFstConductivity;
+ uint32_t outTrdConductivity;
+ uint32_t trdSndConductivity;
+ uint32_t sndFstConductivity;
+ uint32_t fstOutConductivity;
+ uint32_t plusMaxEnergy;
+ uint32_t minusMaxEnergy;
+ uint32_t plusMaxEnergyPreRead;
+ uint32_t minusMaxEnergyPreRead;
+ uint32_t preReadLevelDiff;
+ uint32_t rsvd[14]; // null?
+} __attribute__((packed));
+
+struct shinkos6145_correctionparam {
+ uint16_t pulseTransTable_Y[256]; // @0
+ uint16_t pulseTransTable_M[256]; // @512
+ uint16_t pulseTransTable_C[256]; // @1024
+ uint16_t pulseTransTable_O[256]; // @1536
+
+ uint16_t lineHistCoefTable_Y[256]; // @2048
+ uint16_t lineHistCoefTable_M[256]; // @2560
+ uint16_t lineHistCoefTable_C[256]; // @3072
+ uint16_t lineHistCoefTable_O[256]; // @3584
+
+ uint16_t lineCorrectEnvA_Y; // @4096
+ uint16_t lineCorrectEnvA_M; // @4098
+ uint16_t lineCorrectEnvA_C; // @4100
+ uint16_t lineCorrectEnvA_O; // @4102
+
+ uint16_t lineCorrectEnvB_Y; // @4104
+ uint16_t lineCorrectEnvB_M; // @4106
+ uint16_t lineCorrectEnvB_C; // @4108
+ uint16_t lineCorrectEnvB_O; // @4110
+
+ uint16_t lineCorrectEnvC_Y; // @4112
+ uint16_t lineCorrectEnvC_M; // @4114
+ uint16_t lineCorrectEnvC_C; // @4116
+ uint16_t lineCorrectEnvC_O; // @4118
+
+ uint32_t lineCorrectSlice_Y; // @4120
+ uint32_t lineCorrectSlice_M; // @4124
+ uint32_t lineCorrectSlice_C; // @4128
+ uint32_t lineCorrectSlice_O; // @4132
+
+ uint32_t lineCorrectSlice1Line_Y; // @4136
+ uint32_t lineCorrectSlice1Line_M; // @4140
+ uint32_t lineCorrectSlice1Line_C; // @4144
+ uint32_t lineCorrectSlice1Line_O; // @4148
+
+ uint32_t lineCorrectPulseMax_Y; // @4152 [array]
+ uint32_t lineCorrectPulseMax_M; // @4156 [array]
+ uint32_t lineCorrectPulseMax_C; // @4160 [array]
+ uint32_t lineCorrectPulseMax_O; // @4164 [array]
+
+ struct tankParamTable tableTankParam_Y; // @4168
+ struct tankParamTable tableTankParam_M; // @4296
+ struct tankParamTable tableTankParam_C; // @4424
+ struct tankParamTable tableTankParam_O; // @4552
+
+ uint16_t tankPlusMaxEnergyTable_Y[256]; // @4680
+ uint16_t tankPlusMaxEnergyTable_M[256]; // @5192
+ uint16_t tankPlusMaxEnergyTable_C[256]; // @5704
+ uint16_t tankPlusMaxEnergyTable_O[256]; // @6216
+
+ uint16_t tankMinusMaxEnergy_Y[256]; // @6728
+ uint16_t tankMinusMaxEnergy_M[256]; // @7240
+ uint16_t tankMinusMaxEnergy_C[256]; // @7752
+ uint16_t tankMinusMaxEnergy_O[256]; // @8264
+
+ uint16_t printMaxPulse_Y; // @8776
+ uint16_t printMaxPulse_M; // @8778
+ uint16_t printMaxPulse_C; // @8780
+ uint16_t printMaxPulse_O; // @8782
+
+ uint16_t mtfWeightH_Y; // @8784
+ uint16_t mtfWeightH_M; // @8786
+ uint16_t mtfWeightH_C; // @8788
+ uint16_t mtfWeightH_O; // @8790
+
+ uint16_t mtfWeightV_Y; // @8792
+ uint16_t mtfWeightV_M; // @8794
+ uint16_t mtfWeightV_C; // @8796
+ uint16_t mtfWeightV_O; // @8798
+
+ uint16_t mtfSlice_Y; // @8800
+ uint16_t mtfSlice_M; // @8802
+ uint16_t mtfSlice_C; // @8804
+ uint16_t mtfSlice_O; // @8806
+
+ uint16_t val_1; // @8808 // 1 enables linepreprintprocess
+ uint16_t val_2; // @8810 // 1 enables ctankprocess
+ uint16_t printOpLevel; // @8812
+ uint16_t matteMode; // @8814 // 1 for matte
+
+ uint16_t randomBase[4]; // @8816 [use lower byte of each]
+
+ uint16_t matteSize; // @8824
+ uint16_t matteGloss; // @8826
+ uint16_t matteDeglossBlk; // @8828
+ uint16_t matteDeglossWht; // @8830
+
+ uint16_t printSideOffset; // @8832
+ uint16_t headDots; // @8834 [always 0x0780, ie 1920. print width
+
+ uint16_t SideEdgeCoefTable[128]; // @8836
+ uint8_t rsvd_2[256]; // @9092, null?
+ uint16_t SideEdgeLvCoefTable[256]; // @9348
+ uint8_t rsvd_3[2572]; // @9860, null?
+
+ /* User-supplied data */
+ uint16_t width; // @12432
+ uint16_t height; // @12434
+ uint8_t pad[3948]; // @12436, null.
+} __attribute__((packed)); /* 16384 bytes */
+
+/* Private data stucture */
+struct shinkos6145_ctx {
+ struct libusb_device_handle *dev;
+ uint8_t endp_up;
+ uint8_t endp_down;
+ int type;
+
+ uint8_t jobid;
+
+ struct s6145_printjob_hdr hdr;
+
+ uint8_t image_avg[3]; /* CMY */
+
+ uint8_t *databuf;
+ size_t datalen;
+
+ struct shinkos6145_correctionparam *corrdata;
+ size_t corrdatalen;
+};
+
+static int shinkos6145_get_imagecorr(struct shinkos6145_ctx *ctx);
+
+/* Structs for printer */
+struct s6145_cmd_hdr {
+ uint16_t cmd;
+ uint16_t len; /* Not including this header */
+} __attribute__((packed));
+
+#define S6145_CMD_GETSTATUS 0x0001
+#define S6145_CMD_MEDIAINFO 0x0002
+#define S6145_CMD_ERRORLOG 0x0004
+#define S6145_CMD_GETPARAM 0x0005
+#define S6145_CMD_GETSERIAL 0x0006
+#define S6145_CMD_PRINTSTAT 0x0007
+#define S6145_CMD_EXTCOUNTER 0x0008
+#define S6145_CMD_MEMORYBANK 0x000A // Brava 21 only?
+
+#define S6145_CMD_PRINTJOB 0x4001
+#define S6145_CMD_CANCELJOB 0x4002
+#define S6145_CMD_FLASHLED 0x4003
+#define S6145_CMD_RESET 0x4004
+#define S6145_CMD_READTONE 0x4005
+#define S6145_CMD_SETPARAM 0x4007
+
+#define S6145_CMD_GETCORR 0x400D
+#define S6145_CMD_GETEEPROM 0x400E
+#define S6145_CMD_SETEEPROM 0x400F
+
+#define S6145_CMD_FWINFO 0xC003
+#define S6145_CMD_UPDATE 0xC004
+
+static char *cmd_names(uint16_t v) {
+ switch (le16_to_cpu(v)) {
+ case S6145_CMD_GETSTATUS:
+ return "Get Status";
+ case S6145_CMD_MEDIAINFO:
+ return "Get Media Info";
+ case S6145_CMD_ERRORLOG:
+ return "Get Error Log";
+ case S6145_CMD_GETPARAM:
+ return "Get Parameter";
+ case S6145_CMD_GETSERIAL:
+ return "Get Serial Number";
+ case S6145_CMD_PRINTSTAT:
+ return "Get Print ID Status";
+ case S6145_CMD_EXTCOUNTER:
+ return "Get Extended Counters";
+ case S6145_CMD_PRINTJOB:
+ return "Print";
+ case S6145_CMD_CANCELJOB:
+ return "Cancel Print";
+ case S6145_CMD_FLASHLED:
+ return "Flash LEDs";
+ case S6145_CMD_RESET:
+ return "Reset";
+ case S6145_CMD_READTONE:
+ return "Read Tone Curve";
+ case S6145_CMD_SETPARAM:
+ return "Set Parameter";
+ case S6145_CMD_GETCORR:
+ return "Get Image Correction Parameter";
+ case S6145_CMD_GETEEPROM:
+ return "Get EEPROM Backup Parameter";
+ case S6145_CMD_SETEEPROM:
+ return "Set EEPROM Backup Parameter";
+ case S6145_CMD_FWINFO:
+ return "Get Firmware Info";
+ case S6145_CMD_UPDATE:
+ return "Update";
+ default:
+ return "Unknown Command";
+ }
+};
+
+struct s6145_print_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t id;
+ uint16_t count;
+ uint16_t columns;
+ uint16_t rows;
+ uint8_t media; /* reserved in docs, but brava21 uses this */
+ uint8_t combo_wait;
+ uint8_t reserved[6];
+ uint8_t unk_1; /* Brava 21 sets this to 1 */
+ uint8_t method;
+ uint8_t image_avg;
+} __attribute__((packed));
+
+#define PRINT_MODE_NO_OC 0x01
+#define PRINT_MODE_GLOSSY 0x02
+#define PRINT_MODE_MATTE 0x03
+
+#if 0
+static char *print_modes(uint8_t v) {
+ switch (v) {
+ case PRINT_MODE_NO_OC:
+ return "No Overcoat";
+ case PRINT_MODE_GLOSSY:
+ return "Glossy";
+ case PRINT_MODE_MATTE:
+ return "Matte";
+ default:
+ return "Unknown";
+ }
+}
+#endif
+
+#define PRINT_METHOD_STD 0x00
+#define PRINT_METHOD_COMBO_2 0x02
+#define PRINT_METHOD_SPLIT 0x04
+#define PRINT_METHOD_DOUBLE 0x08
+#define PRINT_METHOD_NOTRIM 0x80
+
+static char *print_methods (uint8_t v) {
+ switch (v & 0xf) {
+ case PRINT_METHOD_STD:
+ return "Standard";
+ case PRINT_METHOD_COMBO_2:
+ return "2up";
+ case PRINT_METHOD_SPLIT:
+ return "Split";
+ case PRINT_METHOD_DOUBLE:
+ return "Double";
+ default:
+ return "Unknown";
+ }
+}
+
+struct s6145_cancel_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t id;
+} __attribute__((packed));
+
+struct s6145_reset_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+ uint8_t curveid;
+} __attribute__((packed));
+
+#define RESET_PRINTER 0x03
+#define RESET_TONE_CURVE 0x04
+
+#define TONE_CURVE_ID 0x01
+
+struct s6145_readtone_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+ uint8_t curveid;
+} __attribute__((packed));
+
+#define READ_TONE_CURVE_USER 0x01
+#define READ_TONE_CURVE_CURR 0x02
+
+struct s6145_setparam_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+ uint32_t param;
+} __attribute__((packed));
+
+#define PARAM_OC_PRINT 0x20
+#define PARAM_PAPER_PRESV 0x3d
+#define PARAM_DRIVER_MODE 0x3e
+#define PARAM_PAPER_MODE 0x3f
+#define PARAM_REGION_CODE 0x53 // Brava 21 only?
+#define PARAM_SLEEP_TIME 0x54
+
+
+#define PARAM_OC_PRINT_OFF 0x00000001
+#define PARAM_OC_PRINT_GLOSS 0x00000002
+#define PARAM_OC_PRINT_MATTE 0x00000003
+
+#define PARAM_PAPER_PRESV_OFF 0x00000000
+#define PARAM_PAPER_PRESV_ON 0x00000001
+
+#define PARAM_DRIVER_WIZOFF 0x00000000
+#define PARAM_DRIVER_WIZON 0x00000001
+
+#define PARAM_PAPER_NOCUT 0x00000000
+#define PARAM_PAPER_CUTLOAD 0x00000001
+
+#define PARAM_SLEEP_5MIN 0x00000000
+#define PARAM_SLEEP_15MIN 0x00000001
+#define PARAM_SLEEP_30MIN 0x00000002
+#define PARAM_SLEEP_60MIN 0x00000003
+#define PARAM_SLEEP_120MIN 0x00000004
+#define PARAM_SLEEP_240MIN 0x00000005
+
+struct s6145_seteeprom_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t data[256]; /* Maxlen */
+} __attribute__((packed));
+
+struct s6145_errorlog_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint16_t index; /* 0 is latest */
+} __attribute__((packed));
+
+struct s6145_getparam_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+} __attribute__((packed));
+
+struct s6145_getprintidstatus_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t id;
+} __attribute__((packed));
+
+struct s6145_fwinfo_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+} __attribute__((packed));
+
+#define FWINFO_TARGET_MAIN_BOOT 0x01
+#define FWINFO_TARGET_MAIN_APP 0x02
+#define FWINFO_TARGET_PRINT_TABLES 0x03
+#define FWINFO_TARGET_DSP 0x04
+
+static char *fwinfo_targets (uint8_t v) {
+ switch (v) {
+ case FWINFO_TARGET_MAIN_BOOT:
+ return "Main Boot ";
+ case FWINFO_TARGET_MAIN_APP:
+ return "Main App ";
+ case FWINFO_TARGET_DSP:
+ return "DSP ";
+ case FWINFO_TARGET_PRINT_TABLES:
+ return "Print Tables";
+ default:
+ return "Unknown ";
+ }
+}
+
+struct s6145_update_cmd {
+ struct s6145_cmd_hdr hdr;
+ uint8_t target;
+ uint8_t curve_id;
+ uint8_t reset; // ??
+ uint8_t reserved[3];
+ uint32_t size;
+} __attribute__((packed));
+
+#define UPDATE_TARGET_USER 0x03
+#define UPDATE_TARGET_CURRENT 0x04
+
+static char *update_targets (uint8_t v) {
+ switch (v) {
+ case UPDATE_TARGET_USER:
+ return "User";
+ case UPDATE_TARGET_CURRENT:
+ return "Current";
+ default:
+ return "Unknown";
+ }
+}
+
+#define UPDATE_SIZE 0x600
+/* Update is three channels, Y, M, C;
+ each is 256 entries of 11-bit data padded to 16-bits.
+ Printer expects LE data. We use BE data on disk.
+*/
+
+struct s6145_status_hdr {
+ uint8_t result;
+ uint8_t error;
+ uint8_t printer_major;
+ uint8_t printer_minor;
+ uint8_t reserved[3];
+ uint8_t status;
+ uint16_t payload_len;
+} __attribute__((packed));
+
+#define RESULT_SUCCESS 0x01
+#define RESULT_FAIL 0x02
+
+#define ERROR_NONE 0x00
+#define ERROR_INVALID_PARAM 0x01
+#define ERROR_MAIN_APP_INACTIVE 0x02
+#define ERROR_COMMS_TIMEOUT 0x03
+#define ERROR_MAINT_NEEDED 0x04
+#define ERROR_BAD_COMMAND 0x05
+#define ERROR_PRINTER 0x11
+#define ERROR_BUFFER_FULL 0x21
+
+static char *error_codes(uint8_t major, uint8_t minor)
+{
+ switch(major) {
+ case 0x01: /* "Controller Error" */
+ switch(minor) {
+ case 0x01:
+ return "Controller: EEPROM Write Timeout";
+ case 0x0A:
+ return "Controller: Invalid Print Parameter Table";
+ case 0x0C:
+ return "Controller: Print Parameter Table Mismatch";
+ case 0x0F:
+ return "Controller: Main FW Checksum";
+ case 0x10:
+ return "Controller: Flash Write Failed";
+ case 0x13:
+ return "Controller: Print Parameter Table Checksum";
+ case 0x14:
+ return "Controller: Print Parameter Table Write Failed";
+ case 0x15:
+ return "Controller: User Tone Curve Write Failed";
+ case 0x16:
+ return "Controller: MSP Communication";
+ case 0x17:
+ return "Controller: THV Autotuning";
+ case 0x18:
+ return "Controller: THV Value Out of Range";
+ case 0x19:
+ return "Controller: Thermal Head";
+ case 0x1A:
+ return "Controller: Wake from Power Save Failed";
+ default:
+ return "Controller: Unknown";
+ }
+ case 0x02: /* "Mechanical Error" */
+ switch (minor) {
+ case 0x01:
+ return "Mechanical: Pinch Head Home";
+ case 0x02:
+ return "Mechanical: Pinch Head (position 1)";
+ case 0x03:
+ return "Mechanical: Pinch Head (position 2)";
+ case 0x04:
+ return "Mechanical: Pinch Head (position 3)";
+ case 0x0B:
+ return "Mechanical: Cutter (Right)";
+ case 0x0C:
+ return "Mechanical: Cutter (Left)";
+ default:
+ return "Mechanical: Unknown";
+ }
+ case 0x03: /* "Sensor Error" */
+ switch (minor) {
+ case 0x01:
+ return "Sensor: Head Up";
+ case 0x02:
+ return "Sensor: Head Down";
+ case 0x0B:
+ return "Sensor: Cutter Left";
+ case 0x0C:
+ return "Sensor: Cutter Right";
+ case 0x0D:
+ return "Sensor: Cutter Left+Right";
+ case 0x15:
+ return "Sensor: Head Up Unstable";
+ case 0x16:
+ return "Sensor: Head Down Unstable";
+ case 0x17:
+ return "Sensor: Cutter Left Unstable";
+ case 0x18:
+ return "Sensor: Cutter Right Unstable";
+ case 0x19:
+ return "Sensor: Cover Open Unstable";
+ case 0x1E:
+ return "Sensor: Ribbon Mark (Cyan)";
+ case 0x1F:
+ return "Sensor: Ribbon Mark (OC)";
+ default:
+ return "Sensor: Unknown";
+ }
+ case 0x04: /* "Temperature Sensor Error" */
+ switch (minor) {
+ case 0x01:
+ return "Temp Sensor: Thermal Head Low";
+ case 0x02:
+ return "Temp Sensor: Thermal Head High";
+ case 0x05:
+ return "Temp Sensor: Environment Low";
+ case 0x06:
+ return "Temp Sensor: Environment High";
+ case 0x07:
+ return "Temp Sensor: Preheat";
+ case 0x08:
+ return "Temp Sensor: Thermal Protect";
+ default:
+ return "Temp Sensor: Unknown";
+ }
+ case 0x5: /* "Paper Jam" */
+ switch (minor) {
+ case 0x01:
+ return "Paper Jam: Loading Paper Top On";
+ case 0x02:
+ return "Paper Jam: Loading Print Position On";
+ case 0x03:
+ return "Paper Jam: Loading Print Position Off";
+ case 0x04:
+ return "Paper Jam: Loading Paper Top Off";
+ case 0x05:
+ return "Paper Jam: Loading Cut Print Position Off";
+ case 0x0C:
+ return "Paper Jam: Initializing Print Position Off";
+ case 0x0D:
+ return "Paper Jam: Initializing Print Position On";
+ case 0x15:
+ return "Paper Jam: Printing Print Position Off";
+ case 0x16:
+ return "Paper Jam: Printing Paper Top On";
+ case 0x17:
+ return "Paper Jam: Printing Paper Top Off";
+ case 0x1F:
+ return "Paper Jam: Precut Print Position Off";
+ case 0x20:
+ return "Paper Jam: Precut Print Position On";
+
+ case 0x29:
+ return "Paper Jam: Printing Paper Top On";
+ case 0x2A:
+ return "Paper Jam: Printing Pre-Yellow Print Position Off";
+ case 0x2B:
+ return "Paper Jam: Printing Yellow Print Position Off";
+ case 0x2C:
+ return "Paper Jam: Printing Yellow Print Position On";
+ case 0x2D:
+ return "Paper Jam: Printing Pre-Magenta Print Position Off";
+ case 0x2E:
+ return "Paper Jam: Printing Magenta Print Position On";
+ case 0x2F:
+ return "Paper Jam: Printing Magenta Print Position Off";
+ case 0x30:
+ return "Paper Jam: Printing Pre-Cyan Print Position Off";
+ case 0x31:
+ return "Paper Jam: Printing Cyan Print Position On";
+ case 0x32:
+ return "Paper Jam: Printing Cyan Print Position Off";
+ case 0x33:
+ return "Paper Jam: Printing Pre-OC Print Position Off";
+ case 0x34:
+ return "Paper Jam: Printing OC Print Position On";
+ case 0x35:
+ return "Paper Jam: Printing OC Print Position Off";
+ case 0x36:
+ return "Paper Jam: Cut Print Position Off";
+ case 0x37:
+ return "Paper Jam: Home Position Off";
+ case 0x38:
+ return "Paper Jam: Paper Top Off";
+ case 0x39:
+ return "Paper Jam: Print Position On";
+
+ case 0x51:
+ return "Paper Jam: Paper Empty On, Top On, Position On";
+ case 0x52:
+ return "Paper Jam: Paper Empty On, Top On, Position Off";
+ case 0x54:
+ return "Paper Jam: Paper Empty On, Top Off, Position Off";
+ case 0x60:
+ return "Paper Jam: Cutter Right";
+ case 0x61:
+ return "Paper Jam: Cutter Left";
+
+ default:
+ return "Paper Jam: Unknown";
+ }
+ case 0x06: /* User Error */
+ switch (minor) {
+ case 0x01:
+ return "Drawer Unit Open";
+ case 0x02:
+ return "Incorrect Ribbon";
+ case 0x04:
+ return "Ribbon Empty";
+ case 0x08:
+ return "No Paper";
+ case 0x0C:
+ return "Paper End";
+ default:
+ return "Unknown";
+ }
+ default:
+ return "Unknown";
+ }
+}
+
+static char *error_str(uint8_t v) {
+ switch (v) {
+ case ERROR_NONE:
+ return "None";
+ case ERROR_INVALID_PARAM:
+ return "Invalid Command Parameter";
+ case ERROR_MAIN_APP_INACTIVE:
+ return "Main App Inactive";
+ case ERROR_COMMS_TIMEOUT:
+ return "Main Communication Timeout";
+ case ERROR_MAINT_NEEDED:
+ return "Maintainence Needed";
+ case ERROR_BAD_COMMAND:
+ return "Inappropriate Command";
+ case ERROR_PRINTER:
+ return "Printer Error";
+ case ERROR_BUFFER_FULL:
+ return "Buffer Full";
+ default:
+ return "Unknown";
+ }
+}
+
+#define STATUS_READY 0x00
+#define STATUS_INIT_CPU 0x31
+#define STATUS_INIT_RIBBON 0x32
+#define STATUS_INIT_PAPER 0x33
+#define STATUS_THERMAL_PROTECT 0x34
+#define STATUS_USING_PANEL 0x35
+#define STATUS_SELF_DIAG 0x36
+#define STATUS_DOWNLOADING 0x37
+
+#define STATUS_FEEDING_PAPER 0x61
+#define STATUS_PRE_HEAT 0x62
+#define STATUS_PRINT_Y 0x63
+#define STATUS_BACK_FEED_Y 0x64
+#define STATUS_PRINT_M 0x65
+#define STATUS_BACK_FEED_M 0x66
+#define STATUS_PRINT_C 0x67
+#define STATUS_BACK_FEED_C 0x68
+#define STATUS_PRINT_OP 0x69
+#define STATUS_PAPER_CUT 0x6A
+#define STATUS_PAPER_EJECT 0x6B
+#define STATUS_BACK_FEED_E 0x6C
+
+static char *status_str(uint8_t v) {
+ switch (v) {
+ case STATUS_READY:
+ return "Ready";
+ case STATUS_INIT_CPU:
+ return "Initializing CPU";
+ case STATUS_INIT_RIBBON:
+ return "Initializing Ribbon";
+ case STATUS_INIT_PAPER:
+ return "Loading Paper";
+ case STATUS_THERMAL_PROTECT:
+ return "Thermal Protection";
+ case STATUS_USING_PANEL:
+ return "Using Operation Panel";
+ case STATUS_SELF_DIAG:
+ return "Processing Self Diagnosis";
+ case STATUS_DOWNLOADING:
+ return "Processing Download";
+ case STATUS_FEEDING_PAPER:
+ return "Feeding Paper";
+ case STATUS_PRE_HEAT:
+ return "Pre-Heating";
+ case STATUS_PRINT_Y:
+ return "Printing Yellow";
+ case STATUS_BACK_FEED_Y:
+ return "Back-Feeding - Yellow Complete";
+ case STATUS_PRINT_M:
+ return "Printing Magenta";
+ case STATUS_BACK_FEED_M:
+ return "Back-Feeding - Magenta Complete";
+ case STATUS_PRINT_C:
+ return "Printing Cyan";
+ case STATUS_BACK_FEED_C:
+ return "Back-Feeding - Cyan Complete";
+ case STATUS_PRINT_OP:
+ return "Laminating";
+ case STATUS_PAPER_CUT:
+ return "Cutting Paper";
+ case STATUS_PAPER_EJECT:
+ return "Ejecting Paper";
+ case STATUS_BACK_FEED_E:
+ return "Back-Feeding - Ejected";
+ case ERROR_PRINTER:
+ return "Printer Error";
+ default:
+ return "Unknown";
+ }
+}
+
+struct s6145_status_resp {
+ struct s6145_status_hdr hdr;
+ uint32_t count_lifetime;
+ uint32_t count_maint;
+ uint32_t count_paper;
+ uint32_t count_cutter;
+ uint32_t count_head;
+ uint32_t count_ribbon_left;
+ uint32_t reserved;
+
+ uint8_t bank1_printid;
+ uint16_t bank1_remaining;
+ uint16_t bank1_finished;
+ uint16_t bank1_specified;
+ uint8_t bank1_status;
+
+ uint8_t bank2_printid;
+ uint16_t bank2_remaining;
+ uint16_t bank2_finished;
+ uint16_t bank2_specified;
+ uint8_t bank2_status;
+
+ uint8_t reserved2[16];
+ uint8_t tonecurve_status;
+ uint8_t reserved3[6];
+} __attribute__((packed));
+
+#define BANK_STATUS_FREE 0x00
+#define BANK_STATUS_XFER 0x01
+#define BANK_STATUS_FULL 0x02
+#define BANK_STATUS_PRINTING 0x12
+
+static char *bank_statuses(uint8_t v)
+{
+ switch (v) {
+ case BANK_STATUS_FREE:
+ return "Free";
+ case BANK_STATUS_XFER:
+ return "Xfer";
+ case BANK_STATUS_FULL:
+ return "Full";
+ case BANK_STATUS_PRINTING:
+ return "Printing";
+ default:
+ return "Unknown";
+ }
+}
+
+#define TONECURVE_INIT 0x00
+#define TONECURVE_USER 0x01
+#define TONECURVE_CURRENT 0x02
+
+static char *tonecurve_statuses (uint8_t v)
+{
+ switch(v) {
+ case 0:
+ return "Initial";
+ case 1:
+ return "UserSet";
+ case 2:
+ return "Current";
+ default:
+ return "Unknown";
+ }
+}
+
+struct s6145_geteeprom_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t data[256];
+} __attribute__((packed));
+
+struct s6145_readtone_resp {
+ struct s6145_status_hdr hdr;
+ uint16_t total_size;
+} __attribute__((packed));
+
+struct s6145_mediainfo_item {
+ uint8_t media_code;
+ uint16_t columns;
+ uint16_t rows;
+ uint8_t reserved;
+ uint8_t print_method; /* PRINT_METHOD_* */
+ uint8_t reserved2[3];
+} __attribute__((packed));
+
+#define MEDIA_4x6 0x00
+#define MEDIA_3_5x5 0x01
+#define MEDIA_5x7 0x03
+#define MEDIA_6x9 0x05
+#define MEDIA_6x8 0x06
+#define MEDIA_2x6 0x07
+#define MEDIA_6x6 0x08
+
+static char *print_medias (uint8_t v) {
+ switch (v) {
+ case MEDIA_4x6:
+ return "4x6";
+ case MEDIA_3_5x5:
+ return "3.5x5";
+ case MEDIA_5x7:
+ return "5x7";
+ case MEDIA_6x9:
+ return "6x9";
+ case MEDIA_6x8:
+ return "6x8";
+ case MEDIA_2x6:
+ return "2x6";
+ case MEDIA_6x6:
+ return "6x6";
+ default:
+ return "Unknown";
+ }
+}
+
+#define RIBBON_NONE 0x00
+#define RIBBON_4x6 0x01
+#define RIBBON_3_5x5 0x02
+#define RIBBON_5x7 0x03
+#define RIBBON_6x8 0x04
+#define RIBBON_6x9 0x05
+
+static char *print_ribbons (uint8_t v) {
+ switch (v) {
+ case RIBBON_NONE:
+ return "None";
+ case RIBBON_4x6:
+ return "4x6";
+ case RIBBON_3_5x5:
+ return "3.5x5";
+ case RIBBON_5x7:
+ return "5x7";
+ case RIBBON_6x8:
+ return "6x8";
+ case RIBBON_6x9:
+ return "6x9";
+ default:
+ return "Unknown";
+ }
+}
+
+struct s6145_mediainfo_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t ribbon;
+ uint8_t reserved;
+ uint8_t count;
+ struct s6145_mediainfo_item items[10]; /* Not all necessarily used */
+} __attribute__((packed));
+
+struct s6145_error_item {
+ uint8_t major;
+ uint8_t minor;
+ uint32_t print_counter;
+} __attribute__((packed));
+
+struct s6145_errorlog_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t count;
+ struct s6145_error_item items[10]; /* Not all necessarily used */
+} __attribute__((packed));
+
+struct s6145_getparam_resp {
+ struct s6145_status_hdr hdr;
+ uint32_t param;
+} __attribute__((packed));
+
+struct s6145_getserial_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t data[8];
+} __attribute__((packed));
+
+struct s6145_getprintidstatus_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t id;
+ uint16_t remaining;
+ uint16_t finished;
+ uint16_t specified;
+ uint16_t status;
+} __attribute__((packed));
+
+#define STATUS_WAITING 0x0000
+#define STATUS_PRINTING 0x0100
+#define STATUS_COMPLETED 0x0200
+#define STATUS_ERROR 0xFFFF
+
+struct s6145_getextcounter_resp {
+ struct s6145_status_hdr hdr;
+ uint32_t lifetime_distance; /* Inches */
+ uint32_t maint_distance;
+ uint32_t head_distance;
+ uint8_t reserved[32];
+} __attribute__((packed));
+
+struct s6145_fwinfo_resp {
+ struct s6145_status_hdr hdr;
+ uint8_t name[8];
+ uint8_t type[16];
+ uint8_t date[10];
+ uint8_t major;
+ uint8_t minor;
+ uint16_t checksum;
+} __attribute__((packed));
+
+struct s6145_imagecorr_resp {
+ struct s6145_status_hdr hdr;
+ uint16_t total_size;
+} __attribute__((packed));
+
+struct s6145_imagecorr_data {
+ uint8_t remain_pkt;
+ uint8_t return_size;
+ uint8_t data[16];
+} __attribute__((packed));
+
+static int get_param(struct shinkos6145_ctx *ctx, int target, uint32_t *param);
+
+#define READBACK_LEN 512 /* Needs to be larger than largest response hdr */
+#define CMDBUF_LEN sizeof(struct s6145_print_cmd)
+
+uint8_t rdbuf[READBACK_LEN];
+
+static int s6145_do_cmd(struct shinkos6145_ctx *ctx,
+ uint8_t *cmd, int cmdlen,
+ int minlen, int *num)
+{
+ int ret;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+
+ libusb_device_handle *dev = ctx->dev;
+ uint8_t endp_up = ctx->endp_up;
+ uint8_t endp_down = ctx->endp_down;
+
+ if ((ret = send_data(dev, endp_down,
+ cmd, cmdlen)))
+ return (ret < 0) ? ret : -99;
+
+ ret = read_data(dev, endp_up,
+ rdbuf, READBACK_LEN, num);
+
+ if (ret < 0)
+ return ret;
+ if (*num < minlen) {
+ ERROR("Short read! (%d/%d))\n", *num, minlen);
+ return -99;
+ }
+
+ if (resp->result != RESULT_SUCCESS) {
+ INFO("Printer Status: %02x (%s)\n", resp->status,
+ status_str(resp->status));
+ INFO(" Result: 0x%02x Error: 0x%02x (0x%02x/0x%02x = %s)\n",
+ resp->result, resp->error, resp->printer_major,
+ resp->printer_minor, error_codes(resp->printer_major, resp->printer_minor));
+ return -99;
+ }
+
+ return ret;
+}
+
+static int get_status(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_status_resp *resp = (struct s6145_status_resp *) rdbuf;
+ struct s6145_getextcounter_resp *resp2 = (struct s6145_getextcounter_resp *) rdbuf;
+ int ret, num = 0;
+ uint32_t val;
+
+ cmd.cmd = cpu_to_le16(S6145_CMD_GETSTATUS);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+
+ INFO("Printer Status: 0x%02x (%s)\n", resp->hdr.status,
+ status_str(resp->hdr.status));
+ if (resp->hdr.status == ERROR_PRINTER) {
+ if(resp->hdr.error == ERROR_NONE)
+ resp->hdr.error = resp->hdr.status;
+ INFO(" Error 0x%02x (%s) 0x%02x/0x%02x (%s)\n",
+ resp->hdr.error,
+ error_str(resp->hdr.error),
+ resp->hdr.printer_major,
+ resp->hdr.printer_minor, error_codes(resp->hdr.printer_major, resp->hdr.printer_minor));
+ }
+ if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s6145_status_resp) - sizeof(struct s6145_status_hdr)))
+ return -1;
+
+ INFO(" Print Counts:\n");
+ INFO("\tSince Paper Changed:\t%08u\n", le32_to_cpu(resp->count_paper));
+ INFO("\tLifetime:\t\t%08u\n", le32_to_cpu(resp->count_lifetime));
+ INFO("\tMaintainence:\t\t%08u\n", le32_to_cpu(resp->count_maint));
+ INFO("\tPrint Head:\t\t%08u\n", le32_to_cpu(resp->count_head));
+ INFO(" Cutter Actuations:\t%08u\n", le32_to_cpu(resp->count_cutter));
+ INFO(" Ribbon Remaining:\t%08u\n", le32_to_cpu(resp->count_ribbon_left));
+ INFO("Bank 1: 0x%02x (%s) Job %03u @ %03u/%03u (%03u remaining)\n",
+ resp->bank1_status, bank_statuses(resp->bank1_status),
+ resp->bank1_printid,
+ le16_to_cpu(resp->bank1_finished),
+ le16_to_cpu(resp->bank1_specified),
+ le16_to_cpu(resp->bank1_remaining));
+
+ INFO("Bank 2: 0x%02x (%s) Job %03d @ %03d/%03d (%03d remaining)\n",
+ resp->bank2_status, bank_statuses(resp->bank1_status),
+ resp->bank2_printid,
+ le16_to_cpu(resp->bank2_finished),
+ le16_to_cpu(resp->bank2_specified),
+ le16_to_cpu(resp->bank2_remaining));
+
+ INFO("Tonecurve Status: 0x%02x (%s)\n", resp->tonecurve_status, tonecurve_statuses(resp->tonecurve_status));
+
+ /* Query Extended counters */
+ cmd.cmd = cpu_to_le16(S6145_CMD_EXTCOUNTER);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp2),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+ if (le16_to_cpu(resp2->hdr.payload_len) != (sizeof(struct s6145_getextcounter_resp) - sizeof(struct s6145_status_hdr)))
+ return -1;
+
+ INFO("Lifetime Distance: %08d inches\n", le32_to_cpu(resp2->lifetime_distance));
+ INFO("Maintainence Distance: %08d inches\n", le32_to_cpu(resp2->maint_distance));
+ INFO("Head Distance: %08d inches\n", le32_to_cpu(resp2->head_distance));
+
+ /* Query various params */
+ if ((ret = get_param(ctx, PARAM_PAPER_PRESV, &val))) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ INFO("Paper Preserve mode: %s\n", (val ? "On" : "Off"));
+
+ if ((ret = get_param(ctx, PARAM_DRIVER_MODE, &val))) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ INFO("Driver mode: %s\n", (val ? "On" : "Off"));
+
+ if ((ret = get_param(ctx, PARAM_PAPER_MODE, &val))) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ INFO("Paper load mode: %s\n", (val ? "Cut" : "No Cut"));
+
+ if ((ret = get_param(ctx, PARAM_SLEEP_TIME, &val))) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ if (val == 0)
+ val = 5;
+ else if (val == 1)
+ val = 15;
+ else if (val == 2)
+ val = 30;
+ else if (val == 3)
+ val = 60;
+ else if (val == 4)
+ val = 120;
+ else if (val >= 5)
+ val = 240;
+ else
+ val = 240; // default?
+
+ INFO("Sleep delay: %u minutes\n", val);
+
+ return 0;
+}
+
+static int get_fwinfo(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_fwinfo_cmd cmd;
+ struct s6145_fwinfo_resp *resp = (struct s6145_fwinfo_resp *)rdbuf;
+ int num = 0;
+ int i;
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_FWINFO);
+ cmd.hdr.len = cpu_to_le16(1);
+
+ INFO("FW Information:\n");
+
+ for (i = FWINFO_TARGET_MAIN_BOOT ; i <= FWINFO_TARGET_PRINT_TABLES ; i++) {
+ int ret;
+ cmd.target = i;
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command (%d)\n", cmd_names(cmd.hdr.cmd), ret);
+ continue;
+ }
+
+ if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s6145_fwinfo_resp) - sizeof(struct s6145_status_hdr)))
+ continue;
+
+ INFO(" %s\t ver %02x.%02x\n", fwinfo_targets(i),
+ resp->major, resp->minor);
+#if 0
+ INFO(" name: '%s'\n", resp->name);
+ INFO(" type: '%s'\n", resp->type);
+ INFO(" date: '%s'\n", resp->date);
+ INFO(" version: %02x.%02x (CRC %04x)\n", resp->major, resp->minor,
+ le16_to_cpu(resp->checksum));
+#endif
+ }
+ return 0;
+}
+
+static int get_errorlog(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_errorlog_resp *resp = (struct s6145_errorlog_resp *) rdbuf;
+ int ret, num = 0;
+ int i;
+
+ cmd.cmd = cpu_to_le16(S6145_CMD_ERRORLOG);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+
+ if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s6145_errorlog_resp) - sizeof(struct s6145_status_hdr)))
+ return -2;
+
+ INFO("Stored Error Events: %d entries:\n", resp->count);
+ for (i = 0 ; i < resp->count ; i++) {
+ INFO(" %02d: @ %08u prints : 0x%02x/0x%02x (%s)\n", i,
+ le32_to_cpu(resp->items[i].print_counter),
+ resp->items[i].major, resp->items[i].minor,
+ error_codes(resp->items[i].major, resp->items[i].minor));
+ }
+ return 0;
+}
+
+static int get_mediainfo(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_mediainfo_resp *resp = (struct s6145_mediainfo_resp *) rdbuf;
+ int ret, num = 0;
+ int i;
+
+ cmd.cmd = cpu_to_le16(S6145_CMD_MEDIAINFO);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+
+ if (le16_to_cpu(resp->hdr.payload_len) != (sizeof(struct s6145_mediainfo_resp) - sizeof(struct s6145_status_hdr)))
+ return -2;
+
+ INFO("Loaded Media Type: %s\n", print_ribbons(resp->ribbon));
+ INFO("Supported Print Sizes: %d entries:\n", resp->count);
+ for (i = 0 ; i < resp->count ; i++) {
+ INFO(" %02d: C 0x%02x (%s), %04dx%04d, P 0x%02x (%s)\n", i,
+ resp->items[i].media_code, print_medias(resp->items[i].media_code),
+ le16_to_cpu(resp->items[i].columns),
+ le16_to_cpu(resp->items[i].rows),
+ resp->items[i].print_method, print_methods(resp->items[i].print_method));
+ }
+ return 0;
+}
+
+static int cancel_job(struct shinkos6145_ctx *ctx, char *str)
+{
+ struct s6145_cancel_cmd cmd;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+ int ret, num = 0;
+
+ if (!str)
+ return -1;
+
+ cmd.id = atoi(str);
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_CANCELJOB);
+ cmd.hdr.len = cpu_to_le16(1);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.hdr.cmd));
+ return ret;
+ }
+
+ return 0;
+}
+
+static int flash_led(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+ int ret, num = 0;
+
+ cmd.cmd = cpu_to_le16(S6145_CMD_FLASHLED);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+
+ return 0;
+}
+
+
+static int set_param(struct shinkos6145_ctx *ctx, int target, uint32_t param)
+{
+ struct s6145_setparam_cmd cmd;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+ int ret, num = 0;
+
+ /* Set up command */
+ cmd.target = target;
+ cmd.param = cpu_to_le32(param);
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_SETPARAM);
+ cmd.hdr.len = cpu_to_le16(sizeof(struct s6145_setparam_cmd)-sizeof(cmd.hdr));
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command (%d)\n", cmd_names(cmd.hdr.cmd), ret);
+ }
+
+ return ret;
+}
+
+static int get_param(struct shinkos6145_ctx *ctx, int target, uint32_t *param)
+{
+ struct s6145_getparam_cmd cmd;
+ struct s6145_getparam_resp *resp = (struct s6145_getparam_resp *) rdbuf;
+ int ret, num = 0;
+
+ /* Set up command */
+ cmd.target = target;
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_GETPARAM);
+ cmd.hdr.len = cpu_to_le16(sizeof(struct s6145_getparam_cmd)-sizeof(cmd.hdr));
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command (%d)\n", cmd_names(cmd.hdr.cmd), ret);
+ }
+ *param = le32_to_cpu(resp->param);
+
+ return ret;
+}
+
+
+static int reset_curve(struct shinkos6145_ctx *ctx, int target)
+{
+ struct s6145_reset_cmd cmd;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+ int ret, num = 0;
+
+ cmd.target = target;
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_RESET);
+ cmd.hdr.len = cpu_to_le16(1);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.hdr.cmd));
+ return ret;
+ }
+
+ return 0;
+}
+
+static int shinkos6145_dump_corrdata(struct shinkos6145_ctx *ctx, char *fname)
+{
+ int ret;
+
+ ret = shinkos6145_get_imagecorr(ctx);
+ if (ret) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+
+ /* Open file and write it out */
+ {
+ int fd = open(fname, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR);
+ if (fd < 0) {
+ ERROR("Unable to open filename\n");
+ return fd;
+ }
+
+ write(fd, ctx->corrdata, sizeof(struct shinkos6145_correctionparam));
+ close(fd);
+ }
+
+ /* Free the buffers */
+ free(ctx->corrdata);
+ ctx->corrdata = NULL;
+ ctx->corrdatalen = 0;
+
+ return ret;
+}
+
+static int get_tonecurve(struct shinkos6145_ctx *ctx, int type, char *fname)
+{
+ struct s6145_readtone_cmd cmd;
+ struct s6145_readtone_resp *resp = (struct s6145_readtone_resp *) rdbuf;
+ int ret, num = 0;
+
+ uint8_t *data;
+ uint16_t curves[UPDATE_SIZE] = { 0 };
+
+ int i,j;
+
+ cmd.target = type;
+ cmd.curveid = TONE_CURVE_ID;
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_READTONE);
+ cmd.hdr.len = cpu_to_le16(1);
+
+ INFO("Dump %s Tone Curve to '%s'\n", tonecurve_statuses(type), fname);
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.hdr.cmd));
+ return ret;
+ }
+
+ resp->total_size = le16_to_cpu(resp->total_size);
+
+ data = malloc(resp->total_size * 2);
+ if (!data) {
+ ERROR("Memory Allocation Failure!\n");
+ return -1;
+ }
+
+ i = 0;
+ while (i < resp->total_size) {
+ ret = read_data(ctx->dev, ctx->endp_up,
+ data + i,
+ resp->total_size * 2 - i,
+ &num);
+ if (ret < 0)
+ goto done;
+ i += num;
+ }
+
+ i = j = 0;
+ while (i < resp->total_size) {
+ memcpy(curves + j, data + i+2, data[i+1]);
+ j += data[i+1] / 2;
+ i += data[i+1] + 2;
+ }
+
+ /* Open file and write it out */
+ {
+ int tc_fd = open(fname, O_WRONLY|O_CREAT, S_IRUSR|S_IWUSR);
+ if (tc_fd < 0) {
+ ret = -1;
+ goto done;
+ }
+
+ for (i = 0 ; i < UPDATE_SIZE; i++) {
+ /* Byteswap appropriately */
+ curves[i] = cpu_to_be16(le16_to_cpu(curves[i]));
+ }
+ write(tc_fd, curves, UPDATE_SIZE * sizeof(uint16_t));
+ close(tc_fd);
+ }
+
+done:
+ free(data);
+ return ret;
+}
+
+static int set_tonecurve(struct shinkos6145_ctx *ctx, int target, char *fname)
+{
+ struct s6145_update_cmd cmd;
+ struct s6145_status_hdr *resp = (struct s6145_status_hdr *) rdbuf;
+ int ret, num = 0;
+
+ INFO("Set %s Tone Curve from '%s'\n", update_targets(target), fname);
+
+ uint16_t *data = malloc(UPDATE_SIZE * sizeof(uint16_t));
+ if (!data) {
+ ERROR("Memory Allocation Failure!\n");
+ return -1;
+ }
+
+ /* Read in file */
+ int tc_fd = open(fname, O_RDONLY);
+ if (tc_fd < 0) {
+ ret = -1;
+ goto done;
+ }
+ if (read(tc_fd, data, UPDATE_SIZE * sizeof(uint16_t)) != (UPDATE_SIZE * sizeof(uint16_t))) {
+ ret = -2;
+ goto done;
+ }
+ close(tc_fd);
+ /* Byteswap data to local CPU.. */
+ for (ret = 0; ret < UPDATE_SIZE ; ret++) {
+ data[ret] = be16_to_cpu(data[ret]);
+ }
+
+ /* Set up command */
+ cmd.target = target;
+ cmd.reserved[0] = cmd.reserved[1] = cmd.reserved[2] = 0;
+ cmd.reset = 0;
+ cmd.size = cpu_to_le32(UPDATE_SIZE * sizeof(uint16_t));
+
+ cmd.hdr.cmd = cpu_to_le16(S6145_CMD_UPDATE);
+ cmd.hdr.len = cpu_to_le16(sizeof(struct s6145_update_cmd)-sizeof(cmd.hdr));
+
+ /* Byteswap data to format printer is expecting.. */
+ for (ret = 0; ret < UPDATE_SIZE ; ret++) {
+ data[ret] = cpu_to_le16(data[ret]);
+ }
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.hdr.cmd));
+ goto done;
+ }
+
+ /* Sent transfer */
+ if ((ret = send_data(ctx->dev, ctx->endp_down,
+ (uint8_t *) data, UPDATE_SIZE * sizeof(uint16_t)))) {
+ goto done;
+ }
+
+done:
+ free(data);
+
+ return ret;
+}
+
+static int shinkos6145_get_imagecorr(struct shinkos6145_ctx *ctx)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_imagecorr_resp *resp = (struct s6145_imagecorr_resp *) rdbuf;
+
+ size_t total = 0;
+ int ret, num;
+ cmd.cmd = cpu_to_le16(S6145_CMD_GETCORR);
+ cmd.len = 0;
+
+ if (ctx->corrdata) {
+ free(ctx->corrdata);
+ ctx->corrdata = NULL;
+ }
+
+ if ((ret = s6145_do_cmd(ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ goto done;
+ }
+
+ ctx->corrdatalen = le16_to_cpu(resp->total_size);
+ INFO("Fetching %lu bytes of image correction data\n", ctx->corrdatalen);
+
+ ctx->corrdata = malloc(sizeof(struct shinkos6145_correctionparam));
+ if (!ctx->corrdata) {
+ ERROR("Memory allocation failure\n");
+ ret = -ENOMEM;
+ goto done;
+ }
+ memset(ctx->corrdata, 0, sizeof(struct shinkos6145_correctionparam));
+ total = 0;
+
+ while (total < ctx->corrdatalen) {
+ struct s6145_imagecorr_data data;
+
+ ret = read_data(ctx->dev, ctx->endp_up, (uint8_t *) &data,
+ sizeof(data),
+ &num);
+ if (ret < 0)
+ goto done;
+
+ memcpy(((uint8_t*)ctx->corrdata) + total, data.data, sizeof(data.data));
+ total += sizeof(data.data);
+
+ if (data.remain_pkt == 0)
+ DEBUG("correction block transferred (%lu/%lu total)\n", total, ctx->corrdatalen);
+
+ }
+
+#if !defined(WITH_6145_LIB)
+ /* Sanity check correction data */
+ {
+ int i;
+ struct shinkos6145_correctionparam *corrdata = ctx->corrdata;
+
+ for (i = 0 ; i < 256 ; i++) {
+ if (le16_to_cpu(corrdata->pulseTransTable_Y[i]) > le16_to_cpu(corrdata->printMaxPulse_Y) ||
+ le16_to_cpu(corrdata->pulseTransTable_M[i]) > le16_to_cpu(corrdata->printMaxPulse_M) ||
+ le16_to_cpu(corrdata->pulseTransTable_C[i]) > le16_to_cpu(corrdata->printMaxPulse_C) ||
+ le16_to_cpu(corrdata->pulseTransTable_O[i]) > le16_to_cpu(corrdata->printMaxPulse_O)) {
+ ret = -10;
+ goto done;
+ }
+ }
+
+ if (!corrdata->tableTankParam_Y.trdTankSize ||
+ !corrdata->tableTankParam_M.trdTankSize ||
+ !corrdata->tableTankParam_C.trdTankSize ||
+ !corrdata->tableTankParam_O.trdTankSize) {
+ ret = -14;
+ goto done;
+ }
+ if (!corrdata->tableTankParam_Y.sndTankSize ||
+ !corrdata->tableTankParam_M.sndTankSize ||
+ !corrdata->tableTankParam_C.sndTankSize ||
+ !corrdata->tableTankParam_O.sndTankSize) {
+ ret = -15;
+ goto done;
+ }
+ if (!corrdata->tableTankParam_Y.fstTankSize ||
+ !corrdata->tableTankParam_M.fstTankSize ||
+ !corrdata->tableTankParam_C.fstTankSize ||
+ !corrdata->tableTankParam_O.fstTankSize) {
+ ret = -16;
+ goto done;
+ }
+ if (corrdata->val_1 > 1 ||
+ corrdata->val_2 > 1 ||
+ corrdata->printOpLevel > 0xff ||
+ corrdata->matteMode > 1) {
+ ret = -17;
+ goto done;
+ }
+ if (corrdata->randomBase[0] > 0xff ||
+ corrdata->randomBase[1] > 0xff ||
+ corrdata->randomBase[2] > 0xff ||
+ corrdata->randomBase[3] > 0xff) {
+ ret = -18;
+ goto done;
+ }
+ if (!corrdata->matteSize ||
+ corrdata->matteSize > 2) {
+ ret = -19;
+ goto done;
+ }
+ }
+#endif
+
+done:
+ return ret;
+}
+
+static void shinkos6145_cmdline(void)
+{
+ DEBUG("\t\t[ -c filename ] # Get user/NV tone curve\n");
+ DEBUG("\t\t[ -C filename ] # Set user/NV tone curve\n");
+ DEBUG("\t\t[ -e ] # Query error log\n");
+ DEBUG("\t\t[ -F ] # Flash Printer LED\n");
+ DEBUG("\t\t[ -i ] # Query printer info\n");
+ DEBUG("\t\t[ -k num ] # Set sleep time (5-240 minutes)\n");
+ DEBUG("\t\t[ -l filename ] # Get current tone curve\n");
+ DEBUG("\t\t[ -L filename ] # Set current tone curve\n");
+ DEBUG("\t\t[ -m ] # Query media\n");
+ DEBUG("\t\t[ -Q filename ] # Extract image correction params\n");
+ DEBUG("\t\t[ -r ] # Reset user/NV tone curve\n");
+ DEBUG("\t\t[ -R ] # Reset printer to factory defaults\n");
+ DEBUG("\t\t[ -s ] # Query status\n");
+ DEBUG("\t\t[ -X jobid ] # Abort a printjob\n");
+}
+
+int shinkos6145_cmdline_arg(void *vctx, int argc, char **argv)
+{
+ struct shinkos6145_ctx *ctx = vctx;
+ int i, j = 0;
+
+ if (!ctx)
+ return -1;
+
+ while ((i = getopt(argc, argv, GETOPT_LIST_GLOBAL "c:C:eFik:l:L:mr:Q:R:sX:")) >= 0) {
+ switch(i) {
+ GETOPT_PROCESS_GLOBAL
+ case 'c':
+ j = get_tonecurve(ctx, TONECURVE_USER, optarg);
+ break;
+ case 'C':
+ j = set_tonecurve(ctx, TONECURVE_USER, optarg);
+ break;
+ case 'e':
+ j = get_errorlog(ctx);
+ break;
+ case 'F':
+ j = flash_led(ctx);
+ break;
+ case 'i':
+ j = get_fwinfo(ctx);
+ break;
+ case 'k': {
+ uint32_t i = atoi(optarg);
+ if (i < 5)
+ i = 0;
+ else if (i < 15)
+ i = 1;
+ else if (i < 30)
+ i = 2;
+ else if (i < 60)
+ i = 3;
+ else if (i < 120)
+ i = 4;
+ else if (i < 240)
+ i = 5;
+ else
+ i = 5;
+
+ j = set_param(ctx, PARAM_SLEEP_TIME, i);
+ break;
+ }
+ case 'l':
+ j = get_tonecurve(ctx, TONECURVE_CURRENT, optarg);
+ break;
+ case 'L':
+ j = set_tonecurve(ctx, TONECURVE_CURRENT, optarg);
+ break;
+ case 'm':
+ j = get_mediainfo(ctx);
+ break;
+ case 'Q':
+ j = shinkos6145_dump_corrdata(ctx, optarg);
+ break;
+ case 'r':
+ j = reset_curve(ctx, RESET_TONE_CURVE);
+ break;
+ case 'R':
+ j = reset_curve(ctx, RESET_PRINTER);
+ break;
+ case 's':
+ j = get_status(ctx);
+ break;
+ case 'X':
+ j = cancel_job(ctx, optarg);
+ break;
+ default:
+ break; /* Ignore completely */
+ }
+
+ if (j) return j;
+ }
+
+ return 0;
+}
+
+static void *shinkos6145_init(void)
+{
+ struct shinkos6145_ctx *ctx = malloc(sizeof(struct shinkos6145_ctx));
+ if (!ctx) {
+ ERROR("Memory Allocation Failure!\n");
+ return NULL;
+ }
+ memset(ctx, 0, sizeof(struct shinkos6145_ctx));
+
+ return ctx;
+}
+
+static void shinkos6145_attach(void *vctx, struct libusb_device_handle *dev,
+ uint8_t endp_up, uint8_t endp_down, uint8_t jobid)
+{
+ struct shinkos6145_ctx *ctx = vctx;
+ struct libusb_device *device;
+ struct libusb_device_descriptor desc;
+
+ ctx->dev = dev;
+ ctx->endp_up = endp_up;
+ ctx->endp_down = endp_down;
+
+ device = libusb_get_device(dev);
+ libusb_get_device_descriptor(device, &desc);
+
+ ctx->type = lookup_printer_type(&shinkos6145_backend,
+ desc.idVendor, desc.idProduct);
+
+ /* Ensure jobid is sane */
+ ctx->jobid = (jobid & 0x7f) + 1;
+}
+
+static void shinkos6145_teardown(void *vctx) {
+ struct shinkos6145_ctx *ctx = vctx;
+
+ if (!ctx)
+ return;
+
+ if (ctx->databuf)
+ free(ctx->databuf);
+ if (ctx->corrdata)
+ free(ctx->corrdata);
+
+ free(ctx);
+}
+
+#if !defined (WITH_6145_LIB)
+static void lib6145_calc_avg(struct shinkos6145_ctx *ctx, uint16_t rows, uint16_t cols)
+{
+ uint32_t plane, i, planelen;
+ planelen = rows * cols;
+
+ for (plane = 0 ; plane < 3 ; plane++) {
+ uint64_t sum = 0;
+
+ for (i = 0 ; i < planelen ; i++) {
+ sum += ctx->databuf[(planelen * plane) + i];
+ }
+ ctx->image_avg[plane] = (sum / planelen);
+ }
+}
+
+static void lib6145_process_image(uint8_t *src, uint16_t *dest,
+ struct shinkos6145_correctionparam *corrdata,
+ uint8_t oc_mode)
+{
+ uint32_t in, out;
+
+ uint16_t pad_l, pad_r, row_lim;
+ uint16_t row, col;
+
+ row_lim = le16_to_cpu(corrdata->headDots);
+ pad_l = (row_lim - le16_to_cpu(corrdata->width)) / 2;
+ pad_r = pad_l + le16_to_cpu(corrdata->width);
+ out = 0;
+ in = 0;
+
+ /* Convert YMC 8-bit to 16-bit, and pad appropriately to full stripe */
+ for (row = 0 ; row < le16_to_cpu(corrdata->height) ; row++) {
+ for (col = 0 ; col < row_lim; col++) {
+ uint16_t val;
+ if (col < pad_l) {
+ val = 0;
+ } else if (col < pad_r) {
+ val = corrdata->pulseTransTable_Y[src[in++]];
+ } else {
+ val = 0;
+ }
+ dest[out++] = val;
+ }
+ }
+ for (row = 0 ; row < le16_to_cpu(corrdata->height) ; row++) {
+ for (col = 0 ; col < row_lim; col++) {
+ uint16_t val;
+ if (col < pad_l) {
+ val = 0;
+ } else if (col < pad_r) {
+ val = corrdata->pulseTransTable_M[src[in++]];
+ } else {
+ val = 0;
+ }
+ dest[out++] = val;
+ }
+ }
+ for (row = 0 ; row < le16_to_cpu(corrdata->height) ; row++) {
+ for (col = 0 ; col < row_lim; col++) {
+ uint16_t val;
+ if (col < pad_l) {
+ val = 0;
+ } else if (col < pad_r) {
+ val = corrdata->pulseTransTable_C[src[in++]];
+ } else {
+ val = 0;
+ }
+ dest[out++] = val;
+ }
+ }
+
+ /* Generate lamination plane, if desired */
+ if (oc_mode > PRINT_MODE_NO_OC) {
+ // XXX matters if we're using glossy/matte..
+ // or should we just dump over the contents of the "raw" file?
+ for (row = 0 ; row < le16_to_cpu(corrdata->height) ; row++) {
+ for (col = 0 ; col < row_lim; col++) {
+ uint16_t val;
+ if (col < pad_l) {
+ val = 0;
+ } else if (col < pad_r) {
+ val = corrdata->pulseTransTable_O[corrdata->printOpLevel];
+ } else {
+ val = 0;
+ }
+ dest[out++] = val;
+ }
+ }
+ }
+}
+#endif
+
+
+static int shinkos6145_read_parse(void *vctx, int data_fd) {
+ struct shinkos6145_ctx *ctx = vctx;
+ int ret;
+ uint8_t tmpbuf[4];
+
+ if (!ctx)
+ return CUPS_BACKEND_FAILED;
+
+ /* Read in then validate header */
+ ret = read(data_fd, &ctx->hdr, sizeof(ctx->hdr));
+ if (ret < 0 || ret != sizeof(ctx->hdr)) {
+ if (ret == 0)
+ return CUPS_BACKEND_CANCEL;
+ ERROR("Read failed (%d/%d/%d)\n",
+ ret, 0, (int)sizeof(ctx->hdr));
+ perror("ERROR: Read failed");
+ return ret;
+ }
+
+ if (le32_to_cpu(ctx->hdr.len1) != 0x10 ||
+ le32_to_cpu(ctx->hdr.len2) != 0x64 ||
+ le32_to_cpu(ctx->hdr.dpi) != 300) {
+ ERROR("Unrecognized header data format!\n");
+ return CUPS_BACKEND_CANCEL;
+ }
+
+ if (le32_to_cpu(ctx->hdr.model) != 6145) {
+ ERROR("Unrecognized printer (%d)!\n", le32_to_cpu(ctx->hdr.model));
+
+ return CUPS_BACKEND_CANCEL;
+ }
+
+ if (ctx->databuf) {
+ free(ctx->databuf);
+ ctx->databuf = NULL;
+ }
+
+ ctx->datalen = le32_to_cpu(ctx->hdr.rows) * le32_to_cpu(ctx->hdr.columns) * 3;
+ ctx->databuf = malloc(ctx->datalen);
+ if (!ctx->databuf) {
+ ERROR("Memory allocation failure!\n");
+ return CUPS_BACKEND_FAILED;
+ }
+
+ {
+ int remain = ctx->datalen;
+ uint8_t *ptr = ctx->databuf;
+ do {
+ ret = read(data_fd, ptr, remain);
+ if (ret < 0) {
+ ERROR("Read failed (%d/%d/%zu)\n",
+ ret, remain, ctx->datalen);
+ perror("ERROR: Read failed");
+ return ret;
+ }
+ ptr += ret;
+ remain -= ret;
+ } while (remain);
+ }
+
+ /* Make sure footer is sane too */
+ ret = read(data_fd, tmpbuf, 4);
+ if (ret != 4) {
+ ERROR("Read failed (%d/%d/%d)\n",
+ ret, 4, 4);
+ perror("ERROR: Read failed");
+ return ret;
+ }
+ if (tmpbuf[0] != 0x04 ||
+ tmpbuf[1] != 0x03 ||
+ tmpbuf[2] != 0x02 ||
+ tmpbuf[3] != 0x01) {
+ ERROR("Unrecognized footer data format!\n");
+ return CUPS_BACKEND_FAILED;
+ }
+
+ return CUPS_BACKEND_OK;
+}
+
+static int shinkos6145_main_loop(void *vctx, int copies) {
+ struct shinkos6145_ctx *ctx = vctx;
+
+ int ret, num;
+ uint8_t cmdbuf[CMDBUF_LEN];
+ uint8_t rdbuf2[READBACK_LEN];
+
+ int i, last_state = -1, state = S_IDLE;
+
+ struct s6145_cmd_hdr *cmd = (struct s6145_cmd_hdr *) cmdbuf;
+ struct s6145_print_cmd *print = (struct s6145_print_cmd *) cmdbuf;
+ struct s6145_status_resp *sts = (struct s6145_status_resp *) rdbuf;
+ struct s6145_mediainfo_resp *media = (struct s6145_mediainfo_resp *) rdbuf;
+
+ uint32_t cur_mode;
+
+ /* Send Media Query */
+ memset(cmdbuf, 0, CMDBUF_LEN);
+ cmd->cmd = cpu_to_le16(S6145_CMD_MEDIAINFO);
+ cmd->len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ cmdbuf, sizeof(*cmd),
+ sizeof(*media),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd->cmd));
+ return CUPS_BACKEND_FAILED;
+ }
+
+ if (le16_to_cpu(media->hdr.payload_len) != (sizeof(struct s6145_mediainfo_resp) - sizeof(struct s6145_status_hdr)))
+ return CUPS_BACKEND_FAILED;
+
+ /* Validate print sizes */
+ for (i = 0; i < media->count ; i++) {
+ /* Look for matching media */
+ if (le16_to_cpu(media->items[i].columns) == cpu_to_le16(le32_to_cpu(ctx->hdr.columns)) &&
+ le16_to_cpu(media->items[i].rows) == cpu_to_le16(le32_to_cpu(ctx->hdr.rows)) &&
+ media->items[i].print_method == le32_to_cpu(ctx->hdr.method) &&
+ media->items[i].media_code == le32_to_cpu(ctx->hdr.media))
+ break;
+ }
+ if (i == media->count) {
+ ERROR("Incorrect media loaded for print!\n");
+ return CUPS_BACKEND_HOLD;
+ }
+ // XXX sanity-check media vs size
+ // don't know if media information above will catch this.
+
+ // XXX check copies against remaining media!
+
+ /* Query printer mode */
+ ret = get_param(ctx, PARAM_OC_PRINT, &cur_mode);
+ if (ret) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+
+top:
+ if (state != last_state) {
+ if (dyesub_debug)
+ DEBUG("last_state %d new %d\n", last_state, state);
+ }
+
+ /* Send Status Query */
+ memset(cmdbuf, 0, CMDBUF_LEN);
+ cmd->cmd = cpu_to_le16(S6145_CMD_GETSTATUS);
+ cmd->len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(ctx,
+ cmdbuf, sizeof(*cmd),
+ sizeof(struct s6145_status_hdr),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd->cmd));
+ return CUPS_BACKEND_FAILED;
+ }
+
+ if (memcmp(rdbuf, rdbuf2, READBACK_LEN)) {
+ memcpy(rdbuf2, rdbuf, READBACK_LEN);
+
+ INFO("Printer Status: 0x%02x (%s)\n",
+ sts->hdr.status, status_str(sts->hdr.status));
+ if (sts->hdr.result != RESULT_SUCCESS)
+ goto printer_error;
+ if (sts->hdr.status == ERROR_PRINTER)
+ goto printer_error;
+ } else if (state == last_state) {
+ sleep(1);
+ goto top;
+ }
+ last_state = state;
+
+ fflush(stderr);
+
+ switch (state) {
+ case S_IDLE:
+ INFO("Waiting for printer idle\n");
+ /* If either bank is free, continue */
+ if (sts->bank1_status == BANK_STATUS_FREE ||
+ sts->bank2_status == BANK_STATUS_FREE)
+ state = S_PRINTER_READY_CMD;
+
+ break;
+ case S_PRINTER_READY_CMD: {
+ // XXX send "get eeprom backup command" ?
+
+ /* Set matte/etc */
+
+ uint32_t oc_mode = le32_to_cpu(ctx->hdr.oc_mode);
+ uint32_t updated = 0;
+
+ if (!oc_mode) /* if nothing set, default to glossy */
+ oc_mode = PARAM_OC_PRINT_GLOSS;
+
+ if (cur_mode != oc_mode) {
+ /* If cur_mode is not the same as desired oc_mode,
+ change it -- but we have to wait until the printer
+ is COMPLETELY idle */
+ if (sts->bank1_status != BANK_STATUS_FREE ||
+ sts->bank2_status != BANK_STATUS_FREE) {
+ INFO("Need to switch overcoat mode, waiting for printer idle\n");
+ sleep(1);
+ goto top;
+ }
+ ret = set_param(ctx, PARAM_OC_PRINT, oc_mode);
+ if (ret) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ updated = 1;
+ }
+
+ /* Get image correction parameters if necessary */
+ if (updated || !ctx->corrdata || !ctx->corrdatalen) {
+ ret = shinkos6145_get_imagecorr(ctx);
+ if (ret) {
+ ERROR("Failed to execute command\n");
+ return ret;
+ }
+ }
+
+ /* Set up library transform... */
+ uint32_t newlen = le16_to_cpu(ctx->corrdata->headDots) *
+ le32_to_cpu(ctx->hdr.rows) * sizeof(uint16_t) * 4;
+ uint16_t *databuf2 = malloc(newlen);
+
+ /* Set the size in the correctiondata */
+ ctx->corrdata->width = cpu_to_le16(le32_to_cpu(ctx->hdr.columns));
+ ctx->corrdata->height = cpu_to_le16(le32_to_cpu(ctx->hdr.rows));
+
+ /* Convert packed RGB to planar YMC */
+ {
+ int planelen = le16_to_cpu(ctx->corrdata->width) * le16_to_cpu(ctx->corrdata->height);
+ uint8_t *databuf3 = malloc(ctx->datalen);
+
+ for (i = 0 ; i < planelen ; i++) {
+ uint8_t r, g, b;
+ r = ctx->databuf[3*i];
+ g = ctx->databuf[3*i+1];
+ b = ctx->databuf[3*i+2];
+ databuf3[i] = 255 - b;
+ databuf3[planelen + i] = 255 - g;
+ databuf3[planelen + planelen + i] = 255 - r;
+ }
+ free(ctx->databuf);
+ ctx->databuf = databuf3;
+ }
+
+ /* Perform the actual library transform */
+#if defined(WITH_6145_LIB)
+#if defined(S6145_RE)
+ INFO("Calling Reverse-Engineered Image Processing Library...\n");
+#else
+ INFO("Calling Sinfonia Image Processing Library...\n");
+#endif
+ if (ImageAvrCalc(ctx->databuf, le32_to_cpu(ctx->hdr.columns), le32_to_cpu(ctx->hdr.rows), ctx->image_avg)) {
+ ERROR("Library returned error!\n");
+ return CUPS_BACKEND_FAILED;
+ }
+
+ ImageProcessing(ctx->databuf, databuf2, ctx->corrdata);
+#else
+ INFO("Calling Internal Fallback Image Processing Library...\n");
+
+ lib6145_calc_avg(ctx, le32_to_cpu(ctx->hdr.columns), le32_to_cpu(ctx->hdr.rows));
+ lib6145_process_image(ctx->databuf, databuf2, ctx->corrdata, oc_mode);
+#endif
+ free(ctx->databuf);
+ ctx->databuf = (uint8_t*) databuf2;
+ ctx->datalen = newlen;
+
+ INFO("Initiating print job (internal id %d)\n", ctx->jobid);
+
+ memset(cmdbuf, 0, CMDBUF_LEN);
+ print->hdr.cmd = cpu_to_le16(S6145_CMD_PRINTJOB);
+ print->hdr.len = cpu_to_le16(sizeof (*print) - sizeof(*cmd));
+
+ print->id = ctx->jobid;
+ print->count = cpu_to_le16(copies);
+ print->columns = cpu_to_le16(le32_to_cpu(ctx->hdr.columns));
+ print->rows = cpu_to_le16(le32_to_cpu(ctx->hdr.rows));
+ print->image_avg = ctx->image_avg[2]; /* Cyan level */
+ print->method = cpu_to_le32(ctx->hdr.method);
+ print->combo_wait = 0;
+
+ /* Brava21 header has a few quirks */
+ if(ctx->type == P_SHINKO_S6145D) {
+ print->media = ctx->hdr.media;
+ print->unk_1 = 0x01;
+ }
+
+ if ((ret = s6145_do_cmd(ctx,
+ cmdbuf, sizeof(*print),
+ sizeof(struct s6145_status_hdr),
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(print->hdr.cmd));
+ return ret;
+ }
+
+ if (sts->hdr.result != RESULT_SUCCESS) {
+ if (sts->hdr.error == ERROR_BUFFER_FULL) {
+ INFO("Printer Buffers full, retrying\n");
+ break;
+ } else if ((sts->hdr.status & 0xf0) == 0x30 || sts->hdr.status == 0x21) {
+ INFO("Printer busy (%s), retrying\n", status_str(sts->hdr.status));
+ break;
+ } else if (sts->hdr.status != ERROR_NONE)
+ goto printer_error;
+ }
+
+ INFO("Sending image data to printer\n");
+ if ((ret = send_data(ctx->dev, ctx->endp_down,
+ ctx->databuf, ctx->datalen)))
+ return CUPS_BACKEND_FAILED;
+
+ INFO("Waiting for printer to acknowledge completion\n");
+ sleep(1);
+ state = S_PRINTER_SENT_DATA;
+ break;
+ }
+ case S_PRINTER_SENT_DATA:
+ if (fast_return) {
+ INFO("Fast return mode enabled.\n");
+ state = S_FINISHED;
+ } else if (sts->hdr.status == STATUS_READY) {
+ state = S_FINISHED;
+ }
+ break;
+ default:
+ break;
+ };
+
+ if (state != S_FINISHED)
+ goto top;
+
+ INFO("Print complete\n");
+
+ return CUPS_BACKEND_OK;
+
+printer_error:
+ ERROR("Printer reported error: %#x (%s) status: %#x (%s) -> %#x.%#x (%s)\n",
+ sts->hdr.error,
+ error_str(sts->hdr.error),
+ sts->hdr.status,
+ status_str(sts->hdr.status),
+ sts->hdr.printer_major, sts->hdr.printer_minor,
+ error_codes(sts->hdr.printer_major, sts->hdr.printer_minor));
+ return CUPS_BACKEND_FAILED;
+}
+
+static int shinkos6145_query_serno(struct libusb_device_handle *dev, uint8_t endp_up, uint8_t endp_down, char *buf, int buf_len)
+{
+ struct s6145_cmd_hdr cmd;
+ struct s6145_getserial_resp *resp = (struct s6145_getserial_resp*) rdbuf;
+ int ret, num = 0;
+
+ struct shinkos6145_ctx ctx = {
+ .dev = dev,
+ .endp_up = endp_up,
+ .endp_down = endp_down,
+ };
+
+ cmd.cmd = cpu_to_le16(S6145_CMD_GETSERIAL);
+ cmd.len = cpu_to_le16(0);
+
+ if ((ret = s6145_do_cmd(&ctx,
+ (uint8_t*)&cmd, sizeof(cmd),
+ sizeof(*resp) - 1,
+ &num)) < 0) {
+ ERROR("Failed to execute %s command\n", cmd_names(cmd.cmd));
+ return ret;
+ }
+
+ /* Null-terminate */
+ resp->hdr.payload_len = le16_to_cpu(resp->hdr.payload_len);
+ if (resp->hdr.payload_len > 23)
+ resp->hdr.payload_len = 23;
+ resp->data[resp->hdr.payload_len] = 0;
+ strncpy(buf, (char*)resp->data, buf_len);
+ buf[buf_len-1] = 0; /* ensure it's null terminated */
+
+ return CUPS_BACKEND_OK;
+}
+
+/* Exported */
+#define USB_VID_SHINKO 0x10CE
+#define USB_PID_SHINKO_S6145 0x0019
+#define USB_PID_SHINKO_S6145D 0x001E /* Aka CIAAT Brava 21 */
+
+struct dyesub_backend shinkos6145_backend = {
+ .name = "Shinko/Sinfonia CHC-S6145",
+ .version = "0.14WIP",
+ .uri_prefix = "shinkos6145",
+ .cmdline_usage = shinkos6145_cmdline,
+ .cmdline_arg = shinkos6145_cmdline_arg,
+ .init = shinkos6145_init,
+ .attach = shinkos6145_attach,
+ .teardown = shinkos6145_teardown,
+ .read_parse = shinkos6145_read_parse,
+ .main_loop = shinkos6145_main_loop,
+ .query_serno = shinkos6145_query_serno,
+ .devices = {
+ { USB_VID_SHINKO, USB_PID_SHINKO_S6145, P_SHINKO_S6145, ""},
+ { USB_VID_SHINKO, USB_PID_SHINKO_S6145D, P_SHINKO_S6145D, ""},
+ { 0, 0, 0, ""}
+ }
+};
+
+/* CHC-S6145 data format
+
+ Spool file consists of an 116-byte header, followed by RGB-packed data,
+ followed by a 4-byte footer. Header appears to consist of a series of
+ 4-byte Little Endian words.
+
+ 10 00 00 00 MM MM 00 00 HH 00 00 00 01 00 00 00 MM == Model (ie 6145d), HH == 0x02 (5" media), 0x03 (6" media)
+ 64 00 00 00 00 00 00 00 TT 00 00 00 00 00 00 00 TT == 0x08 5x5, 0x03 5x7, 0x07 2x6, 0x00 4x6, 0x06 6x6/6x6+6x2/6x8
+ UU 00 00 00 ZZ 00 00 00 XX 00 00 00 00 00 00 00 XX == 0x00 default, 0x02 glossy, 0x03 matte, ZZ == 0x00 default, 0x01 == std qual; UU == 0x00 normal, 0x04 2x6*2, 0x05 6x6+2x6
+ 00 00 00 00 WW WW 00 00 HH HH 00 00 NN 00 00 00 WW/HH Width, Height (LE), NN == Copies
+ 00 00 00 00 00 00 00 00 00 00 00 00 ce ff ff ff
+ 00 00 00 00 ce ff ff ff QQ QQ 00 00 ce ff ff ff QQ == DPI (300)
+ 00 00 00 00 ce ff ff ff 00 00 00 00 00 00 00 00
+ 00 00 00 00
+
+ [[Packed RGB payload of WW*HH*3 bytes]]
+
+ 04 03 02 01 [[ footer ]]
+
+ * CIAAT Brava 21 data format
+
+ This printer is supposed to be a variant of the S6145, but uses a
+ different spool format -- but seems to use the same command language.
+
+ 01 40 12 00 II NN NN YY YY XX XX TT 00 00 00 00 00 00 01 MM QQ ZZ
+
+ II == Job ID (01-255, backend fills)
+ NN NN == copies (LE)
+ YY YY == Columns (LE)
+ XX XX == Rows (LE)
+ MM == Overcoat (02 = glossy, 03 = matte, 01 = none)
+ TT == Type (00 = 4x6, 03 = 5x7, 06 = 8x6, 07 = 2x6)
+ QQ == Multicut (00 = normal, 01 = none, 02 = 2*4x6,
+ 04 = 2*2x6, 80 = 4x6-notrim)
+ ZZ == Cyan Average (backend fills)
+
+ 1844*2434 8x6
+ 1844*2492 4x6*2
+ 1548*2140 5x7
+ 1844*1240 4x6 (and 2x6*2)
+ 1844*1210 4x6-notrim (WTF?)
+ 1844*634 2x6
+
+
+ [[ Followed by XX*YY*3 bytes of image data, RGB ]]
+
+*/
diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c
index 1d1f653..bfc4890 100644
--- a/src/main/print-olympus.c
+++ b/src/main/print-olympus.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-olympus.c,v 1.218 2015/09/13 14:26:01 speachy Exp $"
+ * "$Id: print-olympus.c,v 1.227 2016/01/14 04:56:58 speachy Exp $"
*
* Print plug-in DyeSub driver (formerly Olympus driver) for the GIMP.
*
@@ -234,6 +234,8 @@ typedef struct /* printer specific parameters */
const laminate_list_t *laminate;
const dyesub_media_list_t *media;
const dyesub_stringlist_t *uiconstraints;
+ void (*job_start_func)(stp_vars_t *);
+ void (*job_end_func)(stp_vars_t *);
} dyesub_cap_t;
@@ -1349,22 +1351,25 @@ static void updr150_200_printer_init_func(stp_vars_t *v, int updr200)
stp_zfwrite("\x6a\xff\xff\xff"
"\xef\xff\xff\xff", 1, 8, v);
- /* This is actually ***MEDIA*** size, not print size. They aren't
- necessarily the same, but for now, they are. */
+
if (strcmp(privdata.pagesize,"B7") == 0)
pg = '\x01';
else if (strcmp(privdata.pagesize,"w288h432") == 0)
pg = '\x02';
- else if (updr200 && strcmp(privdata.pagesize,"w144h432") == 0)
+ else if (updr200 && strcmp(privdata.pagesize,"w288h432-div2") == 0)
pg = '\x02';
else if (strcmp(privdata.pagesize,"w360h504") == 0)
pg = '\x03';
+ else if (updr200 && strcmp(privdata.pagesize,"w360h504-div2") == 0)
+ pg = '\x03';
else if (strcmp(privdata.pagesize,"w432h576") == 0)
pg = '\x04';
+ else if (updr200 && strcmp(privdata.pagesize,"w432h576-div2") == 0)
+ pg = '\x04';
else
pg = 0;
- stp_putc(pg, v);
- dyesub_nputc(v, '\0', 3);
+
+ stp_put32_le(pg, v);
stp_zfwrite("\xfc\xff\xff\xff"
"\xfb\xff\xff\xff"
@@ -1372,13 +1377,18 @@ static void updr150_200_printer_init_func(stp_vars_t *v, int updr200)
"\xf5\xff\xff\xff",
1, 16, v);
- if (updr200 && (strcmp(privdata.pagesize,"B7") == 0 ||
- strcmp(privdata.pagesize,"w432h576") == 0)) {
- /* SONY_MULTICUT -- B7 on 5x7 media also gets 0x01 */
- pg = 0x4;
+ /* Multicut mode */
+ if (updr200) {
+ if (!strcmp(privdata.pagesize,"w288h432-div2") ||
+ !strcmp(privdata.pagesize,"w360h504-div2") ||
+ !strcmp(privdata.pagesize,"w432h576-div2"))
+ pg = 0x01;
+ else
+ pg = 0x02;
} else {
- pg = 0x1;
+ pg = 0x01;
}
+
stp_put32_le(pg, v);
stp_zfwrite("\x07\x00\x00\x00"
@@ -1398,9 +1408,13 @@ static void updr150_200_printer_init_func(stp_vars_t *v, int updr200)
}
stp_zfwrite("\x05\x00\x00\x00"
"\x02\x03\x00\x01", 1, 8, v);
+
+ /* Multicut mode */
if (updr200) {
- if (strcmp(privdata.pagesize,"w144h432") == 0)
- stp_putc(0x02, v); /* SONY_MULTICUT: 2x6 on 4x6, 4x6 on 8x6, 3x5 on 7x5 */
+ if (!strcmp(privdata.pagesize,"w288h432-div2") ||
+ !strcmp(privdata.pagesize,"w360h504-div2") ||
+ !strcmp(privdata.pagesize,"w432h576-div2"))
+ stp_putc(0x02, v);
else
stp_putc(0x00, v);
} else {
@@ -1413,12 +1427,7 @@ static void updr150_200_printer_init_func(stp_vars_t *v, int updr200)
"\x00\x00\x00\x00\x07\x00\x00\x00\x00", 1, 24, v);
stp_put16_be(privdata.w_size, v);
- if (updr200 && strcmp(privdata.pagesize,"w144h432") == 0) {
- stp_put16_be(1382, v);
- /* SONY_MULTICUT -- 4x6 on 8x6 uses 2674 rows, 3x7 on 5x7 uses 2420 */
- } else {
- stp_put16_be(privdata.h_size, v);
- }
+ stp_put16_be(privdata.h_size, v);
stp_zfwrite("\xf9\xff\xff\xff",
1, 4, v);
@@ -1431,11 +1440,10 @@ static void updr150_200_printer_init_func(stp_vars_t *v, int updr200)
stp_zfwrite("\x00\x00\x00\x00", 1, 4, v);
stp_put16_be(privdata.w_size, v);
stp_put16_be(privdata.h_size, v);
-
- stp_zfwrite("\xf8\xff\xff\xff"
- "\xec\xff\xff\xff",
- 1, 8, v);
-
+ stp_zfwrite("\xf8\xff\xff\xff", 1, 4, v);
+
+ /* Each data block has this header. Can actually have multiple blocks! */
+ stp_zfwrite("\xec\xff\xff\xff", 1, 4, v);
stp_zfwrite("\x0b\x00\x00\x00\x1b\xea"
"\x00\x00\x00\x00", 1, 10, v);
stp_put32_be(privdata.w_size*privdata.h_size*3, v);
@@ -1466,22 +1474,26 @@ static void updr150_printer_end_func(stp_vars_t *v)
/* Sony UP-DR200 */
static const dyesub_pagesize_t updr200_page[] =
{
- { "w144h432", "2UPC-R204 (2x6)", PT(691,334)+1, PT(2048,334)+1, 0, 0, 0, 0, DYESUB_LANDSCAPE},
{ "w288h432", "2UPC-R204 (4x6)", PT(1382,334)+1, PT(2048,334)+1, 0, 0, 0, 0, DYESUB_LANDSCAPE},
+ { "w288h432-div2", "2UPC-R204 (2*2x6)", PT(1382,334)+1, PT(2048,334)+1, 0, 0, 0, 0, DYESUB_LANDSCAPE},
{ "B7", "2UPC-R203 (3.5x5)", PT(1210,334)+1, PT(1728,334)+1, 0, 0, 0, 0, DYESUB_LANDSCAPE},
{ "w360h504", "2UPC-R205 (5x7)", PT(1728,334)+1, PT(2380,334)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
+ { "w360h504-div2", "2UPC-R205 (2*3.5x5)", PT(1728,334)+1, PT(2420,334)+1, 0, 0, 0, 0, DYESUB_PORTRAIT},
{ "w432h576", "2UPC-R206 (6x8)", PT(2048,334)+1, PT(2724,334)+1, 0, 0, 0, DYESUB_PORTRAIT},
+ { "w432h576-div2", "2UPC-R206 (2*4x6)", PT(2048,334)+1, PT(2764,334)+1, 0, 0, 0, DYESUB_PORTRAIT},
};
LIST(dyesub_pagesize_list_t, updr200_page_list, dyesub_pagesize_t, updr200_page);
static const dyesub_printsize_t updr200_printsize[] =
{
- { "334x334", "w144h432", 691, 2048},
{ "334x334", "w288h432", 1382, 2048},
+ { "334x334", "w288h432-div2", 1382, 2048},
{ "334x334", "B7", 1210, 1728},
{ "334x334", "w360h504", 1728, 2380},
+ { "334x334", "w360h504-div2", 1728, 2420},
{ "334x334", "w432h576", 2048, 2724},
+ { "334x334", "w432h576-div2", 2048, 2764},
};
LIST(dyesub_printsize_list_t, updr200_printsize_list, dyesub_printsize_t, updr200_printsize);
@@ -1501,31 +1513,6 @@ static void updr200_printer_init_func(stp_vars_t *v)
updr150_200_printer_init_func(v, 1);
}
-static void updr200_printer_end_func(stp_vars_t *v)
-{
- if (strcmp(privdata.pagesize,"w144h432") == 0) {
- /* SONY_MULTICUT -- 2x6 on 4x6, 3x5 on 5x7, 4x6 on 8x6 */
- stp_zfwrite("\xfc\xff\xff\xff"
- "\xfa\xff\xff\xff",
- 1, 8, v);
- stp_zfwrite("\x07\x00\x00\x00"
- "\x1b\xc0\x00\x03\x00\x05\x00"
- "\x05\x00\x00\x00"
- "\x02\x03\x00\x01\x01",
- 1, 20, v);
- stp_zfwrite("\x07\x00\x00\x00"
- "\x1b\x0a\x00\x00\x00\x00\x00"
- "\x07\x00\x00\x00"
- "\x1b\x17\x00\x00\x00\x00\x00",
- 1, 22, v);
- stp_zfwrite("\xf3\xff\xff\xff",
- 1, 4, v);
- } else {
- /* Normal operation */
- updr150_printer_end_func(v);
- }
-}
-
/* Sony UP-CR10L / DNP SL10 */
static const dyesub_pagesize_t upcr10_page[] =
{
@@ -2819,9 +2806,9 @@ static const laminate_t mitsu_cpd70x_laminate[] =
LIST(laminate_list_t, mitsu_cpd70x_laminate_list, laminate_t, mitsu_cpd70x_laminate);
-static void mitsu_cpd70k60_printer_init(stp_vars_t *v, int is_k60, int is_305)
+static void mitsu_cpd70k60_printer_init(stp_vars_t *v, unsigned char model)
{
- /* Printer init */
+ /* Printer wakeup */
stp_putc(0x1b, v);
stp_putc(0x45, v);
stp_putc(0x57, v);
@@ -2832,60 +2819,49 @@ static void mitsu_cpd70k60_printer_init(stp_vars_t *v, int is_k60, int is_305)
stp_putc(0x1b, v);
stp_putc(0x5a, v);
stp_putc(0x54, v);
- if (is_k60) {
- stp_putc(0x00, v);
- } else if (is_305) {
- stp_putc(0x90, v);
- } else {
- stp_putc(0x01, v);
- }
+ stp_putc(model, v); /* k60 == x02, 305 == x90, d70x == x01 */
dyesub_nputc(v, 0x00, 12);
stp_put16_be(privdata.w_size, v);
stp_put16_be(privdata.h_size, v);
if (*((const char*)((privdata.laminate->seq).data)) != 0x00) {
- /* Laminate a slightly larger boundary */
+ /* Laminate a slightly larger boundary in Matte mode */
stp_put16_be(privdata.w_size, v);
stp_put16_be(privdata.h_size + 12, v);
- if (is_k60) {
- stp_putc(0x04, v); /* Matte Lamination forces UltraFine */
+ if (model == 0x02) {
+ stp_putc(0x04, v); /* Matte Lamination forces UltraFine on K60 */
} else {
stp_putc(0x03, v); /* Matte Lamination forces Superfine (or UltraFine) */
}
} else {
- dyesub_nputc(v, 0x00, 4); /* Ie no Lamination */
- stp_putc(0x00, v); /* Fine mode */
+ /* Glossy lamination here */
+ stp_put16_be(0, v);
+ stp_put16_be(0, v);
+ stp_putc(0x00, v); /* ...and just use fine mode. XXX (optional?) */
}
dyesub_nputc(v, 0x00, 7);
- if (is_k60 || is_305) {
- stp_putc(0x01, v); /* K60 has a single "lower" deck */
+ if (model != 0x01) {
+ stp_putc(0x00, v); /* D70x: 0x00 Auto deck selection, 0x01 for Lower, 0x02 for Upper */
} else {
- stp_putc(0x00, v); /* Auto deck selection, or 0x01 for Lower, 0x02 for Upper */
+ stp_putc(0x01, v); /* All others have a single "lower" deck */
}
- dyesub_nputc(v, 0x00, 8);
+ dyesub_nputc(v, 0x00, 7);
+ stp_putc(0x00, v); /* Lamination always enabled */
stp_zfwrite((privdata.laminate->seq).data, 1,
(privdata.laminate->seq).bytes, v); /* Lamination mode */
dyesub_nputc(v, 0x00, 6);
- /* Multi-cut control */
- if (is_305) {
- if (strcmp(privdata.pagesize,"w288h432") == 0) {
- stp_putc(0x01, v);
- } else {
- stp_putc(0x00, v);
- }
+ /* Multi-cut controlx */
+ if (strcmp(privdata.pagesize,"w432h576-div2") == 0) {
+ stp_putc(0x01, v);
+ } else if (strcmp(privdata.pagesize,"w360h504-div2") == 0) {
+ stp_putc(0x01, v);
+ } else if (strcmp(privdata.pagesize,"w288h432-div2") == 0) {
+ stp_putc(0x05, v);
} else {
- if (strcmp(privdata.pagesize,"w432h576-div2") == 0) {
- stp_putc(0x01, v);
- } else if (strcmp(privdata.pagesize,"w360h504-div2") == 0) {
- stp_putc(0x01, v);
- } else if (strcmp(privdata.pagesize,"w288h432-div2") == 0) {
- stp_putc(0x05, v);
- } else {
- stp_putc(0x00, v);
- }
+ stp_putc(0x00, v);
}
dyesub_nputc(v, 0x00, 15);
@@ -2894,7 +2870,7 @@ static void mitsu_cpd70k60_printer_init(stp_vars_t *v, int is_k60, int is_305)
static void mitsu_cpd70x_printer_init(stp_vars_t *v)
{
- mitsu_cpd70k60_printer_init(v, 0, 0);
+ mitsu_cpd70k60_printer_init(v, 0x01);
}
static void mitsu_cpd70x_printer_end(stp_vars_t *v)
@@ -2999,7 +2975,7 @@ LIST(dyesub_printsize_list_t, mitsu_cpk60_printsize_list, dyesub_printsize_t, mi
static void mitsu_cpk60_printer_init(stp_vars_t *v)
{
- mitsu_cpd70k60_printer_init(v, 1, 0);
+ mitsu_cpd70k60_printer_init(v, 0x02);
}
static const dyesub_pagesize_t mitsu_cpd80_page[] =
@@ -3057,7 +3033,7 @@ LIST(dyesub_printsize_list_t, kodak305_printsize_list, dyesub_printsize_t, kodak
static void kodak305_printer_init(stp_vars_t *v)
{
- mitsu_cpd70k60_printer_init(v, 0, 1);
+ mitsu_cpd70k60_printer_init(v, 0x90);
}
/* Shinko CHC-S9045 (experimental) */
@@ -3482,6 +3458,10 @@ static const dyesub_pagesize_t shinko_chcs6145_page[] =
DYESUB_PORTRAIT},
{ "w432h576-w432h432_w432h144", "6x6+2x6", PT(1844,300)+1, PT(2434,300)+1, 0, 0, 0, 0,
DYESUB_PORTRAIT},
+ { "w432h576-div2", "4x6*2", PT(1844,300)+1, PT(2492,300)+1, 0, 0, 0, 0,
+ DYESUB_PORTRAIT},
+ { "w432h648", "6x9", PT(1844,300)+1, PT(2740,300)+1, 0, 0, 0, 0,
+ DYESUB_PORTRAIT},
};
LIST(dyesub_pagesize_list_t, shinko_chcs6145_page_list, dyesub_pagesize_t, shinko_chcs6145_page);
@@ -3496,13 +3476,16 @@ static const dyesub_printsize_t shinko_chcs6145_printsize[] =
{ "300x300", "w432h432", 1832, 1844},
{ "300x300", "w432h576", 1844, 2434},
{ "300x300", "w432h576-w432h432_w432h144", 1844, 2434},
+ { "300x300", "w432h576-div2", 1844, 2492},
+ { "300x300", "w432h648", 1844, 2740},
};
LIST(dyesub_printsize_list_t, shinko_chcs6145_printsize_list, dyesub_printsize_t, shinko_chcs6145_printsize);
static const laminate_t shinko_chcs6145_laminate[] =
{
- {"PrinterDefault", N_("Printer Default"), {4, "\x01\0\0\0"}},
+ {"PrinterDefault", N_("Printer Default"), {4, "\0\0\0\0"}},
+ {"None", N_("None"), {4, "\x01\0\0\0"}},
{"Glossy", N_("Glossy"), {4, "\x02\0\0\0"}},
{"Matte", N_("Matte"), {4, "\x03\0\0\0"}},
};
@@ -3529,7 +3512,11 @@ static void shinko_chcs6145_printer_init(stp_vars_t *v)
media = 0x07;
else if (strcmp(privdata.pagesize,"w432h576-w432h432_w432h144") == 0)
media = 0x06;
-
+ else if (strcmp(privdata.pagesize,"w432h576-div2") == 0)
+ media = 0x06;
+ else if (strcmp(privdata.pagesize,"w432h648") == 0)
+ media = 0x05;
+
stp_put32_le(0x10, v);
stp_put32_le(6145, v); /* Printer Model */
if (!strcmp(privdata.pagesize,"w360h360") ||
@@ -3548,6 +3535,8 @@ static void shinko_chcs6145_printer_init(stp_vars_t *v)
stp_put32_le(0x05, v);
} else if (strcmp(privdata.pagesize,"w288h432-div2") == 0) {
stp_put32_le(0x04, v);
+ } else if (strcmp(privdata.pagesize,"w432h576-div2") == 0) {
+ stp_put32_le(0x02, v);
} else {
stp_put32_le(0x00, v);
}
@@ -3610,61 +3599,6 @@ static const dyesub_printsize_t ciaat_brava21_printsize[] =
LIST(dyesub_printsize_list_t, ciaat_brava21_printsize_list, dyesub_printsize_t, ciaat_brava21_printsize);
-static const laminate_t ciaat_brava21_laminate[] =
-{
- {"Off", N_("Off"), {1, "\x01"}},
- {"Glossy", N_("Glossy"), {1, "\x02"}},
- {"Matte", N_("Matte"), {1, "\x03"}},
-};
-
-LIST(laminate_list_t, ciaat_brava21_laminate_list, laminate_t, ciaat_brava21_laminate);
-
-static void ciaat_brava21_printer_init(stp_vars_t *v)
-{
- int media = 0;
-
- if (strcmp(privdata.pagesize,"w288h432") == 0)
- media = 0x00;
- else if (strcmp(privdata.pagesize,"w288h432-div2") == 0)
- media = 0x00;
- else if (strcmp(privdata.pagesize,"w360h504") == 0)
- media = 0x03;
- else if (strcmp(privdata.pagesize,"w432h576") == 0)
- media = 0x06;
- else if (strcmp(privdata.pagesize,"w144h432") == 0)
- media = 0x07;
- else if (strcmp(privdata.pagesize,"w432h576-div2") == 0)
- media = 0x06;
-
- stp_putc(0x01, v);
- stp_putc(0x40, v);
- stp_putc(0x12, v);
- stp_putc(0x00, v);
- stp_putc(0x01, v);
- stp_putc(0x01, v); /* Copies */
- stp_putc(0x00, v);
- stp_put16_le(privdata.w_size, v); /* Columns */
- stp_put16_le(privdata.h_size, v); /* Rows */
-
- stp_putc(media, v);
-
- dyesub_nputc(v, 0x00, 6);
- stp_putc(0x01, v);
-
- if (strcmp(privdata.pagesize,"w288h432-div2") == 0)
- media = 0x04;
- else if (strcmp(privdata.pagesize,"w432h576-div2") == 0)
- media = 0x02;
- else
- media = 0x00; /* or 0x01 to turn off trimming */
-
- stp_zfwrite((privdata.laminate->seq).data, 1,
- (privdata.laminate->seq).bytes, v); /* Lamination */
-
- stp_putc(media, v);
- stp_putc(0x00, v);
-}
-
/* Dai Nippon Printing DS40 */
static const dyesub_resolution_t res_dnpds40_dpi[] =
{
@@ -4378,7 +4312,7 @@ static void citizen_cw01_plane_init(stp_vars_t *v)
static const dyesub_cap_t dyesub_model_capabilities[] =
{
{ /* Olympus P-10, P-11 */
- 2,
+ 2,
&rgb_ink_list,
&res_310dpi_list,
&p10_page_list,
@@ -4389,8 +4323,9 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&p10_printer_init_func, &p10_printer_end_func,
NULL, NULL,
&p10_block_init_func, NULL,
- NULL, NULL, NULL, /* color profile/adjustment is built into printer */
- &p10_laminate_list, NULL, NULL
+ NULL, NULL, NULL, /* color profile/adjustment is built into printer */
+ &p10_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Olympus P-200 */
4,
@@ -4406,6 +4341,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
p200_adj_any, p200_adj_any, p200_adj_any,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Olympus P-300 */
0,
@@ -4421,6 +4357,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&p300_block_init_func, NULL,
p300_adj_cyan, p300_adj_magenta, p300_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Olympus P-400 */
1,
@@ -4436,6 +4373,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&p400_block_init_func, NULL,
p400_adj_cyan, p400_adj_magenta, p400_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Olympus P-440 */
3,
@@ -4449,7 +4387,8 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
&p440_block_init_func, &p440_block_end_func,
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
- &p10_laminate_list, NULL, NULL
+ &p10_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Olympus P-S100 */
20,
@@ -4464,6 +4403,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon CP-10 */
1002,
@@ -4480,6 +4420,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon CP-100, CP-200, CP-300 */
1000,
@@ -4496,6 +4437,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon CP-220, CP-330, SELPHY CP400, SELPHY CP500, SELPHY CP510,
SELPHY CP520, SELPHY CP530, SELPHY CP600, SELPHY CP710,
@@ -4515,6 +4457,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY ES1 */
1003,
@@ -4531,6 +4474,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY ES2, SELPHY ES20 */
1005,
@@ -4547,6 +4491,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY ES3, SELPHY ES30 */
1006,
@@ -4563,6 +4508,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY ES40 */
1007,
@@ -4579,6 +4525,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY CP790 */
1008,
@@ -4595,6 +4542,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY CP800 */
1009,
@@ -4611,6 +4559,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon SELPHY CP900 */
1010,
@@ -4627,6 +4576,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
cpx00_adj_cyan, cpx00_adj_magenta, cpx00_adj_yellow,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Canon CP820, CP910 */
1011,
@@ -4643,6 +4593,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL, /* Printer handles color correction! */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony UP-DP10 */
2000,
@@ -4658,6 +4609,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
updp10_adj_cyan, updp10_adj_magenta, updp10_adj_yellow,
&updp10_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony UP-DR150 */
2001,
@@ -4672,6 +4624,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&updp10_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony DPP-EX5, DPP-EX7 */
2002,
@@ -4687,6 +4640,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&dppex5_block_init, NULL,
NULL, NULL, NULL,
&dppex5_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony UP-DR100 */
2003,
@@ -4701,6 +4655,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&updr100_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony UP-DR200 */
2004,
@@ -4710,11 +4665,12 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&updr200_printsize_list,
SHRT_MAX,
DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
- &updr200_printer_init_func, &updr200_printer_end_func,
+ &updr200_printer_init_func, &updr150_printer_end_func,
NULL, NULL,
NULL, NULL,
NULL, NULL, NULL,
&updr200_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Sony UP-CR10L / DNP SL10 */
2005,
@@ -4729,6 +4685,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Fujifilm Printpix CX-400 */
3000,
@@ -4744,6 +4701,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Fujifilm Printpix CX-550 */
3001,
@@ -4759,6 +4717,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Fujifilm FinePix NX-500 */
3002,
@@ -4773,6 +4732,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Easyshare Dock family */
4000,
@@ -4788,6 +4748,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Photo Printer 6800 */
4001,
@@ -4802,6 +4763,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_6800_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Photo Printer 6850 */
4002,
@@ -4816,6 +4778,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_6800_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Photo Printer 605 */
4003,
@@ -4830,6 +4793,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_605_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Professional 1400 */
4004,
@@ -4846,6 +4810,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&kodak_6800_laminate_list, &kodak_1400_media_list, NULL,
+ NULL, NULL,
},
{ /* Kodak Photo Printer 805 */
4005,
@@ -4862,6 +4827,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_6800_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Professional 9810 */
4006,
@@ -4877,6 +4843,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_9810_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak 8810 */
4007,
@@ -4892,6 +4859,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_8810_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak 7000/7010 */
4008,
@@ -4907,6 +4875,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_7000_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak 7015 */
4009,
@@ -4922,6 +4891,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_7000_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak Professional 8500 */
4100,
@@ -4936,6 +4906,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&kodak_8500_laminate_list, &kodak_8500_media_list, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CP3020D/DU/DE */
4101,
@@ -4951,6 +4922,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CP3020DA/DAE */
4102,
@@ -4966,6 +4938,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CP9550D */
4103,
@@ -4981,6 +4954,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CP9810D */
4104,
@@ -4997,6 +4971,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&mitsu_cp9810_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CPD70D/CPD707D */
4105,
@@ -5013,6 +4988,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&mitsu_cpd70x_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CPK60D */
4106,
@@ -5029,6 +5005,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&mitsu_cpd70x_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Mitsubishi CPD80D */
4107,
@@ -5045,6 +5022,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&mitsu_cpd70x_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Kodak 305 */
4108,
@@ -5061,6 +5039,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No block funcs */
NULL, NULL, NULL, /* color profile/adjustment is built into printer */
&mitsu_cpd70x_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Shinko CHC-S9045 (experimental) */
5000,
@@ -5075,6 +5054,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Shinko/Sinfonia CHC-S2145 */
5001,
@@ -5089,6 +5069,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No blocks */
NULL, NULL, NULL, /* Color correction in printer */
&shinko_chcs2145_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Shinko/Sinfonia CHC-S1245 */
5002,
@@ -5117,10 +5098,11 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No blocks */
NULL, NULL, NULL, /* Color correction in printer */
&shinko_chcs6245_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Shinko/Sinfonia CHC-S6145 */
5004,
- &ymc_ink_list,
+ &rgb_ink_list,
&res_300dpi_list,
&shinko_chcs6145_page_list,
&shinko_chcs6145_printsize_list,
@@ -5131,8 +5113,9 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL, /* No blocks */
NULL, NULL, NULL, /* Color correction in printer */
&shinko_chcs6145_laminate_list, NULL, NULL,
+ NULL, NULL,
},
- { /* CIAAT Brava 21 */
+ { /* CIAAT Brava 21 (aka CHC-S6145D) */
5005,
&rgb_ink_list,
&res_300dpi_list,
@@ -5140,11 +5123,12 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
&ciaat_brava21_printsize_list,
SHRT_MAX,
DYESUB_FEATURE_FULL_WIDTH | DYESUB_FEATURE_FULL_HEIGHT,
- &ciaat_brava21_printer_init, NULL,
+ &shinko_chcs6145_printer_init, &shinko_chcs2145_printer_end,
NULL, NULL, /* No planes */
NULL, NULL, /* No blocks */
NULL, NULL, NULL, /* Color correction in printer */
- &ciaat_brava21_laminate_list, NULL, NULL,
+ &shinko_chcs6145_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Dai Nippon Printing DS40 */
6000,
@@ -5160,6 +5144,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&dnpds40_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Dai Nippon Printing DS80 */
6001,
@@ -5175,6 +5160,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&dnpds40_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Dai Nippon Printing DSRX1 */
6002,
@@ -5190,6 +5176,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&dnpds40_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Dai Nippon Printing DS620 */
6003,
@@ -5205,6 +5192,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&dnpds40_laminate_list, NULL, NULL,
+ NULL, NULL,
},
{ /* Citizen CW-01 */
6005,
@@ -5220,6 +5208,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
NULL, NULL, NULL,
+ NULL, NULL,
},
{ /* Dai Nippon Printing DS80DX */
6006,
@@ -5235,6 +5224,7 @@ static const dyesub_cap_t dyesub_model_capabilities[] =
NULL, NULL,
NULL, NULL, NULL,
&dnpds40_laminate_list, &dnpds80dx_media_list, &dnpds80dx_uiconstraints_list,
+ NULL, NULL,
},
};
@@ -6416,6 +6406,38 @@ dyesub_print(const stp_vars_t *v, stp_image_t *image)
return status;
}
+static int
+dyesub_job_start(const stp_vars_t *v, stp_image_t *image)
+{
+ const dyesub_cap_t *caps;
+ stp_vars_t *nv = stp_vars_create_copy(v);
+
+ stp_prune_inactive_options(nv);
+ caps = dyesub_get_model_capabilities(stp_get_model_id(nv));
+
+ if (caps->job_start_func)
+ caps->job_start_func(nv);
+ stp_vars_destroy(nv);
+
+ return 1;
+}
+
+static int
+dyesub_job_end(const stp_vars_t *v, stp_image_t *image)
+{
+ const dyesub_cap_t *caps;
+ stp_vars_t *nv = stp_vars_create_copy(v);
+
+ stp_prune_inactive_options(nv);
+ caps = dyesub_get_model_capabilities(stp_get_model_id(nv));
+
+ if (caps->job_end_func)
+ caps->job_end_func(nv);
+ stp_vars_destroy(nv);
+
+ return 1;
+}
+
static const stp_printfuncs_t print_dyesub_printfuncs =
{
dyesub_list_parameters,
@@ -6428,8 +6450,8 @@ static const stp_printfuncs_t print_dyesub_printfuncs =
dyesub_describe_resolution,
dyesub_describe_output,
stp_verify_printer_params,
- NULL,
- NULL,
+ dyesub_job_start,
+ dyesub_job_end,
NULL
};
diff --git a/src/main/print-pcl.c b/src/main/print-pcl.c
index 5f0d1fa..7954b9a 100644
--- a/src/main/print-pcl.c
+++ b/src/main/print-pcl.c
@@ -1,5 +1,5 @@
/*
- * "$Id: print-pcl.c,v 1.165 2015/09/09 23:57:32 speachy Exp $"
+ * "$Id: print-pcl.c,v 1.166 2015/10/26 00:43:07 sletter1 Exp $"
*
* Print plug-in HP PCL driver for the GIMP.
*
@@ -64,6 +64,9 @@ typedef struct
int use_crd;
int orientation;
int label_separator;
+ unsigned int h_offset; /* decipoints */
+ unsigned int v_offset; /* decipoints */
+ int darkness;
} pcl_privdata_t;
/*
@@ -1516,6 +1519,12 @@ static const stp_parameter_t the_parameters[] =
STP_PARAMETER_TYPE_STRING_LIST, STP_PARAMETER_CLASS_FEATURE,
STP_PARAMETER_LEVEL_BASIC, 1, 1, STP_CHANNEL_NONE, 1, 0,
},
+ {
+ "Darkness", N_("Darkness"), "Color=No,Category=Basic Printer Setup",
+ N_("Darkness Adjust, from -20 to 20"),
+ STP_PARAMETER_TYPE_INT, STP_PARAMETER_CLASS_FEATURE,
+ STP_PARAMETER_LEVEL_BASIC, 0, 1, STP_CHANNEL_NONE, 1, 0
+ },
};
static const int the_parameter_count =
@@ -1580,6 +1589,24 @@ static const float_param_t float_parameters[] =
STP_PARAMETER_LEVEL_ADVANCED4, 0, 1, STP_CHANNEL_NONE, 1, 0
}, 0.0, 5.0, 1.0, 1
},
+ {
+ {
+ "HorizOffset", N_("Horizontal Offset"),
+ "Color=No,Category=Basic Output Adjustment",
+ N_("Adjust horizontal position"),
+ STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+ STP_PARAMETER_LEVEL_ADVANCED3, 1, 1, STP_CHANNEL_NONE, 1, 0,
+ }, 0.0, 4.0, 0.0, 0
+ },
+ {
+ {
+ "VertOffset", N_("Vertical Offset"),
+ "Color=No,Category=Basic Output Adjustment",
+ N_("Adjust vertical position"),
+ STP_PARAMETER_TYPE_DOUBLE, STP_PARAMETER_CLASS_OUTPUT,
+ STP_PARAMETER_LEVEL_ADVANCED3, 1, 1, STP_CHANNEL_NONE, 1, 0,
+ }, 0.0, 10.0, 0.0, 0
+ },
};
static const int float_parameter_count =
@@ -1836,7 +1863,6 @@ static const stp_param_string_t label_separator_types[] =
};
#define NUM_LABEL_SEPARATOR (sizeof (label_separator_types) / sizeof (stp_param_string_t))
-
/*
* 'pcl_papersize_valid()' - Is the paper size valid for this printer.
*/
@@ -2172,6 +2198,19 @@ pcl_parameters(const stp_vars_t *v, const char *name,
description->is_active = 0;
}
}
+ else if (strcmp(name, "Darkness") == 0)
+ {
+ if (caps->stp_printer_type & PCL_PRINTER_LABEL)
+ {
+ description->deflt.integer = 0;
+ description->bounds.integer.lower = -20;
+ description->bounds.integer.upper = 20;
+ }
+ else
+ {
+ description->is_active = 0;
+ }
+ }
else if (strcmp(name, "CyanDensity") == 0 ||
strcmp(name, "MagentaDensity") == 0 ||
strcmp(name, "YellowDensity") == 0 ||
@@ -2194,6 +2233,18 @@ pcl_parameters(const stp_vars_t *v, const char *name,
else
description->is_active = 0;
}
+ else if (strcmp(name, "HorizOffset") == 0 ||
+ strcmp(name, "VertOffset") == 0)
+ {
+ if (caps->stp_printer_type & PCL_PRINTER_LABEL)
+ {
+ description->is_active = 1;
+ }
+ else
+ {
+ description->is_active = 0;
+ }
+ }
else if (strcmp(name, "InkChannels") == 0)
{
if (caps->color_type & PCL_COLOR_CMYKcm)
@@ -2480,6 +2531,8 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
const char *duplex_mode = stp_get_string_parameter(v, "Duplex");
const char *orientation_mode = stp_get_string_parameter(v, "Orientation");
const char *label_separator_mode = stp_get_string_parameter(v, "LabelSeparator");
+ double h_offset = get_double_param(v, "HorizOffset");
+ double v_offset = get_double_param(v, "VertOffset");
int page_number = stp_get_int_parameter(v, "PageNumber");
int printing_color = 0;
int top = stp_get_top(v);
@@ -2671,6 +2724,24 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
privdata.label_separator = 4;
if ((strncmp(label_separator_mode, "NONE", 10) == 0))
privdata.label_separator = 5;
+
+ /*
+ * Print Offsets
+ */
+ privdata.h_offset = (int) (h_offset * 720.0);
+ privdata.v_offset = (int) (v_offset * 720.0);
+
+ /*
+ * Darkness Mode
+ */
+ if (stp_check_int_parameter(v, "Darkness", STP_PARAMETER_ACTIVE))
+ {
+ privdata.darkness = stp_get_int_parameter(v, "Darkness");
+ }
+ else
+ {
+ privdata.darkness = 30;
+ }
}
@@ -2687,6 +2758,13 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
if (label)
{
+ if (privdata.darkness > -21 && privdata.darkness < 21)
+ {
+ stp_puts("\033%-12345X@PJL JOB NAME=\"JOB_CONFIG\" SECURITY=\"0x0000FFFF\"\n", v);
+ stp_zprintf(v, "@PJL DEFAULT DARKNESS=%d\n", privdata.darkness);
+ stp_puts("@PJL EOJ\n", v);
+ stp_puts("\033%-12345X\n", v);
+ }
if (privdata.do_cretb)
stp_puts("\033*rbC", v); /* End raster graphics */
stp_puts("\033E", v); /* PCL reset */
@@ -2696,8 +2774,10 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
stp_zprintf(v, "\033%%-12345X@PJL SET RESOLUTION=%d\n"
"@PJL SET PAPERWIDTH=%d\n"
"@PJL SET PAPERLENGTH=%d\n"
+ "@PJL SET VERTICALOFFSET=%d\n"
+ "@PJL SET HORIZONTALOFFSET=%d\n"
"@PJL ENTER LANGUAGE=PCL\n", xdpi, out_width*10,
- out_height*10);
+ out_height*10, privdata.v_offset, privdata.h_offset);
if ( privdata.label_separator != 0) {
stp_zprintf(v, "\033%%-12345X@PJL JOB SETUP = \"ON\" "
@@ -2729,7 +2809,9 @@ pcl_do_print(stp_vars_t *v, stp_image_t *image)
stp_zprintf(v, "\033&l%dP", stp_get_page_height(v) / 12);
/* Length of "forms" in "lines" */
stp_puts("\033&l0L", v); /* Turn off perforation skip */
- stp_puts("\033&l0E", v); /* Reset top margin to 0 */
+ if (! label) {
+ stp_puts("\033&l0E", v); /* Reset top margin to 0 */
+ }
/*
* Convert media source string to the code, if specified.
diff --git a/src/xml/escp2/model/Makefile.am b/src/xml/escp2/model/Makefile.am
index 7887eca..ea1cc3f 100644
--- a/src/xml/escp2/model/Makefile.am
+++ b/src/xml/escp2/model/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.33 2013/06/23 01:31:40 rlk Exp $
+## $Id: Makefile.am,v 1.34 2015/10/19 12:26:38 rlk Exp $
## Copyright (C) 2008 Robert Krawitz
##
## This program is free software; you can redistribute it and/or modify
@@ -147,7 +147,8 @@ pkgxmldata_DATA = \
model_118.xml \
model_119.xml \
model_120.xml \
- model_121.xml
+ model_121.xml \
+ model_122.xml
xml-stamp: $(pkgxmldata_DATA) Makefile.am
-rm -f $@ $@.tmp
diff --git a/src/xml/escp2/model/Makefile.in b/src/xml/escp2/model/Makefile.in
index c6a2d79..21a41d8 100644
--- a/src/xml/escp2/model/Makefile.in
+++ b/src/xml/escp2/model/Makefile.in
@@ -498,7 +498,8 @@ pkgxmldata_DATA = \
model_118.xml \
model_119.xml \
model_120.xml \
- model_121.xml
+ model_121.xml \
+ model_122.xml
CLEANFILES = xmli18n-tmp.h xml-stamp xml-stamp.tmp
EXTRA_DIST = $(pkgxmldata_DATA)
diff --git a/src/xml/escp2/model/model_122.xml b/src/xml/escp2/model/model_122.xml
new file mode 100644
index 0000000..99aa2da
--- /dev/null
+++ b/src/xml/escp2/model/model_122.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0"?>
+
+<gutenprint xmlns="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xsi:schemaLocation="http://gimp-print.sourceforge.net/xsd/gp.xsd-1.0 gutenprint.xsd">
+<copyright>
+ * Copyright 2008 Robert Krawitz (rlk@alum.mit.edu)
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+</copyright>
+<escp2Model id="122">
+ <media src="escp2/media/claria.xml"/>
+ <inputSlots src="escp2/inputslots/rx680.xml"/>
+ <qualityPresets src="escp2/qualitypresets/v2880.xml"/>
+ <inkGroup src="escp2/inks/claria.xml"/>
+ <mediaSizes src="escp2/mediasizes/standard.xml"/>
+ <verticalBorderlessSequence>US\003\000\000\000\002</verticalBorderlessSequence>
+ <preinitSequence>\000\000\000\033\001@EJL\0401284.4\012@EJL\040\040\040\040\040\012\033@</preinitSequence>
+ <preinitRemoteSequence>SN\001\000\000</preinitRemoteSequence>
+ <postinitRemoteSequence>JE\001\000\000</postinitRemoteSequence>
+ <commandSet>2000</commandSet>
+ <borderless>Full</borderless>
+ <supportsVariableDropsizes/>
+ <hasFastGraymode/>
+ <sendZeroAdvance/>
+ <supportsD4Mode/>
+ <preferredEnvelopeOrientation>Portrait</preferredEnvelopeOrientation>
+ <headConfiguration type="default">
+ <Nozzles>90</Nozzles>
+ <MinNozzles>1</MinNozzles>
+ <FirstNozzle>0</FirstNozzle>
+ <NozzleSeparation>4</NozzleSeparation>
+ </headConfiguration>
+ <physicalChannels>6</physicalChannels>
+ <baseSeparation>360</baseSeparation>
+ <resolutionScale>14400</resolutionScale>
+ <minimumResolution>360 90</minimumResolution>
+ <maximumResolution>5760 2880</maximumResolution>
+ <extraVerticalFeed>10</extraVerticalFeed>
+ <separationRows>1</separationRows>
+ <zeroMarginOffset>80</zeroMarginOffset>
+ <microLeftMargin>42</microLeftMargin>
+ <minHorizontalAlignment>1</minHorizontalAlignment>
+ <baseHorizontalAlignment>28800</baseHorizontalAlignment>
+ <bidirectionalAutoUpperLimit>16588800</bidirectionalAutoUpperLimit>
+ <minimumMediaSize>144 144</minimumMediaSize>
+ <maximumMediaSize>936 86400</maximumMediaSize>
+ <maximumImageableArea>936 86400</maximumImageableArea>
+ <margins interleave="soft" media="sheet">9 9 0 9</margins>
+ <margins interleave="printer" media="sheet">9 9 0 9</margins>
+ <margins interleave="soft" media="roll">9 9 0 0</margins>
+ <margins interleave="printer" media="roll">9 9 0 0</margins>
+ <margins duplex="duplex">9 9 27 27</margins>
+ <CDOffset>204 189</CDOffset>
+ <CDMediaSize>595 842</CDMediaSize>
+ <AlignmentChoices>4 15 0 0</AlignmentChoices>
+ <ChannelNames>
+ <ChannelName translate="text" name="Yellow" text="Yellow"/>
+ <ChannelName translate="text" name="Black" text="Black"/>
+ <ChannelName translate="text" name="LightCyan" text="Light Cyan"/>
+ <ChannelName translate="text" name="LightMagenta" text="Light Magenta"/>
+ <ChannelName translate="text" name="Magenta" text="Magenta"/>
+ <ChannelName translate="text" name="Cyan" text="Cyan"/>
+ </ChannelNames>
+ <resolutions>
+ <resolution translate="text" name="360x90sw" text="360 x 90 DPI Fast Economy">
+ <physicalResolution>360 90</physicalResolution>
+ <parameter type="float" name="escp2_density">4.000000</parameter>
+ <parameter type="integer" name="escp2_ink_type">51</parameter>
+ <parameter type="integer" name="escp2_base_res">360</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.125000</parameter>
+ <parameter type="float" name="DropSize2">0.420000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="360x180sw" text="360 x 180 DPI Draft">
+ <physicalResolution>360 180</physicalResolution>
+ <parameter type="float" name="escp2_density">4.000000</parameter>
+ <parameter type="integer" name="escp2_ink_type">49</parameter>
+ <parameter type="integer" name="escp2_base_res">360</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.360000</parameter>
+ <parameter type="float" name="DropSize2">0.600000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="360sw" text="360 DPI">
+ <physicalResolution>360 360</physicalResolution>
+ <parameter type="float" name="escp2_density">4.000000</parameter>
+ <parameter type="integer" name="escp2_ink_type">49</parameter>
+ <parameter type="integer" name="escp2_base_res">360</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.360000</parameter>
+ <parameter type="float" name="DropSize2">0.600000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="720x360sw" text="720 x 360 DPI">
+ <physicalResolution>720 360</physicalResolution>
+ <verticalPasses>4</verticalPasses>
+ <parameter type="float" name="escp2_density">2.450000</parameter>
+ <parameter type="integer" name="escp2_ink_type">33</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.160000</parameter>
+ <parameter type="float" name="DropSize2">0.580000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="720sw" text="720 DPI">
+ <physicalResolution>720 720</physicalResolution>
+ <parameter type="float" name="escp2_density">1.224000</parameter>
+ <parameter type="integer" name="escp2_ink_type">33</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.130000</parameter>
+ <parameter type="float" name="DropSize2">0.580000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="1440x720sw" text="1440 x 720 DPI">
+ <physicalResolution>1440 720</physicalResolution>
+ <parameter type="float" name="escp2_density">0.612000</parameter>
+ <parameter type="integer" name="escp2_ink_type">33</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.130000</parameter>
+ <parameter type="float" name="DropSize2">0.580000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="1440x1440ov" text="1440 x 1440 DPI">
+ <physicalResolution>2880 1440</physicalResolution>
+ <printedResolution>1440 1440</printedResolution>
+ <parameter type="float" name="escp2_density">1.1770000</parameter>
+ <parameter type="integer" name="escp2_ink_type">37</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.500000</parameter>
+ <parameter type="float" name="DropSize2">0.600000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="2880x1440sw" text="2880 x 1440 DPI">
+ <physicalResolution>2880 1440</physicalResolution>
+ <parameter type="float" name="escp2_density">0.586000</parameter>
+ <parameter type="integer" name="escp2_ink_type">37</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.500000</parameter>
+ <parameter type="float" name="DropSize2">0.600000</parameter>
+ <parameter type="float" name="DropSize3">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="5760x1440sw" text="5760 x 1440 DPI">
+ <physicalResolution>5760 1440</physicalResolution>
+ <parameter type="float" name="escp2_density">0.733000</parameter>
+ <parameter type="integer" name="escp2_ink_type">37</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.833000</parameter>
+ <parameter type="float" name="DropSize2">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="2880x2880sw" text="2880 x 2880 DPI">
+ <physicalResolution>2880 2880</physicalResolution>
+ <parameter type="float" name="escp2_density">0.733000</parameter>
+ <parameter type="integer" name="escp2_ink_type">37</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">0.833000</parameter>
+ <parameter type="float" name="DropSize2">1.000000</parameter>
+ </resolution>
+ <resolution translate="text" name="5760x2880sw" text="5760 x 2880 DPI">
+ <physicalResolution>5760 2880</physicalResolution>
+ <parameter type="float" name="escp2_density">0.440000</parameter>
+ <parameter type="integer" name="escp2_ink_type">37</parameter>
+ <parameter type="integer" name="escp2_base_res">720</parameter>
+ <parameter type="integer" name="escp2_bits">2</parameter>
+ <parameter type="float" name="DropSize1">1.000000</parameter>
+ </resolution>
+ </resolutions>
+</escp2Model>
+</gutenprint>
diff --git a/src/xml/printers.xml b/src/xml/printers.xml
index 8ec79c5..27f5c2f 100644
--- a/src/xml/printers.xml
+++ b/src/xml/printers.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!--
- "$Id: printers.xml,v 1.427 2015/10/03 22:20:34 rlk Exp $"
+ "$Id: printers.xml,v 1.431 2016/01/14 00:49:59 speachy Exp $"
XML description of printers known to libgutenprint
You can add additional printers here, but the underlying driver has
@@ -1319,6 +1319,7 @@
<printer translate="name" name="Epson B-510DN" driver="escp2-b510dn" manufacturer="Epson" model="87" parameters="standard_params" foomaticid="Epson-B510DN" />
<printer translate="name" name="Epson L120" driver="escp2-l120" manufacturer="Epson" model="80" parameters="cx3500_params" foomaticid="Epson-L120" />
<printer translate="name" name="Epson L210" driver="escp2-l210" manufacturer="Epson" model="80" parameters="cx3500_params" foomaticid="Epson-L210" />
+ <printer translate="name" name="Epson L1800" driver="escp2-l1800" manufacturer="Epson" model="122" parameters="cx3500_params" foomaticid="Epson-L1800" />
<printer translate="name" name="Epson Stylus C20" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20" manufacturer="Epson" model="42" parameters="480_params" foomaticid="Epson-Stylus_C20" />
<printer translate="name" name="Epson Stylus C20SX" driver="escp2-c20sx" manufacturer="Epson" model="42" parameters="480_params" foomaticid="Epson-Stylus_C20SX" />
<printer translate="name" name="Epson Stylus C20UX" deviceid="MFG:EPSON;MDL:Stylus C20;DES:EPSON Stylus C20;CMD:ESCPL2,BDC,D4;" driver="escp2-c20ux" manufacturer="Epson" model="42" parameters="480_params" foomaticid="Epson-Stylus_C20UX" />
@@ -2378,6 +2379,7 @@
<printer translate="name" name="Kyocera FS-1030D" driver="kyocera-fs-1030d" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1030D" />
<printer translate="name" name="Kyocera FS-1050" deviceid="MFG:Kyocera Mita;MDL:Kyocera Mita FS-1050;DES:Kyocera FS-1050;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1050" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1050" />
<printer translate="name" name="Kyocera FS-1118MFP" deviceid="MFG:Kyocera;MDL:FS-1118MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;" driver="kyocera-fs-1118mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1118MFP" />
+ <printer translate="name" name="Kyocera FS-1135MFP" deviceid="MFG:Kyocera;MDL:FS-1135MFP;CMD:PCLXL,PostScript Emulation,PCL5E,PJL;" driver="kyocera-fs-1135mfp" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1135MFP" />
<printer translate="name" name="Kyocera FS-1200" deviceid="MFG:Kyocera;MDL:Kyocera FS-1200;DES:Kyocera FS-1200;CMD:POSTSCRIPT,PJL,PCL;" driver="kyocera-fs-1200" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1200" />
<printer translate="name" name="Kyocera FS-1600" deviceid="MFG:Kyocera;MDL:FS-1600;DES:Kyocera FS-1600;" driver="kyocera-fs-1600" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600" />
<printer translate="name" name="Kyocera FS-1600+" driver="kyocera-fs-1600plus" manufacturer="Kyocera" model="62" parameters="pcl_laser_params" foomaticid="Kyocera-FS-1600plus" />
@@ -2928,9 +2930,9 @@
<printer translate="name" name="Sinfonia CHC-S1245/E1" driver="sinfonia-chcs1245" manufacturer="Sinfonia" model="5002" foomaticid="Sinfonia-CHC-S1245" parameters="nativecopies">EXPERIMENTAL</printer>
<printer translate="name" name="Shinko CHC-S6245" driver="shinko-chcs6245" manufacturer="Shinko" model="5003" foomaticid="Shinko-CHC-S6245" parameters="nativecopies">EXPERIMENTAL</printer>
<printer translate="name" name="Sinfonia CHC-S6245/CE1" driver="sinfonia-chcs6245" manufacturer="Sinfonia" model="5003" foomaticid="Sinfonia-CHC-S6245" parameters="nativecopies">EXPERIMENTAL</printer>
- <printer translate="name" name="Shinko CHC-S6145" deviceid="MFG:SINFONIA;CMD:SUPCC;MDL:CHC-S6145;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="shinko-chcs6145" manufacturer="Shinko" model="5004" foomaticid="Shinko-CHC-S6145">EXPERIMENTAL</printer>
- <printer translate="name" name="Sinfonia CHC-S6145/CS2" driver="sinfonia-chcs6145" manufacturer="Sinfonia" model="5004" foomaticid="Sinfonia-CHC-S6145">EXPERIMENTAL</printer>
- <printer translate="name" name="CIAAT Brava 21" driver="ciaat-brava-21" manufacturer="CIAAT" model="5005" foomaticid="CIAAT-Brava-21">EXPERIMENTAL</printer>
+ <printer translate="name" name="Shinko CHC-S6145" driver="shinko-chcs6145" manufacturer="Shinko" model="5004" foomaticid="Shinko-CHC-S6145" parameters="nativecopies">EXPERIMENTAL</printer>
+ <printer translate="name" name="Sinfonia CHC-S6145/CS2" deviceid="MFG:SINFONIA;CMD:SUPCC;MDL:CHC-S6145;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="sinfonia-chcs6145" manufacturer="Sinfonia" model="5004" foomaticid="Sinfonia-CHC-S6145" parameters="nativecopies">EXPERIMENTAL</printer>
+ <printer translate="name" name="CIAAT Brava 21" deviceid="MFG:CIAAT;CMD:SUPCC;MDL:BRAVA21;CLS:PRINTER;DES:Thermal Dye Photo Printer;" driver="ciaat-brava-21" manufacturer="CIAAT" model="5005" foomaticid="CIAAT-Brava-21" parameters="nativecopies">EXPERIMENTAL</printer>
<printer translate="name" name="Dai Nippon Printing DS40" deviceid="MANUFACTURER:Dai Nippon Printing ;MODEL:DS40;" driver="dnp-ds40" manufacturer="Dai Nippon Printing" model="6000" foomaticid="DNP-DS40" parameters="nativecopies" />
<printer translate="name" name="Dai Nippon Printing DS80" deviceid="MANUFACTURER:Dai Nippon Printing ;MODEL:DS80;" driver="dnp-ds80" manufacturer="Dai Nippon Printing" model="6001" foomaticid="DNP-DS80" parameters="nativecopies" />
<printer translate="name" name="Dai Nippon Printing DSRX1" driver="dnp-dsrx1" deviceid="MANUFACTURER:Dai Nippon Printing ;MODEL:DS-RX1;" manufacturer="Dai Nippon Printing" model="6002" foomaticid="DNP-DSRX1" parameters="nativecopies" />
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 20:24:31 +0000