hiti: Bugfixes relating to the P320 and P461 sheet printers

This commit is contained in:
Solomon Peachy 2024-06-08 19:17:51 -04:00
parent cf1d9da634
commit d0204fe9a7

View file

@ -1197,20 +1197,22 @@ static int hiti_get_info(struct hiti_ctx *ctx)
return CUPS_BACKEND_FAILED;
INFO("6x4 prints: %u\n", buf[0]);
ret = hiti_query_counter(ctx, 3, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("5x7 prints: %u\n", buf[0]);
if (!ctx->sheet) {
ret = hiti_query_counter(ctx, 3, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("5x7 prints: %u\n", buf[0]);
ret = hiti_query_counter(ctx, 4, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("6x8 prints: %u\n", buf[0]);
ret = hiti_query_counter(ctx, 4, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("6x8 prints: %u\n", buf[0]);
ret = hiti_query_counter(ctx, 5, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("6x9 prints: %u\n", buf[0]);
ret = hiti_query_counter(ctx, 5, buf, ctx->erdc_rpc_len);
if (ret)
return CUPS_BACKEND_FAILED;
INFO("6x9 prints: %u\n", buf[0]);
}
// XXX other shit..
@ -1369,7 +1371,7 @@ static int hiti_attach(void *vctx, struct dyesub_connection *conn, uint8_t jobid
if (ret)
return ret;
if (ctx->conn->type != P_HITI_51X && ctx->sheet) {
if (ctx->conn->type != P_HITI_51X && !ctx->sheet) {
ret = hiti_query_hilightadj(ctx);
if (ret)
return ret;
@ -1384,7 +1386,11 @@ static int hiti_attach(void *vctx, struct dyesub_connection *conn, uint8_t jobid
return CUPS_BACKEND_FAILED;
switch (ctx->conn->type) {
// XXX P320/P310
// XXX P310/P322
case P_HITI_320:
if (strncmp(ctx->version, "1.04.0", 6) < 0)
WARNING("Printer firmware %s out of date (vs %s), please update.\n", ctx->version, "v1.04.0");
break;
case P_HITI_461:
if (strncmp(ctx->version, "1.12.0", 6) < 0)
WARNING("Printer firmware %s out of date (vs %s), please update.\n", ctx->version, "v1.12.0");
@ -3438,7 +3444,7 @@ static const struct device_id hiti_devices[] = {
const struct dyesub_backend hiti_backend = {
.name = "HiTi Photo Printers",
.version = "0.74",
.version = "0.75",
.uri_prefixes = hiti_prefixes,
.cmdline_usage = hiti_cmdline,
.cmdline_arg = hiti_cmdline_arg,