Added support for Canon Optura 20 (reported by Walt H)

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6915 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Hans Ulrich Niedermann
2003-11-08 11:55:27 +00:00
parent 9121c54ec1
commit a7e4d02ebe
4 changed files with 13 additions and 6 deletions

View File

@@ -4,7 +4,7 @@ libgphoto2 CVS HEAD
drivers (camlibs):
* Canon driver:
- added support for G5
- added support for G5, Optura 20
- re-added support for A300 and S50
packaging:

View File

@@ -1,3 +1,7 @@
2003-11-08 Hans Ulrich Niedermann <gp@n-dimensional.de>
* canon.c, canon.h: Added support for Optura 20 (reported by Walt H)
2003-10-27 Marcus Meissner <meissner@suse.de>
* canon.c: PowerShot S50 and A300 got lost somewhere.

View File

@@ -78,11 +78,11 @@
* such that their camera name occurs in the list of supported
* cameras.
*
* Note:
* - at least some serial cameras require a certain name for correct
* Notes:
* - At least some serial cameras require a certain name for correct
* detection.
* - newer Canon cameras USB also support a PTP mode. see ptp/ptp2 camlibs.
* - no IEEE1394 cameras supported yet
* - Newer Canon USB cameras also support a PTP mode. See ptp2 camlib.
* - No IEEE1394 cameras supported yet.
**/
#define S32K (32 * 1024)
@@ -171,6 +171,7 @@ const struct canonCamModelData models[] = {
{"Canon:PowerShot unknown 5", CANON_PS_UNK5, 0x04A9, 0x307a, CAP_SUP, S10M, S32K, S2M, NULL},
/* MV630i seems to be a DV camcorder */
{"Canon:MV630i", CANON_MV630I, 0x04A9, 0x307b, CAP_SUP, S99M, S32K, S2M, NULL},
{"Canon:Optura 20", CANON_OPT_20, 0x04A9, 0x307f, CAP_SUP, S99M, S32K, S2M, NULL},
{"Canon:EOS 10D", CANON_EOS_10D, 0x04A9, 0x3083, CAP_SUP, S10M, S32K, S2M, NULL},
/* 0x3099 is the EOS 300D/Digital Rebel in PTP mode */

View File

@@ -98,6 +98,7 @@ typedef enum {
* @CANON_MV630I: MV630i camcorder
* @CANON_EOS_10D: EOS 10D
* @CANON_OPT_200: Optura 200 MC, MVX2i
* @CANON_OPT_20: Optura 20
* @CANON_PS_UNK1: Unknown camera seen in Mac OS X Image Capture
* @CANON_PS_UNK2: Unknown camera seen in Mac OS X Image Capture
* @CANON_PS_UNK3: Unknown camera seen in Mac OS X Image Capture
@@ -156,7 +157,8 @@ typedef enum {
CANON_PS_S400,
CANON_PS_SD100,
CANON_EOS_300D,
CANON_PS_G5
CANON_PS_G5,
CANON_OPT_20
} canonCamModel;
/**