Changeset 1425

Timestamp:

11/23/11 21:45:17 (18 months ago)

Author:

philmoz

Message:

A few small changes:

• Fix script menu 'back' option when menu opened using 'Func/Set?' button. Now returns back to <ALT> mode instead of doing nothing.
• Relax restriction on focus distance override for G12 & G10 when 'Continuous AF' is enabled. Override can be used when camera is in Manual Focus mode.
• Cleanup some incorrect comments for SX30 and SX40.

Location:

trunk

Files:

• core/gui_menu.c (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)
• platform/sx30/sub/100h/lib.c (modified) (1 diff)
• platform/sx40hs/sub/100g/boot.c (modified) (1 diff)

trunk/core/gui_menu.c

@@ -115 +115 @@
         gui_menu_set_curr_menu(gui_menu_stack[gui_menu_stack_ptr].menu, gui_menu_stack[gui_menu_stack_ptr].toppos, gui_menu_stack[gui_menu_stack_ptr].curpos);
         gui_menu_erase_and_redraw();
+    }
+    else
+    {
+        // 'Back' selected; but no menu to go back to
+        // Occurs when script menu opened using 'Func/Set' button
+        // Return to normal <ALT> mode.
+        gui_set_mode(GUI_MODE_ALT);
+        kbd_reset_autoclicked_key();    // Need this to stop 'Func/Set' registering twice???
+        draw_restore();
     }
 }

trunk/platform/generic/wrappers.c

@@ -256 +256 @@
 void lens_set_focus_pos(long newpos)
 {
-#if defined(CAMERA_g12) || defined(CAMERA_g10)  // G12 & G10 crash if in Continuous AF mode and try to call _MoveFocusLensToDistance
+#if defined(CAMERA_g12) || defined(CAMERA_g10)  // G12 & G10 crash if in Continuous AF mode, and not MF, and try to call _MoveFocusLensToDistance
         int af_mode;
         get_property_case(PROPCASE_CONTINUOUS_AF,&af_mode,sizeof(af_mode));
-        if (af_mode == 0)       // can only set focus distance when not in continuous AF mode
+        if ((af_mode == 0) || (shooting_get_focus_mode() == 1)) // can only set focus distance when MF mode or not in continuous AF mode
 #endif
         {

trunk/platform/sx30/sub/100h/lib.c

@@ -56 +56 @@
 void *vid_get_viewport_live_fb()
 {
+    // Found by searching RAM locations that referenced 0x40587700 (viewport buffer)
+    // and also changed to the other buffer addresses over time. Then used each here
+        // and selected value that gave the fastest Motion Detect response using http://dataghost.com/chdk/md_meter.html.
         return (void*)(*(int*)(0x20C8));
-        //// Values below found by searching firmware for references & usage of viewport buffer address 0x40587700
-        //// then experimenting to see what gave best Motion Detector speed results using http://dataghost.com/chdk/md_meter.html.
-        //long* t = (long*)0xFFB968C4;                                          // Table of viewport buffer addresses (@FF853F24 in _sub_FF853DC0__LiveImage.c__10)
-        //unsigned char i = *((unsigned char*)(0x20a8));                // Index value (byte) stored here (@FF853F50 in _sub_FF853DC0__LiveImage.c__10)
-        //return (void*)t[(i-1)&3];                                                     // Appears to be 4 buffers, current index - 1 seems best
 }
 

trunk/platform/sx40hs/sub/100g/boot.c

@@ -460 +460 @@
 
 ///*----------------------------------------------------------------------
-// @ FF8A3B4C
+// @ 0xff09bbb0
 void __attribute__((naked,noinline)) init_file_modules_task() {
  asm volatile(