diff options
Diffstat (limited to 'src/main/canon-media-mode.h')
| -rw-r--r-- | src/main/canon-media-mode.h | 2149 |
1 files changed, 1613 insertions, 536 deletions
diff --git a/src/main/canon-media-mode.h b/src/main/canon-media-mode.h index 95d6768..f569d66 100644 --- a/src/main/canon-media-mode.h +++ b/src/main/canon-media-mode.h @@ -1072,6 +1072,9 @@ DECLARE_MODEUSES(canon_BJC_S520); /* ----------------------------------- Canon BJC S600 ----------------------------------- */ static const char* canon_BJC_S600_modeuses_plain[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_high", "600x600dpi", "600x600dpi_draft",/*untested*/ @@ -1081,12 +1084,18 @@ static const char* canon_BJC_S600_modeuses_plain[] = { }; static const char* canon_BJC_S600_modeuses_PPpro[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh2", "600x600dpi_photo2", NULL }; static const char* canon_BJC_S600_modeuses_coated[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh3", "600x600dpi_photohigh", "600x600dpi_photo", @@ -1095,6 +1104,9 @@ static const char* canon_BJC_S600_modeuses_coated[] = { }; static const char* canon_BJC_S600_modeuses_PPgloss[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh3", "600x600dpi_photohigh", "600x600dpi_photo", @@ -1102,23 +1114,35 @@ static const char* canon_BJC_S600_modeuses_PPgloss[] = { }; static const char* canon_BJC_S600_modeuses_inkjetHagaki[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photo3", "600x600dpi_photodraft3", NULL }; static const char* canon_BJC_S600_modeuses_Envelope[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_high3", "600x600dpi_std3", NULL }; static const char* canon_BJC_S600_modeuses_TShirt[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_tshirt", NULL }; static const char* canon_BJC_S600_modeuses_Transparency[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh5", "600x600dpi_photohigh4", "600x600dpi_photo4", @@ -1219,64 +1243,88 @@ DECLARE_MODEUSES(canon_BJC_S750); /* ----------------------------------- Canon BJC S800 ----------------------------------- */ static const char* canon_BJC_S800_modeuses_plain[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_high2", - "600x600dpi_high", - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi",*/ "600x600dpi_draft", /* Mono */ "600x600dpi_highmono2", - "600x600dpi_highmono", - "600x600dpi_mono", +/* "600x600dpi_highmono",*/ +/* "600x600dpi_mono",*/ "600x600dpi_draftmono", NULL - }; +}; static const char* canon_BJC_S800_modeuses_PPpro[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh4", - "600x600dpi_photohigh", +/* "600x600dpi_photohigh",*/ NULL }; static const char* canon_BJC_S800_modeuses_PPplus[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh2", - "600x600dpi_photo",/*untested*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL }; static const char* canon_BJC_S800_modeuses_PPgloss[] = { - "600x600dpi_photohigh3", - "600x600dpi_photohigh", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_S800_modeuses_glossFilm[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh2", - "600x600dpi_photo",/*untested*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL }; static const char* canon_BJC_S800_modeuses_PPother[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh4", - "600x600dpi_photohigh", - "600x600dpi_photo", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo",*/ "600x600dpi_photodraft", /* Mono */ "600x600dpi_photomonohigh2", - "600x600dpi_photomonohigh", - "600x600dpi_photomono", +/* "600x600dpi_photomonohigh",*/ +/* "600x600dpi_photomono",*/ "600x600dpi_photomonodraft", NULL }; static const char* canon_BJC_S800_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_S800_modeuses_Transparency[] = { - "600x600dpi_std2", - "600x600dpi_draft2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std2",*/ +/* "600x600dpi_draft2",*/ NULL }; @@ -1302,51 +1350,72 @@ DECLARE_MODEUSES(canon_BJC_S800); /* ----------------------------------- Canon BJC S820 ----------------------------------- */ static const char* canon_BJC_S820_modeuses_plain[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_high2", - "600x600dpi_high",/*untested*/ - "600x600dpi", +/* "600x600dpi_high",*/ /*untested*/ +/* "600x600dpi",*/ "600x600dpi_draft", /* Mono */ "600x600dpi_highmono2",/*untested*/ - "600x600dpi_highmono",/*untested*/ - "600x600dpi_mono",/*untested*/ +/* "600x600dpi_highmono",*/ /*untested*/ +/* "600x600dpi_mono",*/ /*untested*/ "600x600dpi_draftmono", NULL - }; +}; static const char* canon_BJC_S820_modeuses_PPpro[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh4", - "600x600dpi_photohigh", +/* "600x600dpi_photohigh",*/ NULL }; static const char* canon_BJC_S820_modeuses_PPplus[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh2", - "600x600dpi_photo",/*untested*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL }; static const char* canon_BJC_S820_modeuses_PPgloss[] = { - "600x600dpi_photohigh3", - "600x600dpi_photohigh", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_S820_modeuses_glossFilm[] = { + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", "600x600dpi_photohigh2", - "600x600dpi_photo",/*untested*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL }; static const char* canon_BJC_S820_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_S820_modeuses_Transparency[] = { - "600x600dpi_std2", - "600x600dpi_draft2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std2",*/ +/* "600x600dpi_draft2",*/ NULL }; @@ -1372,56 +1441,80 @@ DECLARE_MODEUSES(canon_BJC_S820); /* ----------------------------------- Canon BJC S900 ----------------------------------- */ static const char* canon_BJC_S900_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high",*/ +/* "600x600dpi",*/ "600x600dpi_draft", /* Mono */ "600x600dpi_highmono2",/*untested*/ - "600x600dpi_highmono",/*untested*/ - "600x600dpi_mono",/*untested*/ +/* "600x600dpi_highmono",*/ /*untested*/ +/* "600x600dpi_mono",*/ /*untested*/ "600x600dpi_draftmono", NULL - }; +}; static const char* canon_BJC_S900_modeuses_PPpro[] = { - "600x600dpi_photohigh5", - "600x600dpi_photohigh", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh5",*/ +/* "600x600dpi_photohigh",*/ NULL }; static const char* canon_BJC_S900_modeuses_PPplus[] = { - "600x600dpi_photohigh3", - "600x600dpi_photo2",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photo2",*/ /*untested*/ NULL }; static const char* canon_BJC_S900_modeuses_PPgloss[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_S900_modeuses_coated[] = { - "600x600dpi_photohigh4", - "600x600dpi_photohigh", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh4",*/ +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_S900_modeuses_glossFilm[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL }; static const char* canon_BJC_S900_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_S900_modeuses_Transparency[] = { - "600x600dpi_std2", - "600x600dpi_draft2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std2",*/ +/* "600x600dpi_draft2",*/ NULL }; @@ -2227,68 +2320,98 @@ DECLARE_MODEUSES(canon_BJC_i900); /* ----------------------------------- Canon i950 ----------------------------------- */ static const char* canon_BJC_i950_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi_high"/*untested*/, - "600x600dpi", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high2",*/ +/* "600x600dpi_high",*/ /*untested*/ +/* "600x600dpi",*/ "600x600dpi_draft",/*untested*/ "600x600dpi_draft2", "600x600dpi_draftmono",/* mono --- untested*/ "600x600dpi_draftmono2",/* mono */ NULL - }; +}; static const char* canon_BJC_i950_modeuses_PPpro[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo3",*/ NULL }; static const char* canon_BJC_i950_modeuses_PPplus[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ /*untested*/ NULL }; static const char* canon_BJC_i950_modeuses_PPgloss[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i950_modeuses_PPmatte[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i950_modeuses_coated[] = { - "600x600dpi_photohigh", - "600x600dpi_photo3", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo3",*/ +/* "600x600dpi_photo",*/ NULL }; static const char* canon_BJC_i950_modeuses_GlossyFilm[] = { - "600x600dpi_photohigh", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ NULL }; static const char* canon_BJC_i950_modeuses_inkjetHagaki[] = { - "600x600dpi_photohigh4", - "600x600dpi_photo4", - "600x600dpi_photodraft4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh4",*/ +/* "600x600dpi_photo4",*/ +/* "600x600dpi_photodraft4",*/ NULL }; static const char* canon_BJC_i950_modeuses_disc[] = { - "600x600dpi_photo5", - "600x600dpi_photodraft5", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo5",*/ +/* "600x600dpi_photodraft5",*/ NULL }; static const char* canon_BJC_i950_modeuses_Hagaki[] = { - "600x600dpi_high4", - "600x600dpi_high5",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high4",*/ +/* "600x600dpi_high5",*/ /*untested*/ "600x600dpi_std4",/*untested*/ "600x600dpi_std5", "600x600dpi_draftmono4",/* mono---untested*/ @@ -2297,19 +2420,28 @@ static const char* canon_BJC_i950_modeuses_Hagaki[] = { }; static const char* canon_BJC_i950_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_i950_modeuses_Transparency[] = { - "600x600dpi_std3", - "600x600dpi_draft3", - "600x600dpi_draft4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std3",*/ +/* "600x600dpi_draft3",*/ +/* "600x600dpi_draft4",*/ NULL }; static const char* canon_BJC_i950_modeuses_PPother[] = { - "600x600dpi_photo2",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo2",*/ /*untested*/ NULL }; @@ -2336,65 +2468,91 @@ DECLARE_MODEUSES(canon_BJC_i950); /* ----------------------------------- Canon i960 ----------------------------------- */ static const char* canon_BJC_i960_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi_high3",/* duplex */ - "600x600dpi_high", - "600x600dpi",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high2",*/ +/* "600x600dpi_high3",*/ /* duplex */ +/* "600x600dpi_high",*/ +/* "600x600dpi",*/ /*untested*/ "600x600dpi_draft", "600x600dpi_draft2", "600x600dpi_draftmono",/* mono */ "600x600dpi_draftmono2",/* mono */ NULL - }; +}; static const char* canon_BJC_i960_modeuses_PPpro[] = { - "600x600dpi_photohigh", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo",*/ NULL }; static const char* canon_BJC_i960_modeuses_PPplus[] = { - "600x600dpi_photohigh", - "600x600dpi_photo5",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo5",*/ /*untested*/ NULL }; - static const char* canon_BJC_i960_modeuses_PPgloss[] = { - "600x600dpi_photohigh", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i960_modeuses_PPmatte[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i960_modeuses_coated[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo", - "600x600dpi_photo5", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo",*/ +/* "600x600dpi_photo5",*/ NULL }; static const char* canon_BJC_i960_modeuses_inkjetHagaki[] = { - "600x600dpi_photohigh3", - "600x600dpi_photo3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photo3",*/ NULL }; static const char* canon_BJC_i960_modeuses_disc[] = { - "600x600dpi_photo4", - "600x600dpi_photodraft4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo4",*/ +/* "600x600dpi_photodraft4",*/ NULL }; static const char* canon_BJC_i960_modeuses_Hagaki[] = { - "600x600dpi_high4", - "600x600dpi_high5", - "600x600dpi_std4",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high4",*/ +/* "600x600dpi_high5",*/ +/* "600x600dpi_std4",*/ /*untested*/ "600x600dpi_std5", "600x600dpi_draft5", "600x600dpi_draftmono4", @@ -2403,19 +2561,28 @@ static const char* canon_BJC_i960_modeuses_Hagaki[] = { }; static const char* canon_BJC_i960_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_i960_modeuses_Transparency[] = { - "600x600dpi_std3", - "600x600dpi_draft3", - "600x600dpi_draft4",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std3",*/ +/* "600x600dpi_draft3",*/ +/* "600x600dpi_draft4",*/ /*untested*/ NULL }; static const char* canon_BJC_i960_modeuses_PPother[] = { - "600x600dpi_photo2",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo2",*/ /*untested*/ NULL }; @@ -2441,65 +2608,92 @@ DECLARE_MODEUSES(canon_BJC_i960); /* ----------------------------------- Canon i990 ----------------------------------- */ static const char* canon_BJC_i990_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi_high3", /*duplex*/ - "600x600dpi", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high2",*/ +/* "600x600dpi_high3",*/ /*duplex*/ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", "600x600dpi_draftmono",/*mono*/ "600x600dpi_draftmono2",/*mono*/ NULL - }; +}; /* most photo modes use R ink and therefore unsupported */ /* unsupported */ static const char* canon_BJC_i990_modeuses_PPpro[] = { - "600x600dpi_photohigh",/*stand-in*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ NULL }; /* highest mode not yet supported */ static const char* canon_BJC_i990_modeuses_PPplus[] = { - "600x600dpi_photohigh",/*stand-in*/ - "600x600dpi_photodraft", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ +/* "600x600dpi_photodraft",*/ NULL }; /* unsupported */ static const char* canon_BJC_i990_modeuses_PPmatte[] = { - "600x600dpi_photohigh",/*stand-in*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ NULL }; /* highest mode not yet supported */ static const char* canon_BJC_i990_modeuses_PPgloss[] = { - "600x600dpi_photohigh",/*stand-in*/ - "600x600dpi_photodraft2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ +/* "600x600dpi_photodraft2",*/ NULL }; static const char* canon_BJC_i990_modeuses_coated[] = { - "600x600dpi_photohigh", - "600x600dpi_photomed", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photomed",*/ +/* "600x600dpi_photo",*/ NULL }; /* high mode not yet supported */ static const char* canon_BJC_i990_modeuses_inkjetHagaki[] = { - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i990_modeuses_disc[] = { - "600x600dpi_photo3", - "600x600dpi_photodraft3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo3",*/ +/* "600x600dpi_photodraft3",*/ NULL }; static const char* canon_BJC_i990_modeuses_Hagaki[] = { - "600x600dpi_high4", - "600x600dpi_std4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high4",*/ +/* "600x600dpi_std4",*/ "600x600dpi_draft5", "600x600dpi_draft4", "600x600dpi_draftmono4",/*mono*/ @@ -2508,19 +2702,28 @@ static const char* canon_BJC_i990_modeuses_Hagaki[] = { }; static const char* canon_BJC_i990_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_i990_modeuses_Transparency[] = { - "600x600dpi_std3", - "600x600dpi_draft3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std3",*/ +/* "600x600dpi_draft3",*/ NULL }; /* untested */ static const char* canon_BJC_i990_modeuses_PPother[] = { - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo",*/ NULL }; @@ -2629,72 +2832,102 @@ DECLARE_MODEUSES(canon_BJC_i6100); /* ----------------------------------- Canon i9100 ----------------------------------- */ static const char* canon_BJC_i9100_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi_high", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high2",*/ +/* "600x600dpi_high",*/ "600x600dpi", "600x600dpi_draft",/*untested*/ "600x600dpi_mono",/*untested*/ "600x600dpi_draftmono", NULL - }; +}; static const char* canon_BJC_i9100_modeuses_PPpro[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i9100_modeuses_PPplus[] = { - "600x600dpi_photohigh2", - "600x600dpi_photo2",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photo2",*/ /*untested*/ NULL }; static const char* canon_BJC_i9100_modeuses_PPmatte[] = { - "600x600dpi_photohigh", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo",*/ NULL }; static const char* canon_BJC_i9100_modeuses_coated[] = { - "600x600dpi_photohigh", - "600x600dpi_photo2", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo2",*/ +/* "600x600dpi_photo",*/ NULL }; static const char* canon_BJC_i9100_modeuses_inkjetHagaki[] = { - "600x600dpi_photohigh4", - "600x600dpi_photo4", - "600x600dpi_photodraft4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh4",*/ +/* "600x600dpi_photo4",*/ +/* "600x600dpi_photodraft4",*/ NULL }; static const char* canon_BJC_i9100_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", "600x600dpi_draftmono2", NULL }; static const char* canon_BJC_i9100_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_i9100_modeuses_Transparency[] = { - "600x600dpi_photohigh3", - "600x600dpi_photo3",/*untested*/ - "600x600dpi_photodraft3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photo3",*/ /*untested*/ +/* "600x600dpi_photodraft3",*/ NULL }; static const char* canon_BJC_i9100_modeuses_PPother[] = { - "600x600dpi_photo2",/*untested*/ - "600x600dpi_photo",/*untested*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo2",*/ /*untested*/ +/* "600x600dpi_photo",*/ /*untested*/ NULL - }; +}; static const canon_modeuse_t canon_BJC_i9100_modeuses[] = { { "Plain", canon_BJC_i9100_modeuses_plain, 0 }, @@ -2716,64 +2949,91 @@ DECLARE_MODEUSES(canon_BJC_i9100); /* ----------------------------------- Canon i9900 ----------------------------------- */ static const char* canon_BJC_i9900_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high2",*/ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", "600x600dpi_draftmono",/*mono*/ "600x600dpi_draftmono2",/*mono*/ NULL - }; +}; /* most photo modes use R,G inks and therefore unsupported */ /* unsupported */ static const char* canon_BJC_i9900_modeuses_PPpro[] = { - "600x600dpi_photohigh",/*stand-in*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ NULL }; /* highest mode not yet supported */ static const char* canon_BJC_i9900_modeuses_PPplus[] = { - "600x600dpi_photohigh",/*stand-in*/ - "600x600dpi_photodraft", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ +/* "600x600dpi_photodraft",*/ NULL }; /* unsupported */ static const char* canon_BJC_i9900_modeuses_PPmatte[] = { - "600x600dpi_photohigh",/*stand-in*/ + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ NULL }; /* highest mode not yet supported */ static const char* canon_BJC_i9900_modeuses_PPgloss[] = { - "600x600dpi_photohigh",/*stand-in*/ - "600x600dpi_photodraft", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ /*stand-in*/ +/* "600x600dpi_photodraft",*/ NULL }; static const char* canon_BJC_i9900_modeuses_coated[] = { - "600x600dpi_photohigh", - "600x600dpi_photomed", - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photomed",*/ +/* "600x600dpi_photo",*/ NULL }; /* high mode not yet supported */ static const char* canon_BJC_i9900_modeuses_inkjetHagaki[] = { - "600x600dpi_photo2", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo2",*/ NULL }; static const char* canon_BJC_i9900_modeuses_disc[] = { - "600x600dpi_photo3", - "600x600dpi_photodraft3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo3",*/ +/* "600x600dpi_photodraft3",*/ NULL }; static const char* canon_BJC_i9900_modeuses_Hagaki[] = { - "600x600dpi_high4", - "600x600dpi_std4", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_high4",*/ +/* "600x600dpi_std4",*/ "600x600dpi_draft5", "600x600dpi_draft4", "600x600dpi_draftmono4",/*mono*/ @@ -2782,20 +3042,29 @@ static const char* canon_BJC_i9900_modeuses_Hagaki[] = { }; static const char* canon_BJC_i9900_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_tshirt",*/ NULL }; static const char* canon_BJC_i9900_modeuses_Transparency[] = { - "600x600dpi_std3", - "600x600dpi_draft3", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_std3",*/ +/* "600x600dpi_draft3",*/ NULL }; static const char* canon_BJC_i9900_modeuses_PPother[] = { - "600x600dpi_photo", + "1200x1200dpi_legacy", + "600x600dpi_legacy", + "300x300dpi_legacy", +/* "600x600dpi_photo",*/ NULL - }; +}; static const canon_modeuse_t canon_BJC_i9900_modeuses[] = { { "Plain", canon_BJC_i9900_modeuses_plain, 0 }, @@ -2949,6 +3218,73 @@ static const canon_modeuse_t canon_PIXMA_iP100_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_iP100); +/* ----------------------------------- Canon iP110 ----------------------------------- */ +static const char* canon_PIXMA_iP110_modeuses_plain[] = { + "600x600dpi_high2", + "600x600dpi_high", /* mono */ + "600x600dpi", + "600x600dpi_draft", + "300x300dpi", + "300x300dpi_draft", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_PPpro[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_PPplus[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_PPmatte[] = { + "600x600dpi_photohigh", + "600x600dpi_photo2", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_Hagaki[] = { + "600x600dpi_high4", + "600x600dpi_high3", /* mono */ + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_TShirt[] = { + "600x600dpi_tshirt", + NULL +}; + +static const char* canon_PIXMA_iP110_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL + }; + +static const canon_modeuse_t canon_PIXMA_iP110_modeuses[] = { + { "Plain", canon_PIXMA_iP110_modeuses_plain, 0 },/*INKSET_COLOR_SUPPORT | INKSET_COLOR_MODEREPL*/ + { "PhotoPlusGloss2", canon_PIXMA_iP110_modeuses_PPpro, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss", canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard",canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_PIXMA_iP110_modeuses_PPmatte, INKSET_COLOR_SUPPORT }, + { "Coated", canon_PIXMA_iP110_modeuses_PPmatte, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_PIXMA_iP110_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/ + { "InkJetHagaki", canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK", canon_PIXMA_iP110_modeuses_PPplus, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_PIXMA_iP110_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/ + { "TShirt", canon_PIXMA_iP110_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_PIXMA_iP110_modeuses_Hagaki, 0 },/*INKSET_COLOR_SUPPORT*/ + { "PhotopaperOther", canon_PIXMA_iP110_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_PIXMA_iP110); + /* ----------------------------------- Canon iP2000 ----------------------------------- */ static const char* canon_PIXMA_iP2000_modeuses_plain[] = { "600x600dpi_high2", @@ -4635,9 +4971,9 @@ DECLARE_MODEUSES(canon_PIXMA_iP6700); /* ----------------------------------- Canon iP7100 ----------------------------------- */ static const char* canon_PIXMA_iP7100_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi_high2",/* duplex */ - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi_high2",*/ /* duplex */ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ @@ -4646,87 +4982,86 @@ static const char* canon_PIXMA_iP7100_modeuses_plain[] = { NULL }; -static const char* canon_PIXMA_iP7100_modeuses_PPpro[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_PPpro[] = { "600x600dpi_photohigh", "600x600dpi_photo", NULL -}; - +};*/ -static const char* canon_PIXMA_iP7100_modeuses_PPplus[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_PPplus[] = { "600x600dpi_photohigh", "600x600dpi_photo", NULL -}; +};*/ -static const char* canon_PIXMA_iP7100_modeuses_PPplusDS[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_PPplusDS[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP7100_modeuses_PPmatte[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_PPmatte[] = { "600x600dpi_photohigh2", "600x600dpi_photo", NULL -}; +};*/ static const char* canon_PIXMA_iP7100_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", /* Mono */ "600x600dpi_mono", NULL }; -static const char* canon_PIXMA_iP7100_modeuses_FA[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_FA[] = { "600x600dpi_photohigh3", NULL -}; +};*/ -static const char* canon_PIXMA_iP7100_modeuses_disc[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_disc[] = { "600x600dpi_photo", "600x600dpi_photodraft", NULL -}; +};*/ -static const char* canon_PIXMA_iP7100_modeuses_TShirt[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_TShirt[] = { "600x600dpi", NULL -}; +};*/ -static const char* canon_PIXMA_iP7100_modeuses_Transparency[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_Transparency[] = { "600x600dpi_std4", "600x600dpi_draft4", NULL -}; +};*/ /*untested*/ -static const char* canon_PIXMA_iP7100_modeuses_PPother[] = { +/*static const char* canon_PIXMA_iP7100_modeuses_PPother[] = { "600x600dpi_photo", "600x600dpi_photodraft", NULL - }; + };*/ static const canon_modeuse_t canon_PIXMA_iP7100_modeuses[] = { { "Plain", canon_PIXMA_iP7100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, - { "GlossyPro", canon_PIXMA_iP7100_modeuses_PPpro, 0 }, - { "PhotopaperPlus", canon_PIXMA_iP7100_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_PIXMA_iP7100_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_PIXMA_iP7100_modeuses_PPmatte, 0 }, - { "GlossyPaper", canon_PIXMA_iP7100_modeuses_PPplusDS, 0 }, - { "Coated", canon_PIXMA_iP7100_modeuses_PPmatte, 0 }, - { "InkJetHagaki", canon_PIXMA_iP7100_modeuses_PPplus, 0 }, +/* { "GlossyPro", canon_PIXMA_iP7100_modeuses_PPpro, 0 },*/ +/* { "PhotopaperPlus", canon_PIXMA_iP7100_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_PIXMA_iP7100_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_iP7100_modeuses_PPmatte, 0 },*/ +/* { "GlossyPaper", canon_PIXMA_iP7100_modeuses_PPplusDS, 0 },*/ +/* { "Coated", canon_PIXMA_iP7100_modeuses_PPmatte, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_iP7100_modeuses_PPplus, 0 },*/ { "Hagaki", canon_PIXMA_iP7100_modeuses_Hagaki, DUPLEX_SUPPORT }, - { "FineArtPhotoRag", canon_PIXMA_iP7100_modeuses_FA, 0 }, - { "FineArtOther", canon_PIXMA_iP7100_modeuses_FA, 0 }, - { "DiscCompat", canon_PIXMA_iP7100_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_iP7100_modeuses_disc, 0 }, - { "TShirt", canon_PIXMA_iP7100_modeuses_TShirt, 0 }, +/* { "FineArtPhotoRag", canon_PIXMA_iP7100_modeuses_FA, 0 },*/ +/* { "FineArtOther", canon_PIXMA_iP7100_modeuses_FA, 0 },*/ +/* { "DiscCompat", canon_PIXMA_iP7100_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_iP7100_modeuses_disc, 0 },*/ +/* { "TShirt", canon_PIXMA_iP7100_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_iP7100_modeuses_Hagaki, 0 }, - { "Transparency", canon_PIXMA_iP7100_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_PIXMA_iP7100_modeuses_PPother, 0 },/*untested*/ +/* { "Transparency", canon_PIXMA_iP7100_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_PIXMA_iP7100_modeuses_PPother, 0 },*/ /*untested*/ }; DECLARE_MODEUSES(canon_PIXMA_iP7100); @@ -4899,9 +5234,9 @@ DECLARE_MODEUSES(canon_PIXMA_iP7500); /* ----------------------------------- Canon iP8100 ----------------------------------- */ static const char* canon_PIXMA_iP8100_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi_high2",/* duplex */ - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi_high2",*/ /* duplex */ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ @@ -4911,199 +5246,204 @@ static const char* canon_PIXMA_iP8100_modeuses_plain[] = { }; /* no support for modes using R yet */ -static const char* canon_PIXMA_iP8100_modeuses_PPpro[] = { - "600x600dpi_photohigh",/*untested*/ - "600x600dpi_photo", +/*static const char* canon_PIXMA_iP8100_modeuses_PPpro[] = { + "600x600dpi_photohigh",*/ /*untested*/ +/* "600x600dpi_photo", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_PPplus[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_PPplus[] = { "600x600dpi_photohigh", "600x600dpi_photo", "600x600dpi_photodraft2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_PPplusDS[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_PPplusDS[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_PPmatte[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_PPmatte[] = { "600x600dpi_photohigh2", "600x600dpi_photo", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_PPgloss[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_PPgloss[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_inkjetHagaki[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_inkjetHagaki[] = { "600x600dpi_photohigh", "600x600dpi_photo", NULL -}; +};*/ static const char* canon_PIXMA_iP8100_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", /* Mono */ "600x600dpi_mono", NULL }; -static const char* canon_PIXMA_iP8100_modeuses_FA[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_FA[] = { "600x600dpi_photohigh3", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_disc[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_disc[] = { "600x600dpi_photo", "600x600dpi_photodraft", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_TShirt[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_TShirt[] = { "600x600dpi", NULL -}; +};*/ -static const char* canon_PIXMA_iP8100_modeuses_Transparency[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_Transparency[] = { "600x600dpi_std4", "600x600dpi_draft4", NULL -}; +};*/ /*untested*/ -static const char* canon_PIXMA_iP8100_modeuses_PPother[] = { +/*static const char* canon_PIXMA_iP8100_modeuses_PPother[] = { "600x600dpi_photo", "600x600dpi_photodraft2", NULL - }; + };*/ static const canon_modeuse_t canon_PIXMA_iP8100_modeuses[] = { { "Plain", canon_PIXMA_iP8100_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, - { "GlossyPro", canon_PIXMA_iP8100_modeuses_PPpro, 0 }, - { "PhotopaperPlus", canon_PIXMA_iP8100_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_PIXMA_iP8100_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_PIXMA_iP8100_modeuses_PPmatte, 0 }, - { "GlossyPaper", canon_PIXMA_iP8100_modeuses_PPgloss, 0 }, - { "Coated", canon_PIXMA_iP8100_modeuses_PPmatte, 0 }, - { "InkJetHagaki", canon_PIXMA_iP8100_modeuses_inkjetHagaki, 0 }, +/* { "GlossyPro", canon_PIXMA_iP8100_modeuses_PPpro, 0 },*/ +/* { "PhotopaperPlus", canon_PIXMA_iP8100_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_PIXMA_iP8100_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_iP8100_modeuses_PPmatte, 0 },*/ +/* { "GlossyPaper", canon_PIXMA_iP8100_modeuses_PPgloss, 0 },*/ +/* { "Coated", canon_PIXMA_iP8100_modeuses_PPmatte, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_iP8100_modeuses_inkjetHagaki, 0 },*/ { "Hagaki", canon_PIXMA_iP8100_modeuses_Hagaki, DUPLEX_SUPPORT }, - { "FineArtPhotoRag", canon_PIXMA_iP8100_modeuses_FA, 0 }, - { "FineArtOther", canon_PIXMA_iP8100_modeuses_FA, 0 }, - { "DiscCompat", canon_PIXMA_iP8100_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_iP8100_modeuses_disc, 0 }, - { "TShirt", canon_PIXMA_iP8100_modeuses_TShirt, 0 }, +/* { "FineArtPhotoRag", canon_PIXMA_iP8100_modeuses_FA, 0 },*/ +/* { "FineArtOther", canon_PIXMA_iP8100_modeuses_FA, 0 },*/ +/* { "DiscCompat", canon_PIXMA_iP8100_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_iP8100_modeuses_disc, 0 },*/ +/* { "TShirt", canon_PIXMA_iP8100_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_iP8100_modeuses_Hagaki, 0 }, - { "Transparency", canon_PIXMA_iP8100_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_PIXMA_iP8100_modeuses_PPother, 0 },/*untested*/ +/* { "Transparency", canon_PIXMA_iP8100_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_PIXMA_iP8100_modeuses_PPother, 0 },*/ /*untested*/ }; DECLARE_MODEUSES(canon_PIXMA_iP8100); /* ----------------------------------- Canon iP8500 ----------------------------------- */ static const char* canon_PIXMA_iP8500_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi", - "300x300dpi", - "300x300dpi_draft", +/* "600x600dpi_high",*/ +/* "600x600dpi_high2",*/ +/* "600x600dpi",*/ + "600x600dpi_draft", + "600x600dpi_draft2", + "600x600dpi_mono", + "600x600dpi_draftmono", NULL }; /* modes not yet supported */ -static const char* canon_PIXMA_iP8500_modeuses_PPpro[] = { - "600x600dpi_photodraft",/*temporary stand-in: untested*/ - NULL -}; +/*static const char* canon_PIXMA_iP8500_modeuses_PPpro[] = { + "600x600dpi_photodraft", */ /*temporary stand-in: untested*/ +/* NULL +};*/ /* most modes unsupported */ -static const char* canon_PIXMA_iP8500_modeuses_PPplus[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_PPplus[] = { "600x600dpi_photodraft", NULL -}; +};*/ /* most modes unsupported */ -static const char* canon_PIXMA_iP8500_modeuses_PPplusDS[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_PPplusDS[] = { "600x600dpi_photodraft2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8500_modeuses_PPhires[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_PPhires[] = { "600x600dpi_photohigh", "600x600dpi_photo", NULL -}; +};*/ /* US driver does not support this media: untested */ -static const char* canon_PIXMA_iP8500_modeuses_inkjetHagaki[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_inkjetHagaki[] = { "600x600dpi_photohigh", "600x600dpi_photo", NULL -}; +};*/ /* US driver does not support this media */ static const char* canon_PIXMA_iP8500_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", + "600x600dpi_mono", + "600x600dpi_draftmono", NULL }; -static const char* canon_PIXMA_iP8500_modeuses_disc[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_disc[] = { "600x600dpi_photo3", "600x600dpi_photodraft3", NULL -}; +};*/ -static const char* canon_PIXMA_iP8500_modeuses_TShirt[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_TShirt[] = { "600x600dpi_tshirt", NULL -}; +};*/ -static const char* canon_PIXMA_iP8500_modeuses_Transparency[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_Transparency[] = { "600x600dpi_photo4", "600x600dpi_photodraft4", NULL -}; +};*/ -static const char* canon_PIXMA_iP8500_modeuses_PPother[] = { +/*static const char* canon_PIXMA_iP8500_modeuses_PPother[] = { "600x600dpi_photo3", NULL -}; +};*/ static const canon_modeuse_t canon_PIXMA_iP8500_modeuses[] = { { "Plain", canon_PIXMA_iP8500_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, - { "GlossyPro", canon_PIXMA_iP8500_modeuses_PPpro, 0 },/*unsupported*/ - { "PhotopaperPlus", canon_PIXMA_iP8500_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_PIXMA_iP8500_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_PIXMA_iP8500_modeuses_PPpro, 0 },/*unsupported*/ - { "GlossyPaper", canon_PIXMA_iP8500_modeuses_PPplusDS, 0 }, - { "Coated", canon_PIXMA_iP8500_modeuses_PPhires, 0 }, - { "InkJetHagaki", canon_PIXMA_iP8500_modeuses_inkjetHagaki, 0 },/*untested*/ +/* { "GlossyPro", canon_PIXMA_iP8500_modeuses_PPpro, 0 },*/ /*unsupported*/ +/* { "PhotopaperPlus", canon_PIXMA_iP8500_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_PIXMA_iP8500_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_iP8500_modeuses_PPpro, 0 },*/ /*unsupported*/ +/* { "GlossyPaper", canon_PIXMA_iP8500_modeuses_PPplusDS, 0 },*/ +/* { "Coated", canon_PIXMA_iP8500_modeuses_PPhires, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_iP8500_modeuses_inkjetHagaki, 0 },*/ /*untested*/ { "Hagaki", canon_PIXMA_iP8500_modeuses_Hagaki, DUPLEX_SUPPORT },/*untested*/ - { "DiscCompat", canon_PIXMA_iP8500_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_iP8500_modeuses_disc, 0 }, - { "TShirt", canon_PIXMA_iP8500_modeuses_TShirt, 0 }, +/* { "DiscCompat", canon_PIXMA_iP8500_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_iP8500_modeuses_disc, 0 },*/ +/* { "TShirt", canon_PIXMA_iP8500_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_iP8500_modeuses_Hagaki, 0 }, - { "Transparency", canon_PIXMA_iP8500_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_PIXMA_iP8500_modeuses_PPother, 0 }, +/* { "Transparency", canon_PIXMA_iP8500_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_PIXMA_iP8500_modeuses_PPother, 0 },*/ }; DECLARE_MODEUSES(canon_PIXMA_iP8500); /* ----------------------------------- Canon iP8600 ----------------------------------- */ static const char* canon_PIXMA_iP8600_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi_high2",/* duplex */ - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi_high2",*/ /* duplex */ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ @@ -5113,103 +5453,196 @@ static const char* canon_PIXMA_iP8600_modeuses_plain[] = { }; /* modes using R not yet supported */ -static const char* canon_PIXMA_iP8600_modeuses_PPpro[] = { - "600x600dpi_photohigh2",/*untested*/ - "600x600dpi_photo", +/*static const char* canon_PIXMA_iP8600_modeuses_PPpro[] = { + "600x600dpi_photohigh2",*/ /*untested*/ +/* "600x600dpi_photo", NULL -}; +};*/ /* highest mode using R not supported yet */ -static const char* canon_PIXMA_iP8600_modeuses_PPplus[] = { - "600x600dpi_photohigh2",/*untested*/ - "600x600dpi_photo", +/*static const char* canon_PIXMA_iP8600_modeuses_PPplus[] = { + "600x600dpi_photohigh2",*/ /*untested*/ +/* "600x600dpi_photo", "600x600dpi_photodraft2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_PPplusDS[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_PPplusDS[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_PPmatte[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_PPmatte[] = { "600x600dpi_photohigh2", "600x600dpi_photo", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_inkjetHagaki[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_inkjetHagaki[] = { "600x600dpi_photohigh3", "600x600dpi_photo3", NULL -}; +};*/ static const char* canon_PIXMA_iP8600_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", /* Mono */ "600x600dpi_mono", NULL }; -static const char* canon_PIXMA_iP8600_modeuses_FA[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_FA[] = { "600x600dpi_photohigh4", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_disc[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_disc[] = { "600x600dpi_photo", "600x600dpi_photodraft", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_TShirt[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_TShirt[] = { "600x600dpi", NULL -}; +};*/ -static const char* canon_PIXMA_iP8600_modeuses_Transparency[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_Transparency[] = { "600x600dpi_std4", "600x600dpi_draft4", NULL -}; +};*/ /*untested*/ -static const char* canon_PIXMA_iP8600_modeuses_PPother[] = { +/*static const char* canon_PIXMA_iP8600_modeuses_PPother[] = { "600x600dpi_photo", "600x600dpi_photodraft", NULL - }; +};*/ static const canon_modeuse_t canon_PIXMA_iP8600_modeuses[] = { { "Plain", canon_PIXMA_iP8600_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, - { "GlossyPro", canon_PIXMA_iP8600_modeuses_PPpro, 0 }, - { "PhotopaperPlus", canon_PIXMA_iP8600_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_PIXMA_iP8600_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_PIXMA_iP8600_modeuses_PPmatte, 0 }, - { "GlossyPaper", canon_PIXMA_iP8600_modeuses_PPplusDS, 0 }, - { "Coated", canon_PIXMA_iP8600_modeuses_PPmatte, 0 }, - { "InkJetHagaki", canon_PIXMA_iP8600_modeuses_inkjetHagaki, 0 }, +/* { "GlossyPro", canon_PIXMA_iP8600_modeuses_PPpro, 0 },*/ +/* { "PhotopaperPlus", canon_PIXMA_iP8600_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_PIXMA_iP8600_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_iP8600_modeuses_PPmatte, 0 },*/ +/* { "GlossyPaper", canon_PIXMA_iP8600_modeuses_PPplusDS, 0 },*/ +/* { "Coated", canon_PIXMA_iP8600_modeuses_PPmatte, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_iP8600_modeuses_inkjetHagaki, 0 },*/ { "Hagaki", canon_PIXMA_iP8600_modeuses_Hagaki, DUPLEX_SUPPORT }, - { "FineArtPhotoRag", canon_PIXMA_iP8600_modeuses_FA, 0 }, - { "FineArtOther", canon_PIXMA_iP8600_modeuses_FA, 0 }, - { "DiscCompat", canon_PIXMA_iP8600_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_iP8600_modeuses_disc, 0 }, - { "TShirt", canon_PIXMA_iP8600_modeuses_TShirt, 0 }, +/* { "FineArtPhotoRag", canon_PIXMA_iP8600_modeuses_FA, 0 },*/ +/* { "FineArtOther", canon_PIXMA_iP8600_modeuses_FA, 0 },*/ +/* { "DiscCompat", canon_PIXMA_iP8600_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_iP8600_modeuses_disc, 0 },*/ +/* { "TShirt", canon_PIXMA_iP8600_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_iP8600_modeuses_Hagaki, 0 }, - { "Transparency", canon_PIXMA_iP8600_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_PIXMA_iP8600_modeuses_PPother, 0 },/*untested*/ +/* { "Transparency", canon_PIXMA_iP8600_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_PIXMA_iP8600_modeuses_PPother, 0 },*/ /*untested*/ }; DECLARE_MODEUSES(canon_PIXMA_iP8600); -/* ----------------------------------- Canon iP9910 ----------------------------------- */ -static const char* canon_PIXMA_iP9910_modeuses_plain[] = { +/* ----------------------------------- Canon iP8700 ----------------------------------- */ +/* most photo modes use gray ink which is unsupported */ +/* TODO: mono modes for photo media */ +static const char* canon_PIXMA_iP8700_modeuses_plain[] = { "600x600dpi_high", - "600x600dpi_high2",/* duplex */ "600x600dpi", + "300x300dpi", + NULL + }; + +/* unsupported*/ +static const char* canon_PIXMA_iP8700_modeuses_PPplusG2[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +/* unsupported*/ +static const char* canon_PIXMA_iP8700_modeuses_PPpro[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_PPmatte[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_inkjetHagaki[] = { + "600x600dpi_photohigh4", + "600x600dpi_photo4", + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_disc[] = { + "600x600dpi_photohigh3", + "600x600dpi_photo3", + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +/* unsupported*/ +static const char* canon_PIXMA_iP8700_modeuses_photorag[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +static const char* canon_PIXMA_iP8700_modeuses_PPother[] = { + "600x600dpi_photo2", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_iP8700_modeuses[] = { + { "Plain", canon_PIXMA_iP8700_modeuses_plain, 0}, + { "PhotoPlusGloss2", canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "PhotoProPlat", canon_PIXMA_iP8700_modeuses_PPpro, 0 }, + { "PhotoProLuster", canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "PhotoProSemiGloss",canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "GlossyPaperStandard",canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "PhotopaperMatte", canon_PIXMA_iP8700_modeuses_PPmatte, 0 }, + { "GlossyPaper", canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "Coated", canon_PIXMA_iP8700_modeuses_PPmatte, 0 }, + { "HagakiA", canon_PIXMA_iP8700_modeuses_Hagaki, 0 }, + { "InkJetHagaki", canon_PIXMA_iP8700_modeuses_inkjetHagaki, 0 }, + { "InkjetPhotoHagakiK",canon_PIXMA_iP8700_modeuses_PPplusG2, 0 }, + { "Hagaki", canon_PIXMA_iP8700_modeuses_Hagaki, 0 }, + { "DiscCompat", canon_PIXMA_iP8700_modeuses_disc, 0 }, + { "DiscOthers", canon_PIXMA_iP8700_modeuses_disc, 0 }, + { "TShirt", canon_PIXMA_iP8700_modeuses_TShirt, 0 }, + { "Envelope", canon_PIXMA_iP8700_modeuses_Hagaki, 0 }, + { "FineArtPhotoRag", canon_PIXMA_iP8700_modeuses_photorag, 0 },/*untested*/ + { "FineArtOther", canon_PIXMA_iP8700_modeuses_photorag, 0 }, + { "PhotopaperOther", canon_PIXMA_iP8700_modeuses_PPother, 0 }, +}; + +DECLARE_MODEUSES(canon_PIXMA_iP8700); + +/* ----------------------------------- Canon iP9910 ----------------------------------- */ +static const char* canon_PIXMA_iP9910_modeuses_plain[] = { +/* "600x600dpi_high",*/ +/* "600x600dpi_high2",*/ /*duplex*/ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ @@ -5219,92 +5652,92 @@ static const char* canon_PIXMA_iP9910_modeuses_plain[] = { }; /* highest mode using R not yet supported */ -static const char* canon_PIXMA_iP9910_modeuses_PPpro[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_PPpro[] = { "600x600dpi_photo", "600x600dpi_photo2", NULL -}; +};*/ /* highest mode using R not supported yet */ -static const char* canon_PIXMA_iP9910_modeuses_PPplus[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_PPplus[] = { "600x600dpi_photo2", "600x600dpi_photodraft2", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_PPplusDS[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_PPplusDS[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_PPmatte[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_PPmatte[] = { "600x600dpi_photohigh2", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_inkjetHagaki[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_inkjetHagaki[] = { "600x600dpi_photohigh3", "600x600dpi_photo3", NULL -}; +};*/ static const char* canon_PIXMA_iP9910_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3", +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ "600x600dpi_draft3", /* Mono */ "600x600dpi_mono", NULL }; -static const char* canon_PIXMA_iP9910_modeuses_FA[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_FA[] = { "600x600dpi_photohigh4", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_disc[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_disc[] = { "600x600dpi_photo2", "600x600dpi_photodraft", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_TShirt[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_TShirt[] = { "600x600dpi", NULL -}; +};*/ -static const char* canon_PIXMA_iP9910_modeuses_Transparency[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_Transparency[] = { "600x600dpi_std4", "600x600dpi_draft4", NULL -}; +};*/ /*untested*/ -static const char* canon_PIXMA_iP9910_modeuses_PPother[] = { +/*static const char* canon_PIXMA_iP9910_modeuses_PPother[] = { "600x600dpi_photo2", NULL - }; +};*/ static const canon_modeuse_t canon_PIXMA_iP9910_modeuses[] = { { "Plain", canon_PIXMA_iP9910_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, - { "GlossyPro", canon_PIXMA_iP9910_modeuses_PPpro, 0 }, - { "PhotopaperPlus", canon_PIXMA_iP9910_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_PIXMA_iP9910_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_PIXMA_iP9910_modeuses_PPmatte, 0 }, - { "GlossyPaper", canon_PIXMA_iP9910_modeuses_PPplusDS, 0 }, - { "Coated", canon_PIXMA_iP9910_modeuses_PPmatte, 0 }, - { "InkJetHagaki", canon_PIXMA_iP9910_modeuses_inkjetHagaki, 0 }, +/* { "GlossyPro", canon_PIXMA_iP9910_modeuses_PPpro, 0 },*/ +/* { "PhotopaperPlus", canon_PIXMA_iP9910_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_PIXMA_iP9910_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_iP9910_modeuses_PPmatte, 0 },*/ +/* { "GlossyPaper", canon_PIXMA_iP9910_modeuses_PPplusDS, 0 },*/ +/* { "Coated", canon_PIXMA_iP9910_modeuses_PPmatte, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_iP9910_modeuses_inkjetHagaki, 0 },*/ { "Hagaki", canon_PIXMA_iP9910_modeuses_Hagaki, 0 }, - { "FineArtPhotoRag", canon_PIXMA_iP9910_modeuses_FA, 0 }, - { "FineArtOther", canon_PIXMA_iP9910_modeuses_FA, 0 }, - { "DiscCompat", canon_PIXMA_iP9910_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_iP9910_modeuses_disc, 0 }, - { "TShirt", canon_PIXMA_iP9910_modeuses_TShirt, 0 }, +/* { "FineArtPhotoRag", canon_PIXMA_iP9910_modeuses_FA, 0 },*/ +/* { "FineArtOther", canon_PIXMA_iP9910_modeuses_FA, 0 },*/ +/* { "DiscCompat", canon_PIXMA_iP9910_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_iP9910_modeuses_disc, 0 },*/ +/* { "TShirt", canon_PIXMA_iP9910_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_iP9910_modeuses_Hagaki, 0 }, - { "Transparency", canon_PIXMA_iP9910_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_PIXMA_iP9910_modeuses_PPother, 0 }, +/* { "Transparency", canon_PIXMA_iP9910_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_PIXMA_iP9910_modeuses_PPother, 0 },*/ }; DECLARE_MODEUSES(canon_PIXMA_iP9910); @@ -5531,6 +5964,76 @@ static const canon_modeuse_t canon_PIXMA_iX6500_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_iX6500); +/* ----------------------------------- Canon iX6800 ----------------------------------- */ + +static const char* canon_PIXMA_iX6800_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi", + "300x300dpi", + "300x300dpi_draft", + NULL + }; + +static const char* canon_PIXMA_iX6800_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_PPpro[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_PPmatte[] = { + "600x600dpi_photohigh", + "600x600dpi_photo2", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_inkjetHagaki[] = { + "600x600dpi_photohigh2", + "600x600dpi_photo3", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +static const char* canon_PIXMA_iX6800_modeuses_PPother[] = { + "600x600dpi_photo", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_iX6800_modeuses[] = { + { "Plain", canon_PIXMA_iX6800_modeuses_plain, 0}, + { "PhotoPlusGloss2", canon_PIXMA_iX6800_modeuses_PPplusG2, 0 }, + { "PhotoProPlat", canon_PIXMA_iX6800_modeuses_PPpro, 0 }, + { "PhotoProLuster", canon_PIXMA_iX6800_modeuses_PPplusG2, 0 }, + { "PhotoProSemiGloss",canon_PIXMA_iX6800_modeuses_PPplusG2, 0 }, + { "GlossyPaperStandard",canon_PIXMA_iX6800_modeuses_PPplusG2, 0 }, + { "PhotopaperMatte", canon_PIXMA_iX6800_modeuses_PPmatte, 0 }, + { "Coated", canon_PIXMA_iX6800_modeuses_PPmatte, 0 }, + { "HagakiA", canon_PIXMA_iX6800_modeuses_Hagaki, 0 }, + { "InkJetHagaki", canon_PIXMA_iX6800_modeuses_inkjetHagaki, 0 }, + { "InkjetPhotoHagakiK",canon_PIXMA_iX6800_modeuses_PPplusG2, 0 }, + { "Hagaki", canon_PIXMA_iX6800_modeuses_Hagaki, 0 }, + { "TShirt", canon_PIXMA_iX6800_modeuses_TShirt, 0 }, + { "Envelope", canon_PIXMA_iX6800_modeuses_Hagaki, 0 }, + { "PhotopaperOther", canon_PIXMA_iX6800_modeuses_PPother, 0 }, +}; + +DECLARE_MODEUSES(canon_PIXMA_iX6800); + /* ----------------------------------- Canon iX7000 ----------------------------------- */ static const char* canon_PIXMA_iX7000_modeuses_plain[] = { "600x600dpi_high", @@ -7884,8 +8387,8 @@ DECLARE_MODEUSES(canon_MULTIPASS_MP830); /* ----------------------------------- Canon MP900 ----------------------------------- */ static const char* canon_MULTIPASS_MP900_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ @@ -7894,92 +8397,92 @@ static const char* canon_MULTIPASS_MP900_modeuses_plain[] = { NULL }; -static const char* canon_MULTIPASS_MP900_modeuses_PPpro[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_PPpro[] = { "600x600dpi_photohigh", "600x600dpi_photo", - "600x600dpi_photo2",/*untested*/ - NULL -}; + "600x600dpi_photo2",*/ /*untested*/ +/* NULL +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_PPplus[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_PPplus[] = { "600x600dpi_photohigh", - "600x600dpi_photo2",/*untested*/ - NULL -}; + "600x600dpi_photo2",*/ /*untested*/ +/* NULL +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_PPplusDS[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_PPplusDS[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_PPmatte[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_PPmatte[] = { "600x600dpi_photohigh2", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_coated[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_coated[] = { "600x600dpi_photohigh2", "600x600dpi_photo", "600x600dpi_photo2", NULL -}; +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_inkjetHagaki[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_inkjetHagaki[] = { "600x600dpi_photohigh3", "600x600dpi_photo3", NULL -}; +};*/ static const char* canon_MULTIPASS_MP900_modeuses_Hagaki[] = { - "600x600dpi_high4", - "600x600dpi_std4", +/* "600x600dpi_high4",*/ +/* "600x600dpi_std4",*/ "600x600dpi_draft4", "600x600dpi_draftmono4",/* Mono */ NULL }; -static const char* canon_MULTIPASS_MP900_modeuses_disc[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_disc[] = { "600x600dpi_photo4", "600x600dpi_photodraft4", NULL -}; +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_TShirt[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_TShirt[] = { "600x600dpi_tshirt", NULL -}; +};*/ -static const char* canon_MULTIPASS_MP900_modeuses_Transparency[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_Transparency[] = { "600x600dpi_std3", "600x600dpi_draft3", NULL -}; +};*/ /*untested*/ -static const char* canon_MULTIPASS_MP900_modeuses_PPother[] = { +/*static const char* canon_MULTIPASS_MP900_modeuses_PPother[] = { "600x600dpi_photohigh", "600x600dpi_photo2", NULL - }; + };*/ static const canon_modeuse_t canon_MULTIPASS_MP900_modeuses[] = { { "Plain", canon_MULTIPASS_MP900_modeuses_plain, 0 }, - { "GlossyPro", canon_MULTIPASS_MP900_modeuses_PPpro, 0 }, - { "PhotopaperPlus", canon_MULTIPASS_MP900_modeuses_PPplus, 0 }, - { "PhotopaperPlusDouble", canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 }, - { "GlossyPaper", canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 }, - { "PhotopaperMatte", canon_MULTIPASS_MP900_modeuses_PPmatte, 0 }, - { "Coated", canon_MULTIPASS_MP900_modeuses_coated, 0 }, - { "InkJetHagaki", canon_MULTIPASS_MP900_modeuses_inkjetHagaki, 0 }, +/* { "GlossyPro", canon_MULTIPASS_MP900_modeuses_PPpro, 0 },*/ +/* { "PhotopaperPlus", canon_MULTIPASS_MP900_modeuses_PPplus, 0 },*/ +/* { "PhotopaperPlusDouble", canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 },*/ +/* { "GlossyPaper", canon_MULTIPASS_MP900_modeuses_PPplusDS, 0 },*/ +/* { "PhotopaperMatte", canon_MULTIPASS_MP900_modeuses_PPmatte, 0 },*/ +/* { "Coated", canon_MULTIPASS_MP900_modeuses_coated, 0 },*/ +/* { "InkJetHagaki", canon_MULTIPASS_MP900_modeuses_inkjetHagaki, 0 },*/ { "Hagaki", canon_MULTIPASS_MP900_modeuses_Hagaki, 0 }, - { "DiscCompat", canon_MULTIPASS_MP900_modeuses_disc, 0 }, - { "DiscOthers", canon_MULTIPASS_MP900_modeuses_disc, 0 }, - { "TShirt", canon_MULTIPASS_MP900_modeuses_TShirt, 0 }, +/* { "DiscCompat", canon_MULTIPASS_MP900_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_MULTIPASS_MP900_modeuses_disc, 0 },*/ +/* { "TShirt", canon_MULTIPASS_MP900_modeuses_TShirt, 0 },*/ { "Envelope", canon_MULTIPASS_MP900_modeuses_Hagaki, 0 }, - { "Transparency", canon_MULTIPASS_MP900_modeuses_Transparency, 0 }, - { "PhotopaperOther", canon_MULTIPASS_MP900_modeuses_PPother, 0 },/*untested*/ +/* { "Transparency", canon_MULTIPASS_MP900_modeuses_Transparency, 0 },*/ +/* { "PhotopaperOther", canon_MULTIPASS_MP900_modeuses_PPother, 0 },*/ /*untested*/ }; DECLARE_MODEUSES(canon_MULTIPASS_MP900); @@ -8993,6 +9496,65 @@ static const canon_modeuse_t canon_MULTIPASS_MX420_modeuses[] = { DECLARE_MODEUSES(canon_MULTIPASS_MX420); +/* ----------------------------------- Canon MX470 ----------------------------------- */ + +static const char* canon_MULTIPASS_MX470_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high5",/* duplex */ + "600x600dpi", + "300x300dpi", + NULL + }; + +static const char* canon_MULTIPASS_MX470_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_MX470_modeuses_PPpro[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_MX470_modeuses_Hagaki[] = { + "600x600dpi_high3", + "600x600dpi_std3", + NULL +}; + +static const char* canon_MULTIPASS_MX470_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +static const char* canon_MULTIPASS_MX470_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL +}; + +static const canon_modeuse_t canon_MULTIPASS_MX470_modeuses[] = { + { "Plain", canon_MULTIPASS_MX470_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotoPlusGloss2", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_MULTIPASS_MX470_modeuses_PPpro, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Coated", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_MULTIPASS_MX470_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "InkJetHagaki", canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_MULTIPASS_MX470_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_MULTIPASS_MX470_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "TShirt", canon_MULTIPASS_MX470_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_MULTIPASS_MX470_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotopaperOther", canon_MULTIPASS_MX470_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_MULTIPASS_MX470); + /* ----------------------------------- Canon MX510 ----------------------------------- */ static const char* canon_MULTIPASS_MX510_modeuses_plain[] = { "600x600dpi_high", @@ -9116,6 +9678,65 @@ static const canon_modeuse_t canon_MULTIPASS_MX520_modeuses[] = { DECLARE_MODEUSES(canon_MULTIPASS_MX520); +/* ----------------------------------- Canon MX530 ----------------------------------- */ + +static const char* canon_MULTIPASS_MX530_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high5",/* duplex */ + "600x600dpi", + "300x300dpi", + NULL + }; + +static const char* canon_MULTIPASS_MX530_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_MX530_modeuses_PPpro[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_MX530_modeuses_Hagaki[] = { + "600x600dpi_high3", + "600x600dpi_std3", + NULL +}; + +static const char* canon_MULTIPASS_MX530_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +static const char* canon_MULTIPASS_MX530_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL +}; + +static const canon_modeuse_t canon_MULTIPASS_MX530_modeuses[] = { + { "Plain", canon_MULTIPASS_MX530_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL }, + { "PhotoPlusGloss2", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_MULTIPASS_MX530_modeuses_PPpro, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Coated", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_MULTIPASS_MX530_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "InkJetHagaki", canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_MULTIPASS_MX530_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_MULTIPASS_MX530_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "TShirt", canon_MULTIPASS_MX530_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_MULTIPASS_MX530_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotopaperOther", canon_MULTIPASS_MX530_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_MULTIPASS_MX530); + /* ----------------------------------- Canon MX700 ----------------------------------- */ static const char* canon_MULTIPASS_MX700_modeuses_plain[] = { "600x600dpi_high", @@ -9753,14 +10374,112 @@ static const canon_modeuse_t canon_MULTIPASS_MX7600_modeuses[] = { DECLARE_MODEUSES(canon_MULTIPASS_MX7600); +/* ----------------------------------- Canon E400 ----------------------------------- */ + +static const char* canon_MULTIPASS_E400_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi", + "300x300dpi", + NULL +}; + +static const char* canon_MULTIPASS_E400_modeuses_PPplusG2[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_E400_modeuses_PPglossy[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const canon_modeuse_t canon_MULTIPASS_E400_modeuses[] = { + { "Plain", canon_MULTIPASS_E400_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "PhotoPlusGloss2", canon_MULTIPASS_E400_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Coated", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_MULTIPASS_E400_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "InkJetHagaki", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_MULTIPASS_E400_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "TShirt", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_MULTIPASS_E400_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "PhotopaperOther", canon_MULTIPASS_E400_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_MULTIPASS_E400); + +/* ----------------------------------- Canon E480 ----------------------------------- */ +static const char* canon_MULTIPASS_E480_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high2",/* color-only */ + "600x600dpi", + "300x300dpi", + NULL +}; + +static const char* canon_MULTIPASS_E480_modeuses_PPplusG2[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_E480_modeuses_PP[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_E480_modeuses_Hagaki[] = { + "600x600dpi_high3", + "600x600dpi_std3", + NULL +}; + +static const char* canon_MULTIPASS_E480_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +static const char* canon_MULTIPASS_E480_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL +}; + +static const canon_modeuse_t canon_MULTIPASS_E480_modeuses[] = { + { "Plain", canon_MULTIPASS_E480_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotoPlusGloss2", canon_MULTIPASS_E480_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "Coated", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_MULTIPASS_E480_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "InkJetHagaki", canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_MULTIPASS_E480_modeuses_PP, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_MULTIPASS_E480_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "TShirt", canon_MULTIPASS_E480_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_MULTIPASS_E480_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "PhotopaperOther", canon_MULTIPASS_E480_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_MULTIPASS_E480); + /* ----------------------------------- Canon E500 ----------------------------------- */ static const char* canon_MULTIPASS_E500_modeuses_plain[] = { "600x600dpi_high", "600x600dpi_high2",/* color-only */ "600x600dpi", - "600x600dpi_draft",/*untested*/ "300x300dpi", - "300x300dpi_draft", NULL }; @@ -9872,6 +10591,106 @@ static const canon_modeuse_t canon_MULTIPASS_E510_modeuses[] = { DECLARE_MODEUSES(canon_MULTIPASS_E510); +/* ----------------------------------- Canon E560 ----------------------------------- */ +static const char* canon_MULTIPASS_E560_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high2",/* color-only */ + "600x600dpi", + "300x300dpi", + NULL +}; + +static const char* canon_MULTIPASS_E560_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_E560_modeuses_PPproPlat[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MULTIPASS_E560_modeuses_Hagaki[] = { + "600x600dpi_high3", + "600x600dpi_std3", + NULL +}; + +static const char* canon_MULTIPASS_E560_modeuses_TShirt[] = { + "600x600dpi_photohigh", + NULL +}; + +static const char* canon_MULTIPASS_E560_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL +}; + +static const canon_modeuse_t canon_MULTIPASS_E560_modeuses[] = { + { "Plain", canon_MULTIPASS_E560_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL | DUPLEX_SUPPORT | DUPLEX_MODEREPL}, + { "PhotoPlusGloss2", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_MULTIPASS_E560_modeuses_PPproPlat, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Coated", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_MULTIPASS_E560_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "InkJetHagaki", canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_MULTIPASS_E560_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_MULTIPASS_E560_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "TShirt", canon_MULTIPASS_E560_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_MULTIPASS_E560_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotopaperOther", canon_MULTIPASS_E560_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_MULTIPASS_E560); + +/* ----------------------------------- Canon P200 ----------------------------------- */ + +static const char* canon_PIXMA_P200_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi", + "300x300dpi", + NULL +}; + +static const char* canon_PIXMA_P200_modeuses_PPplusG2[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_P200_modeuses_PPglossy[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_P200_modeuses[] = { + { "Plain", canon_PIXMA_P200_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "PhotoPlusGloss2", canon_PIXMA_P200_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "GlossyPaper", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Coated", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_PIXMA_P200_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "InkJetHagaki", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "CanonPhotoHagakiK",canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_PIXMA_P200_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "TShirt", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_PIXMA_P200_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT }, + { "PhotopaperOther", canon_PIXMA_P200_modeuses_PPglossy, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_PIXMA_P200); + /* ----------------------------------- Canon MG2100 ----------------------------------- */ static const char* canon_PIXMA_MG2100_modeuses_plain[] = { "600x600dpi_high", @@ -10070,6 +10889,63 @@ static const canon_modeuse_t canon_PIXMA_MG2400_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_MG2400); +/* ----------------------------------- Canon MG2900 ----------------------------------- */ +static const char* canon_PIXMA_MG2900_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi", + "300x300dpi", + NULL + }; + +static const char* canon_PIXMA_MG2900_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_MG2900_modeuses_PPpro[] = { + "600x600dpi_photohigh2", + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_MG2900_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_MG2900_modeuses_TShirt[] = { + "600x600dpi_photo", + NULL + }; + +static const char* canon_PIXMA_MG2900_modeuses_PPother[] = { + "600x600dpi_photohigh", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_MG2900_modeuses[] = { + { "Plain", canon_PIXMA_MG2900_modeuses_plain, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotoPlusGloss2", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProPlat", canon_PIXMA_MG2900_modeuses_PPpro, INKSET_COLOR_SUPPORT }, + { "PhotoProLuster", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotoProSemiGloss",canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "PhotopaperMatte", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "GlossyPaperStandard", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Coated", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "HagakiA", canon_PIXMA_MG2900_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "InkJetHagaki", canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "InkjetPhotoHagakiK",canon_PIXMA_MG2900_modeuses_PPplusG2, INKSET_COLOR_SUPPORT }, + { "Hagaki", canon_PIXMA_MG2900_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "TShirt", canon_PIXMA_MG2900_modeuses_TShirt, INKSET_COLOR_SUPPORT }, + { "Envelope", canon_PIXMA_MG2900_modeuses_Hagaki, INKSET_BLACK_SUPPORT | INKSET_COLOR_SUPPORT | INKSET_BLACK_MODEREPL | INKSET_COLOR_MODEREPL }, + { "PhotopaperOther", canon_PIXMA_MG2900_modeuses_PPother, INKSET_COLOR_SUPPORT }, +}; + +DECLARE_MODEUSES(canon_PIXMA_MG2900); + /* ----------------------------------- Canon MG3100 ----------------------------------- */ static const char* canon_PIXMA_MG3100_modeuses_plain[] = { "600x600dpi_high", @@ -10243,7 +11119,7 @@ static const char* canon_PIXMA_MG3500_modeuses_Hagaki[] = { }; static const char* canon_PIXMA_MG3500_modeuses_TShirt[] = { - "600x600dpi_tshirt", + "600x600dpi_photohigh", NULL }; @@ -10643,6 +11519,72 @@ static const canon_modeuse_t canon_PIXMA_MG5500_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_MG5500); +/* ----------------------------------- Canon MG5600 ----------------------------------- */ +static const char* canon_PIXMA_MG5600_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high2",/* duplex */ + "600x600dpi", + "600x600dpi_std2",/* duplex */ + "300x300dpi", + NULL + }; + +static const char* canon_PIXMA_MG5600_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_MG5600_modeuses_PPpro[] = { + /*ud1 not supported */ + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_MG5600_modeuses_PPmatte[] = { + "600x600dpi_photohigh2", + "600x600dpi_photo2", + NULL +}; + +static const char* canon_PIXMA_MG5600_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_MG5600_modeuses_TShirt[] = { + "600x600dpi_photohigh2", + NULL +}; + +static const char* canon_PIXMA_MG5600_modeuses_PPother[] = { + "600x600dpi_photohigh", /* experimental */ + "600x600dpi_photo", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_MG5600_modeuses[] = { + { "Plain", canon_PIXMA_MG5600_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, + { "PhotoPlusGloss2", canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "PhotoProPlat", canon_PIXMA_MG5600_modeuses_PPpro, 0 }, + { "PhotoProLuster", canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "PhotoProSemiGloss",canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "PhotopaperMatte", canon_PIXMA_MG5600_modeuses_PPmatte, 0 }, + { "GlossyPaperStandard", canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "Coated", canon_PIXMA_MG5600_modeuses_PPmatte, 0 }, + { "HagakiA", canon_PIXMA_MG5600_modeuses_Hagaki, 0 }, + { "InkJetHagaki", canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "InkjetPhotoHagakiK",canon_PIXMA_MG5600_modeuses_PPplusG2, 0 }, + { "Hagaki", canon_PIXMA_MG5600_modeuses_Hagaki, 0 }, + { "TShirt", canon_PIXMA_MG5600_modeuses_TShirt, 0 }, + { "Envelope", canon_PIXMA_MG5600_modeuses_Hagaki, 0 }, + { "PhotopaperOther", canon_PIXMA_MG5600_modeuses_PPother, 0 }, +}; + +DECLARE_MODEUSES(canon_PIXMA_MG5600); + /* ----------------------------------- Canon MG6100 ----------------------------------- */ /* most photo modes use gray ink which is unsupported */ /* TODO: mono modes for photo media */ @@ -10905,7 +11847,7 @@ static const canon_modeuse_t canon_PIXMA_MG6300_modeuses[] = { { "PhotoProLuster", canon_PIXMA_MG6300_modeuses_PPplusG2, 0 },/*unsupported*/ { "PhotoProSemiGloss",canon_PIXMA_MG6300_modeuses_PPplusG2, 0 },/*unsupported*/ { "PhotopaperMatte", canon_PIXMA_MG6300_modeuses_PPmatte, 0 }, - { "GlossyPaper", canon_PIXMA_MG6300_modeuses_PPplusG2, 0 },/*unsupported*/ + { "GlossyPaper", canon_PIXMA_MG6300_modeuses_PPmatte, 0 },/*unsupported*/ { "Coated", canon_PIXMA_MG6300_modeuses_PPmatte, 0 }, { "HagakiA", canon_PIXMA_MG6300_modeuses_Hagaki, DUPLEX_SUPPORT }, { "InkJetHagaki", canon_PIXMA_MG6300_modeuses_inkjetHagaki, 0 }, @@ -11016,6 +11958,100 @@ static const canon_modeuse_t canon_PIXMA_MG6500_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_MG6500); +/* ----------------------------------- Canon MG6700 ----------------------------------- */ +/* most photo modes use gray ink which is unsupported */ +/* TODO: mono modes for photo media */ +static const char* canon_PIXMA_MG6700_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi_high2",/* duplex */ + "600x600dpi", + "600x600dpi_std2",/* duplex */ + "300x300dpi", + NULL + }; + +/* unsupported*/ +static const char* canon_PIXMA_MG6700_modeuses_PPplusG2[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +/* unsupported*/ +static const char* canon_PIXMA_MG6700_modeuses_PPpro[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_PPmatte[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_inkjetHagaki[] = { + "600x600dpi_photohigh4", + "600x600dpi_photo4", + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_disc[] = { + "600x600dpi_photohigh3", + "600x600dpi_photo3", + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_TShirt[] = { + "600x600dpi_photo", + NULL +}; + +/* unsupported*/ +static const char* canon_PIXMA_MG6700_modeuses_photorag[] = { + "600x600dpi_photohigh",/*stand-in*/ + "600x600dpi_photo",/*stand-in*/ + "600x600dpi_photo2",/*stand-in*/ + NULL +}; + +static const char* canon_PIXMA_MG6700_modeuses_PPother[] = { + "600x600dpi_photo2", + NULL +}; + +static const canon_modeuse_t canon_PIXMA_MG6700_modeuses[] = { + { "Plain", canon_PIXMA_MG6700_modeuses_plain, DUPLEX_SUPPORT | DUPLEX_MODEREPL }, + { "PhotoPlusGloss2", canon_PIXMA_MG6700_modeuses_PPplusG2, 0 },/*unsupported*/ + { "PhotoProPlat", canon_PIXMA_MG6700_modeuses_PPpro, 0 },/*unsupported*/ + { "PhotoProLuster", canon_PIXMA_MG6700_modeuses_PPplusG2, 0 },/*unsupported*/ + { "PhotoProSemiGloss",canon_PIXMA_MG6700_modeuses_PPplusG2, 0 },/*unsupported*/ + { "PhotopaperMatte", canon_PIXMA_MG6700_modeuses_PPmatte, 0 }, + { "GlossyPaperStandard", canon_PIXMA_MG6700_modeuses_PPplusG2, 0 },/*unsupported*/ + { "Coated", canon_PIXMA_MG6700_modeuses_PPmatte, 0 }, + { "HagakiA", canon_PIXMA_MG6700_modeuses_Hagaki, DUPLEX_SUPPORT }, + { "InkJetHagaki", canon_PIXMA_MG6700_modeuses_inkjetHagaki, 0 }, + { "InkjetPhotoHagakiK",canon_PIXMA_MG6700_modeuses_PPplusG2, 0 },/*unsupported*/ + { "Hagaki", canon_PIXMA_MG6700_modeuses_Hagaki, DUPLEX_SUPPORT }, + { "DiscCompat", canon_PIXMA_MG6700_modeuses_disc, 0 }, + { "DiscOthers", canon_PIXMA_MG6700_modeuses_disc, 0 }, + { "TShirt", canon_PIXMA_MG6700_modeuses_TShirt, 0 }, + { "Envelope", canon_PIXMA_MG6700_modeuses_Hagaki, 0 }, + { "FineArtPhotoRag", canon_PIXMA_MG6700_modeuses_photorag, 0 },/*unsupported*/ + { "FineArtOther", canon_PIXMA_MG6700_modeuses_photorag, 0 },/*unsupported*/ + { "PhotopaperOther", canon_PIXMA_MG6700_modeuses_PPother, 0 }, +}; + +DECLARE_MODEUSES(canon_PIXMA_MG6700); + /* ----------------------------------- Canon MG8100 ----------------------------------- */ /* most photo modes use gray ink which is unsupported */ /* TODO: mono modes for photo media */ @@ -11205,155 +12241,155 @@ DECLARE_MODEUSES(canon_PIXMA_MG8200); /* ----------------------------------- Canon Pro9000 ----------------------------------- */ static const char* canon_PIXMA_Pro9000_modeuses_plain[] = { - "600x600dpi_high2", - "600x600dpi", +/* "600x600dpi_high2",*/ +/* "600x600dpi",*/ "600x600dpi_std2", "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ - "600x600dpi_highmono", - "600x600dpi_mono", +/* "600x600dpi_highmono",*/ +/* "600x600dpi_mono",*/ "600x600dpi_draftmono", "600x600dpi_draftmono2", NULL }; /* highest mode not yet supported (R,G inks) */ -static const char* canon_PIXMA_Pro9000_modeuses_PPplusG2[] = { - "600x600dpi_photo", +/*static const char* canon_PIXMA_Pro9000_modeuses_PPplusG2[] = { + "600x600dpi_photo",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL -}; +};*/ /* highest mode not yet supported (R,G inks) */ -static const char* canon_PIXMA_Pro9000_modeuses_PPplus[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_PPplus[] = { "600x600dpi_photo", - "600x600dpi_photodraft2", + "600x600dpi_photodraft2",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", "600x600dpi_photomonodraft", NULL -}; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_PPgloss[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_PPgloss[] = { "600x600dpi_photohigh3", - "600x600dpi_photodraft", + "600x600dpi_photodraft",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomonodraft", NULL -}; +};*/ /* highest mode not yet supported (R,G inks) */ -static const char* canon_PIXMA_Pro9000_modeuses_PPpro[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_PPpro[] = { "600x600dpi_photohigh", - "600x600dpi_photo", + "600x600dpi_photo",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomonomed", "600x600dpi_photomono", NULL -}; +};*/ /* highest mode not yet supported (R,G inks) */ -static const char* canon_PIXMA_Pro9000_modeuses_PPproPlat[] = { - "600x600dpi_photohigh", +/*static const char* canon_PIXMA_Pro9000_modeuses_PPproPlat[] = { + "600x600dpi_photohigh",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomonomed", NULL -}; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_PPmatte[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_PPmatte[] = { "600x600dpi_photohigh2", - "600x600dpi_photo", + "600x600dpi_photo",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL -}; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_inkjetHagaki[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_inkjetHagaki[] = { "600x600dpi_photomed2", - "600x600dpi_photomed", + "600x600dpi_photomed",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL -}; +};*/ static const char* canon_PIXMA_Pro9000_modeuses_Hagaki[] = { - "600x600dpi_high3", - "600x600dpi_std3",/*Mono High*/ - "600x600dpi_std4",/* bw=2 for mono */ +/* "600x600dpi_high3",*/ +/* "600x600dpi_std3",*/ /*Mono High*/ +/* "600x600dpi_std4",*/ /* bw=2 for mono */ "600x600dpi_draft3",/* bw=2 for mono */ NULL }; -static const char* canon_PIXMA_Pro9000_modeuses_disc[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_disc[] = { "600x600dpi_photohigh4", - "600x600dpi_photo2", + "600x600dpi_photo2",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL -}; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_board[] = { - "600x600dpi_photohigh5", +/*static const char* canon_PIXMA_Pro9000_modeuses_board[] = { + "600x600dpi_photohigh5",*/ /* Mono */ - "600x600dpi_photomono", +/* "600x600dpi_photomono", NULL - }; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_photorag[] = { +/*static const char* canon_PIXMA_Pro9000_modeuses_photorag[] = { "600x600dpi_photohigh5", - "600x600dpi_photo", + "600x600dpi_photo",*/ /* Mono */ - "600x600dpi_photomonohigh", +/* "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL - }; +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_TShirt[] = { - "600x600dpi_tshirt",/* bw=2 for mono */ - NULL -}; +/*static const char* canon_PIXMA_Pro9000_modeuses_TShirt[] = { + "600x600dpi_tshirt",*/ /* bw=2 for mono */ +/* NULL +};*/ -static const char* canon_PIXMA_Pro9000_modeuses_PPother[] = { - "600x600dpi_photo", +/*static const char* canon_PIXMA_Pro9000_modeuses_PPother[] = { + "600x600dpi_photo",*/ /* Mono */ - "600x600dpi_photomono", +/* "600x600dpi_photomono", NULL - }; +};*/ static const canon_modeuse_t canon_PIXMA_Pro9000_modeuses[] = { { "Plain", canon_PIXMA_Pro9000_modeuses_plain, 0 }, - { "PhotopaperPlus", canon_PIXMA_Pro9000_modeuses_PPplus, 0 }, - { "PhotoPlusGloss2", canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 }, - { "GlossyPaper", canon_PIXMA_Pro9000_modeuses_PPgloss, 0 }, - { "PhotoProSemiGloss", canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 }, - { "GlossyPro", canon_PIXMA_Pro9000_modeuses_PPpro, 0 }, - { "PhotoPro2", canon_PIXMA_Pro9000_modeuses_PPpro, 0 }, - { "PhotoProPlat", canon_PIXMA_Pro9000_modeuses_PPproPlat, 0 }, - { "PhotopaperMatte", canon_PIXMA_Pro9000_modeuses_PPmatte, 0 }, - { "Coated", canon_PIXMA_Pro9000_modeuses_PPmatte, 0 }, - { "InkJetHagaki", canon_PIXMA_Pro9000_modeuses_inkjetHagaki, 0 }, +/* { "PhotopaperPlus", canon_PIXMA_Pro9000_modeuses_PPplus, 0 },*/ +/* { "PhotoPlusGloss2", canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 },*/ +/* { "GlossyPaper", canon_PIXMA_Pro9000_modeuses_PPgloss, 0 },*/ +/* { "PhotoProSemiGloss", canon_PIXMA_Pro9000_modeuses_PPplusG2, 0 },*/ +/* { "GlossyPro", canon_PIXMA_Pro9000_modeuses_PPpro, 0 },*/ +/* { "PhotoPro2", canon_PIXMA_Pro9000_modeuses_PPpro, 0 },*/ +/* { "PhotoProPlat", canon_PIXMA_Pro9000_modeuses_PPproPlat, 0 },*/ +/* { "PhotopaperMatte", canon_PIXMA_Pro9000_modeuses_PPmatte, 0 },*/ +/* { "Coated", canon_PIXMA_Pro9000_modeuses_PPmatte, 0 },*/ +/* { "InkJetHagaki", canon_PIXMA_Pro9000_modeuses_inkjetHagaki, 0 },*/ { "Hagaki", canon_PIXMA_Pro9000_modeuses_Hagaki, 0 }, - { "DiscCompat", canon_PIXMA_Pro9000_modeuses_disc, 0 }, - { "DiscOthers", canon_PIXMA_Pro9000_modeuses_disc, 0 }, - { "Boardpaper", canon_PIXMA_Pro9000_modeuses_board, 0 }, - { "Canvas", canon_PIXMA_Pro9000_modeuses_board, 0 }, - { "FineArtPhotoRag", canon_PIXMA_Pro9000_modeuses_photorag, 0 }, - { "FineArtOther", canon_PIXMA_Pro9000_modeuses_board, 0 }, - { "FineArtPremiumMatte",canon_PIXMA_Pro9000_modeuses_board, 0 }, - { "FineArtMuseumEtching",canon_PIXMA_Pro9000_modeuses_photorag, 0 }, - { "TShirt", canon_PIXMA_Pro9000_modeuses_TShirt, 0 }, +/* { "DiscCompat", canon_PIXMA_Pro9000_modeuses_disc, 0 },*/ +/* { "DiscOthers", canon_PIXMA_Pro9000_modeuses_disc, 0 },*/ +/* { "Boardpaper", canon_PIXMA_Pro9000_modeuses_board, 0 },*/ +/* { "Canvas", canon_PIXMA_Pro9000_modeuses_board, 0 },*/ +/* { "FineArtPhotoRag", canon_PIXMA_Pro9000_modeuses_photorag, 0 },*/ +/* { "FineArtOther", canon_PIXMA_Pro9000_modeuses_board, 0 },*/ +/* { "FineArtPremiumMatte",canon_PIXMA_Pro9000_modeuses_board, 0 },*/ +/* { "FineArtMuseumEtching",canon_PIXMA_Pro9000_modeuses_photorag, 0 },*/ +/* { "TShirt", canon_PIXMA_Pro9000_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_Pro9000_modeuses_Hagaki, 0 }, - { "PhotopaperOther", canon_PIXMA_Pro9000_modeuses_PPother, 0 }, +/* { "PhotopaperOther", canon_PIXMA_Pro9000_modeuses_PPother, 0 },*/ }; DECLARE_MODEUSES(canon_PIXMA_Pro9000); @@ -11361,13 +12397,13 @@ DECLARE_MODEUSES(canon_PIXMA_Pro9000); /* ----------------------------------- Canon Pro9000mk2 ----------------------------------- */ static const char* canon_PIXMA_Pro9000mk2_modeuses_plain[] = { - "600x600dpi_high", - "600x600dpi", +/* "600x600dpi_high",*/ +/* "600x600dpi",*/ "600x600dpi_draft", "600x600dpi_draft2", /* Mono */ - "600x600dpi_highmono", - "600x600dpi_mono", +/* "600x600dpi_highmono",*/ +/* "600x600dpi_mono",*/ "600x600dpi_draftmono", "600x600dpi_draftmono2", NULL @@ -11375,7 +12411,7 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_plain[] = { /* highest mode not yet supported (R,G inks) */ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPplusG2[] = { - "600x600dpi_photo", +/* "600x600dpi_photo",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomono", @@ -11383,8 +12419,8 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPplusG2[] = { }; static const char* canon_PIXMA_Pro9000mk2_modeuses_PPgloss[] = { - "600x600dpi_photohigh2", - "600x600dpi_photodraft", +/* "600x600dpi_photohigh2",*/ +/* "600x600dpi_photodraft",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomonodraft", @@ -11393,8 +12429,8 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPgloss[] = { /* highest mode not yet supported (R,G inks) */ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPpro2[] = { - "600x600dpi_photomed", - "600x600dpi_photo", +/* "600x600dpi_photomed",*/ +/* "600x600dpi_photo",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomonomed",/*untested: quality setting uncertain*/ @@ -11404,7 +12440,7 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPpro2[] = { /* highest mode not yet supported (R,G inks) */ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPproPlat[] = { - "600x600dpi_photomed", +/* "600x600dpi_photomed",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomonomed", @@ -11412,8 +12448,8 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPproPlat[] = { }; static const char* canon_PIXMA_Pro9000mk2_modeuses_PPmatte[] = { - "600x600dpi_photohigh", - "600x600dpi_photo", +/* "600x600dpi_photohigh",*/ +/* "600x600dpi_photo",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomono", @@ -11421,8 +12457,8 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPmatte[] = { }; static const char* canon_PIXMA_Pro9000mk2_modeuses_inkjetHagaki[] = { - "600x600dpi_photohigh3", - "600x600dpi_photo3", +/* "600x600dpi_photohigh3",*/ +/* "600x600dpi_photo3",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomono", @@ -11430,17 +12466,17 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_inkjetHagaki[] = { }; static const char* canon_PIXMA_Pro9000mk2_modeuses_Hagaki[] = { - "600x600dpi_high2",/* bw=2 for mono */ - "600x600dpi_std2",/* bw=2 for mono */ +/* "600x600dpi_high2",*/ /* bw=2 for mono */ +/* "600x600dpi_std2",*/ /* bw=2 for mono */ "600x600dpi_draft2",/* bw=2 for mono */ /* Mono */ - "600x600dpi_high3", +/* "600x600dpi_high3",*/ NULL }; static const char* canon_PIXMA_Pro9000mk2_modeuses_disc[] = { - "600x600dpi_photohigh4", - "600x600dpi_photo4", +/* "600x600dpi_photohigh4",*/ +/* "600x600dpi_photo4",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomono", @@ -11448,28 +12484,28 @@ static const char* canon_PIXMA_Pro9000mk2_modeuses_disc[] = { }; static const char* canon_PIXMA_Pro9000mk2_modeuses_board[] = { - "600x600dpi_photohigh5", +/* "600x600dpi_photohigh5",*/ /* Mono */ "600x600dpi_photomonohigh", NULL }; static const char* canon_PIXMA_Pro9000mk2_modeuses_photorag[] = { - "600x600dpi_photohigh5", - "600x600dpi_photo", +/* "600x600dpi_photohigh5",*/ +/* "600x600dpi_photo",*/ /* Mono */ "600x600dpi_photomonohigh", "600x600dpi_photomono", NULL }; -static const char* canon_PIXMA_Pro9000mk2_modeuses_TShirt[] = { - "600x600dpi_tshirt",/* bw=2 for mono */ - NULL -}; +/*static const char* canon_PIXMA_Pro9000mk2_modeuses_TShirt[] = { + "600x600dpi_tshirt",*/ /* bw=2 for mono */ +/* NULL +};*/ static const char* canon_PIXMA_Pro9000mk2_modeuses_PPother[] = { - "600x600dpi_photo", +/* "600x600dpi_photo",*/ /* Mono */ "600x600dpi_photomono", NULL @@ -11494,7 +12530,7 @@ static const canon_modeuse_t canon_PIXMA_Pro9000mk2_modeuses[] = { { "FineArtOther", canon_PIXMA_Pro9000mk2_modeuses_board, 0 }, { "FineArtPremiumMatte",canon_PIXMA_Pro9000mk2_modeuses_board, 0 }, { "FineArtMuseumEtching",canon_PIXMA_Pro9000mk2_modeuses_photorag, 0 }, - { "TShirt", canon_PIXMA_Pro9000mk2_modeuses_TShirt, 0 }, +/* { "TShirt", canon_PIXMA_Pro9000mk2_modeuses_TShirt, 0 },*/ { "Envelope", canon_PIXMA_Pro9000mk2_modeuses_Hagaki, 0 }, { "PhotopaperOther", canon_PIXMA_Pro9000mk2_modeuses_PPother, 0 }, }; @@ -11508,9 +12544,9 @@ static const char* canon_PIXMA_Pro9500_modeuses_plain[] = { "600x600dpi", "600x600dpi_draft", /* Mono */ - "600x600dpi_highmono2", - "600x600dpi_highmono",/*untested*/ - "600x600dpi_mono", +/* "600x600dpi_highmono2",*/ +/* "600x600dpi_highmono",*/ /*untested*/ +/* "600x600dpi_mono",*/ "600x600dpi_draftmono", "600x600dpi_draftmono2",/*untested*/ NULL @@ -11563,9 +12599,9 @@ static const char* canon_PIXMA_Pro9500_modeuses_inkjetHagaki[] = { /* modes not yet supported (R,G inks) */ static const char* canon_PIXMA_Pro9500_modeuses_Hagaki[] = { /* Mono */ - "600x600dpi_highmono2", - "600x600dpi_highmono", - "600x600dpi_mono",/*untested*/ +/* "600x600dpi_highmono2",*/ +/* "600x600dpi_highmono",*/ +/* "600x600dpi_mono",*/ /*untested*/ "600x600dpi_draftmono",/*untested*/ "600x600dpi_draftmono2",/*untested*/ NULL @@ -11638,9 +12674,9 @@ static const char* canon_PIXMA_Pro9500mk2_modeuses_plain[] = { "600x600dpi", "600x600dpi_draft", /* Mono */ - "600x600dpi_highmono2", - "600x600dpi_highmono",/*untested*/ - "600x600dpi_mono", +/* "600x600dpi_highmono2",*/ +/* "600x600dpi_highmono",*/ /*untested*/ +/* "600x600dpi_mono",*/ "600x600dpi_draftmono", "600x600dpi_draftmono2",/*untested*/ NULL @@ -11685,9 +12721,9 @@ static const char* canon_PIXMA_Pro9500mk2_modeuses_inkjetHagaki[] = { /* modes not yet supported (R,G inks) */ static const char* canon_PIXMA_Pro9500mk2_modeuses_Hagaki[] = { /* Mono */ - "600x600dpi_highmono2", - "600x600dpi_highmono", - "600x600dpi_mono",/*untested*/ +/* "600x600dpi_highmono2",*/ +/* "600x600dpi_highmono",*/ +/* "600x600dpi_mono",*/ /*untested*/ "600x600dpi_draftmono",/*untested*/ "600x600dpi_draftmono2",/*untested*/ NULL @@ -11752,4 +12788,45 @@ static const canon_modeuse_t canon_PIXMA_Pro9500mk2_modeuses[] = { DECLARE_MODEUSES(canon_PIXMA_Pro9500mk2); +/* ----------------------------------- Canon MAXIFY iB4000 ----------------------------------- */ + +static const char* canon_MAXIFY_iB4000_modeuses_plain[] = { + "600x600dpi_high", + "600x600dpi", + "600x600dpi_mono", + NULL +}; + +static const char* canon_MAXIFY_iB4000_modeuses_PPplusG2[] = { + "600x600dpi_photohigh", + "600x600dpi_photo", + NULL +}; + +static const char* canon_MAXIFY_iB4000_modeuses_Hagaki[] = { + "600x600dpi_high2", + "600x600dpi_std2", + NULL +}; + +static const canon_modeuse_t canon_MAXIFY_iB4000_modeuses[] = { + { "Plain", canon_MAXIFY_iB4000_modeuses_plain, DUPLEX_SUPPORT }, + { "PhotoPlusGloss2", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "PhotoProPlat", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 },/*unsupported*/ + { "PhotoProLuster", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "PhotoProSemiGloss",canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "GlossyPaperStandard",canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "PhotopaperMatte", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "Coated", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "HagakiA", canon_MAXIFY_iB4000_modeuses_Hagaki, 0 }, + { "InkJetHagaki", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "InkjetPhotoHagakiK",canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 }, + { "Hagaki", canon_MAXIFY_iB4000_modeuses_Hagaki, 0 }, + { "TShirt", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 },/*unsupported*/ + { "Envelope", canon_MAXIFY_iB4000_modeuses_Hagaki, 0 }, + { "PhotopaperOther", canon_MAXIFY_iB4000_modeuses_PPplusG2, 0 },/*unsupported*/ +}; + +DECLARE_MODEUSES(canon_MAXIFY_iB4000); + #endif |