diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-11-27 12:15:51 -0500 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2019-11-27 12:15:51 -0500 |
| commit | d6ec252e9b71d4e399ba396a892cd46ef3b0fe5c (patch) | |
| tree | 4f04bf6cebfbdac1bdb010818ff92d432796d672 | |
| parent | 2bae6fc51889f1938b05c35bf6965a1826a2d834 (diff) | |
| download | cups-d6ec252e9b71d4e399ba396a892cd46ef3b0fe5c.tar.gz | |
Add support for the second roll in DYMO Twin/DUO label printers.
| -rw-r--r-- | CHANGES.md | 3 | ||||
| -rw-r--r-- | filter/rastertolabel.c | 13 | ||||
| -rw-r--r-- | ppdc/sample.drv | 11 |
3 files changed, 17 insertions, 10 deletions
diff --git a/CHANGES.md b/CHANGES.md index eadae56a0..f4436f4d1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,4 @@ -CHANGES - 2.3.1 - 2019-11-18 +CHANGES - 2.3.1 - 2019-11-27 ============================ @@ -27,6 +27,7 @@ Changes in CUPS v2.3.1 - Fixed spelling of "fold-accordion". - Fixed the default common name for TLS certificates used by `ippeveprinter`. - Fixed the option names used for IPP Everywhere finishing options. +- Added support for the second roll of the DYMO Twin/DUO label printers. Changes in CUPS v2.3.0 diff --git a/filter/rastertolabel.c b/filter/rastertolabel.c index 35d678db7..c576edaa0 100644 --- a/filter/rastertolabel.c +++ b/filter/rastertolabel.c @@ -23,12 +23,12 @@ /* - * This driver filter currently supports Dymo, Intellitech, and Zebra + * This driver filter currently supports DYMO, Intellitech, and Zebra * label printers. * - * The Dymo portion of the driver has been tested with the 300, 330, - * and 330 Turbo label printers; it may also work with other models. - * The Dymo printers support printing at 136, 203, and 300 DPI. + * The DYMO portion of the driver has been tested with the 300, 330, + * 330 Turbo, and 450 Twin Turbo label printers; it may also work with other + * models. The DYMO printers support printing at 136, 203, and 300 DPI. * * The Intellitech portion of the driver has been tested with the * Intellibar 408, 412, and 808 and supports their PCL variant. @@ -43,7 +43,7 @@ * Model number constants... */ -#define DYMO_3x0 0 /* Dymo Labelwriter 300/330/330 Turbo */ +#define DYMO_3x0 0 /* DYMO Labelwriter 300/330/330 Turbo */ #define ZEBRA_EPL_LINE 0x10 /* Zebra EPL line mode printers */ #define ZEBRA_EPL_PAGE 0x11 /* Zebra EPL page mode printers */ @@ -191,6 +191,9 @@ StartPage(ppd_file_t *ppd, /* I - PPD file */ printf("\033D%c", header->cupsBytesPerLine); printf("\033%c", header->cupsCompression + 'c'); /* Darkness */ + + if (header->MediaPosition) + printf("\033q%d", header->MediaPosition + 1); /* Roll Select */ break; case ZEBRA_EPL_LINE : diff --git a/ppdc/sample.drv b/ppdc/sample.drv index 7ac2cb27b..148cf0f54 100644 --- a/ppdc/sample.drv +++ b/ppdc/sample.drv @@ -115,7 +115,7 @@ Attribute "FileSystem" "" "False" Attribute "LandscapeOrientation" "" "Plus90" Attribute "TTRasterizer" "" "Type42" -Copyright "Copyright (c) 2007-2018 by Apple Inc." +Copyright "Copyright (c) 2007-2019 by Apple Inc." Copyright "Copyright (c) 1997-2007 by Easy Software Products." Copyright "" Copyright "Licensed under Apache License v2.0. See the file \"LICENSE\" for more" @@ -125,11 +125,11 @@ Font * Version "2.3" -// Dymo Label Printer +// DYMO Label Printer { - Manufacturer "Dymo" + Manufacturer "DYMO" ModelName "Label Printer" - Attribute NickName "" "Dymo Label Printer" + Attribute NickName "" "DYMO Label Printer" PCFileName "dymo.ppd" DriverType label ModelNumber $DYMO_3x0 @@ -155,6 +155,9 @@ Version "2.3" Resolution k 1 0 0 0 203dpi *Resolution k 1 0 0 0 300dpi + *InputSlot 0 "Roll/Main Roll" + InputSlot 1 "Roll2/Second Roll (DUO/Twin Only)" + Darkness 0 Light Darkness 1 Medium *Darkness 2 Normal |