From 6aaf2b43eaea75f97d421f1e18b2962a5eb34e4e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 5 Oct 2015 09:33:39 +0200 Subject: [PATCH] added nikon coolpix s2900 id --- camlibs/ptp2/cameras/nikon-coolpix-s2900.txt | 202 +++++++++++++++++++ camlibs/ptp2/library.c | 3 + 2 files changed, 205 insertions(+) create mode 100644 camlibs/ptp2/cameras/nikon-coolpix-s2900.txt diff --git a/camlibs/ptp2/cameras/nikon-coolpix-s2900.txt b/camlibs/ptp2/cameras/nikon-coolpix-s2900.txt new file mode 100644 index 000000000..6bdded300 --- /dev/null +++ b/camlibs/ptp2/cameras/nikon-coolpix-s2900.txt @@ -0,0 +1,202 @@ +Camera summary: +Manufacturer: Nikon Corporation +Model: S2900 + Version: COOLPIX S2900 V1.0 +Vendor Extension ID: 0xa (1.0) +Vendor Extension Description: microsoft.com/deviceservices: 1.0; + +Capture Formats: JPEG +Display Formats: Undefined Type, Association/Directory, Defined Type, JPEG, DPOF, MS AVI, Apple Quicktime, MS Wave + +Device Capabilities: + File Download, File Deletion, File Upload + Generic Image Capture, No Open Capture, No vendor specific capture + Nikon Wifi support + +Storage Devices Summary: +store_00010001: + StorageDescription: S2900 + VolumeLabel: None + Storage Type: Removable RAM (memory card) + Filesystemtype: Digital Camera Layout (DCIM) + Access Capability: Read-Write + Maximum Capability: 7884242944 (7519 MB) + Free Space (Bytes): 6407028736 (6110 MB) + Free Space (Images): 1155 + +Device Property Summary: +Property 0xd407:(read only) (type=0x6) 1 +Property 0xd406:(readwrite) (type=0xffff) '' +Property 0xd002:(readwrite) (type=0x6) Enumeration [1,2,3,4,5,6,7] value: 6 +Date & Time(0x5011):(readwrite) (type=0xffff) '20151002T130827' +Flash Mode(0x500c):(readwrite) (type=0x4) Enumeration [1,2] value: Automatic flash (1) +Focus Mode(0x500a):(readwrite) (type=0x4) Enumeration [2,3] value: Automatic (2) +Focal Length(0x5008):(read only) (type=0x6) Enumeration [3500,4600,5300,6100,7300,8600,10500] value: 35 mm (3500) +Battery Level(0x5001):(read only) (type=0x2) Enumeration [2,5,25,50,65,80,100] value: 80% (80) +Property 0xd303:(read only) (type=0x2) 1 + +/main/settings/datetime +Label: Camera Date and Time +Type: DATE +Current: 1443762521 +Printable: Fri Oct 2 13:08:41 2015 +Help: Use 'now' as the current time when setting. + +/main/settings/fastfs +Label: Fast Filesystem +Type: TOGGLE +Current: 1 +/main/settings/capturetarget +Label: Capture Target +Type: RADIO +Current: Internal RAM +Choice: 0 Internal RAM +Choice: 1 Memory card +/main/status/serialnumber +Label: Serial Number +Type: TEXT +Current: None +/main/status/manufacturer +Label: Camera Manufacturer +Type: TEXT +Current: Nikon Corporation +/main/status/cameramodel +Label: Camera Model +Type: TEXT +Current: S2900 +/main/status/deviceversion +Label: Device Version +Type: TEXT +Current: COOLPIX S2900 V1.0 +/main/status/vendorextension +Label: Vendor Extension +Type: TEXT +Current: microsoft.com/deviceservices: 1.0; +/main/capturesettings/flashmode +Label: Flash Mode +Type: RADIO +Current: Automatic Flash +Choice: 0 Automatic Flash +Choice: 1 Flash off +/main/capturesettings/focallength +Label: Focal Length +Type: RANGE +Current: 35 +Bottom: 35 +Top: 105 +Step: 1 +/main/capturesettings/focusmode +Label: Focus Mode +Type: RADIO +Current: Automatic +Choice: 0 Automatic +Choice: 1 Automatic Macro +/main/wifiprofiles/new/name +Label: Profile name +Type: TEXT +Current: +/main/wifiprofiles/new/essid +Label: WIFI ESSID +Type: TEXT +Current: +/main/wifiprofiles/new/ipaddr +Label: IP address (empty for DHCP) +Type: TEXT +Current: +/main/wifiprofiles/new/netmask +Label: Network mask +Type: TEXT +Current: +/main/wifiprofiles/new/gw +Label: Default gateway +Type: TEXT +Current: +/main/wifiprofiles/new/accessmode +Label: Access mode +Type: RADIO +Current: Managed +Choice: 0 Managed +Choice: 1 Ad-hoc +/main/wifiprofiles/new/channel +Label: WIFI channel +Type: RANGE +Current: 1 +Bottom: 1 +Top: 11 +Step: 1 +/main/wifiprofiles/new/encryption +Label: Encryption +Type: RADIO +Current: None +Choice: 0 None +Choice: 1 WEP 64-bit +Choice: 2 WEP 128-bit +/main/wifiprofiles/new/key +Label: Encryption key (hex) +Type: TEXT +Current: +/main/wifiprofiles/new/write +Label: Write +Type: TOGGLE +Current: 0 +/main/other/d407 +Label: PTP Property 0xd407 +Type: TEXT +Current: 1 +/main/other/d406 +Label: PTP Property 0xd406 +Type: TEXT +Current: +/main/other/d002 +Label: PTP Property 0xd002 +Type: MENU +Current: 6 +Choice: 0 1 +Choice: 1 2 +Choice: 2 3 +Choice: 3 4 +Choice: 4 5 +Choice: 5 6 +Choice: 6 7 +/main/other/5011 +Label: Date & Time +Type: TEXT +Current: 20151002T130841 +/main/other/500c +Label: Flash Mode +Type: MENU +Current: 1 +Choice: 0 1 +Choice: 1 2 +/main/other/500a +Label: Focus Mode +Type: MENU +Current: 2 +Choice: 0 2 +Choice: 1 3 +/main/other/5008 +Label: Focal Length +Type: MENU +Current: 3500 +Choice: 0 3500 +Choice: 1 4600 +Choice: 2 5300 +Choice: 3 6100 +Choice: 4 7300 +Choice: 5 8600 +Choice: 6 10500 +/main/other/5001 +Label: Battery Level +Type: MENU +Current: 80 +Choice: 0 2 +Choice: 1 5 +Choice: 2 25 +Choice: 3 50 +Choice: 4 65 +Choice: 5 80 +Choice: 6 100 +/main/other/d303 +Label: PTP Property 0xd303 +Type: TEXT +Current: 1 diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 53449f4eb..46720c950 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -1110,6 +1110,9 @@ static struct { /* David Shawcross */ {"Nikon:Coolpix S3700", 0x04b0, 0x035c, PTP_CAP}, + /* David Shawcross */ + {"Nikon:Coolpix S2900", 0x04b0, 0x035e, PTP_CAP}, + /* Nikon D100 has a PTP mode: westin 2002.10.16 */ {"Nikon:DSC D100 (PTP mode)", 0x04b0, 0x0402, 0}, /* D2H SLR in PTP mode from Steve Drew */