DNP: Rework the new sies a little based on what I've learned so far

(They're still mostly just placeholders, but eh)
This commit is contained in:
Solomon Peachy 2022-09-29 09:48:38 -04:00
parent 34ee1f2305
commit e6293c3a57
1 changed files with 15 additions and 6 deletions

View File

@ -186,15 +186,19 @@ struct dnpds40_cmd {
#define MULTICUT_A4x5X2 43
#define MULTICUT_4x4 47
// #define MULTICUT_4x4_5 XXX
#define MULTICUT_4x6 48
#define MULTICUT_4x8 49
// #define MULTICUT_4_5x3 XXX
// #define MULTICUT_4_5x4 XXX
#define MULTICUT_4_5x4_5 50
#define MULTICUT_4_5x6 51
#define MULTICUT_4_5x8 52
// #define MULTICUT_4x3 XXX // 1266x936
// #define MULTICUT_4x3X2 XXX
// #define MULTICUT_4x4X2 XXX
// #define MULTICUT_4_5x3 XXX // 1408x936
// #define MULTICUT_4_5x3X2 XXX
// #define MULTICUT_4_5x4X2 XXX
#define MULTICUT_S_SIMPLEX 100
#define MULTICUT_S_FRONT 200
#define MULTICUT_S_BACK 300
@ -1880,6 +1884,8 @@ parsed:
switch(ctx->media) {
case 150: // 4x6, QW410
if (job->multicut != MULTICUT_4x4 &&
// XXX job->multicut != MULTICUT_4x3 &&
// XXX job->multicut != MULTICUT_4x3X2 &&
job->multicut != MULTICUT_4x6) {
ERROR("Incorrect media for job loaded (%u vs %u)\n", ctx->media, job->multicut);
dnpds40_cleanup_job(job);
@ -1889,7 +1895,9 @@ parsed:
case 151: // 4x8, QW410
if (job->multicut != MULTICUT_4x4 &&
job->multicut != MULTICUT_4x6 &&
// XXX job->multicut != MULTICUT_4x4_5 &&
// XXX job->multicut != MULTICUT_4x3 &&
// XXX job->multicut != MULTICUT_4x3X2 &&
// XXX job->multicut != MULTICUT_4x4X2 &&
job->multicut != MULTICUT_4x8) {
ERROR("Incorrect media for job loaded (%u vs %u)\n", ctx->media, job->multicut);
dnpds40_cleanup_job(job);
@ -1898,8 +1906,7 @@ parsed:
break;
case 160: // 4.5x6, QW410
if (job->multicut != MULTICUT_4_5x4_5 &&
// XXX job->multicut != MULTICUT_4_5x4 &&
// XXX job->multicut != MULTICUT_4_5x3 &&
// XXX job->multicut != MULTICUT_4_5x3X2 &&
job->multicut != MULTICUT_4_5x6) {
ERROR("Incorrect media for job loaded (%u vs %u)\n", ctx->media, job->multicut);
dnpds40_cleanup_job(job);
@ -1909,6 +1916,8 @@ parsed:
case 161: // 4.5x8, QW410
if (job->multicut != MULTICUT_4_5x4_5 &&
job->multicut != MULTICUT_4_5x6 &&
// XXX job->multicut != MULTICUT_4_5x4_X2 &&
// XXX job->multicut != MULTICUT_4_5x3X2 &&
job->multicut != MULTICUT_4_5x8) {
ERROR("Incorrect media for job loaded (%u vs %u)\n", ctx->media, job->multicut);
dnpds40_cleanup_job(job);