diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2009-01-20 11:58:47 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2009-01-20 11:58:47 +0000 |
| commit | 816d4bb4dfeaa976cde47f0567ea2482b87c697e (patch) | |
| tree | 09f4acb3bcce0c4a721beb2cb994cf548ba7b7b1 | |
| parent | d60d77871ed729fd822d3d53c030f720262d363e (diff) | |
| download | libgphoto2-816d4bb4dfeaa976cde47f0567ea2482b87c697e.tar.gz | |
retrieved d200 properties.
added stroboscop flash mode
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@11737 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | camlibs/ptp2/config.c | 1 | ||||
| -rw-r--r-- | camlibs/ptp2/library.c | 16 |
2 files changed, 8 insertions, 9 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index 0b38afe83..6376fd298 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -1128,6 +1128,7 @@ static struct deviceproptableu8 nikon_flashmode[] = { { N_("iTTL"), 0, 0 }, { N_("Manual"), 1, 0 }, { N_("Commander"), 2, 0 }, + { N_("Repeating"), 3, 0 }, /* stroboskop */ }; GENERIC8TABLE(Nikon_FlashMode,nikon_flashmode) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 7a1cf37a3..c0d247896 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -328,7 +328,7 @@ const static uint16_t nikon_d700_extra_props[] = { 0xd200, 0xd201 }; -/* not yet fully verified. -Marcus */ +/* from Jana Jaegers D200, extracted by Marcus */ const static uint16_t nikon_d200_extra_props[] = { 0xd010, 0xd011, 0xd012, 0xd013, 0xd014, 0xd015, 0xd016, 0xd017, 0xd018, 0xd019, 0xd01a, 0xd01b, 0xd01c, 0xd01d, 0xd01e, 0xd01f, @@ -339,19 +339,17 @@ const static uint16_t nikon_d200_extra_props[] = { 0xd048, 0xd049, 0xd04a, 0xd04b, 0xd04f, 0xd050, 0xd051, 0xd052, 0xd054, 0xd055, 0xd056, 0xd057, 0xd058, 0xd059, 0xd05a, 0xd05b, 0xd05c, 0xd05e, 0xd05f, -0xd062, 0xd063, 0xd064, -0xd068, 0xd06a, 0xd06b, 0xd06c, 0xd06f, -0xd070, 0xd074, 0xd075, 0xd077, -0xd078, 0xd079, 0xd07a, 0xd07b, +0xd062, 0xd063, 0xd064, 0xd068, 0xd06a, 0xd06b, 0xd06c, 0xd06f, +0xd070, 0xd074, 0xd075, 0xd077, 0xd078, 0xd079, 0xd07a, 0xd07b, 0xd080, 0xd081, 0xd082, 0xd083, 0xd084, 0xd085, 0xd086, 0xd087, 0xd088, 0xd089, 0xd08a, 0xd08b, 0xd090, 0xd091, 0xd092, 0xd0c0, 0xd0c1, 0xd0c2, 0xd0c3, 0xd0c4, 0xd0c5, 0xd0e0, 0xd0e1, 0xd0e2, 0xd0e3, 0xd0e4, 0xd0e5, 0xd0e6, 0xd100, 0xd101, 0xd102, 0xd103, 0xd104, 0xd105, 0xd106, -0xd108, 0xd109, 0xd10a, 0xd10b, 0xd10c, 0xd10e, 0xd10f, +0xd108, 0xd109, 0xd10a, 0xd10b, 0xd10c, 0xd10d, 0xd10e, 0xd10f, 0xd120, 0xd121, 0xd122, 0xd124, 0xd125, 0xd126, -0xd142, +0xd140, 0xd142, 0xd160, 0xd163, 0xd164, 0xd166, 0xd167, 0xd16c, 0xd16d, 0xd181, 0xd182, 0xd183, 0xd1c0, 0xd1c1, @@ -431,7 +429,7 @@ static const struct { { 0x41a, nikon_d300_extra_props, sizeof(nikon_d300_extra_props)/sizeof(nikon_d300_extra_props[0]) }, /* D90 - confirmed by Marcus */ { 0x421, nikon_d90_extra_props, sizeof(nikon_d90_extra_props)/sizeof(nikon_d90_extra_props[0]) }, - /* D200 - guessed by Marcus */ + /* D200 - confirmed by Marcus */ { 0x410, nikon_d200_extra_props, sizeof(nikon_d200_extra_props)/sizeof(nikon_d200_extra_props[0]) }, /* D40x - confirmed by Marcus */ { 0x418, nikon_d40x_extra_props, sizeof(nikon_d40x_extra_props)/sizeof(nikon_d40x_extra_props[0]) } @@ -813,7 +811,7 @@ static struct { /* Justin Case <justin_case@gmx.net> */ {"Nikon:D2X SLR (PTP mode)", 0x04b0, 0x0408, PTP_CAP}, /* Niclas Gustafsson (nulleman @ sf) */ - {"Nikon:D50 (PTP mode)", 0x04b0, 0x040a, PTP_CAP}, + {"Nikon:D50 (PTP mode)", 0x04b0, 0x040a, PTP_CAP}, /* no hidden props */ {"Nikon:DSC D70s (PTP mode)", 0x04b0, 0x040e, PTP_CAP}, /* Jana Jaeger <jjaeger.suse.de> */ {"Nikon:DSC D200 (PTP mode)", 0x04b0, 0x0410, PTP_CAP|PTP_NIKON_SUPPRESSED_PROPS}, |