added support for pt2420

[ptouch-print] / src / libptouch.c

diff --git a/src/libptouch.c b/src/libptouch.c
index 45833df28921cc38ade26c9c971a888450a4fd85..df88e92ead4b6ebd46085c7546bd156903399294 100644 (file)
--- a/src/libptouch.c
+++ b/src/libptouch.c
@@ -1,17 +1,17 @@
 /*
        libptouch - functions to help accessing a brother ptouch
-       
-       Copyright (C) 2013 Dominic Radermacher <dominic.radermacher@gmail.com>
-       
+
+       Copyright (C) 2013-2017 Dominic Radermacher <blip@mockmoon-cybernetics.ch>
+
        This program is free software; you can redistribute it and/or modify it
        under the terms of the GNU General Public License version 3 as
        published by the Free Software Foundation
-       
+
        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
@@ -32,7 +32,8 @@
 
 #define _(s) gettext(s)
 
-struct _pt_tape_info tape_info[5]= {
+struct _pt_tape_info tape_info[6]= {
+       {6, 32},        /* 6mm tape is 32px wide? works for me ;-) */
        {9, 52},        /* 9mm tape is 52px wide? works for me ;-) */
        {12,76},        /* and 76px work for me on a 12mm tape - maybe its only 64px */
        {18,120},
@@ -41,8 +42,14 @@ struct _pt_tape_info tape_info[5]= {
 };
 
 struct _pt_dev_info ptdevs[] = {
-       {0x04f9, 0x202d, "PT-2430PC", 128, 0},  /* 180dpi, maximum 128px */
-       {0x04f9, 0x202c, "PT-1230PC", 76, 0},   /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */
+       {0x04f9, 0x202d, "PT-2430PC", 128, FLAG_NONE},  /* 180dpi, maximum 128px */
+       {0x04f9, 0x2007, "PT-2420PC", 128, FLAG_NONE},  /* maximum tape width 24mm, unknown how much pixels, untested so far */
+       {0x04f9, 0x202c, "PT-1230PC", 76, FLAG_NONE},   /* 180dpi, supports tapes up to 12mm - I don't know how much pixels it can print! */
+       {0x04f9, 0x2061, "PT-P700", 120, FLAG_UNSUP_RASTER},    /* DOES NOT WORK */
+       {0x04f9, 0x2073, "PT-D450VP", 120, FLAG_UNSUP_RASTER},  /* DOES NOT WORK */
+       /* Notes about the PT-D450VP: Tape detecting works, but printing does
+          not. The tape is just blank. I assume, the printer does not understand
+          the sent rasterdata. I'm also unsure about how many dots width we have */
        {0,0,"",0,0}
 };
 
@@ -56,11 +63,15 @@ int ptouch_open(ptouch_dev *ptdev)
        struct libusb_device_descriptor desc;
        ssize_t cnt;
        int r,i=0;
-       
+
        if ((*ptdev=malloc(sizeof(struct _ptouch_dev))) == NULL) {
                fprintf(stderr, _("out of memory\n"));
                return -1;
        }
+       if (((*ptdev)->devinfo=malloc(sizeof(struct _pt_dev_info))) == NULL) {
+               fprintf(stderr, _("out of memory\n"));
+               return -1;
+       }
        if ((libusb_init(NULL)) < 0) {
                fprintf(stderr, _("libusb_init() failed\n"));
                return -1;
@@ -96,6 +107,8 @@ int ptouch_open(ptouch_dev *ptdev)
                                        return -1;
                                }
                                (*ptdev)->h=handle;
+                               (*ptdev)->devinfo->max_px=ptdevs[k].max_px;
+                               (*ptdev)->devinfo->flags=ptdevs[k].flags;
                                return 0;
                        }
                }
@@ -115,7 +128,7 @@ int ptouch_close(ptouch_dev ptdev)
 int ptouch_send(ptouch_dev ptdev, uint8_t *data, int len)
 {
        int r,tx;
-       
+
        if (ptdev == NULL) {
                return -1;
        }
@@ -271,6 +284,8 @@ int ptouch_getstatus(ptouch_dev ptdev)
 
 int ptouch_getmaxwidth(ptouch_dev ptdev)
 {
+       /* TODO: should also check what the device supports. but I assume,
+          you can't use a large tape in a printe that doesn't support it anyways */
        return ptdev->tape_width_px;
 }