diff --git a/README b/README index dc84bf8..3782210 100644 --- a/README +++ b/README @@ -73,6 +73,8 @@ Olmec OP900 Shinko CHC-S6245 (aka Sinfonia CE1) Sony UP-D898 + Sony UP-CR20L + Sony UP-DR80MD Shinko CHC-S6145-5A (aka Sinfonia CS2-c) Magicard Rio 2E (and other Magicard models) @@ -689,7 +691,7 @@ Additional model IDs recognized: sony-updr150 sony-updr200 sony-upcr10l - sony-upd895 sony-upd897 + sony-upd895 sony-upd897 dnp-sl10 sonyupdr150 sonyupdr200 sonyupcr10 Verified supported printers: @@ -704,16 +706,28 @@ DNP DS-SL10 - Work-in-progress printers: - - Sony UP-D898 - Valid commands: -s Query printer status This backend does not support reporting marker levels. + *************************************************************************** + BACKEND=sonyupdneo + + Additional model IDs recognized: + sony-upcr20l sony-upd898 + sony-updr80md dnp-sl20 + + Work-in-progress printers (Lack USB PIDs) + + Sony UP-D898 / UP-DX898 + Sony UP-CR20L + Sony UP-DR80MD + DNP DS-SL20 + + This backend does not support reporting marker levels. + *************************************************************************** BACKEND=mitsu70x diff --git a/backend_sonyupd.c b/backend_sonyupd.c index 0ed605c..96f0534 100644 --- a/backend_sonyupd.c +++ b/backend_sonyupd.c @@ -606,11 +606,10 @@ static int upd_query_markers(void *vctx, struct marker **markers, int *count) static const char *sonyupd_prefixes[] = { "sonyupd", "sony-updr150", "sony-updr200", "sony-upcr10l", - "sony-upd895", "sony-upd897", + "sony-upd895", "sony-upd897", "dnp-sl10", // Backwards compatibility "sonyupdr150", "sonyupdr200", "sonyupcr10", -// "sony-upd898", NULL }; diff --git a/backend_sonyupdneo.c b/backend_sonyupdneo.c index 609a430..09b42f8 100644 --- a/backend_sonyupdneo.c +++ b/backend_sonyupdneo.c @@ -323,7 +323,7 @@ static int updneo_query_markers(void *vctx, struct marker **markers, int *count) static const char *sonyupdneo_prefixes[] = { "sonyupdneo", - "sony-upd898", "sony-upcr20l", "sony-updr80", + "sony-upd898", "sony-upcr20l", "sony-updr80", "sony-updr80md", "dnp-sl20", NULL }; @@ -349,7 +349,7 @@ struct dyesub_backend sonyupdneo_backend = { .devices = { { USB_VID_SONY, USB_PID_SONY_UPD898MD, P_SONY_UPD898, NULL, "sony-upd898"}, { USB_VID_SONY, USB_PID_SONY_UPCR20L, P_SONY_UPCR20L, NULL, "sony-upcr20l"}, - { USB_VID_SONY, USB_PID_SONY_UPDR80MD, P_SONY_UPDR80, NULL, "sony-upd80"}, + { USB_VID_SONY, USB_PID_SONY_UPDR80MD, P_SONY_UPDR80, NULL, "sony-updr80md"}, { 0, 0, 0, NULL, NULL} } }; diff --git a/regression.csv b/regression.csv index 9fa43c9..805afed 100644 --- a/regression.csv +++ b/regression.csv @@ -105,7 +105,7 @@ sony-upd897,0x054c,0x01e7,sony_upd897-1280x1280.raw, # # 'sonyupdneo' # -sony-updr80,0x054c,0xcdef,sony_updr80md-a4.raw, +sony-updr80md,0x054c,0xcdef,sony_updr80md-a4.raw, sony-upcr20l,0x054c,0xbcde,sony_upcr20l_4x6.raw, sony-upcr20l,0x054c,0xbcde,sony_upcr20l_8x6.raw, sony-upd898,0x054c,0xabcd,sony_upd898-1280x960.raw