slp
/
selphy_print
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ek8810: Implement support for print sizes > 8x12

Browse Source 
Printer does it all internally, supposedly/apparently.
master
Solomon Peachy 2 years ago
parent 35ee06f3ab
commit 231341dd2b
2 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File

25
backend_shinkos6245.c
Unescape Escape View File

@ -1,7 +1,7 @@
/*
* Shinko/Sinfonia CHC-S6245 CUPS backend -- libusb-1.0 version
*
* (c) 2015-2020 Solomon Peachy <pizza@shaftnet.org>
* (c) 2015-2021 Solomon Peachy <pizza@shaftnet.org>
*
* Low-level documentation was provided by Sinfonia, Inc. Thank you!
*
@ -1101,8 +1101,8 @@ static int shinkos6245_main_loop(void *vctx, const void *vjob) {
}
// XXX what about mcut |= PRINT_METHOD_DISABLE_ERR;
/* EK8810 uses special "cutlist" */
if (ctx->dev.conn->type == P_KODAK_8810) {
/* EK8810 uses special "cutlist" */
switch (job->jp.media) {
case CODE_8x4_2:
if (job->jp.ext_flags & EXT_FLAG_DOUBLESLUG)
@ -1131,6 +1131,25 @@ static int shinkos6245_main_loop(void *vctx, const void *vjob) {
default:
break;
}
/* EK8810 supports multi-panel panorama! */
if (job->jp.rows > 3624) {
if (copies > 1) {
WARNING("Multiple copies of panorama prints is not supported!\n");
copies = 1;
}
if (job->jp.media) {
ERROR("Don't support multi-cut with panorama!\n");
return CUPS_BACKEND_CANCEL;
}
if (job->jp.rows > 9624 &&
ctx->media.ribbon_code != RIBBON_8x12 &&
ctx->media.ribbon_code != RIBBON_8x12K) {
/* Sizes over 8x24 require 8x12 media */
ERROR("Incorrect media loaded for print!\n");
return CUPS_BACKEND_HOLD;
}
}
}
#if 0 /* Doesn't work on EK8810. Not sure about S6245 */
@ -1462,7 +1481,7 @@ static const char *shinkos6245_prefixes[] = {
const struct dyesub_backend shinkos6245_backend = {
.name = "Sinfonia CHC-S6245 / Kodak 8810",
.version = "0.36" " (lib " LIBSINFONIA_VER ")",
.version = "0.37" " (lib " LIBSINFONIA_VER ")",
.uri_prefixes = shinkos6245_prefixes,
.cmdline_usage = shinkos6245_cmdline,
.cmdline_arg = shinkos6245_cmdline_arg,

36
regression-gp.csv
Unescape Escape View File

@ -101,10 +101,10 @@ shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10-w576h432_w576h288
shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864
shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864-div2
shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864-div3
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=Glossy
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=GlossyFine
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=Matte
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=MatteFine
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=Glossy
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=GlossyFine
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=Matte
shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=MatteFine
#
shinko-chcs2145,0x10ce,0x000e,0,PageSize=w144h432
shinko-chcs2145,0x10ce,0x000e,0,PageSize=w288h432
@ -132,9 +132,9 @@ shinko-chcs6145,0x10ce,0x0019,4,PageSize=w432h576-div2
shinko-chcs6145,0x10ce,0x0019,5,PageSize=w432h648
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h360
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=None
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=Glossy
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=Matte
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=None
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=Glossy
shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=Matte
#
sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w144h432
sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432
@ -147,9 +147,9 @@ sinfonia-chcs2245,0x10ce,0x0039,4,PageSize=w432h576-div2
sinfonia-chcs2245,0x10ce,0x0039,5,PageSize=w432h648
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h360
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=None
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=Glossy
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=Matte
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=None
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=Glossy
sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=Matte
sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432;StpPrintQuality=High
sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432;StpPrintQuality=Standard
#
@ -165,9 +165,9 @@ shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10-div2
shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864
shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864-div2
shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864-div3
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=Glossy
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=Matte
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=None
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=Glossy
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=Matte
shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=None
#
kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576
kodak-8810,0x040a,0x404d,0x11,PageSize=c8x10
@ -179,8 +179,14 @@ kodak-8810,0x040a,0x404d,0x12,PageSize=w576h576
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h576-div2
kodak-8810,0x040a,0x404d,0x12,PageSize=w360h576
kodak-8810,0x040a,0x404d,0x12,PageSize=w432h576
kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLamination=Glossy
kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLamination=Satin
kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLaminate=Glossy
kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLaminate=Satin
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1008
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1152
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1440
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1728
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h2304
kodak-8810,0x040a,0x404d,0x12,PageSize=w576h2592
#
sony-updr150,0x054c,0x01e8,,PageSize=w288h432
sony-updr150,0x054c,0x01e8,,PageSize=w432h576

1 #gp_printername,vid,pid,type,gp_options[,pano_options]
101 shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864
102 shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864-div2
103 shinko-chcs1245,0x10ce,0x0007,1,PageSize=w576h864-div3
104 shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=Glossy shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=Glossy
105 shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=GlossyFine shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=GlossyFine
106 shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=Matte shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=Matte
107 shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLamination=MatteFine shinko-chcs1245,0x10ce,0x0007,0,PageSize=c8x10;StpLaminate=MatteFine
108 #
109 shinko-chcs2145,0x10ce,0x000e,0,PageSize=w144h432
110 shinko-chcs2145,0x10ce,0x000e,0,PageSize=w288h432
132 shinko-chcs6145,0x10ce,0x0019,5,PageSize=w432h648
133 shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h360
134 shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504
135 shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=None shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=None
136 shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=Glossy shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=Glossy
137 shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLamination=Matte shinko-chcs6145,0x10ce,0x0019,3,PageSize=w360h504;StpLaminate=Matte
138 #
139 sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w144h432
140 sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432
147 sinfonia-chcs2245,0x10ce,0x0039,5,PageSize=w432h648
148 sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h360
149 sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504
150 sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=None sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=None
151 sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=Glossy sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=Glossy
152 sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLamination=Matte sinfonia-chcs2245,0x10ce,0x0039,3,PageSize=w360h504;StpLaminate=Matte
153 sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432;StpPrintQuality=High
154 sinfonia-chcs2245,0x10ce,0x0039,1,PageSize=w288h432;StpPrintQuality=Standard
155 #
165 shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864
166 shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864-div2
167 shinko-chcs6245,0x10ce,0x001d,0x12,PageSize=w576h864-div3
168 shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=Glossy shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=Glossy
169 shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=Matte shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=Matte
170 shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLamination=None shinko-chcs6245,0x10ce,0x001d,0x11,PageSize=c8x10;StpLaminate=None
171 #
172 kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576
173 kodak-8810,0x040a,0x404d,0x11,PageSize=c8x10
179 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h576-div2
180 kodak-8810,0x040a,0x404d,0x12,PageSize=w360h576
181 kodak-8810,0x040a,0x404d,0x12,PageSize=w432h576
182 kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLamination=Glossy kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLaminate=Glossy
183 kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLamination=Satin kodak-8810,0x040a,0x404d,0x11,PageSize=w288h576;StpLaminate=Satin
184 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1008
185 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1152
186 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1440
187 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h1728
188 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h2304
189 kodak-8810,0x040a,0x404d,0x12,PageSize=w576h2592
190 #
191 sony-updr150,0x054c,0x01e8,,PageSize=w288h432
192 sony-updr150,0x054c,0x01e8,,PageSize=w432h576
Write Preview
Loading…
Cancel
Save