added canon eos r6 2

2 files changed, 1015 insertions, 0 deletions

diff --git a/camlibs/ptp2/cameras/canon-eos-r6-2.txt b/camlibs/ptp2/cameras/canon-eos-r6-2.txt
new file mode 100644
index 000000000..fcfd0a304
--- /dev/null
+++ b/camlibs/ptp2/cameras/canon-eos-r6-2.txt
@@ -0,0 +1,1013 @@
+Camera summary:
+Manufacturer: Canon.Inc
+Model: Canon EOS R6m2
+  Version: 3-1.0.0
+  Serial Number: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+Vendor Extension ID: 0xb (1.0)
+Vendor Extension Description: 
+
+Capture Formats: JPEG Unknown(b108) Unknown(b10b) Unknown(b982)
+Display Formats: Association/Directory, Script, DPOF, MS AVI, MS Wave, JPEG, Unknown(b103), Unknown(bf02), Defined Type, Unknown(b105), Unknown(b982), Unknown(b10a), Unknown(b10b), Unknown(b109)
+
+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_00010001:
+	StorageDescription: SD1
+	VolumeLabel: 
+	Storage Type: Removable RAM (memory card)
+	Filesystemtype: Digital Camera Layout (DCIM)
+	Access Capability: Read-Write
+	Maximum Capability: 61874372608 (59008 MB)
+	Free Space (Bytes): 24193925120 (23073 MB)
+	Free Space (Images): -1
+store_00020001:
+	StorageDescription: SD2
+	VolumeLabel: 
+	Storage Type: Removable RAM (memory card)
+	Filesystemtype: Digital Camera Layout (DCIM)
+	Access Capability: Read-Write
+	Maximum Capability: 61874372608 (59008 MB)
+	Free Space (Bytes): 24194318336 (23073 MB)
+	Free Space (Images): -1
+
+Device Property Summary:
+Property 0xd402:(read only) (type=0xffff) 'Canon EOS R6m2'
+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: 90% (90)
+
+/main/actions/syncdatetimeutc
+Label: Synchronize camera date and time with PC
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/actions/syncdatetime
+Label: Synchronize camera date and time with PC
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/actions/uilock
+Label: UI Lock
+Readonly: 0
+Type: TOGGLE
+Current: 2
+END
+/main/actions/popupflash
+Label: Popup Flash
+Readonly: 0
+Type: TOGGLE
+Current: 2
+END
+/main/actions/autofocusdrive
+Label: Drive Canon DSLR Autofocus
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/actions/manualfocusdrive
+Label: Drive Canon DSLR Manual focus
+Readonly: 0
+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
+END
+/main/actions/cancelautofocus
+Label: Cancel Canon DSLR Autofocus
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/actions/eoszoom
+Label: Canon EOS Zoom
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/actions/eoszoomposition
+Label: Canon EOS Zoom Position
+Readonly: 0
+Type: TEXT
+Current: 0,0
+END
+/main/actions/viewfinder
+Label: Canon EOS Viewfinder
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/actions/eosremoterelease
+Label: Canon EOS Remote Release
+Readonly: 0
+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
+END
+/main/actions/eosmoviemode
+Label: Movie Mode
+Readonly: 0
+Type: TOGGLE
+Current: 2
+END
+/main/actions/opcode
+Label: PTP Opcode
+Readonly: 0
+Type: TEXT
+Current: 0x1001,0xparam1,0xparam2
+END
+/main/settings/datetimeutc
+Label: Camera Date and Time
+Readonly: 0
+Type: DATE
+Current: 1671560504
+Printable: Tue 20 Dec 2022 10:21:44 AM PST
+Help: Use 'now' as the current time when setting.
+
+END
+/main/settings/datetime
+Label: Camera Date and Time
+Readonly: 0
+Type: DATE
+Current: 1671560504
+Printable: Tue 20 Dec 2022 10:21:44 AM PST
+Help: Use 'now' as the current time when setting.
+
+END
+/main/settings/output
+Label: Camera Output
+Readonly: 0
+Type: RADIO
+Current: TFT
+Choice: 0 Off
+Choice: 1 TFT
+Choice: 2 PC
+Choice: 3 TFT + PC
+Choice: 4 MOBILE
+Choice: 5 TFT + MOBILE
+Choice: 6 PC + MOBILE
+Choice: 7 TFT + PC + MOBILE
+Choice: 8 MOBILE2
+Choice: 9 TFT + MOBILE2
+Choice: 10 PC + MOBILE2
+Choice: 11 TFT + PC + MOBILE2
+END
+/main/settings/movierecordtarget
+Label: Recording Destination
+Readonly: 0
+Type: RADIO
+Current: SDRAM
+Choice: 0 Card
+Choice: 1 None
+Choice: 2 SDRAM
+END
+/main/settings/evfmode
+Label: EVF Mode
+Readonly: 0
+Type: RADIO
+Current: 1
+Choice: 0 1
+END
+/main/settings/ownername
+Label: Owner Name
+Readonly: 0
+Type: TEXT
+Current: 
+END
+/main/settings/artist
+Label: Artist
+Readonly: 0
+Type: TEXT
+Current: 
+END
+/main/settings/copyright
+Label: Copyright
+Readonly: 0
+Type: TEXT
+Current: 
+END
+/main/settings/nickname
+Label: Nickname
+Readonly: 0
+Type: TEXT
+Current: EOSR6m2_LISA
+END
+/main/settings/customfuncex
+Label: Custom Functions Ex
+Readonly: 0
+Type: TEXT
+Current: 20,1,6,14,1,102,1,0,
+END
+/main/settings/focusarea
+Label: Focus Area
+Readonly: 0
+Type: TEXT
+Current: 127
+END
+/main/settings/strobofiring
+Label: Strobo Firing
+Readonly: 0
+Type: RADIO
+Current: 0
+Choice: 0 0
+Choice: 1 1
+END
+/main/settings/flashcharged
+Label: Flash Charging State
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/settings/oneshotrawon
+Label: One Shot Raw On
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/settings/autopoweroff
+Label: Auto Power Off
+Readonly: 0
+Type: RADIO
+Current: 30
+Choice: 0 15
+Choice: 1 30
+Choice: 2 60
+Choice: 3 180
+Choice: 4 300
+Choice: 5 600
+Choice: 6 1800
+Choice: 7 0
+Choice: 8 4294967295
+END
+/main/settings/depthoffield
+Label: Depth of Field
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/settings/capturetarget
+Label: Capture Target
+Readonly: 0
+Type: RADIO
+Current: Internal RAM
+Choice: 0 Internal RAM
+Choice: 1 Memory card
+END
+/main/settings/capture
+Label: Capture
+Readonly: 0
+Type: TOGGLE
+Current: 0
+END
+/main/settings/remotemode
+Label: Remote Mode
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/settings/eventmode
+Label: Event Mode
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/status/serialnumber
+Label: Serial Number
+Readonly: 0
+Type: TEXT
+Current: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+END
+/main/status/manufacturer
+Label: Camera Manufacturer
+Readonly: 0
+Type: TEXT
+Current: Canon.Inc
+END
+/main/status/cameramodel
+Label: Camera Model
+Readonly: 0
+Type: TEXT
+Current: Canon EOS R6m2
+END
+/main/status/deviceversion
+Label: Device Version
+Readonly: 0
+Type: TEXT
+Current: 3-1.0.0
+END
+/main/status/vendorextension
+Label: Vendor Extension
+Readonly: 0
+Type: TEXT
+Current: 
+END
+/main/status/model
+Label: Camera Model
+Readonly: 0
+Type: TEXT
+Current: 2147484801
+END
+/main/status/Battery Level
+Label: Battery Level
+Readonly: 1
+Type: TEXT
+Current: 89%
+END
+/main/status/batterylevel
+Label: Battery Level
+Readonly: 0
+Type: TEXT
+Current: 100%
+END
+/main/status/lensname
+Label: Lens Name
+Readonly: 0
+Type: TEXT
+Current: RF70-200mm F4 L IS USM
+END
+/main/status/eosserialnumber
+Label: Serial Number
+Readonly: 0
+Type: TEXT
+Current: nnnnnnnnnnnn
+END
+/main/status/availableshots
+Label: Available Shots
+Readonly: 0
+Type: TEXT
+Current: 36867
+END
+/main/status/eosmovieswitch
+Label: Movie Switch
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/imgsettings/imageformat
+Label: Image Format
+Readonly: 0
+Type: RADIO
+Current: RAW
+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 cRAW + Large Fine JPEG
+Choice: 8 cRAW + Large Normal JPEG
+Choice: 9 RAW + Large Fine JPEG
+Choice: 10 RAW + Large Normal JPEG
+Choice: 11 cRAW + Medium Fine JPEG
+Choice: 12 cRAW + Medium Normal JPEG
+Choice: 13 RAW + Medium Fine JPEG
+Choice: 14 RAW + Medium Normal JPEG
+Choice: 15 cRAW + Small Fine JPEG
+Choice: 16 cRAW + Small Normal JPEG
+Choice: 17 RAW + Small Fine JPEG
+Choice: 18 RAW + Small Normal JPEG
+Choice: 19 cRAW + Smaller JPEG
+Choice: 20 RAW + Smaller JPEG
+Choice: 21 RAW
+Choice: 22 cRAW
+END
+/main/imgsettings/imageformatsd
+Label: Image Format SD
+Readonly: 0
+Type: RADIO
+Current: RAW
+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 cRAW + Large Fine JPEG
+Choice: 8 cRAW + Large Normal JPEG
+Choice: 9 RAW + Large Fine JPEG
+Choice: 10 RAW + Large Normal JPEG
+Choice: 11 cRAW + Medium Fine JPEG
+Choice: 12 cRAW + Medium Normal JPEG
+Choice: 13 RAW + Medium Fine JPEG
+Choice: 14 RAW + Medium Normal JPEG
+Choice: 15 cRAW + Small Fine JPEG
+Choice: 16 cRAW + Small Normal JPEG
+Choice: 17 RAW + Small Fine JPEG
+Choice: 18 RAW + Small Normal JPEG
+Choice: 19 cRAW + Smaller JPEG
+Choice: 20 RAW + Smaller JPEG
+Choice: 21 RAW
+Choice: 22 cRAW
+END
+/main/imgsettings/imageformatcf
+Label: Image Format CF
+Readonly: 0
+Type: RADIO
+Current: RAW
+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 cRAW + Large Fine JPEG
+Choice: 8 cRAW + Large Normal JPEG
+Choice: 9 RAW + Large Fine JPEG
+Choice: 10 RAW + Large Normal JPEG
+Choice: 11 cRAW + Medium Fine JPEG
+Choice: 12 cRAW + Medium Normal JPEG
+Choice: 13 RAW + Medium Fine JPEG
+Choice: 14 RAW + Medium Normal JPEG
+Choice: 15 cRAW + Small Fine JPEG
+Choice: 16 cRAW + Small Normal JPEG
+Choice: 17 RAW + Small Fine JPEG
+Choice: 18 RAW + Small Normal JPEG
+Choice: 19 cRAW + Smaller JPEG
+Choice: 20 RAW + Smaller JPEG
+Choice: 21 RAW
+Choice: 22 cRAW
+END
+/main/imgsettings/iso
+Label: ISO Speed
+Readonly: 0
+Type: RADIO
+Current: Unknown value 0003
+Choice: 0 Auto
+Choice: 1 100
+Choice: 2 125
+Choice: 3 160
+Choice: 4 200
+Choice: 5 250
+Choice: 6 320
+Choice: 7 400
+Choice: 8 500
+Choice: 9 640
+Choice: 10 800
+Choice: 11 1000
+Choice: 12 1250
+Choice: 13 1600
+Choice: 14 2000
+Choice: 15 2500
+Choice: 16 3200
+Choice: 17 4000
+Choice: 18 5000
+Choice: 19 6400
+Choice: 20 8000
+Choice: 21 10000
+Choice: 22 12800
+Choice: 23 16000
+Choice: 24 20000
+Choice: 25 25600
+Choice: 26 32000
+Choice: 27 40000
+Choice: 28 51200
+Choice: 29 Unknown value 0093
+Choice: 30 Unknown value 0095
+Choice: 31 102400
+Choice: 32 Unknown value 0003
+END
+/main/imgsettings/whitebalance
+Label: WhiteBalance
+Readonly: 0
+Type: RADIO
+Current: AWB White
+Choice: 0 Auto
+Choice: 1 Daylight
+Choice: 2 Shadow
+Choice: 3 Cloudy
+Choice: 4 Tungsten
+Choice: 5 Fluorescent
+Choice: 6 Flash
+Choice: 7 Manual
+Choice: 8 Color Temperature
+Choice: 9 AWB White
+END
+/main/imgsettings/colortemperature
+Label: Color Temperature
+Readonly: 0
+Type: RADIO
+Current: 5200
+Choice: 0 2500
+Choice: 1 2600
+Choice: 2 2700
+Choice: 3 2800
+Choice: 4 2900
+Choice: 5 3000
+Choice: 6 3100
+Choice: 7 3200
+Choice: 8 3300
+Choice: 9 3400
+Choice: 10 3500
+Choice: 11 3600
+Choice: 12 3700
+Choice: 13 3800
+Choice: 14 3900
+Choice: 15 4000
+Choice: 16 4100
+Choice: 17 4200
+Choice: 18 4300
+Choice: 19 4400
+Choice: 20 4500
+Choice: 21 4600
+Choice: 22 4700
+Choice: 23 4800
+Choice: 24 4900
+Choice: 25 5000
+Choice: 26 5100
+Choice: 27 5200
+Choice: 28 5300
+Choice: 29 5400
+Choice: 30 5500
+Choice: 31 5600
+Choice: 32 5700
+Choice: 33 5800
+Choice: 34 5900
+Choice: 35 6000
+Choice: 36 6100
+Choice: 37 6200
+Choice: 38 6300
+Choice: 39 6400
+Choice: 40 6500
+Choice: 41 6600
+Choice: 42 6700
+Choice: 43 6800
+Choice: 44 6900
+Choice: 45 7000
+Choice: 46 7100
+Choice: 47 7200
+Choice: 48 7300
+Choice: 49 7400
+Choice: 50 7500
+Choice: 51 7600
+Choice: 52 7700
+Choice: 53 7800
+Choice: 54 7900
+Choice: 55 8000
+Choice: 56 8100
+Choice: 57 8200
+Choice: 58 8300
+Choice: 59 8400
+Choice: 60 8500
+Choice: 61 8600
+Choice: 62 8700
+Choice: 63 8800
+Choice: 64 8900
+Choice: 65 9000
+Choice: 66 9100
+Choice: 67 9200
+Choice: 68 9300
+Choice: 69 9400
+Choice: 70 9500
+Choice: 71 9600
+Choice: 72 9700
+Choice: 73 9800
+Choice: 74 9900
+Choice: 75 10000
+END
+/main/imgsettings/whitebalanceadjusta
+Label: WhiteBalance Adjust A
+Readonly: 0
+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
+END
+/main/imgsettings/whitebalanceadjustb
+Label: WhiteBalance Adjust B
+Readonly: 0
+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
+END
+/main/imgsettings/whitebalancexa
+Label: WhiteBalance X A
+Readonly: 0
+Type: RADIO
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+END
+/main/imgsettings/whitebalancexb
+Label: WhiteBalance X B
+Readonly: 0
+Type: RADIO
+Current: 0
+Choice: 0 0
+Choice: 1 1
+Choice: 2 2
+Choice: 3 3
+END
+/main/imgsettings/colorspace
+Label: Color Space
+Readonly: 0
+Type: RADIO
+Current: sRGB
+Choice: 0 sRGB
+Choice: 1 AdobeRGB
+END
+/main/capturesettings/zoomspeed
+Label: Zoom Speed
+Readonly: 0
+Type: TEXT
+Current: 0
+END
+/main/capturesettings/exposurecompensation
+Label: Exposure Compensation
+Readonly: 0
+Type: RADIO
+Current: 0
+Choice: 0 0
+END
+/main/capturesettings/focusmode
+Label: Focus Mode
+Readonly: 0
+Type: RADIO
+Current: One Shot
+Choice: 0 One Shot
+Choice: 1 AI Servo
+Choice: 2 AI Focus
+END
+/main/capturesettings/continuousaf
+Label: Continuous AF
+Readonly: 0
+Type: RADIO
+Current: Off
+Choice: 0 Off
+Choice: 1 On
+END
+/main/capturesettings/aspectratio
+Label: Aspect Ratio
+Readonly: 0
+Type: RADIO
+Current: 3:2
+Choice: 0 3:2
+Choice: 1 1:1
+Choice: 2 4:3
+Choice: 3 16:9
+Choice: 4 1.6x
+END
+/main/capturesettings/storageid
+Label: Storage Device
+Readonly: 0
+Type: TEXT
+Current: 00020001
+END
+/main/capturesettings/highisonr
+Label: High ISO Noise Reduction
+Readonly: 0
+Type: RADIO
+Current: Off
+Choice: 0 Off
+Choice: 1 Low
+Choice: 2 Normal
+Choice: 3 High
+END
+/main/capturesettings/autoexposuremode
+Label: Canon Auto Exposure Mode
+Readonly: 0
+Type: RADIO
+Current: Fv
+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
+Choice: 16 Auto
+Choice: 17 Handheld Night Scene
+Choice: 18 HDR Backlight Control
+Choice: 19 Food
+Choice: 20 Grainy B/W
+Choice: 21 Soft focus
+Choice: 22 Toy camera effect
+Choice: 23 Fish-eye effect
+Choice: 24 Water painting effect
+Choice: 25 Miniature effect
+Choice: 26 HDR art standard
+Choice: 27 HDR art vivid
+Choice: 28 HDR art bold
+Choice: 29 HDR art embossed
+Choice: 30 Panning
+Choice: 31 Self Portrait
+Choice: 32 Hybrid Auto
+Choice: 33 Smooth skin
+Choice: 34 Fv
+END
+/main/capturesettings/autoexposuremodedial
+Label: Canon Auto Exposure Mode Dial
+Readonly: 0
+Type: RADIO
+Current: Fv
+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
+Choice: 16 Auto
+Choice: 17 Handheld Night Scene
+Choice: 18 HDR Backlight Control
+Choice: 19 Food
+Choice: 20 Grainy B/W
+Choice: 21 Soft focus
+Choice: 22 Toy camera effect
+Choice: 23 Fish-eye effect
+Choice: 24 Water painting effect
+Choice: 25 Miniature effect
+Choice: 26 HDR art standard
+Choice: 27 HDR art vivid
+Choice: 28 HDR art bold
+Choice: 29 HDR art embossed
+Choice: 30 Panning
+Choice: 31 Self Portrait
+Choice: 32 Hybrid Auto
+Choice: 33 Smooth skin
+Choice: 34 Fv
+END
+/main/capturesettings/drivemode
+Label: Drive Mode
+Readonly: 0
+Type: RADIO
+Current: Single
+Choice: 0 Single
+Choice: 1 Super high speed continuous shooting
+Choice: 2 Continuous high speed
+Choice: 3 Continuous low speed
+Choice: 4 Timer 10 sec
+Choice: 5 Timer 2 sec
+Choice: 6 Continuous timer
+END
+/main/capturesettings/picturestyle
+Label: Picture Style
+Readonly: 0
+Type: RADIO
+Current: Auto
+Choice: 0 Standard
+Choice: 1 Portrait
+Choice: 2 Landscape
+Choice: 3 Neutral
+Choice: 4 Faithful
+Choice: 5 Monochrome
+Choice: 6 Auto
+Choice: 7 Fine detail
+Choice: 8 User defined 1
+Choice: 9 User defined 2
+Choice: 10 User defined 3
+END
+/main/capturesettings/aperture
+Label: Aperture
+Readonly: 0
+Type: RADIO
+Current: 32
+Choice: 0 Unknown value 00ff
+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
+Choice: 17 25
+Choice: 18 29
+Choice: 19 32
+END
+/main/capturesettings/shutterspeed
+Label: Shutter Speed
+Readonly: 0
+Type: RADIO
+Current: 30
+Choice: 0 bulb
+Choice: 1 30
+Choice: 2 25
+Choice: 3 20
+Choice: 4 15
+Choice: 5 13
+Choice: 6 10.3
+Choice: 7 8
+Choice: 8 6.3
+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
+Choice: 53 1/5000
+Choice: 54 1/6400
+Choice: 55 1/8000
+END
+/main/capturesettings/meteringmode
+Label: Metering Mode
+Readonly: 0
+Type: RADIO
+Current: Evaluative
+Choice: 0 Spot
+Choice: 1 Evaluative
+Choice: 2 Partial
+Choice: 3 Center-weighted average
+END
+/main/capturesettings/liveviewsize
+Label: Live View Size
+Readonly: 0
+Type: RADIO
+Current: val 1
+Choice: 0 Large
+Choice: 1 Medium
+Choice: 2 Small
+END
+/main/capturesettings/bracketmode
+Label: Bracket Mode
+Readonly: 0
+Type: RADIO
+Current: Unknown value 0000
+Choice: 0 Unknown value 0000
+END
+/main/capturesettings/aeb
+Label: Auto Exposure Bracketing
+Readonly: 0
+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
+Choice: 7 +/- 2 1/3
+Choice: 8 +/- 2 2/3
+Choice: 9 +/- 3
+END
+/main/capturesettings/alomode
+Label: Auto Lighting Optimization
+Readonly: 0
+Type: RADIO
+Current: Standard (disabled in manual exposure)
+Choice: 0 Standard (disabled in manual exposure)
+Choice: 1 x1
+Choice: 2 x2
+Choice: 3 x3
+END
+/main/other/d402
+Label: PTP Property 0xd402
+Readonly: 1
+Type: TEXT
+Current: Canon EOS R6m2
+END
+/main/other/d407
+Label: PTP Property 0xd407
+Readonly: 1
+Type: TEXT
+Current: 1
+END
+/main/other/d406
+Label: PTP Property 0xd406
+Readonly: 0
+Type: TEXT
+Current: Unknown Initiator
+END
+/main/other/d303
+Label: PTP Property 0xd303
+Readonly: 1
+Type: TEXT
+Current: 1
+END
+/main/other/5001
+Label: Battery Level
+Readonly: 1
+Type: MENU
+Current: 89
+Choice: 0 100
+Choice: 1 0
+Choice: 2 75
+Choice: 3 0
+Choice: 4 50
+END
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 4b3900aad..aa334c943 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -2500,6 +2500,8 @@ static struct {
 	{"Canon:EOS M50m2",			0x04a9, 0x32f9, PTP_CAP|PTP_CAP_PREVIEW},
 	/* Ingmar Rieger via email */
 	{"Canon:EOS R5 C",			0x04a9, 0x3303, PTP_CAP|PTP_CAP_PREVIEW},
+	/* https://github.com/gphoto/libgphoto2/issues/881 */
+	{"Canon:EOS R6 2",			0x04a9, 0x330b, PTP_CAP|PTP_CAP_PREVIEW},
 
 	/* Konica-Minolta PTP cameras */
 	{"Konica-Minolta:DiMAGE A2 (PTP mode)",        0x132b, 0x0001, 0},