merged 350d additional config parameters
from David Selmeczi. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8986 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
@@ -236,7 +236,8 @@ typedef enum {
|
||||
APERTURE_F14 = 0x45,
|
||||
APERTURE_F16 = 0x48,
|
||||
APERTURE_F18 = 0x4b,
|
||||
APERTURE_F20 = 0x4d
|
||||
APERTURE_F20 = 0x4d,
|
||||
APERTURE_F22 = 0x50
|
||||
} canonApertureState;
|
||||
|
||||
struct canonApertureStateStruct {
|
||||
@@ -245,6 +246,22 @@ struct canonApertureStateStruct {
|
||||
};
|
||||
|
||||
typedef enum {
|
||||
SHUTTER_SPEED_BULB = 0x04,
|
||||
SHUTTER_SPEED_30_SEC = 0x10,
|
||||
SHUTTER_SPEED_25_SEC = 0x13,
|
||||
SHUTTER_SPEED_20_SEC = 0x15,
|
||||
SHUTTER_SPEED_15_SEC = 0x18,
|
||||
SHUTTER_SPEED_13_SEC = 0x1b,
|
||||
SHUTTER_SPEED_10_SEC = 0x1d,
|
||||
SHUTTER_SPEED_8_SEC = 0x20,
|
||||
SHUTTER_SPEED_6_SEC = 0x23,
|
||||
SHUTTER_SPEED_5_SEC = 0x25,
|
||||
SHUTTER_SPEED_4_SEC = 0x28,
|
||||
SHUTTER_SPEED_3_2_SEC = 0x2b,
|
||||
SHUTTER_SPEED_2_5_SEC = 0x2d,
|
||||
SHUTTER_SPEED_2_SEC = 0x30,
|
||||
SHUTTER_SPEED_1_6_SEC = 0x32,
|
||||
SHUTTER_SPEED_1_3_SEC = 0x35,
|
||||
SHUTTER_SPEED_1_SEC = 0x38,
|
||||
SHUTTER_SPEED_0_8_SEC = 0x3b,
|
||||
SHUTTER_SPEED_0_6_SEC = 0x3d,
|
||||
@@ -268,7 +285,20 @@ typedef enum {
|
||||
SHUTTER_SPEED_1_100 = 0x6d,
|
||||
SHUTTER_SPEED_1_125 = 0x70,
|
||||
SHUTTER_SPEED_1_160 = 0x73,
|
||||
SHUTTER_SPEED_1_200 = 0x75
|
||||
SHUTTER_SPEED_1_200 = 0x75,
|
||||
SHUTTER_SPEED_1_250 = 0x78,
|
||||
SHUTTER_SPEED_1_320 = 0x7b,
|
||||
SHUTTER_SPEED_1_400 = 0x7d,
|
||||
SHUTTER_SPEED_1_500 = 0x80,
|
||||
SHUTTER_SPEED_1_640 = 0x83,
|
||||
SHUTTER_SPEED_1_800 = 0x85,
|
||||
SHUTTER_SPEED_1_1000 = 0x88,
|
||||
SHUTTER_SPEED_1_1250 = 0x8b,
|
||||
SHUTTER_SPEED_1_1600 = 0x8d,
|
||||
SHUTTER_SPEED_1_2000 = 0x90,
|
||||
SHUTTER_SPEED_1_2500 = 0x93,
|
||||
SHUTTER_SPEED_1_3200 = 0x95,
|
||||
SHUTTER_SPEED_1_4000 = 0x98
|
||||
} canonShutterSpeedState;
|
||||
|
||||
struct canonShutterSpeedStateStruct {
|
||||
|
||||
@@ -113,6 +113,22 @@ const struct canonIsoStateStruct isoStateArray[] = {
|
||||
};
|
||||
|
||||
const struct canonShutterSpeedStateStruct shutterSpeedStateArray[] = {
|
||||
{SHUTTER_SPEED_BULB, "Bulb"},
|
||||
{SHUTTER_SPEED_30_SEC, "30 seconds"},
|
||||
{SHUTTER_SPEED_25_SEC, "25 seconds"},
|
||||
{SHUTTER_SPEED_20_SEC, "20 seconds"},
|
||||
{SHUTTER_SPEED_15_SEC, "15 seconds"},
|
||||
{SHUTTER_SPEED_13_SEC, "13 seconds"},
|
||||
{SHUTTER_SPEED_10_SEC, "10 seconds"},
|
||||
{SHUTTER_SPEED_8_SEC, "8 seconds"},
|
||||
{SHUTTER_SPEED_6_SEC, "6 seconds"},
|
||||
{SHUTTER_SPEED_5_SEC, "5 seconds"},
|
||||
{SHUTTER_SPEED_4_SEC, "4 seconds"},
|
||||
{SHUTTER_SPEED_3_2_SEC, "3.2 second"},
|
||||
{SHUTTER_SPEED_2_5_SEC, "2.5 second"},
|
||||
{SHUTTER_SPEED_2_SEC, "2 seconds"},
|
||||
{SHUTTER_SPEED_1_6_SEC, "1.6 second"},
|
||||
{SHUTTER_SPEED_1_3_SEC, "1.3 second"},
|
||||
{SHUTTER_SPEED_1_SEC, "1 second"},
|
||||
{SHUTTER_SPEED_0_8_SEC, "8/10 second"},
|
||||
{SHUTTER_SPEED_0_6_SEC, "6/10 second"},
|
||||
@@ -136,6 +152,18 @@ const struct canonShutterSpeedStateStruct shutterSpeedStateArray[] = {
|
||||
{SHUTTER_SPEED_1_125, "1/125 second"},
|
||||
{SHUTTER_SPEED_1_160, "1/160 second"},
|
||||
{SHUTTER_SPEED_1_200, "1/200 second"},
|
||||
{SHUTTER_SPEED_1_250, "1/250 second"},
|
||||
{SHUTTER_SPEED_1_320, "1/320 second"},
|
||||
{SHUTTER_SPEED_1_400, "1/400 second"},
|
||||
{SHUTTER_SPEED_1_500, "1/640 second"},
|
||||
{SHUTTER_SPEED_1_640, "1/640 second"},
|
||||
{SHUTTER_SPEED_1_800, "1/800 second"},
|
||||
{SHUTTER_SPEED_1_1000, "1/1000 second"},
|
||||
{SHUTTER_SPEED_1_1250, "1/1250 second"},
|
||||
{SHUTTER_SPEED_1_1600, "1/1600 second"},
|
||||
{SHUTTER_SPEED_1_2000, "1/2000 second"},
|
||||
{SHUTTER_SPEED_1_3200, "1/3200 second"},
|
||||
{SHUTTER_SPEED_1_4000, "1/4000 second"},
|
||||
{0, NULL},
|
||||
};
|
||||
|
||||
@@ -158,6 +186,7 @@ const struct canonApertureStateStruct apertureStateArray[] = {
|
||||
{APERTURE_F16, "f16"},
|
||||
{APERTURE_F18, "f18"},
|
||||
{APERTURE_F20, "f20"},
|
||||
{APERTURE_F22, "f22"},
|
||||
{0, NULL},
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user