diff --git a/backend/pixma/pixma_mp150.c b/backend/pixma/pixma_mp150.c index 171eccf6d..dacfad901 100644 --- a/backend/pixma/pixma_mp150.c +++ b/backend/pixma/pixma_mp150.c @@ -336,6 +336,10 @@ #define TS2400_PID 0x1108 #define TS2600_PID 0x1107 +#define TS8630_PID 0x18F8 +#define XK110_PID 0x18F9 +#define GX3000_PID 0x18F1 +#define GX4000_PID 0x18F2 /* Generation 4 XML messages that encapsulates the Pixma protocol messages */ #define XML_START_1 \ @@ -1966,6 +1970,10 @@ const pixma_config_t pixma_mp150_devices[] = { DEVICE ("Canon PIXMA TS5400 Series", "TS5400", TS5400_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA TS2400 Series", "TS2400", TS2400_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), DEVICE ("Canon PIXMA TS2600 Series", "TS2600", TS2600_PID, 0, 600, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA TS8630 Series", "TS8630", TS8630_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXUS XK110 Series", "XK110", XK110_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS), + DEVICE ("Canon PIXMA GX3000 Series", "GX3000", GX3000_PID, 0, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS | PIXMA_CAP_ADF), + DEVICE ("Canon PIXMA GX4000 Series", "GX4000", GX4000_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 b1a565724..b6e6a6657 100644 --- a/doc/descriptions/pixma.desc +++ b/doc/descriptions/pixma.desc @@ -226,8 +226,20 @@ :status :untested :comment "Testers needed!" +:model "PIXMA GX3000 Series" +:interface "USB" +:usbid "0x04a9" "0x18f1" +:status :untested +:comment "Testers needed!" + +:model "PIXMA GX4000" +:interface "USB" +:usbid "0x04a9" "0x18f2" +:status :untested +:comment "Testers needed!" + :model "PIXMA GX6000 Series" -:interface "USB Ethernet WiFi" +:interface "USB" :usbid "0x04a9" "0x18a6" :status :untested :comment "Testers needed!" @@ -1265,6 +1277,12 @@ :status :untested :comment "Testers needed!" +:model "PIXMA TS8630 Series" +:interface "USB" +:usbid "0x04a9" "0x18f8" +:status :untested +:comment "Testers needed!" + :model "PIXMA TS9000 Series" :interface "USB WiFi" :usbid "0x04a9" "0x179f" @@ -1337,6 +1355,12 @@ :status :untested :comment "Testers needed!" +:model "PIXUS XK110 Series" +:interface "USB WiFi" +:usbid "0x04a9" "0x18f9" +: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 9811742b6..53087d0f4 100644 --- a/doc/sane-pixma.man +++ b/doc/sane-pixma.man @@ -21,7 +21,7 @@ PIXMA E410, E510, E4500 .br PIXMA G600, G2000, G2010, G2100, G4000, G4511 .br -PIXMA GX6000, GX7000 +PIXMA GX3000, GX4000, GX6000, GX7000 .br PIXMA MG2100, MG2200, MG2400, MG2500, MG2900, MG3000, MG3100 .br @@ -61,7 +61,7 @@ PIXMA TS2400, TS2600, TS3100, TS3300, TS3450, TS3451, TS3452 .br PIXMA TS3500, TS5000, TS5100, TS5350i, TS5400, TS6100, TS6200 .br -PIXMA TS7530, TS7450i ,TS8000, TS8530, TS8200 +PIXMA TS7530, TS7450i ,TS8000, TS8200, TS8530, TS8630 .br PIXUS MP10 .br @@ -135,7 +135,7 @@ PIXMA TS8130, TS8180, TS8230, TS8280, TS8300, TS8330, TS8380, TS9000 .br PIXMA TS9100, TS9180, TS9500, TS9580 .br -PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK500 +PIXUS MP5, XK50, XK60, XK70, XK80, XK90, XK100, XK110, XK500 .br imageCLASS MF720, MF810/820, MF5630, MF5650, MF5750, MF8170c .br