summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--camlibs/ptp2/cameras/canon-rebel-T7i.txt539
-rw-r--r--camlibs/ptp2/library.c10
2 files changed, 546 insertions, 3 deletions
diff --git a/camlibs/ptp2/cameras/canon-rebel-T7i.txt b/camlibs/ptp2/cameras/canon-rebel-T7i.txt
new file mode 100644
index 000000000..3ca75a921
--- /dev/null
+++ b/camlibs/ptp2/cameras/canon-rebel-T7i.txt
@@ -0,0 +1,539 @@
+/main/actions/syncdatetimeutc
+Label: Synchronize camera date and time with PC
+Type: TOGGLE
+Current: 0
+/main/actions/syncdatetime
+Label: Synchronize camera date and time with PC
+Type: TOGGLE
+Current: 0
+/main/actions/uilock
+Label: UI Lock
+Type: TOGGLE
+Current: 2
+/main/actions/autofocusdrive
+Label: Drive Canon DSLR Autofocus
+Type: TOGGLE
+Current: 0
+/main/actions/manualfocusdrive
+Label: Drive Canon DSLR Manual focus
+Type: RADIO
+Current: None
+Choice: 0 Near 1
+Choice: 1 Near 2
+Choice: 2 Near 3
+Choice: 3 None
+Choice: 4 Far 1
+Choice: 5 Far 2
+Choice: 6 Far 3
+/main/actions/cancelautofocus
+Label: Cancel Canon DSLR Autofocus
+Type: TOGGLE
+Current: 0
+/main/actions/eoszoom
+Label: Canon EOS Zoom
+Type: TEXT
+Current: 0
+/main/actions/eoszoomposition
+Label: Canon EOS Zoom Position
+Type: TEXT
+Current: 0,0
+/main/actions/viewfinder
+Label: Canon EOS Viewfinder
+Type: TOGGLE
+Current: 2
+/main/actions/eosremoterelease
+Label: Canon EOS Remote Release
+Type: RADIO
+Current: None
+Choice: 0 None
+Choice: 1 Press Half
+Choice: 2 Press Full
+Choice: 3 Release Half
+Choice: 4 Release Full
+Choice: 5 Immediate
+Choice: 6 Press 1
+Choice: 7 Press 2
+Choice: 8 Press 3
+Choice: 9 Release 1
+Choice: 10 Release 2
+Choice: 11 Release 3
+/main/actions/opcode
+Label: PTP Opcode
+Type: TEXT
+Current: 0x1001,0xparam1,0xparam2
+/main/settings/datetimeutc
+Label: Camera Date and Time
+Type: DATE
+Current: 1501996584
+Printable: Sat 05 Aug 2017 10:16:24 PM PDT
+/main/settings/datetime
+Label: Camera Date and Time
+Type: DATE
+Current: 1501992984
+Printable: Sat 05 Aug 2017 09:16:24 PM PDT
+/main/settings/output
+Label: Camera Output
+Type: RADIO
+Current: Off
+Choice: 0 Off
+Choice: 1 TFT
+Choice: 2 PC
+Choice: 3 TFT + PC
+Choice: 4 Setting 4
+Choice: 5 Setting 5
+Choice: 6 Setting 6
+Choice: 7 Setting 7
+Choice: 8 Unknown value 0008
+Choice: 9 Unknown value 0009
+Choice: 10 Unknown value 000a
+Choice: 11 Unknown value 000b
+/main/settings/movierecordtarget
+Label: Recording Destination
+Type: RADIO
+Current: None
+Choice: 0 None
+/main/settings/evfmode
+Label: EVF Mode
+Type: RADIO
+Current: 1
+Choice: 0 1
+Choice: 1 0
+/main/settings/ownername
+Label: Owner Name
+Type: TEXT
+Current:
+/main/settings/artist
+Label: Artist
+Type: TEXT
+Current:
+/main/settings/copyright
+Label: Copyright
+Type: TEXT
+Current:
+/main/settings/customfuncex
+Label: Custom Functions Ex
+Type: TEXT
+Current: c8,1,1,bc,f,101,1,0,103,1,0,113,1,0,203,1,0,50e,1,0,51b,1,0,51c,1,0,50c,1,0,51d,1,0,60f,1,0,40a,1,c3,702,1,0,704,1,0,811,1,0,814,1,0,
+/main/settings/focusarea
+Label: Focus Area
+Type: TEXT
+Current: 1431652167
+/main/settings/autopoweroff
+Label: Auto Power Off
+Type: TEXT
+Current: 10
+/main/settings/depthoffield
+Label: Depth of Field
+Type: TEXT
+Current: 0
+/main/settings/capturetarget
+Label: Capture Target
+Type: RADIO
+Current: Memory card
+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: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+/main/status/manufacturer
+Label: Camera Manufacturer
+Type: TEXT
+Current: Canon.Inc
+/main/status/cameramodel
+Label: Camera Model
+Type: TEXT
+Current: Canon EOS Rebel T7i
+/main/status/deviceversion
+Label: Device Version
+Type: TEXT
+Current: 3-1.0.1
+/main/status/vendorextension
+Label: Vendor Extension
+Type: TEXT
+Current: None
+/main/status/model
+Label: Camera Model
+Type: TEXT
+Current: 2147484677
+/main/status/Battery Level
+Label: Battery Level
+Type: TEXT
+Current: 100%
+/main/status/batterylevel
+Label: Battery Level
+Type: TEXT
+Current: 100%
+/main/status/lensname
+Label: Lens Name
+Type: TEXT
+Current: EF-S18-135mm f/3.5-5.6 IS
+/main/status/eosserialnumber
+Label: Serial Number
+Type: TEXT
+Current: 032021012159
+/main/status/availableshots
+Label: Available Shots
+Type: TEXT
+Current: 6658
+/main/imgsettings/imageformat
+Label: Image Format
+Type: RADIO
+Current: Large Fine JPEG
+Choice: 0 Large Fine JPEG
+Choice: 1 Large Normal JPEG
+Choice: 2 Medium Fine JPEG
+Choice: 3 Medium Normal JPEG
+Choice: 4 Small Fine JPEG
+Choice: 5 Small Normal JPEG
+Choice: 6 Smaller JPEG
+Choice: 7 RAW + Large Fine JPEG
+Choice: 8 RAW
+/main/imgsettings/imageformatsd
+Label: Image Format SD
+Type: RADIO
+Current: Large Fine JPEG
+Choice: 0 Large Fine JPEG
+Choice: 1 Large Normal JPEG
+Choice: 2 Medium Fine JPEG
+Choice: 3 Medium Normal JPEG
+Choice: 4 Small Fine JPEG
+Choice: 5 Small Normal JPEG
+Choice: 6 Smaller JPEG
+Choice: 7 RAW + Large Fine JPEG
+Choice: 8 RAW
+/main/imgsettings/imageformatcf
+Label: Image Format CF
+Type: RADIO
+Current: Large Fine JPEG
+Choice: 0 Large Fine JPEG
+Choice: 1 Large Normal JPEG
+Choice: 2 Medium Fine JPEG
+Choice: 3 Medium Normal JPEG
+Choice: 4 Small Fine JPEG
+Choice: 5 Small Normal JPEG
+Choice: 6 Smaller JPEG
+Choice: 7 RAW + Large Fine JPEG
+Choice: 8 RAW
+/main/imgsettings/iso
+Label: ISO Speed
+Type: RADIO
+Current: Unknown value 0001
+Choice: 0 Auto
+Choice: 1 100
+Choice: 2 200
+Choice: 3 400
+Choice: 4 800
+Choice: 5 1600
+Choice: 6 3200
+Choice: 7 6400
+Choice: 8 12800
+Choice: 9 25600
+Choice: 10 Unknown value 0001
+/main/imgsettings/whitebalance
+Label: WhiteBalance
+Type: RADIO
+Current: Auto
+Choice: 0 Auto
+Choice: 1 Unknown value 0017
+Choice: 2 Daylight
+Choice: 3 Shadow
+Choice: 4 Cloudy
+Choice: 5 Tungsten
+Choice: 6 Fluorescent
+Choice: 7 Flash
+Choice: 8 Manual
+/main/imgsettings/colortemperature
+Label: Color Temperature
+Type: TEXT
+Current: 5200
+/main/imgsettings/whitebalanceadjusta
+Label: WhiteBalance Adjust A
+Type: RADIO
+Current: 0
+Choice: 0 -9
+Choice: 1 -8
+Choice: 2 -7
+Choice: 3 -6
+Choice: 4 -5
+Choice: 5 -4
+Choice: 6 -3
+Choice: 7 -2
+Choice: 8 -1
+Choice: 9 0
+Choice: 10 1
+Choice: 11 2
+Choice: 12 3
+Choice: 13 4
+Choice: 14 5
+Choice: 15 6
+Choice: 16 7
+Choice: 17 8
+Choice: 18 9
+/main/imgsettings/whitebalanceadjustb
+Label: WhiteBalance Adjust B
+Type: RADIO
+Current: 0
+Choice: 0 -9
+Choice: 1 -8
+Choice: 2 -7
+Choice: 3 -6
+Choice: 4 -5
+Choice: 5 -4
+Choice: 6 -3
+Choice: 7 -2
+Choice: 8 -1
+Choice: 9 0
+Choice: 10 1
+Choice: 11 2
+Choice: 12 3
+Choice: 13 4
+Choice: 14 5
+Choice: 15 6
+Choice: 16 7
+Choice: 17 8
+Choice: 18 9
+/main/imgsettings/whitebalancexa
+Label: WhiteBalance X A
+Type: TEXT
+Current: 0
+/main/imgsettings/whitebalancexb
+Label: WhiteBalance X B
+Type: TEXT
+Current: 0
+/main/imgsettings/colorspace
+Label: Color Space
+Type: RADIO
+Current: sRGB
+Choice: 0 sRGB
+Choice: 1 AdobeRGB
+/main/capturesettings/focusmode
+Label: Focus Mode
+Type: RADIO
+Current: Manual
+Choice: 0 One Shot
+Choice: 1 AI Focus
+Choice: 2 AI Servo
+Choice: 3 Manual
+/main/capturesettings/continuousaf
+Label: Continuous AF
+Type: RADIO
+Current: Off
+Choice: 0 Off
+Choice: 1 On
+/main/capturesettings/aspectratio
+Label: Aspect Ratio
+Type: RADIO
+Current: Unknown value 0000
+Choice: 0 Unknown value 0000
+Choice: 1 Unknown value 0002
+Choice: 2 Unknown value 0007
+Choice: 3 Unknown value 0001
+/main/capturesettings/autoexposuremode
+Label: Canon Auto Exposure Mode
+Type: RADIO
+Current: Manual
+Choice: 0 P
+Choice: 1 TV
+Choice: 2 AV
+Choice: 3 Manual
+Choice: 4 Bulb
+Choice: 5 A_DEP
+Choice: 6 DEP
+Choice: 7 Custom
+Choice: 8 Lock
+Choice: 9 Green
+Choice: 10 Night Portrait
+Choice: 11 Sports
+Choice: 12 Portrait
+Choice: 13 Landscape
+Choice: 14 Closeup
+Choice: 15 Flash Off
+/main/capturesettings/drivemode
+Label: Drive Mode
+Type: RADIO
+Current: Single
+Choice: 0 Single
+Choice: 1 Continuous high speed
+Choice: 2 Continuous low speed
+Choice: 3 Timer 10 sec
+Choice: 4 Timer 2 sec
+Choice: 5 Unknown value 0007
+/main/capturesettings/picturestyle
+Label: Picture Style
+Type: RADIO
+Current: Auto
+Choice: 0 Auto
+Choice: 1 Standard
+Choice: 2 Portrait
+Choice: 3 Landscape
+Choice: 4 Unknown value 0088
+Choice: 5 Neutral
+Choice: 6 Faithful
+Choice: 7 Monochrome
+Choice: 8 User defined 1
+Choice: 9 User defined 2
+Choice: 10 User defined 3
+/main/capturesettings/aperture
+Label: Aperture
+Type: RADIO
+Current: 3.5
+Choice: 0 3.5
+Choice: 1 4
+Choice: 2 4.5
+Choice: 3 5
+Choice: 4 5.6
+Choice: 5 6.3
+Choice: 6 7.1
+Choice: 7 8
+Choice: 8 9
+Choice: 9 10
+Choice: 10 11
+Choice: 11 13
+Choice: 12 14
+Choice: 13 16
+Choice: 14 18
+Choice: 15 20
+Choice: 16 22
+/main/capturesettings/shutterspeed
+Label: Shutter Speed
+Type: RADIO
+Current: 1/100
+Choice: 0 bulb
+Choice: 1 30
+Choice: 2 25
+Choice: 3 20
+Choice: 4 15
+Choice: 5 13
+Choice: 6 10
+Choice: 7 8
+Choice: 8 6
+Choice: 9 5
+Choice: 10 4
+Choice: 11 3.2
+Choice: 12 2.5
+Choice: 13 2
+Choice: 14 1.6
+Choice: 15 1.3
+Choice: 16 1
+Choice: 17 0.8
+Choice: 18 0.6
+Choice: 19 0.5
+Choice: 20 0.4
+Choice: 21 0.3
+Choice: 22 1/4
+Choice: 23 1/5
+Choice: 24 1/6
+Choice: 25 1/8
+Choice: 26 1/10
+Choice: 27 1/13
+Choice: 28 1/15
+Choice: 29 1/20
+Choice: 30 1/25
+Choice: 31 1/30
+Choice: 32 1/40
+Choice: 33 1/50
+Choice: 34 1/60
+Choice: 35 1/80
+Choice: 36 1/100
+Choice: 37 1/125
+Choice: 38 1/160
+Choice: 39 1/200
+Choice: 40 1/250
+Choice: 41 1/320
+Choice: 42 1/400
+Choice: 43 1/500
+Choice: 44 1/640
+Choice: 45 1/800
+Choice: 46 1/1000
+Choice: 47 1/1250
+Choice: 48 1/1600
+Choice: 49 1/2000
+Choice: 50 1/2500
+Choice: 51 1/3200
+Choice: 52 1/4000
+/main/capturesettings/meteringmode
+Label: Metering Mode
+Type: RADIO
+Current: Evaluative
+Choice: 0 Evaluative
+Choice: 1 Partial
+Choice: 2 Spot
+Choice: 3 Center-weighted average
+/main/capturesettings/bracketmode
+Label: Bracket Mode
+Type: TEXT
+Current: 0
+/main/capturesettings/aeb
+Label: Auto Exposure Bracketing
+Type: RADIO
+Current: off
+Choice: 0 off
+Choice: 1 +/- 1/3
+Choice: 2 +/- 2/3
+Choice: 3 +/- 1
+Choice: 4 +/- 1 1/3
+Choice: 5 +/- 1 2/3
+Choice: 6 +/- 2
+/main/other/d402
+Label: PTP Property 0xd402
+Type: TEXT
+Current: Canon EOS Rebel T7i
+/main/other/d407
+Label: PTP Property 0xd407
+Type: TEXT
+Current: 1
+/main/other/d406
+Label: PTP Property 0xd406
+Type: TEXT
+Current: Unknown Initiator
+/main/other/d303
+Label: PTP Property 0xd303
+Type: TEXT
+Current: 1
+/main/other/5001
+Label: Battery Level
+Type: MENU
+Current: 100
+Choice: 0 100
+Choice: 1 0
+Choice: 2 75
+Choice: 3 0
+Choice: 4 50
+Camera summary:
+Manufacturer: Canon.Inc
+Model: Canon EOS Rebel T7i
+ Version: 3-1.0.1
+ Serial Number: 2d5d4db01af2448c9c93b651c0c7549
+Vendor Extension ID: 0xb (1.0)
+
+Capture Formats: JPEG
+Display Formats: Association/Directory, Script, DPOF, MS AVI, MS Wave, JPEG, CRW, Unknown(b103), Unknown(bf02), Defined Type, Unknown(b104), Unknown(b105)
+
+Device Capabilities:
+ File Download, File Deletion, File Upload
+ No Image Capture, No Open Capture, Canon EOS Capture, Canon EOS Capture 2
+ Canon Wifi support
+
+Storage Devices Summary:
+store_00020001:
+ StorageDescription: SD
+ VolumeLabel: None
+ Storage Type: Removable RAM (memory card)
+ Filesystemtype: Digital Camera Layout (DCIM)
+ Access Capability: Read-Write
+ Maximum Capability: 62528684032 (59632 MB)
+ Free Space (Bytes): 59257913344 (56512 MB)
+ Free Space (Images): -1
+
+Device Property Summary:
+Property 0xd402:(read only) (type=0xffff) 'Canon EOS Rebel T7i'
+Property 0xd407:(read only) (type=0x6) 1
+Property 0xd406:(readwrite) (type=0xffff) 'Unknown Initiator'
+Property 0xd303:(read only) (type=0x2) 1
+Battery Level(0x5001):(read only) (type=0x2) Enumeration [100,0,75,0,50] value: 100% (100)
+
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 6fa378e6d..9be6c80eb 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -1875,9 +1875,6 @@ static struct {
/* "T. Ludewig" <t.ludewig@gmail.com> */
{"Canon:EOS 100D", 0x04a9, 0x3270, PTP_CAP|PTP_CAP_PREVIEW},
- /* "Lacy Rhoades" <lacy@colordeaf.net> */
- {"Canon:EOS 200D", 0x04a9, 0x32cc, PTP_CAP|PTP_CAP_PREVIEW},
-
/* Ronny Kalusniok <ladiko@gmail.com> */
{"Canon:PowerShot A2500", 0x04a9, 0x3271, PTPBUG_DELETE_SENDS_EVENT},
@@ -1952,9 +1949,16 @@ static struct {
/* https://github.com/gphoto/libgphoto2/issues/84 */
{"Canon:Digital Ixus 180", 0x04a9, 0x32c0, 0},
+ /* Viktors Berstis <gpjm@berstis.com> */
+ {"Canon:EOS Rebel T7i", 0x04a9, 0x32c9, PTP_CAP|PTP_CAP_PREVIEW},
+
/* Daniel Muller, jednatel SourcePaint s.r.o. <dan@sourcepaint.cz> */
{"Canon:EOS 77D", 0x04a9, 0x32cb, PTP_CAP|PTP_CAP_PREVIEW},
+ /* "Lacy Rhoades" <lacy@colordeaf.net> */
+ {"Canon:EOS 200D", 0x04a9, 0x32cc, PTP_CAP|PTP_CAP_PREVIEW},
+
+
/* Konica-Minolta PTP cameras */
{"Konica-Minolta:DiMAGE A2 (PTP mode)", 0x132b, 0x0001, 0},
{"Konica-Minolta:DiMAGE Z2 (PictBridge mode)", 0x132b, 0x0007, 0},
View Lorry Controller Status