added 2 new cameras

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14817 67ed7778-7388-44ab-90cf-0a291f65f57c

2 files changed, 425 insertions, 0 deletions

diff --git a/camlibs/ptp2/cameras/canon-powershot-a495.txt b/camlibs/ptp2/cameras/canon-powershot-a495.txt
new file mode 100644
index 000000000..52258fde5
--- /dev/null
+++ b/camlibs/ptp2/cameras/canon-powershot-a495.txt
@@ -0,0 +1,207 @@
+/main/actions/syncdatetime
+Label: Synchronize camera date and time with PC
+Type: TOGGLE
+Current: 0
+/main/actions/chdk_reboot
+Label: CHDK Reboot
+Type: TOGGLE
+Current: 2
+/main/actions/chdk_script
+Label: CHDK Script
+Type: RADIO
+Current: cls();exit_alt();
+Choice: 0 cls();exit_alt();
+Choice: 1 shoot();cls();exit_alt();
+/main/settings/ownername
+Label: Owner Name
+Type: TEXT
+Current: 
+/main/settings/capturetarget
+Label: Capture Target
+Type: RADIO
+Current: Internal RAM
+Choice: 0 Internal RAM
+Choice: 1 Memory card
+/main/settings/capture
+Label: Capture
+Type: TOGGLE
+Current: 0
+/main/status/serialnumber
+Label: Serial Number
+Type: TEXT
+Current: 3F1A5D03F98C45BABA2CEFE99F49EDAD
+/main/status/manufacturer
+Label: Camera Manufacturer
+Type: TEXT
+Current: Canon Inc.
+/main/status/cameramodel
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot A495
+/main/status/deviceversion
+Label: Device Version
+Type: TEXT
+Current: 1-8.0.1.0
+/main/status/vendorextension
+Label: Vendor Extension
+Type: TEXT
+Current: None
+/main/status/model
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot A495
+/main/status/firmwareversion
+Label: Firmware Version
+Type: TEXT
+Current: 1.0.0.0
+/main/other/d045
+Label: Event Emulate Mode
+Type: MENU
+Current: 2
+Choice: 0 1
+Choice: 1 2
+Choice: 2 3
+Choice: 3 4
+Choice: 4 5
+Choice: 5 6
+Choice: 6 7
+/main/other/d04a
+Label: PTP Property 0xd04a
+Type: MENU
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+/main/other/d02e
+Label: Size of Output Data from Camera
+Type: TEXT
+Current: 524288
+/main/other/d02f
+Label: Size of Input Data to Camera
+Type: TEXT
+Current: 524288
+/main/other/5001
+Label: Battery Level
+Type: MENU
+Current: 3
+Choice: 0 0
+Choice: 1 1
+Choice: 2 3
+/main/other/d002
+Label: Battery Type
+Type: MENU
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+Choice: 4 4
+Choice: 5 5
+/main/other/d003
+Label: Battery Mode
+Type: MENU
+Current: 1
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+/main/other/d034
+Label: UNIX Time
+Type: TEXT
+Current: 1394386281
+/main/other/d047
+Label: Type of Slideshow
+Type: TEXT
+Current: 0
+/main/other/d046
+Label: DPOF Version
+Type: TEXT
+Current: 257
+/main/other/d030
+Label: Remote API Version
+Type: TEXT
+Current: 256
+/main/other/d049
+Label: Model ID
+Type: TEXT
+Current: 41943040
+/main/other/d032
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot A495
+/main/other/d033
+Label: Camera Owner
+Type: TEXT
+Current: (null)
+/main/other/d031
+Label: Firmware Version
+Type: TEXT
+Current: 16777216
+/main/other/d050
+Label: PTP Property 0xd050
+Type: TEXT
+Current: 0
+/main/other/d402
+Label: PTP Property 0xd402
+Type: TEXT
+Current: Canon PowerShot A495
+/main/other/d406
+Label: PTP Property 0xd406
+Type: TEXT
+Current: Windows
+/main/other/d407
+Label: PTP Property 0xd407
+Type: TEXT
+Current: 1
+/main/other/d303
+Label: PTP Property 0xd303
+Type: TEXT
+Current: 1
+Camera summary:
+Manufacturer: Canon Inc.
+Model: Canon PowerShot A495
+  Version: 1-8.0.1.0
+  Serial Number: xxxxxxxxxxxxxxxxxxxxxxxxxxx
+Vendor Extension ID: 0xb (1.0)
+
+Capture Formats: JPEG
+Display Formats: Association/Directory, Script, DPOF, MS AVI, MS Wave, JPEG, Defined Type, CRW, Unknown(b103), Unknown(b104), Unknown(bf01)
+
+Device Capabilities:
+	File Download, File Deletion, File Upload
+	No Image Capture, No Open Capture, No vendor specific capture
+
+Storage Devices Summary:
+store_00010001:
+	StorageDescription: None
+	VolumeLabel: None
+	Storage Type: Removable RAM (memory card)
+	Filesystemtype: Digital Camera Layout (DCIM)
+	Access Capability: Read-Write
+	Maximum Capability: 3949592576 (3766 MB)
+	Free Space (Bytes): 3684696064 (3514 MB)
+	Free Space (Images): -1
+
+Device Property Summary:
+Event Emulate Mode(0xd045):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7] value: 2
+Property 0xd04a:(readwrite) (type=0x2) Enumeration [0,1,2,3] value: 0
+Size of Output Data from Camera(0xd02e):(read only) (type=0x6) 524288
+Size of Input Data to Camera(0xd02f):(read only) (type=0x6) 524288
+Battery Level(0x5001):(read only) (type=0x2) Enumeration [0,1,3] value: 3% (3)
+Battery Type(0xd002):(read only) (type=0x4) Enumeration [0,1,2,3,4,5] value: Unknown (0)
+Battery Mode(0xd003):(read only) (type=0x6) Enumeration [0,1,2,3] value: Normal (1)
+UNIX Time(0xd034):(readwrite) (type=0x6) 1394386265
+Type of Slideshow(0xd047):(read only) (type=0x4) 0
+DPOF Version(0xd046):(read only) (type=0x4) 257
+Remote API Version(0xd030):(read only) (type=0x6) 256
+Model ID(0xd049):(read only) (type=0x6) 41943040
+Camera Model(0xd032):(read only) (type=0xffff) 'Canon PowerShot A495'
+Camera Owner(0xd033):(readwrite) (type=0x4002) a[0] 
+Firmware Version(0xd031):(read only) (type=0x6) 16777216
+Property 0xd050:(read only) (type=0x2) 0
+Property 0xd402:(read only) (type=0xffff) 'Canon PowerShot A495'
+Property 0xd406:(readwrite) (type=0xffff) 'Windows'
+Property 0xd407:(read only) (type=0x6) 1
+Property 0xd303:(read only) (type=0x2) 1
+
diff --git a/camlibs/ptp2/cameras/canon-powershot-sx510hs.txt b/camlibs/ptp2/cameras/canon-powershot-sx510hs.txt
new file mode 100644
index 000000000..5a7ac4b00
--- /dev/null
+++ b/camlibs/ptp2/cameras/canon-powershot-sx510hs.txt
@@ -0,0 +1,218 @@
+/main/actions/syncdatetime
+Label: Synchronize camera date and time with PC
+Type: TOGGLE
+Current: 0
+/main/actions/chdk_reboot
+Label: CHDK Reboot
+Type: TOGGLE
+Current: 2
+/main/actions/chdk_script
+Label: CHDK Script
+Type: RADIO
+Current: cls();exit_alt();
+Choice: 0 cls();exit_alt();
+Choice: 1 shoot();cls();exit_alt();
+/main/settings/ownername
+Label: Owner Name
+Type: TEXT
+Current: 
+/main/settings/capturetarget
+Label: Capture Target
+Type: RADIO
+Current: Internal RAM
+Choice: 0 Internal RAM
+Choice: 1 Memory card
+/main/settings/capture
+Label: Capture
+Type: TOGGLE
+Current: 0
+/main/status/serialnumber
+Label: Serial Number
+Type: TEXT
+Current: EEAF67A2D86C4B3DB969414114CC71F5
+/main/status/manufacturer
+Label: Camera Manufacturer
+Type: TEXT
+Current: Canon Inc.
+/main/status/cameramodel
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot SX510 HS
+/main/status/deviceversion
+Label: Device Version
+Type: TEXT
+Current: 1-14.0.1.0
+/main/status/vendorextension
+Label: Vendor Extension
+Type: TEXT
+Current: None
+/main/status/model
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot SX510 HS
+/main/status/firmwareversion
+Label: Firmware Version
+Type: TEXT
+Current: 1.0.1.0
+/main/other/d045
+Label: Event Emulate Mode
+Type: MENU
+Current: 2
+Choice: 0 1
+Choice: 1 2
+Choice: 2 3
+Choice: 3 4
+Choice: 4 5
+Choice: 5 6
+Choice: 6 7
+/main/other/d04a
+Label: PTP Property 0xd04a
+Type: MENU
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+/main/other/d02e
+Label: Size of Output Data from Camera
+Type: TEXT
+Current: 524288
+/main/other/d02f
+Label: Size of Input Data to Camera
+Type: TEXT
+Current: 524288
+/main/other/5001
+Label: Battery Level
+Type: MENU
+Current: 3
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+/main/other/d002
+Label: Battery Type
+Type: MENU
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+Choice: 4 4
+Choice: 5 5
+/main/other/d003
+Label: Battery Mode
+Type: MENU
+Current: 1
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+/main/other/d034
+Label: UNIX Time
+Type: TEXT
+Current: 1394379399
+/main/other/d047
+Label: Type of Slideshow
+Type: TEXT
+Current: 0
+/main/other/d046
+Label: DPOF Version
+Type: TEXT
+Current: 257
+/main/other/d030
+Label: Remote API Version
+Type: TEXT
+Current: 256
+/main/other/d049
+Label: Model ID
+Type: TEXT
+Current: 56098816
+/main/other/d032
+Label: Camera Model
+Type: TEXT
+Current: Canon PowerShot SX510 HS
+/main/other/d033
+Label: Camera Owner
+Type: TEXT
+Current: (null)
+/main/other/d031
+Label: Firmware Version
+Type: TEXT
+Current: 16777472
+/main/other/d050
+Label: PTP Property 0xd050
+Type: TEXT
+Current: 0
+/main/other/d051
+Label: PTP Property 0xd051
+Type: TEXT
+Current: (null)
+/main/other/d052
+Label: PTP Property 0xd052
+Type: TEXT
+Current: 0
+/main/other/d402
+Label: PTP Property 0xd402
+Type: TEXT
+Current: Canon PowerShot SX510 HS
+/main/other/d406
+Label: PTP Property 0xd406
+Type: TEXT
+Current: Windows
+/main/other/d407
+Label: PTP Property 0xd407
+Type: TEXT
+Current: 1
+/main/other/d303
+Label: PTP Property 0xd303
+Type: TEXT
+Current: 1
+Camera summary:
+Manufacturer: Canon Inc.
+Model: Canon PowerShot SX510 HS
+  Version: 1-14.0.1.0
+  Serial Number: xxxxxxxxxxxxxxxxxxxxxxxxxxx
+Vendor Extension ID: 0xb (1.0)
+
+Capture Formats: JPEG
+Display Formats: Association/Directory, Script, DPOF, MS Wave, JPEG, Defined Type, Unknown(b103), Unknown(b982), Unknown(b105), Unknown(bf01)
+
+Device Capabilities:
+	File Download, File Deletion, File Upload
+	No Image Capture, No Open Capture, No vendor specific capture
+
+Storage Devices Summary:
+store_00010001:
+	StorageDescription: None
+	VolumeLabel: None
+	Storage Type: Removable RAM (memory card)
+	Filesystemtype: Digital Camera Layout (DCIM)
+	Access Capability: Read-Write
+	Maximum Capability: 4019224576 (3833 MB)
+	Free Space (Bytes): 3826057216 (3648 MB)
+	Free Space (Images): -1
+
+Device Property Summary:
+Event Emulate Mode(0xd045):(readwrite) (type=0x4) Enumeration [1,2,3,4,5,6,7] value: 2
+Property 0xd04a:(readwrite) (type=0x2) Enumeration [0,1,2,3] value: 0
+Size of Output Data from Camera(0xd02e):(read only) (type=0x6) 524288
+Size of Input Data to Camera(0xd02f):(read only) (type=0x6) 524288
+Battery Level(0x5001):(read only) (type=0x2) Enumeration [0,1,2,3] value: 3% (3)
+Battery Type(0xd002):(read only) (type=0x4) Enumeration [0,1,2,3,4,5] value: Unknown (0)
+Battery Mode(0xd003):(read only) (type=0x6) Enumeration [0,1,2,3] value: Normal (1)
+UNIX Time(0xd034):(readwrite) (type=0x6) 1394379388
+Type of Slideshow(0xd047):(read only) (type=0x4) 0
+DPOF Version(0xd046):(read only) (type=0x4) 257
+Remote API Version(0xd030):(read only) (type=0x6) 256
+Model ID(0xd049):(read only) (type=0x6) 56098816
+Camera Model(0xd032):(read only) (type=0xffff) 'Canon PowerShot SX510 HS'
+Camera Owner(0xd033):(readwrite) (type=0x4002) a[0] 
+Firmware Version(0xd031):(read only) (type=0x6) 16777472
+Property 0xd050:(read only) (type=0x2) 0
+Property 0xd051:(read only) (type=0x4004) a[3] 14337,45317,47490
+Property 0xd052:(read only) (type=0x2) 0
+Property 0xd402:(read only) (type=0xffff) 'Canon PowerShot SX510 HS'
+Property 0xd406:(readwrite) (type=0xffff) 'Windows'
+Property 0xd407:(read only) (type=0x6) 1
+Property 0xd303:(read only) (type=0x2) 1
+