added Ixy support thanks to Takeshi Hakamata
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@1789 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -58,6 +58,7 @@ char *models_serial[] = {
|
||||
};
|
||||
char *models_USB[] = {
|
||||
"Canon Digital IXUS",
|
||||
"Canon IXY DIGITAL",
|
||||
"Canon PowerShot S100",
|
||||
NULL
|
||||
};
|
||||
@@ -242,7 +243,7 @@ char *camera_model_string(Camera *camera)
|
||||
case CANON_PS_G1:
|
||||
return "Powershot G1";
|
||||
case CANON_PS_S100:
|
||||
return "Powershot S100 / Digital IXUS";
|
||||
return "Powershot S100 / Digital IXUS / IXY DIGITAL";
|
||||
default:
|
||||
return "Unknown model !";
|
||||
}
|
||||
@@ -963,7 +964,7 @@ int camera_summary(Camera *camera, CameraText *summary)
|
||||
case CANON_PS_S10: model = "Canon Powershot S10"; break;
|
||||
case CANON_PS_S20: model = "Canon Powershot S20"; break;
|
||||
case CANON_PS_G1: model = "Canon Powershot G1"; break;
|
||||
case CANON_PS_S100: model = "Canon Powershot S100 / Digital IXUS"; break;
|
||||
case CANON_PS_S100: model = "Canon Powershot S100 / Digital IXUS / IXY DIGITAL"; break;
|
||||
}
|
||||
|
||||
canon_get_batt_status(camera, &pwr_status, &pwr_source);
|
||||
|
||||
@@ -1008,7 +1008,7 @@ int psa50_ready(Camera *camera)
|
||||
// int cts;
|
||||
|
||||
gp_debug_printf(GP_DEBUG_LOW,"canon","psa50_ready()");
|
||||
|
||||
|
||||
switch (canon_comm_method) {
|
||||
case CANON_USB:
|
||||
psa50_get_owner_name(camera);
|
||||
@@ -1032,8 +1032,9 @@ int psa50_ready(Camera *camera)
|
||||
return 1;
|
||||
}
|
||||
else if ((!strcmp("Canon DIGITAL IXUS",cs->ident))
|
||||
|| (!strcmp("Canon IXY DIGITAL",cs->ident))
|
||||
|| (!strcmp("Canon PowerShot S100",cs->ident))) {
|
||||
gp_frontend_status(camera, "Detected a Digital IXUS / Powershot S100");
|
||||
gp_frontend_status(camera, "Detected a Digital IXUS / IXY DIGITAL / Powershot S100");
|
||||
cs->model = CANON_PS_S100;
|
||||
A5=0;
|
||||
return 1;
|
||||
@@ -1160,9 +1161,10 @@ int psa50_ready(Camera *camera)
|
||||
cs->model = CANON_PS_G1;
|
||||
A5 = 0;
|
||||
} else if ((!strcmp("Canon DIGITAL IXUS",psa50_id))
|
||||
|| (!strcmp("Canon IXY DIGITAL",psa50_id))
|
||||
|| (!strcmp("Canon PowerShot S100",psa50_id)))
|
||||
{
|
||||
gp_frontend_status(camera, "Detected a Digital IXUS / Powershot S100");
|
||||
gp_frontend_status(camera, "Detected a Digital IXUS / IXY DIGITAL / Powershot S100");
|
||||
cs->model = CANON_PS_S100;
|
||||
A5=0;
|
||||
} else {
|
||||
|
||||
@@ -37,6 +37,7 @@ struct camera_to_usb {
|
||||
{ "Canon PowerShot S20", 0x04A9, 0x3043 },
|
||||
{ "Canon PowerShot G1", 0x04A9, 0x3048 },
|
||||
{ "Canon Digital IXUS", 0x4A9, 0x3047 },
|
||||
{ "Canon IXY DIGITAL", 0x4A9, 0x3046 },
|
||||
{ "Canon PowerShot S100", 0x4A9, 0x3045 }
|
||||
};
|
||||
/******* new stuff *********/
|
||||
|
||||
Reference in New Issue
Block a user