Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add canon shutterspeed and afmethod config property values from the R8 #999

Merged
merged 1 commit into from
Sep 4, 2024
Merged

add canon shutterspeed and afmethod config property values from the R8 #999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions camlibs/ptp2/cameras/canon-eos-r8.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,15 +762,15 @@ END
Label: AF Method
Readonly: 0
Type: RADIO
Current: Unknown value 000e
Current: WholeAreaAF
Choice: 0 LiveSpotAF
Choice: 1 Live
Choice: 2 LiveSingleExpandCross
Choice: 3 LiveSingleExpandSurround
Choice: 4 Unknown value 000b
Choice: 5 Unknown value 000c
Choice: 6 Unknown value 000d
Choice: 7 Unknown value 000e
Choice: 4 FlexibleZoneAF1
Choice: 5 FlexibleZoneAF2
Choice: 6 FlexibleZoneAF3
Choice: 7 WholeAreaAF
END
/main/capturesettings/storageid
Label: Storage Device
Expand Down
5 changes: 5 additions & 0 deletions camlibs/ptp2/config.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2474,6 +2474,7 @@ static struct deviceproptableu16 canon_shutterspeed[] = {
{ "1/6000", 0x009c,0 },
{ "1/6400", 0x009d,0 },
{ "1/8000", 0x00a0,0 },
{ "1/16000", 0x00a8,0 },
};
GENERIC16TABLE(Canon_ShutterSpeed,canon_shutterspeed)

Expand Down Expand Up @@ -2567,6 +2568,10 @@ static struct deviceproptableu32 canon_eos_afmethod[] = {
{ N_("LiveZoneLargeV"), 8, 0 },
{ N_("LiveCatchAF"), 9, 0 },
{ N_("LiveSpotAF"), 10, 0 },
{ N_("FlexibleZoneAF1"), 11, 0 },
{ N_("FlexibleZoneAF2"), 12, 0 },
{ N_("FlexibleZoneAF3"), 13, 0 },
{ N_("WholeAreaAF"), 14, 0 },
};
GENERIC32TABLE(Canon_EOS_AFMethod,canon_eos_afmethod)

Expand Down
Loading