Shoot mode "CA+" and "HDR Backlight Control" not identified

Issue #2297 resolved
Licaon Kter created an issue

Yeah yeah, ML is for pros that never switch to anything else other than M(anual), but, on the EOS M there is a mode called CA+, don't really know or care about what it does, only that you can't do anything. You switch to it with the main wheel, the one that switches to Movie too.

While the HDR one, you select it on the screen, it's near Portrait and Landscape and whatever.

Anyway, long story short, when you switch to other modes you get a indicator in the lower bar, that says CA, Tv, Av, etc all 11 photo modes plus 2 in video.

But for these 2 mentioned in the title you only get a "?", so they need a proper definition in src/property.h like #define SHOOTMODE_CAplus 0x??.

How do I go about finding that value?

Comments (8)

  1. Licaon Kter reporter

    @dmilligan:

    • Why not add lua to /modules/Makefile.modules.default in your branch?
    • Also, to make things less confusing, /Makefile.inc might need:
    prepare_install_dir:
    ...
        mkdir -p $(INSTALL_SCRIPTS_DIR)/lib
    ...
    

    and

    install_extra_data: prepare_install_dir
    ...
        $(CP) $(SCRIPT_DIR)/lib/*.lua $(INSTALL_SCRIPTS_DIR)/lib/
    ...
    

    @a1ex: Yes, saw the definitions in lens.c too. Modes are described in the manual at pages 66, 85 and 86. Hopefully you can accept this patch without me needing to branch and PR-it. :P

    --- unified/src/property.h  2015-06-04 14:18:33.464587981 +0400
    +++ lua/src/property.h  2015-06-04 13:47:46.412599444 +0400
    @@ -222,6 +222,7 @@
     #define SHOOTMODE_C2 0x10
     #define SHOOTMODE_C3 0x11
     #define SHOOTMODE_CA 0x13
    +#define SHOOTMODE_AP 0x16
     #define SHOOTMODE_AUTO 9
     #define SHOOTMODE_NOFLASH 0xF
     #define SHOOTMODE_PORTRAIT 0xC
    @@ -229,6 +230,8 @@
     #define SHOOTMODE_MACRO 0xE
     #define SHOOTMODE_SPORTS 0xB
     #define SHOOTMODE_NIGHT 0xA
    +#define SHOOTMODE_NIGHTH 0x17
    +#define SHOOTMODE_HDR 0x18
     #define SHOOTMODE_MOVIE 0x14
    
     // WB in LiveView (and movie) mode
    
    --- unified/src/lens.c  2015-06-04 14:18:33.232587982 +0400
    +++ lua/src/lens.c  2015-06-04 13:47:33.016599461 +0400
    @@ -306,6 +303,7 @@
             shooting_mode == SHOOTMODE_TV ?         "Tv" :
             shooting_mode == SHOOTMODE_AV ?         "Av" :
             shooting_mode == SHOOTMODE_CA ?         "CA" :
    +        shooting_mode == SHOOTMODE_AP ?         "A+" :
             shooting_mode == SHOOTMODE_ADEP ?       "ADEP" :
             shooting_mode == SHOOTMODE_AUTO ?       "Auto" :
             shooting_mode == SHOOTMODE_LANDSCAPE ?  "Landscape" :
    @@ -314,6 +312,8 @@
             shooting_mode == SHOOTMODE_MACRO ?      "Macro" :
             shooting_mode == SHOOTMODE_SPORTS ?     "Sports" :
             shooting_mode == SHOOTMODE_NIGHT ?      "Night" :
    +        shooting_mode == SHOOTMODE_NIGHTH ?     "Handheld Night" :
    +        shooting_mode == SHOOTMODE_HDR ?        "HDR Backlight" :
             shooting_mode == SHOOTMODE_BULB ?       "Bulb" :
             shooting_mode == SHOOTMODE_C ?          "C1" :
             shooting_mode == SHOOTMODE_C2 ?         "C2" :
    @@ -336,6 +336,7 @@
             shooting_mode == SHOOTMODE_TV ?         "Tv" :
             shooting_mode == SHOOTMODE_AV ?         "Av" :
             shooting_mode == SHOOTMODE_CA ?         "CA" :
    +        shooting_mode == SHOOTMODE_AP ?         "A+" :
             shooting_mode == SHOOTMODE_ADEP ?       "AD" :
             shooting_mode == SHOOTMODE_AUTO ?       "[]" :
             shooting_mode == SHOOTMODE_LANDSCAPE ?  "LD" :
    @@ -344,6 +345,8 @@
             shooting_mode == SHOOTMODE_MACRO ?      "MC" :
             shooting_mode == SHOOTMODE_SPORTS ?     "SP" :
             shooting_mode == SHOOTMODE_NIGHT ?      "NI" :
    +        shooting_mode == SHOOTMODE_NIGHTH ?     "NH" :
    +        shooting_mode == SHOOTMODE_HDR ?        "HB" :
             shooting_mode == SHOOTMODE_BULB ?       "B"  :
             shooting_mode == SHOOTMODE_C ?          "C1" :
             shooting_mode == SHOOTMODE_C2 ?         "C2" :
    
  2. David Milligan

    "Why not add lua to /modules/Makefile.modules.default in your branch?"

    To prevent merge conflicts. I prefer to try to avoid merge conflicts so I can merge automatically (even though a merge conflict for this would be easy to fix, it's still a hassle if you merge branches around a lot). I try to only touch core files if I absolutely have to.

    It's always better if you can just submit a PR. I don't want to speak for a1ex, but as a maintainer of a few other projects, I would much prefer somebody submitting a PR, than just posting a diff in an issue tracker (it really shouldn't be much more work to create a PR anyway). That way all I have to do is review it and press a button. Other advantages include: the diff generated by bitbucket is easier to read (b/c it's colored red and green), easier to comment on (you can comment on specific lines in the diff), it's easier to pull and compile/run it, it's easier for you update/resubmit/track changes after review/comments are made, and you get "credit" for the change you made.

    The main reason sites like bitbucket and github and tools like mercurial and git exist is to avoid all the pain and headache that comes with emailing and posting diffs around everywhere.

  3. Log in to comment