diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c index 0a76e5545..99024ca6d 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -350,6 +350,19 @@ #define TC20M_PID 0x18FC #define TC5200M_PID 0x18FF +#define TS8700_PID 0x1118 +#define XK120_PID 0x1119 +#define GX1000_PID 0x110B +#define GX2000_PID 0x110D +#define TS6630_PID 0x114E +#define TS7700_PID 0x110F +#define TS7600i_PID 0x114F +#define TS6730_PID 0x1150 +#define TR7800_PID 0x1151 +#define TS7700i_PID 0x1152 +#define TS7700A_PID 0x1111 +#define GX6500_PID 0x1148 + /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ #define XML_START_1 \ "\ @@ -1991,5 +2004,18 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA TC-20M", "TC-20M", TC20M_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA TC-5200M", "TC-5200M", TC5200M_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS8700 series", "TS8700", TS8700_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA XK120 series", "XK120", XK120_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA GX1000 series", "GX1000", GX1000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA GX2000 series", "GX2000", GX2000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA TS6630 series", "TS6630", TS6630_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS7700 series", "TS7700", TS7700_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS7600i series", "TS7600i", TS7600i_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS6730 series", "TS6730", TS6730_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TR7800 series", "TR7800", TR7800_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF | PIXMA_CAP_ADF_JPEG), + DEVICE ("Canon PIXMA TS7700i series", "TS7700i", TS7700i_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS7700A series", "TS7700A", TS7700A_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA GX6500 series", "GX6500", GX6500_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + END_OF_DEVICE_LIST }; diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc index 84d8b8f52..7b469d69e 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -256,6 +256,18 @@ :status :untested :comment "Testers needed!" +:model "PIXMA GX1000 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x110b" +:status :untested +:comment "Testers needed!" + +:model "PIXMA GX2000 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x110d" +:status :untested +:comment "Testers needed!" + :model "PIXMA GX3000 Series" :interface "USB" :usbid "0x04a9" "0x18f1" @@ -274,6 +286,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA GX6500 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1148" +:status :untested +:comment "Testers needed!" + :model "PIXMA GX7000" :interface "USB" :usbid "0x04a9" "0x18a8" @@ -1031,6 +1049,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA TR7800 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1151" +:status :untested +:comment "Testers needed!" + :model "PIXMA TR8500 Series" :interface "USB Ethernet WiFi" :usbid "0x04a9" "0x1823" @@ -1217,6 +1241,18 @@ :status :good :comment "All resolutions supported (up to 1200DPI). WiFi not tested by Pixma as yet." +:model "PIXMA TS6630 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x114e" +:status :untested +:comment "Testers needed!" + +:model "PIXMA TS6730 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1150" +:status :untested +:comment "Testers needed!" + :model "PIXMA TS7330 Series" :interface "USB WiFi" :usbid "0x04a9" "0x188f" @@ -1247,6 +1283,30 @@ :status :untested :comment "Testers needed!" +:model "PIXMA TS7600i series" +:interface "USB WiFi" +:usbid "0x04a9" "0x114f" +:status :untested +:comment "Testers needed!" + +:model "PIXMA TS7700 series" +:interface "USB WiFi" +:usbid "0x04a9" "0x110f" +:status :untested +:comment "Testers needed!" + +:model "PIXMA TS7700A series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1111" +:status :untested +:comment "Testers needed!" + +:model "PIXMA TS7700i series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1152" +:status :untested +:comment "Testers needed!" + :model "PIXMA TS8000 Series" :interface "USB WiFi" :usbid "0x04a9" "0x1800" @@ -1325,6 +1385,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA TS8700 series" +:interface "USB WiFi" +:usbid "0x04a9" "x1118" +:status :untested +:comment "Testers needed!" + :model "PIXMA TS9000 Series" :interface "USB WiFi" :usbid "0x04a9" "0x179f" @@ -1403,6 +1469,12 @@ :status :untested :comment "Testers needed!" +:model "PIXUS XK120 Series" +:interface "USB WiFi" +:usbid "0x04a9" "0x1119" +:status :untested +:comment "Testers needed!" + :model "PIXUS XK500 Series" :interface "USB WiFi" :usbid "0x04a9" "0x18df" diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man index 540e4f9d1..c83193b8a 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -21,7 +21,7 @@ PIXMA E410, E510, E4500 .br PIXMA G600, G2000, G2010, G2030, G2070, G2100, G3030, G3070, G4000, G4070, G4511 .br -PIXMA GX3000, GX4000, GX6000, GX7000 +PIXMA GX1000, GX2000, GX3000, GX4000, GX6000, GX6500, GX7000 .br PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100 .br @@ -125,19 +125,21 @@ PIXMA MX320, MX390, MX430, MX450, MX490, MX710 .br PIXMA G3000, G3010, G4010, G6000, G6080, G7000, GM4000, GM4080 .br -PIXMA TR7500, TR7530, TR7600, TR8500, TR8530, TR8580, TR8600 +PIXMA TR7500, TR7530, TR7600, TR7800, TR8500, TR8530, TR8580 TR8600 .br PIXMA TR8630, TR9530 .br PIXMA TS3400, TS5100, TS6000, TS6130, TS6180, TS6230, TS6280, TS6300 .br -PIXMA TS6330, TS6330, TS6380, TS6400, TS7330, TS7400, TS7430, TS8100 +PIXMA TS6330, TS6330, TS6380, TS6400, TS6630, TS6730, TS7330, TS7400, .br -PIXMA TS8130, TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000 +PIXMA TS7430, TS7600i, TS7700, TS7700A, TS7700i, TS8100, TS8130 +.br +PIXMA TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS8700, TS9000 .br PIXMA TS9100, TS9180, TS9500, TS9580 .br -PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK500 +PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK120, XK500 .br imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c .br