Skip to content

Dot-Tune AFMA fixes

Alex requested to merge branch/dot-tune into branch/unified

Issue reported by ayshih:

  • The 7D is not one of the three cameras (50D, 5D2, and 5D3) that currently have CONFIG_AFMA_EXTENDED defined in their respective internals.h, so the AFMA values stop at +/-20 instead of +/-100. Presumably someone needs to confirm that the 7D can accept extended AFMA values without problem.
  • The DotTune module is slightly broken currently because it still has checks for CONFIG_AFMA_EXTENDED and CONFIG_AFMA_WIDE_TELE despite being a module now. This needs to be fixed by replacing with functions and variables from afma.c. In the meantime, no camera will show the options for extended fixed ranges (+/-40 or +/-100), but cameras with CONFIG_AFMA_EXTENDED defined will be able to access extended values in Auto range detection.

For 1, I've assumed all cameras can use the extended range (need to check 7D). If that's true, it simplifies things.

For 2, I've replaced the ifdef's with plain if's, and fixed the menu.

I did not test any of the changes, other than menu functionality.

TODO: the module used to scan in both directions, to avoid influcence from any dead times that might occur when ramping the AFMA value. This seems to be broken.

Merge request reports