slp/selphy_print
1
0
Fork 0
Code Issues 51 Pull requests Activity

mitsu d70/d90: Extend spool format to include a page copy count

Browse source 
These printers don't support hardware copies but we want the backend
to be able to handle this so we can:

 * avoid re-running the heavy image processing steps each time
 * allow for automatic Nup/cut page combining

Requires a change in gutenprint to utilize
This commit is contained in:
Solomon Peachy 2025-01-05 21:24:43 -05:00
parent f277217339
commit be55ead6eb
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
backend_mitsu70x.c
View file

@ -1,7 +1,7 @@
/*
* Mitsubishi CP-D70/D707 Photo Printer CUPS backend
*
* (c) 2013-2024 Solomon Peachy <pizza@shaftnet.org>
* (c) 2013-2025 Solomon Peachy <pizza@shaftnet.org>
*
* The latest version of this program can be found at:
*
@ -328,7 +328,8 @@ struct mitsu70x_hdr {
uint8_t mode; /* 0 for cooked YMC planar, 1 for packed BGR */
uint8_t use_lut; /* in BGR mode, 0 disables, 1 enables */
uint8_t reversed; /* 1 tells the backend the row data is correct */
uint8_t pad[447];
uint8_t copies; /* 1-255 */
uint8_t pad[446];
} __attribute__((packed));
STATIC_ASSERT(sizeof(struct mitsu70x_hdr) == 512);
@ -1059,12 +1060,18 @@ repeat:
job->sharpen = mhdr.sharpen - 1;
job->reverse = !mhdr.reversed;
job->common.copies = mhdr.copies;
/* Use larger of our copy counts */
if (job->common.copies < copies)
job->common.copies = copies;
/* Clean up header back to pristine. */
mhdr.use_lut = 0;
mhdr.mode = 0;
mhdr.sharpen = 0;
mhdr.reversed = 0;
mhdr.copies = 0;
/* Work out total printjob size */
job->cols = be16_to_cpu(mhdr.cols);
@ -2639,7 +2646,7 @@ static const struct device_id mitsu70x_devices[] = {
/* Exported */
const struct dyesub_backend mitsu70x_backend = {
.name = "Mitsubishi CP-D70 family",
.version = "0.114" " (lib " LIBMITSU_VER ")",
.version = "0.115" " (lib " LIBMITSU_VER ")",
.flags = BACKEND_FLAG_DUMMYPRINT,
.uri_prefixes = mitsu70x_prefixes,
.devices = mitsu70x_devices,

14
backend_mitsud90.c
View file

@ -1,7 +1,7 @@
/*
* Mitsubishi CP-D90DW Photo Printer CUPS backend
*
* (c) 2019-2024 Solomon Peachy <pizza@shaftnet.org>
* (c) 2019-2025 Solomon Peachy <pizza@shaftnet.org>
*
* The latest version of this program can be found at:
*
@ -314,7 +314,8 @@ struct mitsud90_job_hdr {
uint16_t overlap; /* always 0x0258, ie 600 or 2 inches */
uint8_t unk[4]; /* 00 0c 00 06 */
} pano __attribute__((packed));
uint8_t zero_c[6];
uint8_t zero_c[5];
uint8_t copies; /* EXTENSION */
/*@x50*/uint8_t unk_m1; /* 00 on d90 & m1 Linux, 01 on m1 (windows) */
uint8_t rgbrate; /* M1 only, see below */
uint8_t oprate; /* M1 only, see below */
@ -1378,6 +1379,15 @@ read_data:
job->hdr.colorcorr = 1; // XXX not sure if right for ASK500?
}
job->common.copies = job->hdr.copies;
/* Use larger of our copy counts */
if (job->common.copies < copies)
job->common.copies = copies;
/* Clear header to pristine shape */
job->hdr.copies = 0;
if (job->is_pano) {
int rval;