Author Topic: 500D control such as 5D II.  (Read 33768 times)

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #25 on: December 03, 2012, 02:20:04 AM »
thanks for the test  ;)

isomenu_flash_control we can add to the main repository?
We need a description of this function, the name and the place;)

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #26 on: December 03, 2012, 02:33:45 AM »
thanks for the test  ;)

isomenu_flash_control we can add to the main repository?
We need a description of this function, the name and the place;)

Try to compile from my fork i've added those in consts.h for 600D:

Code: [Select]
#define DLG_INFO 0x14  // info screen
 #define DLG_TEMP_WARNING_LV 0x1A // Camera internal temperature is becoming too high. Live View shooting not possible
 #define DLG_TEMP_WARNING_ALL 0x1B // Camera internal temperature is becoming too high. Can't shoot.
 #define DLG_LV_CHANGE_MAYBE 0x1C // when used goes to Live View in M mode
 #define DLG_ERROR 0x1D // Shows Err 00 when used
 #define DLG_WARNING 0x21 // Shows only ! icons
 #define DLG_Q_MENU 0x23 // Q menu active
 #define DLG_Q_SHUTTER 0x24 // Q shutter setting
 #define DLG_Q_APERTURE 0x25 // Q aperture setting
 #define DLG_Q_ISO 0x26 // ISO Q menu
 #define DLG_Q_EXP_COMP_AEB 0x27 // Q Exposition compensation and AEB
 #define DLG_Q_FLASH_EXP_COMP 0x28 // Q flash exp. compesation
 #define DLG_Q_PICTURE_STYLE 0x2A // Q pic style
 #define DLG_Q_WB 0x2B // Q white balance
 #define DLG_Q_METER_MODE 0x2C // Q metering mode
 #define DLG_Q_QUALITY 0x2D // Q pic quality
 #define DLG_Q_AF_MODE 0x2E // Q AF mode
 #define DLG_Q_DRIVE_MODE 0x2F // Q drive mode
 #define DLG_Q_ALO 0x31 // Q Auto Light optimizer settings
 #define DLG_CA_SHOOT_BY_AMB 0x32 // CA - Shoot by ambience selection
 #define DLG_CA_SHOOT_BY_LIGHT 0x33 // CA - Shoot by lighting or scene type
 #define DLG_Q_FLASH_SET 0x36 // Q flash settings

for 500D you need to check those in platform/500D.111/consts.h after that it should work ok:
// #define DLG_Q_WB 0x?? // Q white balance
// #define DLG_Q_DRIVE_MODE 0x?? // Q drive mode

i've added in 500D and 600D features.h
#define FEATURE_MORE_MENU_OPTION
adn in shoot.c and gui-common.c
#ifdef FEATURE_MORE_MENU_OPTION for each addition.
also changed a little the first part so to have settings saved in ML pref:
Code: [Select]
#ifdef FEATURE_MORE_MENU_OPTION
static CONFIG_INT("wbmenu.manual.control.enabled", wbmenu_manual_control_enabled, 1);
static CONFIG_INT("isomenu.flash.control.enabled", isomenu_flash_control_enabled, 1);
static CONFIG_INT("drivemenu.metering.control.enabled", drivemenu_metering_control_enabled, 1);
int drivemenu_metering_value = 0;
#endif
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #27 on: December 03, 2012, 02:36:13 AM »
pushed now.
If someone can suggest a better naming for menu items would be great, I think that mine actually is not so clear...

Code: [Select]
"More options for menu", <- this is what i don't like more ;)
          "ISO - FLash Comp. in ISO menu."
           "WB - Manual WB in WB menu."
           "Drive - Meter Mode in Drive menu."
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #28 on: December 03, 2012, 02:49:09 AM »
For ISO and WB we change from base screen to Q screen and there is a flick from one screen to the other. can we override a button press?
If from photo screen we can disable up arrow for canon firmware and instead open WB Q screen we will have no flick,
but is this possible?
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #29 on: December 03, 2012, 03:00:14 AM »
If I can do it, we can do it for WB menu.

So we can try, but I will be flickering :
Code: [Select]
if(event->param == BGMT_PRESS_UP)
{
fake_simple_button(BGMT_PRESS_LEFT)
}

The ISO menu (on the ISO button) is not possible on the 500D, left-right buttons return value 0x3f.

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #30 on: December 03, 2012, 03:22:39 AM »
For 500D:
Code: [Select]
#define DLG_Q_ISO 0x1F
#define DLG_Q_WB 6
#define DLG_Q_DRIVE_MODE 9

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #31 on: December 03, 2012, 03:28:08 AM »
For 500D:
Code: [Select]
#define DLG_Q_ISO 0x1F
#define DLG_Q_WB 6
#define DLG_Q_DRIVE_MODE 9
Good, added and compiled right. sent you a download link for testing.
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #32 on: December 03, 2012, 03:39:46 PM »
ALex told me how to override up button, so now there is no more flick when entering DLG_Q_WB, i'm thinking about adding Q dialog to all the other two button so to have a consisten behavior from menu (and also i like more to don't have to use set button with this new feature for changing settings.)
SET can be used to close Q dialog and mode faking halfshutter i suppose, that way it will reduce confusion to who is used to confirm selection with set.
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #33 on: December 03, 2012, 04:04:43 PM »
I made a patch for the main consts.c 500D
DLG_FLASH_AE, this is the Q menu, flash exposure compensation?

Code: [Select]
#define CURRENT_DIALOG_MAYBE (*(int*)0x3a9c) // ok
#define DLG_WB 0x24 // 6
#define DLG_FOCUS_MODE 0x27 // a ?
#define DLG_DRIVE_MODE 0x28 // 9
#define DLG_PICTURE_STYLE 0x23 // 5
#define DLG_PLAY 1 // ok
#define DLG_MENU 2 // ok
#define DLG_Q_UNAVI 0x1E // ok

+#define DLG_Q_WB 0x24 // ok
+#define DLG_Q_FOCUS_MODE 0x27 // ok
+#define DLG_Q_DRIVE_MODE 0x28 // ok
+#define DLG_Q_PICTURE_STYLE 0x23 // ok
+#define DLG_Q_METER_MODE 0x25 // ok
+#define DLG_Q_PICQ 0x26 // ok

#define DLG_FLASH_AE 0x21 // ?
- #define DLG_PICQ 0x26 // wrong value
#define DLG_MOVIE_ENSURE_A_LENS_IS_ATTACHED (CURRENT_DIALOG_MAYBE == 0x1B) // ok
#define DLG_MOVIE_PRESS_LV_TO_RESUME (CURRENT_DIALOG_MAYBE == 0x1B) //?


We can even add a function to the AF mode menu.
Maybe someone has an idea, what would it be able to function?

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #34 on: December 03, 2012, 04:42:20 PM »
I made a patch for the main consts.c 500D
DLG_FLASH_AE, this is the Q menu, flash exposure compensation?
NO, DLG_Q_FLASH_EXP_COMP is.

I have not idea what it is, seems wrong on 600D 0x22 don't show any dialog.
For focus dialog it's already used for togglin trap focus is in manual focus, so you need to think to something that is useful in auto focus only. I didn't figured out nothing so far :)
But instead i've added an option to overrride picstyle dialog (unused by me) with Pic Quality selection (that i was having on SET with CF.N. and now is for opening canon's MyMenu)
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

a1ex

  • Administrator
  • Hero Member
  • *****
  • Posts: 12255
  • Emergencies only
Re: 500D control such as 5D II.
« Reply #35 on: December 03, 2012, 04:45:47 PM »
They are the same, one needs renaming.

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #36 on: December 03, 2012, 04:48:41 PM »
This is the 21 on the 500D :

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #37 on: December 03, 2012, 05:01:41 PM »
This is the 21 on the 500D :

ok mine is 28 on 600D keeping DLG_Q_FLASH_EXP_COMP in all consts.h pushing now.
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #38 on: December 03, 2012, 06:03:07 PM »
Go to the DLG_Q does not always work

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #39 on: December 03, 2012, 06:25:53 PM »
Go to the DLG_Q does not always work
looking at it. same on 600D
pushed fix, was an unnecessary check also made some clean-up and renamed it to: FEATURE_DIALOG_OPTION (seems more clear)
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #40 on: December 03, 2012, 08:03:54 PM »
You can change the parameters when the LCD is off.

Looks like it works on 500D
I'd only removed the redraw () from the code. On the 500D looks better without it.

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #41 on: December 03, 2012, 08:07:15 PM »
You can change the parameters when the LCD is off.

Looks like it works on 500D
I'd only removed the redraw () from the code. On the 500D looks better without it.
ok i'll try again here a video of it on 600D: https://www.dropbox.com/s/6a6w91kaksvbp1v/2012-12-03%2018.45.28.3gp
EDIT: works for me too without redraw().
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #42 on: December 03, 2012, 08:14:29 PM »
small correction, improves error "10000K 9900KK"
Code: [Select]
-bmp_printf(FONT(FONT_LARGE, COLOR_FG_NONLV, bg), 35, 365,"Kelvin WB: %dK",  wb_k);
+bmp_printf(FONT(FONT_LARGE, COLOR_FG_NONLV, bg), 35, 365,"Kelvin WB: %dK%s",  wb_k, " ");

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #43 on: December 03, 2012, 08:45:06 PM »
there is still a problem in LV, arrow buttons get overridden too.
Code: [Select]
-    if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event))  // override standard button dialogs
+    if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event) && !lv)  // override standard button dialogs
fixed
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #44 on: December 03, 2012, 08:51:29 PM »

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #45 on: December 03, 2012, 08:56:37 PM »
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #46 on: December 03, 2012, 08:59:46 PM »
should work:
Code: [Select]
-if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event))  // override standard button dialogs
+if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event) && !lv)  // override standard button dialogs

ops, you were faster ;)


If we, for example, in WB MENU and press the SET button. Go to DLG_Q_UNAVI. It can make a shortcut to the DLG = 0?

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #47 on: December 03, 2012, 09:51:22 PM »
should work:
Code: [Select]
-if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event))  // override standard button dialogs
+if (CURRENT_DIALOG_MAYBE == 0 && !IS_FAKE(event) && !lv)  // override standard button dialogs

ops, you were faster ;)


If we, for example, in WB MENU and press the SET button. Go to DLG_Q_UNAVI. It can make a shortcut to the DLG = 0?
I'm thinking to make SET act like halfshutter to go to DLG = 0

but also this works:
Code: [Select]
kelvin_toggle(-1, -1);
}
+ if(!IS_FAKE(event))
+ {
+ if (event->param == BGMT_PRESS_SET)
+ {
+       SetGUIRequestMode(0);
+       return 0;
+       }
+ }

pushed it.
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-

Greg

  • Contributor
  • Hero Member
  • *****
  • Posts: 589
Re: 500D control such as 5D II.
« Reply #48 on: December 03, 2012, 11:26:10 PM »
The need for the AF mode yet.
It seems to work well.

scrax

  • Contributor
  • Hero Member
  • *****
  • Posts: 1543
  • Code monkey
Re: 500D control such as 5D II.
« Reply #49 on: December 04, 2012, 12:37:58 AM »
The need for the AF mode yet.
It seems to work well.
added, I'm thinking how to remove ISO flick.
Is possible to add the overlay to the iso menu without calling the Q one but can't change values.

Code: [Select]
+        if(DISPLAY_IS_ON && !lv && ISO_ADJUSTMENT_ACTIVE == 1 && CURRENT_DIALOG_MAYBE == 0)
-        if(DISPLAY_IS_ON && !lv)
-        {
-        if(ISO_ADJUSTMENT_ACTIVE == 1)if (CURRENT_DIALOG_MAYBE == 0) SetGUIRequestMode(DLG_Q_ISO);
-        }
-        if(CURRENT_DIALOG_MAYBE == DLG_Q_ISO)
I'm using ML2.3 for photography with:
EOS 600DML | EOS 400Dplus | EOS 5D MLbeta5- EF 100mm f/2.8 USM Macro  - EF-S 17-85mm f4-5.6 IS USM - EF 70-200mm f/4 L USM - 580EXII - OsX, PS, LR, RawTherapee, LightZone -no video experience-