darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

provide both names "EOS 300D" and "EOS Digital Rebel" for users' convenience

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6800 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2003-10-01 13:49:30 +00:00
parent 551e6fb18b
commit e01959f23f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
camlibs/canon/canon.c
View File

@@ -176,6 +176,7 @@ const struct canonCamModelData models[] = {
{"Canon:EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, CAP_SUP, S10M, S32K, S2M, NULL},
/* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */
{"Canon:EOS 300D (normal mode)", CANON_EOS_300D, 0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL},
{"Canon:EOS Digital Rebel (normal mode)",CANON_EOS_300D,0x04A9, 0x3084, CAP_SUP, S10M, S32K, S2M, NULL},
{NULL}
/* *INDENT-ON* */

21
camlibs/ptp2/library.c
View File

@@ -299,25 +299,26 @@ static struct {
* PTP and "normal" (i.e. Canon) mode
* Canon PS G3: A. Marinichev, 20 nov 2002
*/
{"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d},
{"Canon:PowerShot S45 (PTP mode)", 0x04a9, 0x306d},
/* 0x306c is S45 in normal (canon) mode */
{"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f},
{"Canon:PowerShot G3 (PTP mode)", 0x04a9, 0x306f},
/* 0x306e is G3 in normal (canon) mode */
{"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071},
{"Canon:PowerShot S230 (PTP mode)", 0x04a9, 0x3071},
/* 0x3070 is S230 in normal (canon) mode */
{"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071},
{"Canon:Digital IXUS v3 (PTP mode)", 0x04a9, 0x3071},
/* it's the same as S230 */
{"Canon:Digital IXUS 2 (PTP mode)", 0x04a9, 0x3072},
{"Canon:Digital IXUS 2 (PTP mode)", 0x04a9, 0x3072},
{"Canon:PowerShot A70 (PTP)", 0x04a9, 0x3073},
{"Canon:PowerShot A70 (PTP)", 0x04a9, 0x3073},
/* A60 and A70 are PTP also */
{"Canon:PowerShot A60 (PTP)", 0x04a9, 0x3074},
{"Canon:PowerShot A60 (PTP)", 0x04a9, 0x3074},
/* IXUS 400 has the same PID in both modes, Till Kamppeter */
{"Canon:Digital IXUS 400 (PTP mode)", 0x4a9, 0x3075},
{"Canon:PowerShot G5 (PTP mode)", 0x04a9, 0x3085},
{"Canon:Digital IXUS 400 (PTP mode)", 0x04a9, 0x3075},
{"Canon:PowerShot G5 (PTP mode)", 0x04a9, 0x3085},
/* 0x3084 is the EOS 300D/Digital Rebel in normal (canon) mode */
{"Canon:EOS 300D (PTP mode)", 0x04a9, 0x3099},
{"Canon:EOS 300D (PTP mode)", 0x04a9, 0x3099},
{"Canon:EOS Digital Rebel (PTP mode)", 0x04a9, 0x3099},
/* more coming soon :) */
{NULL, 0, 0}