Marker message should include media type where it's known.

This commit is contained in:
Solomon Peachy 2016-08-24 20:54:52 -04:00
parent 903caa8d32
commit 332c060681
2 changed files with 5 additions and 5 deletions

View File

@ -1282,7 +1282,7 @@ top:
if (ctx->media_count_new) {
ATTR("marker-levels=%d\n", count * 100 / ctx->media_count_new);
ATTR("marker-message=\"%d native prints remaining on ribbon\"\n", count);
ATTR("marker-message=\"%d native prints remaining on '%s' ribbon\"\n", count, dnpds40_media_types(ctx->media));
}
/* See if we can rewind to save media */
@ -1420,7 +1420,7 @@ top:
if (ctx->media_count_new) {
ATTR("marker-levels=%d\n", count * 100 / ctx->media_count_new);
ATTR("marker-message=\"%d native prints remaining on ribbon\"\n", count);
ATTR("marker-message=\"%d native prints remaining on '%s' ribbon\"\n", count, dnpds40_media_types(ctx->media));
}
}

View File

@ -180,7 +180,7 @@ struct mitsu9550_status2 {
remain = be16_to_cpu(media->remain); \
if (remain != ctx->last_remain) { \
ctx->last_remain = remain; \
ATTR("marker-message=\"%u prints remaining on ribbon\"\n", remain); \
ATTR("marker-message=\"%u prints remaining on '%s' ribbon\"\n", remain, mitsu9550_media_types(media->type)); \
} \
if (validate_media(media->type, ctx->cols, ctx->rows)) { \
ERROR("Incorrect media (%u) type for printjob (%ux%u)!\n", media->type, ctx->cols, ctx->rows); \
@ -550,7 +550,7 @@ top:
remain = be16_to_cpu(media->remain);
if (remain != ctx->last_remain) {
ctx->last_remain = remain;
ATTR("marker-message=\"%d prints remaining on ribbon\"\n", remain);
ATTR("marker-message=\"%u prints remaining on '%s' ribbon\"\n", remain, mitsu9550_media_types(media->type));
}
ret = mitsu9550_get_status(ctx, rdbuf, 0, 1, 0); // status2
@ -614,7 +614,7 @@ top:
remain = be16_to_cpu(media->remain);
if (remain != ctx->last_remain) {
ctx->last_remain = remain;
ATTR("marker-message=\"%d prints remaining on ribbon\"\n", remain);
ATTR("marker-message=\"%u prints remaining on '%s' ribbon\"\n", remain, mitsu9550_media_types(media->type));
}
ret = mitsu9550_get_status(ctx, rdbuf, 0, 1, 0); // status2