summaryrefslogtreecommitdiff
path: root/src/main/canon-inks.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/canon-inks.h')
-rw-r--r--src/main/canon-inks.h1520
1 files changed, 1498 insertions, 22 deletions
diff --git a/src/main/canon-inks.h b/src/main/canon-inks.h
index 41e8796..90fbb1e 100644
--- a/src/main/canon-inks.h
+++ b/src/main/canon-inks.h
@@ -88,6 +88,8 @@ static const stp_dotsize_t dotsizes_2l[] = {
DECLARE_INK(1,2);
+/* test */
+DECLARE_INK(2,2);
static const stp_dotsize_t dotsizes_3l[] = {
{ 0x1, 0.5 },
@@ -106,16 +108,19 @@ static const stp_dotsize_t dotsizes_4l[] = {
DECLARE_INK(2,4);
-static const stp_dotsize_t dotsizes_7l[] = {
+/*under development*/
+DECLARE_INK(4,4);
+
+static const stp_dotsize_t dotsizes_5l[] = {
{ 0x1, 0.45 },
{ 0x2, 0.55 },
- { 0x3, 0.66 },
- { 0x4, 0.77 },
- { 0x5, 0.88 },
- { 0x6, 1.0 }
+ { 0x3, 0.68 },
+ { 0x4, 1.0 }
};
-DECLARE_INK(3,7);
+/*under development*/
+DECLARE_INK(4,5);
+DECLARE_INK_EXTENDED(4,5,INK_FLAG_5pixel_in_1byte);
static const stp_dotsize_t dotsizes_6l[] = {
{ 0x1, 0.2 },
@@ -125,7 +130,23 @@ static const stp_dotsize_t dotsizes_6l[] = {
{ 0x5, 1.0 }
};
+/*under development*/
DECLARE_INK(4,6);
+DECLARE_INK_EXTENDED(4,6,INK_FLAG_5pixel_in_1byte);
+
+static const stp_dotsize_t dotsizes_7l[] = {
+ { 0x1, 0.45 },
+ { 0x2, 0.55 },
+ { 0x3, 0.66 },
+ { 0x4, 0.77 },
+ { 0x5, 0.88 },
+ { 0x6, 1.0 }
+};
+
+DECLARE_INK(3,7);
+
+/*under development*/
+DECLARE_INK(4,7);
static const stp_dotsize_t dotsizes_8l[] = {
{ 0x1, 0.14 },
@@ -139,6 +160,21 @@ static const stp_dotsize_t dotsizes_8l[] = {
DECLARE_INK(4,8);
+static const stp_dotsize_t dotsizes_9l[] = {
+ { 0x1, 0.14 },
+ { 0x2, 0.29 },
+ { 0x3, 0.43 },
+ { 0x4, 0.55 },
+ { 0x5, 0.66 },
+ { 0x6, 0.71 },
+ { 0x7, 0.88 },
+ { 0x8, 1.00 }
+};
+
+/*under development*/
+DECLARE_INK(4,9);
+DECLARE_INK(8,9);
+
static const stp_dotsize_t dotsizes_16l[] = {
{ 0x1, 0.07 },
{ 0x2, 0.13 },
@@ -158,6 +194,7 @@ static const stp_dotsize_t dotsizes_16l[] = {
};
DECLARE_INK(4,16);
+DECLARE_INK(8,16);
/* A inkset is a list of inks and their (relative) densities
@@ -288,10 +325,22 @@ static const canon_inkset_t canon_7_C4M4Y4c4m4k4K4_inkset[] = {
{'K',1.0,&canon_2b_4l_ink},
};
-static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
+static const canon_inkset_t canon_9_C2M2Y2K2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C3M3Y2K2h_inkset[] = {
{'C',1.0,&canon_2b_3l_ink},
{'M',1.0,&canon_2b_3l_ink},
- {'Y',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_2b_2l_ink},
{'K',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -300,10 +349,10 @@ static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
{0,0.0,NULL},
};
-static const canon_inkset_t canon_9_C4M4Y4K2_inkset[] = {
- {'C',1.0,&canon_2b_4l_ink},
- {'M',1.0,&canon_2b_4l_ink},
- {'Y',1.0,&canon_2b_4l_ink},
+static const canon_inkset_t canon_9_C3M3Y2K2_inkset[] = {
+ {'C',1.0,&canon_2b_3l_ink},
+ {'M',1.0,&canon_2b_3l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
{'K',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -350,6 +399,18 @@ static const canon_inkset_t canon_9_C3M3Y2K2k3_c_inkset[] = {
{0,0.0,NULL}
};
+static const canon_inkset_t canon_9_C3M3Y3K2c3m3_c_inkset[] = {
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {'Y',1.0,&canon_2b_3l_c_ink},
+ {'K',0.0,&canon_1b_2l_ink},
+ {'c',0.5,&canon_2b_3l_c_ink},
+ {'m',0.5,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
/* iP4000 mode used for Super Photo Paper (quality 1) */
static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c_inkset[] = {
{'C',1.0,&canon_2b_3l_c_ink},
@@ -363,6 +424,18 @@ static const canon_inkset_t canon_9_C3M3Y3K2c3m3k3_c_inkset[] = {
{0,0.0,NULL}
};
+static const canon_inkset_t canon_9_C4M4Y4K2_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
/* iP4000 mode used for T-Shirt (quality 2) */
static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
{'C',1.0,&canon_2b_4l_ink},
@@ -376,7 +449,72 @@ static const canon_inkset_t canon_9_C4M4Y4K2k4_inkset[] = {
{0,0.0,NULL},
};
+static const canon_inkset_t canon_9_C4M4Y4K3_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_2b_3l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* check this one!!!! */
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink},
+ {'c',0.5,&canon_2b_4l_ink},
+ {'m',0.5,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C4M4Y4K4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_2b_4l_ink}, /* put K back in for OHP */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* check this one !!! */
+static const canon_inkset_t canon_9_C4M4Y4K4c4m4_inkset[] = {
+ {'C',1.0,&canon_4b_4l_ink},
+ {'M',1.0,&canon_4b_4l_ink},
+ {'Y',1.0,&canon_4b_4l_ink},
+ {'K',0.0,&canon_2b_4l_ink},
+ {'c',1.0,&canon_4b_4l_ink},
+ {'m',1.0,&canon_4b_4l_ink},
+ {'y',1.0,&canon_4b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* check this one!!! */
+static const canon_inkset_t canon_9_C4M4Y4K2c4m4y4_inkset[] = {
+ {'C',1.0,&canon_4b_4l_ink},
+ {'M',1.0,&canon_4b_4l_ink},
+ {'Y',1.0,&canon_4b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink},
+ {'c',0.5,&canon_4b_4l_ink},
+ {'m',0.5,&canon_4b_4l_ink},
+ {'y',1.0,&canon_4b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
/* iP4000 mode used for CD printing (quality 3) */
+/* Gernot: This is also the normal hi-quality mode for iP4000 at quality level 3 */
+/* The same inket is used at quality levels 4, 3 and 2 for CD printing */
static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
{'C',1.0,&canon_2b_4l_ink},
{'M',1.0,&canon_2b_4l_ink},
@@ -389,6 +527,53 @@ static const canon_inkset_t canon_9_C4M4Y4K2c4m4k4_inkset[] = {
{0,0.0,NULL}
};
+static const canon_inkset_t canon_9_C5M5Y5_inkset[] = {
+ {'C',1.0,&canon_4b_5l_ink},
+ {'M',1.0,&canon_4b_5l_ink},
+ {'Y',1.0,&canon_4b_5l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C5M5Y5K2_inkset[] = {
+ {'C',1.0,&canon_4b_5l_ink},
+ {'M',1.0,&canon_4b_5l_ink},
+ {'Y',1.0,&canon_4b_5l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* for PPpro, so no use */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_9_C8M8Y4K4c8m8_inkset[] = {
+ {'C',1.0,&canon_4b_8l_ink},
+ {'M',1.0,&canon_4b_8l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_2b_4l_ink},
+ {'c',1.0,&canon_4b_8l_ink},
+ {'m',1.0,&canon_4b_8l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C8M8Y8c16m16_inkset[] = {
+ {'C',1.0,&canon_4b_8l_ink},
+ {'M',1.0,&canon_4b_8l_ink},
+ {'Y',1.0,&canon_4b_8l_ink},
+ {0,0.0,NULL},
+ {'c',0.5,&canon_8b_16l_ink},
+ {'m',0.5,&canon_8b_16l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
/* iP4000 mode used for Professional Photo Paper in Quality 4 */
static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
@@ -403,7 +588,47 @@ static const canon_inkset_t canon_9_C8M8Y8c16m16k8_inkset[] = {
{0,0.0,NULL}
};
-/* PIXMA Pro9500, PIXMA iP8500 */
+static const canon_inkset_t canon_9_C9M9Y9K2_inkset[] = {
+ {'C',1.0,&canon_4b_9l_ink},
+ {'M',1.0,&canon_4b_9l_ink},
+ {'Y',1.0,&canon_4b_9l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_C9M9Y9K2c9m9y9_inkset[] = {
+ {'C',1.0,&canon_4b_9l_ink},
+ {'M',1.0,&canon_4b_9l_ink},
+ {'Y',1.0,&canon_4b_9l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* for PPpro, so no use */
+ {'c',1.0,&canon_4b_9l_ink},
+ {'m',1.0,&canon_4b_9l_ink},
+ {'y',1.0,&canon_4b_9l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+static const canon_inkset_t canon_9_c9m9y9_inkset[] = {
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_8b_9l_ink},
+ {'m',1.0,&canon_8b_9l_ink},
+ {'y',1.0,&canon_8b_9l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* PIXMA Pro9000, Pro9000 Mk.II, Pro9500, Pro9500 Mk.II, PIXMA iP8500 */
static const canon_inkset_t canon_11_C2M2Y2K2_inkset[] = {
{'C',1.0,&canon_1b_2l_ink},
{'M',1.0,&canon_1b_2l_ink},
@@ -418,6 +643,162 @@ static const canon_inkset_t canon_11_C2M2Y2K2_inkset[] = {
{0,0.0,NULL}
};
+/* Pro9000 */
+static const canon_inkset_t canon_11_C5M5Y5K5c5m5_c_inkset[] = {
+ {'C',1.0,&canon_4b_5l_c_ink},
+ {'M',1.0,&canon_4b_5l_c_ink},
+ {'Y',1.0,&canon_4b_5l_c_ink},
+ {'K',1.0,&canon_4b_5l_c_ink},
+ {'c',1.0,&canon_4b_5l_c_ink},
+ {'m',1.0,&canon_4b_5l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* PIXMA Pro9000, Pro9000 Mk.II, Pro9500, Pro9500 Mk.II, PIXMA iP8500 */
+static const canon_inkset_t canon_11_C6M6Y6K6_c_inkset[] = {
+ {'C',1.0,&canon_4b_6l_c_ink},
+ {'M',1.0,&canon_4b_6l_c_ink},
+ {'Y',1.0,&canon_4b_6l_c_ink},
+ {'K',1.0,&canon_4b_6l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* Pro9000, Pro9000 Mk.II */
+static const canon_inkset_t canon_11_C6M6Y6K6c6m6_c_inkset[] = {
+ {'C',1.0,&canon_4b_6l_c_ink},
+ {'M',1.0,&canon_4b_6l_c_ink},
+ {'Y',1.0,&canon_4b_6l_c_ink},
+ {'K',1.0,&canon_4b_6l_c_ink},
+ {'c',1.0,&canon_4b_6l_c_ink},
+ {'m',1.0,&canon_4b_6l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* Pro9000, Pro9000 Mk.II */
+static const canon_inkset_t canon_11_C6M6Y6K6c16m16_c_inkset[] = {
+ {'C',1.0,&canon_4b_6l_c_ink},
+ {'M',1.0,&canon_4b_6l_c_ink},
+ {'Y',1.0,&canon_4b_6l_c_ink},
+ {'K',1.0,&canon_4b_6l_c_ink},
+ {'c',1.0,&canon_4b_16l_ink},
+ {'m',1.0,&canon_4b_16l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* Pro9000, Pro9000 Mk.II, PIXMA iP8500 */
+static const canon_inkset_t canon_11_C6M6Y6K9c6m6_c_inkset[] = {
+ {'C',1.0,&canon_4b_6l_c_ink},
+ {'M',1.0,&canon_4b_6l_c_ink},
+ {'Y',1.0,&canon_4b_6l_c_ink},
+ {'K',1.0,&canon_4b_9l_ink},
+ {'c',1.0,&canon_4b_6l_c_ink},
+ {'m',1.0,&canon_4b_6l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* PIXMA Pro9500, Pro9500 Mk.II */
+static const canon_inkset_t canon_11_C16M16Y16k16_inkset[] = {
+ {'C',1.0,&canon_4b_16l_ink},
+ {'M',1.0,&canon_4b_16l_ink},
+ {'Y',1.0,&canon_4b_16l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_4b_16l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* Pro9000 Mk.II */
+static const canon_inkset_t canon_11_C16M16Y16K16c16m16_inkset[] = {
+ {'C',1.0,&canon_4b_16l_ink},
+ {'M',1.0,&canon_4b_16l_ink},
+ {'Y',1.0,&canon_4b_16l_ink},
+ {'K',1.0,&canon_4b_16l_ink},
+ {'c',1.0,&canon_4b_16l_ink},
+ {'m',1.0,&canon_4b_16l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL}
+};
+
+/* Gernot: MP150 (MP170 for tests) greyscale */
+static const canon_inkset_t canon_13_K2_inkset[] = {
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* MP150 (MP250 for tests) greyscale */
+static const canon_inkset_t canon_13_K3_inkset[] = {
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'K',1.0,&canon_2b_3l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP2700, MP270 color cartridge only, plain fast mode */
+static const canon_inkset_t canon_13_C2M2Y2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_13_C2M2Y2K2_inkset[] = {
{'C',1.0,&canon_1b_2l_ink},
{'M',1.0,&canon_1b_2l_ink},
@@ -434,6 +815,7 @@ static const canon_inkset_t canon_13_C2M2Y2K2_inkset[] = {
{0,0.0,NULL},
};
+/* MX7600, iX7000 */
static const canon_inkset_t canon_13_C2M2Y2K2k2_inkset[] = {
{'C',1.0,&canon_1b_2l_ink},
{'M',1.0,&canon_1b_2l_ink},
@@ -441,8 +823,42 @@ static const canon_inkset_t canon_13_C2M2Y2K2k2_inkset[] = {
{'K',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
+ {'k',1.0,&canon_1b_2l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP2700, MP270 color cartridge only, plain mode */
+static const canon_inkset_t canon_13_C3M3Y2_inkset[] = {
+ {'C',1.0,&canon_2b_3l_ink},
+ {'M',1.0,&canon_2b_3l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP1900 color cartridge only, plain mode */
+static const canon_inkset_t canon_13_C3M3Y2b_inkset[] = {
+ {'C',1.0,&canon_2b_3l_ink},
+ {'M',1.0,&canon_2b_3l_ink},
+ {'Y',1.0,&canon_2b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
{0,0.0,NULL},
- {'k',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -466,6 +882,45 @@ static const canon_inkset_t canon_13_C3M3Y2K2_inkset[] = {
{0,0.0,NULL},
};
+/* iP1900, std mode, plain media */
+static const canon_inkset_t canon_13_C3M3Y2K2b_inkset[] = {
+ {'C',1.0,&canon_2b_3l_ink},
+ {'M',1.0,&canon_2b_3l_ink},
+ {'Y',1.0,&canon_2b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: iP4500 standard mode changed from the compressed one below */
+/* iP4700 also uses this */
+/* iP4800 also uses this */
+/* MG5100, MG5200 */
+/* TODO: how to get both K and k working, for Hagaki and Env modes */
+static const canon_inkset_t canon_13_C3M3Y2K2y3_c_inkset[] = {
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_3l_c_ink}, /* swap y for k, but in any case it is not in output for plain modes */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iX7000 */
static const canon_inkset_t canon_13_C3M3Y2K2k3_c_inkset[] = {
{'C',1.0,&canon_2b_3l_c_ink},
{'M',1.0,&canon_2b_3l_c_ink},
@@ -473,7 +928,24 @@ static const canon_inkset_t canon_13_C3M3Y2K2k3_c_inkset[] = {
{'K',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
- {'k',0.0,&canon_2b_3l_c_ink},
+ {'k',0.0,&canon_2b_3l_c_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: MP250, MP280 photo modes */
+static const canon_inkset_t canon_13_C4M4Y4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -482,6 +954,212 @@ static const canon_inkset_t canon_13_C3M3Y2K2k3_c_inkset[] = {
{0,0.0,NULL},
};
+static const canon_inkset_t canon_13_C4M4Y4K2_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: MP250, MP270, MP280 high mode */
+static const canon_inkset_t canon_13_C4M4Y3K3_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_3l_ink},
+ {'K',1.0,&canon_2b_3l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+
+/* Gernot: MP150 (MP170 for tests) high-quality mode */
+static const canon_inkset_t canon_13_C4M4Y4K2c4m4y4_inkset[] = {
+ {'C',1.0,&canon_4b_4l_ink},
+ {'M',1.0,&canon_4b_4l_ink},
+ {'Y',1.0,&canon_4b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {'c',1.0,&canon_4b_4l_ink},
+ {'m',1.0,&canon_4b_4l_ink},
+ {'y',1.0,&canon_4b_4l_ink}, /* output uses y */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* test on iP5300 --- swap y and k */
+static const canon_inkset_t canon_13_C4M4Y4K2c4m4k4_inkset[] = {
+ {'C',1.0,&canon_4b_4l_ink},
+ {'M',1.0,&canon_4b_4l_ink},
+ {'Y',1.0,&canon_4b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* do not use for photo modes */
+ {'c',1.0,&canon_4b_4l_ink},
+ {'m',1.0,&canon_4b_4l_ink},
+ {'k',1.0,&canon_4b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP2700 in user-defined highest quality mode for PPGlossPro paper */
+/* MP270 same for PPGpro */
+/* MP280 same for PPGproPlat */
+/* less 0x60 in bytes */
+static const canon_inkset_t canon_13_c3m3y3_inkset[] = {
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_2b_3l_ink},
+ {'m',1.0,&canon_2b_3l_ink},
+ {'y',1.0,&canon_2b_3l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: MP150 (MP170 for tests) high-quality mode for
+ High Resolution Paper
+ Inkjet Hagaki
+ pro Photo Paper
+ super Photo Paper
+ super Photo Paper Double Sided
+ matte Photo Paper
+ other Photo Paper
+
+Also used for all modes of gloss Photo Paper
+*/
+static const canon_inkset_t canon_13_C4M4Y4c4m4y4_inkset[] = {
+ {'C',1.0,&canon_4b_4l_ink},
+ {'M',1.0,&canon_4b_4l_ink},
+ {'Y',1.0,&canon_4b_4l_ink},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_4b_4l_ink},
+ {'m',1.0,&canon_4b_4l_ink},
+ {'k',1.0,&canon_4b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: MP150 (MP170 for tests) T-shirt transfers */
+static const canon_inkset_t canon_13_C5M5Y5_inkset[] = {
+ {'C',1.0,&canon_4b_5l_ink},
+ {'M',1.0,&canon_4b_5l_ink},
+ {'Y',1.0,&canon_4b_5l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: added for iP4700 CD printing */
+/* iP4800 also uses this */
+/* also MG5200 */
+static const canon_inkset_t canon_13_C5M5Y4y4_inkset[] = {
+ {'C',1.0,&canon_4b_5l_ink},
+ {'M',1.0,&canon_4b_5l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iX7000 photo mode */
+static const canon_inkset_t canon_13_C6M6Y2K2k4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: added for iP4700 photo standard quality */
+/* MG5100, MG5200 */
+static const canon_inkset_t canon_13_C6M6Y4y4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* Gernot: added for iP4500 high quality --- check the pos of k/y */
+/* iP4700 also uses this */
+/* iP4800 also uses this */
+/* MG5100, MG5200 */
+static const canon_inkset_t canon_13_C6M6Y4K2y4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_13_C6M6Y4K2k4_inkset[] = {
{'C',1.0,&canon_4b_6l_ink},
{'M',1.0,&canon_4b_6l_ink},
@@ -498,6 +1176,23 @@ static const canon_inkset_t canon_13_C6M6Y4K2k4_inkset[] = {
{0,0.0,NULL},
};
+/* MX7600, iX7000 */
+static const canon_inkset_t canon_13_C6M6Y4K3k4_c_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_4l_ink},/* swapped y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
{'C',1.0,&canon_4b_6l_ink},
{'M',1.0,&canon_4b_6l_ink},
@@ -514,6 +1209,26 @@ static const canon_inkset_t canon_13_C6M6Y4k4yask_inkset[] = {
{0,0.0,NULL},
};
+/* Gernot: iP4500 photo mode */
+/* iP4700 also uses this */
+/* iP4800 also uses this */
+/* MG5100, MG5200 */
+static const canon_inkset_t canon_13_C8M8Y4y4_inkset[] = {
+ {'C',1.0,&canon_4b_8l_ink},
+ {'M',1.0,&canon_4b_8l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* set y to k for photo modes */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_13_C8M8Y4K4k4_inkset[] = {
{'C',1.0,&canon_4b_8l_ink},
{'M',1.0,&canon_4b_8l_ink},
@@ -546,6 +1261,194 @@ static const canon_inkset_t canon_13_C8M8Y4k4yask_inkset[] = {
{0,0.0,NULL},
};
+/* Gernot: MP150 (MP170 for tests) high-quality mode for
+ High Resolution Paper
+ Inkjet Hagaki
+ pro Photo Paper
+ super Photo Paper
+ super Photo Paper Double Sided
+ matte Photo Paper
+ other Photo Paper
+
+ for some reason there is a hack for iP6700 appearing here which might make the y into a k (swapping)
+*/
+static const canon_inkset_t canon_13_c9m9y9_inkset[] = {
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_8b_9l_ink},
+ {'m',1.0,&canon_8b_9l_ink},
+ {'y',1.0,&canon_8b_9l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* MP980 uss 16 inks */
+static const canon_inkset_t canon_16_C8M8Y4k4_inkset[] = {
+ {'C',1.0,&canon_4b_8l_ink},
+ {'M',1.0,&canon_4b_8l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_16_C6M6Y4K2k4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_16_C6M6Y4k4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_16_C5M5Y4k4_inkset[] = {
+ {'C',1.0,&canon_4b_5l_ink},
+ {'M',1.0,&canon_4b_5l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* y and k swapped */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_16_C3M3Y2K2k3_c_inkset[] = {
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_3l_c_ink}, /* y and k swapped */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_16_C2M2Y2K2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+
+static const canon_inkset_t canon_19_C2M2Y2K2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP6700D Fast plain mode */
+static const canon_inkset_t canon_19_C2M2Y2k2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_1b_2l_ink},/* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
{'C',1.0,&canon_2b_3l_ink},
{'M',1.0,&canon_2b_3l_ink},
@@ -553,7 +1456,77 @@ static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
- {'k',1.0,&canon_2b_3l_ink},
+ {'k',1.0,&canon_2b_3l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* works OK on MP960 */
+static const canon_inkset_t canon_19_C3M3Y3K2k3_inkset[] = {
+ {'C',1.0,&canon_2b_3l_ink},
+ {'M',1.0,&canon_2b_3l_ink},
+ {'Y',1.0,&canon_2b_3l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_3l_ink},/* need to swap y -> k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo mode iP6700D T-shirt transfers */
+static const canon_inkset_t canon_19_C4M4Y4k4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo mode MP960 T-shirt transfers --- works OK! */
+static const canon_inkset_t canon_19_C4M4Y4K2k4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -565,6 +1538,285 @@ static const canon_inkset_t canon_19_C3M3Y3k3_inkset[] = {
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
+};
+
+/* photo mode MP960 CDs and iP6700D Photo High 2 [PPmatte, Coated] */
+static const canon_inkset_t canon_19_C4M4Y4c4m4k4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_2b_4l_ink},
+ {'m',1.0,&canon_2b_4l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo mode iP6700D CDs, position of cmk guessed */
+static const canon_inkset_t canon_19_C4M4Y4c4m4k4CD_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_2b_4l_ink},
+ {'m',1.0,&canon_2b_4l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo mode MP960 PPmatte works! */
+static const canon_inkset_t canon_19_C4M4Y4K2c4m4k4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* works when K is set to 0 */
+ {'c',1.0,&canon_2b_4l_ink},
+ {'m',1.0,&canon_2b_4l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* MP960 HIGH works OK */
+static const canon_inkset_t canon_19_C6M6Y4K2_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP6700D Plain High: CMYk */
+static const canon_inkset_t canon_19_C6M6Y4c6m6k4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'c',0.0,&canon_4b_6l_ink}, /* not used */
+ {'m',0.0,&canon_4b_6l_ink}, /* not used */
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP6700D Photo Std: CMYKcmk */
+static const canon_inkset_t canon_19_C6M6Y4c6m6k4photo_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_4b_6l_ink},
+ {'m',1.0,&canon_4b_6l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* hagaki std & high MP960 : CMYKk*/
+static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4hagaki_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {'c',0.0,&canon_4b_6l_ink}, /* will not use, so have to set to 0 */
+ {'m',0.0,&canon_4b_6l_ink}, /* will not use, so have to set to 0 */
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo std mode MP960 and inkjet Hagaki Std: CMYcmk*/
+static const canon_inkset_t canon_19_C6M6Y4K2c6m6k4_inkset[] = {
+ {'C',1.0,&canon_4b_6l_ink},
+ {'M',1.0,&canon_4b_6l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* will not use K */
+ {'c',1.0,&canon_4b_6l_ink},
+ {'m',1.0,&canon_4b_6l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* iP6700D Photo High: CMYkcm */
+static const canon_inkset_t canon_19_C7M7Y4c7m7k4_inkset[] = {
+ {'C',1.0,&canon_4b_7l_ink},
+ {'M',1.0,&canon_4b_7l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'c',1.0,&canon_4b_7l_ink},
+ {'m',1.0,&canon_4b_7l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* swap y and k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* photo high mode MP960 and inkjetHagaki High: CMYcmk */
+static const canon_inkset_t canon_19_C7M7Y4K2c7m7k4_inkset[] = {
+ {'C',1.0,&canon_4b_7l_ink},
+ {'M',1.0,&canon_4b_7l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* will not use K */
+ {'c',1.0,&canon_4b_7l_ink},
+ {'m',1.0,&canon_4b_7l_ink},
+ {'k',1.0,&canon_2b_4l_ink}, /* change y to k */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C2M2Y2K2_inkset[] = {
+ {'C',1.0,&canon_1b_2l_ink},
+ {'M',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C3M3Y2K2_c_inkset[] = {
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
{0,0.0,NULL},
};
@@ -593,10 +1845,61 @@ static const canon_inkset_t canon_22_C3M3Y2K2k3_c_inkset[] = {
{0,0.0,NULL},
};
-static const canon_inkset_t canon_22_C3M3Y2K2_c_inkset[] = {
+/* MP520 photo standard */
+static const canon_inkset_t canon_22_C3M3Y3K2c3m3_c_inkset[] = {
{'C',1.0,&canon_2b_3l_c_ink},
{'M',1.0,&canon_2b_3l_c_ink},
- {'Y',1.0,&canon_1b_2l_ink},
+ {'Y',1.0,&canon_2b_3l_c_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* set to 0 */
+ {'c',1.0,&canon_2b_3l_c_ink},
+ {'m',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_3l_ink}, /* even though we won't use the photo black in this mode its parameters have to be set */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C3M3Y3K2c3m3k3_c_inkset[] = {
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {'Y',1.0,&canon_2b_3l_c_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* set to 0 */
+ {'c',1.0,&canon_2b_3l_c_ink},
+ {'m',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+static const canon_inkset_t canon_22_C4M4Y4K2_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
{'K',1.0,&canon_1b_2l_ink},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -618,6 +1921,58 @@ static const canon_inkset_t canon_22_C3M3Y2K2_c_inkset[] = {
{0,0.0,NULL},
};
+/* MP830 T-Shirt */
+static const canon_inkset_t canon_22_C4M4Y4K2k4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* MP520 high */
+static const canon_inkset_t canon_22_C4M4Y4K2c4m4_inkset[] = {
+ {'C',1.0,&canon_2b_4l_ink},
+ {'M',1.0,&canon_2b_4l_ink},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {'K',0.0,&canon_1b_2l_ink}, /* set to 0 */
+ {'c',1.0,&canon_2b_4l_ink},
+ {'m',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_4l_ink}, /* even though we won't use the photo black in this mode its parameters have to be set */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
{'C',1.0,&canon_2b_4l_ink},
{'M',1.0,&canon_2b_4l_ink},
@@ -629,8 +1984,8 @@ static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
{'k',0.0,&canon_2b_4l_ink}, /* even though we won't use the photo black in this mode its parameters have to be set */
{0,0.0,NULL},
{0,0.0,NULL},
- {0xa3,0.0,&canon_2b_4l_ink},
- {0xad,0.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
@@ -643,11 +1998,132 @@ static const canon_inkset_t canon_22_C4M4Y4K2c4m4k4_inkset[] = {
{0,0.0,NULL},
};
-static const canon_inkset_t canon_22_C2M2Y2K2_inkset[] = {
+/* high */
+/* MP990, MG6100, MG800 */
+/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
+/*static const canon_inkset_t canon_30_C2M6K6m4k4_inkset[] = {*/
+static const canon_inkset_t canon_30_K2C6M6Y4k4_inkset[] = {
+ {'K',1.0,&canon_1b_2l_ink},
+ {'C',1.0,&canon_4b_6l_ink},
+ {0,0.0,NULL},
+ {'M',1.0,&canon_4b_6l_ink},
+ {0,0.0,NULL},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_4l_ink}, /* will not use it, but need to specify it */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* standard */
+/* MP990, MG6100, MG800 */
+/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
+static const canon_inkset_t canon_30_K2C3M3Y2k3_c_inkset[] = {
+ {'K',1.0,&canon_1b_2l_ink},
+ {'C',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {'M',1.0,&canon_2b_3l_c_ink},
+ {0,0.0,NULL},
+ {'Y',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {'k',0.0,&canon_2b_3l_c_ink}, /* will not use it, but need to specify it */
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* fast */
+/* MP990, MG6100, MG800 */
+/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
+/*static const canon_inkset_t canon_30_C2M2K2m2_inkset[] = {*/
+static const canon_inkset_t canon_30_K2C2M2Y2_inkset[] = {
+ {'K',1.0,&canon_1b_2l_ink},
{'C',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
{'M',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
{'Y',1.0,&canon_1b_2l_ink},
- {'K',1.0,&canon_1b_2l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+};
+
+/* CD photo */
+/* reorder: KCcMmYyk*H* not sure what the 2 missing ones are but they are only needed for ud1 anyway */
+/*static const canon_inkset_t canon_30_M5K5m4k4_inkset[] = {*/
+static const canon_inkset_t canon_30_C5M5Y4k4_inkset[] = {
+ {0,0.0,NULL},
+ {'C',1.0,&canon_4b_5l_ink},
+ {0,0.0,NULL},
+ {'M',1.0,&canon_4b_5l_ink},
+ {0,0.0,NULL},
+ {'Y',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {'k',1.0,&canon_2b_4l_ink},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
+ {0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
{0,0.0,NULL},
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 15:55:12 +0000