1
0
mirror of https://git.familie-radermacher.ch/linux/ptouch-print.git synced 2025-07-06 23:24:16 +00:00

Merge pull request #2 from 2-B/master

Adding support for 6mm bands
This commit is contained in:
Dominic Radermacher 2016-04-19 20:44:36 +02:00
commit 0e11a69d27
2 changed files with 29 additions and 7 deletions

21
.gitignore vendored
View File

@ -13,3 +13,24 @@ Makefile.in
/config.h.in /config.h.in
/config.rpath /config.rpath
/config.sub /config.sub
# C-Objects
*.o
# special directories
/po
/m4
src/.deps/
src/.dirstamp
# Log files
*.log
# Documents
ABOUT-NLS
AUTHORS
INSTALL
# Binaries
ptouch-gtk
ptouch-print

View File

@ -1,17 +1,17 @@
/* /*
libptouch - functions to help accessing a brother ptouch libptouch - functions to help accessing a brother ptouch
Copyright (C) 2013 Dominic Radermacher <dominic.radermacher@gmail.com> Copyright (C) 2013 Dominic Radermacher <dominic.radermacher@gmail.com>
This program is free software; you can redistribute it and/or modify it 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 under the terms of the GNU General Public License version 3 as
published by the Free Software Foundation published by the Free Software Foundation
This program is distributed in the hope that it will be useful, but This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation, along with this program; if not, write to the Free Software Foundation,
Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@ -32,7 +32,8 @@
#define _(s) gettext(s) #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 ;-) */ {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 */ {12,76}, /* and 76px work for me on a 12mm tape - maybe its only 64px */
{18,120}, {18,120},
@ -56,7 +57,7 @@ int ptouch_open(ptouch_dev *ptdev)
struct libusb_device_descriptor desc; struct libusb_device_descriptor desc;
ssize_t cnt; ssize_t cnt;
int r,i=0; int r,i=0;
if ((*ptdev=malloc(sizeof(struct _ptouch_dev))) == NULL) { if ((*ptdev=malloc(sizeof(struct _ptouch_dev))) == NULL) {
fprintf(stderr, _("out of memory\n")); fprintf(stderr, _("out of memory\n"));
return -1; return -1;
@ -115,7 +116,7 @@ int ptouch_close(ptouch_dev ptdev)
int ptouch_send(ptouch_dev ptdev, uint8_t *data, int len) int ptouch_send(ptouch_dev ptdev, uint8_t *data, int len)
{ {
int r,tx; int r,tx;
if (ptdev == NULL) { if (ptdev == NULL) {
return -1; return -1;
} }