Changeset 1287

Timestamp:

08/12/11 08:38:51 (22 months ago)

Author:

philmoz

Message:

A410 update from srsa_4c - ​http://chdk.setepontos.com/index.php?topic=650.msg71477#msg71477

• subject distance override made possible by duplicating (and disabling an assert in) MoveFocusLensToDistance?().
• movie time limit fix (the standard, 60min one) was tested, I no longer call it experimental.
• included CAM_DETECT_SCREEN_ERASE
• typo fixed in /platform/a410/shooting.c

Location:

trunk

Files:

• include/lolevel.h (modified) (1 diff)
• platform/a410/notes.txt (modified) (1 diff)
• platform/a410/platform_camera.h (modified) (3 diffs)
• platform/a410/shooting.c (modified) (1 diff)
• platform/a410/sub/100f/Makefile (modified) (1 diff)
• platform/a410/sub/100f/stubs_auto.S (modified) (3 diffs)
• platform/a410/sub/100f/stubs_entry_2.S (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)

trunk/include/lolevel.h

@@ -21 +21 @@
 extern long _GetFocusLensSubjectDistanceFromLens();
 extern void _MoveFocusLensToDistance(short *dist);
+#if defined(CAMERA_a410)
+extern void MoveFocusLensToDistanceA410(short *dist);
+#endif
 extern void _PutInNdFilter();
 extern void _PutOutNdFilter();

trunk/platform/a410/notes.txt

@@ -9 +9 @@
 
 Changelog
+
+Beta 5, 2011-08-07
+- manual focus / subject distance override is now possible (disabled an assert that caused the shutdown)
+  note: this does not include af-scan in video (which would be too much work to fix)
+- movie time limit increase was tested, it's no longer "experimental"
 
 Beta 4, 2011-07-28

trunk/platform/a410/platform_camera.h

@@ -33 +33 @@
         #define CAM_HAS_ND_FILTER                               1
         #undef  CAM_HAS_MANUAL_FOCUS
-        #undef  CAM_CAN_SD_OVER_NOT_IN_MF
-        #undef  CAM_CAN_SD_OVERRIDE // :( it's broken in the firmware
+        #define CAM_CAN_SD_OVER_NOT_IN_MF               1
+        #define CAM_CAN_SD_OVERRIDE                     1 // :/ it's broken in firmware, but got worked around
 
         #undef  CAM_HAS_USER_TV_MODES
@@ -42 +42 @@
 
         #define CAM_CHDK_HAS_EXT_VIDEO_MENU             1//
-        #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD // :(
+        #undef  CAM_AF_SCAN_DURING_VIDEO_RECORD // :( too complex to fix
         #define CAM_EV_IN_VIDEO                         1 //but not very reliable...
         // pattern
@@ -70 +70 @@
         #undef  CAM_BRACKETING //no bracketing in fw
         #define CAM_EXT_TV_RANGE                1
+        #define CAM_DETECT_SCREEN_ERASE         1
 //      #define CAM_NO_MEMPARTINFO              1
 //      #define CAM_MULTIPART                   1

trunk/platform/a410/shooting.c

@@ -72 +72 @@
 const ISOTable iso_table[] = {
     {  0,    0, "Auto", -1},
-    {  1,   64,   "50", -1},
+    {  1,   50,   "50", -1},
     {  2,  100,  "100", -1},
     {  3,  200,  "200", -1},

trunk/platform/a410/sub/100f/Makefile

@@ -1 +1 @@
 topdir=../../../../
 
-OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o
-STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c
+OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o focushack.o
+STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c focushack.c
 
 include  $(topdir)platform/makefile_sub.inc

trunk/platform/a410/sub/100f/stubs_auto.S

@@ -18 +18 @@
 STUB(FFC028B8)
 STUB(FFC03B58)
+STUB(FFC107B8)
 STUB(FFC107D8)
 STUB(FFC10974)
 STUB(FFC10F94)
 STUB(FFC11B80)
+STUB(FFC11D68)
 STUB(FFC12724)
 STUB(FFC157D4)
@@ -34 +36 @@
 STUB(FFC824E4)
 STUB(FFC8A7E8)
+STUB(FFC8C260)
 STUB(FFC92524)
 STUB(FFC92FD0)
@@ -125 +128 @@
 STUB(FFD31890)
 STUB(FFD35A08)
+STUB(FFE11984)
 STUB(FFE18CD8)
+STUB(FFE1BA1C)
+STUB(FFE1DC38)
+STUB(FFE1DF60)
+STUB(FFE20E50)
+STUB(FFE210DC)
+STUB(FFE21424)
+STUB(FFE224CC)
+STUB(FFE224E8)
+STUB(FFE23818)
+STUB(FFE23B2C)
+STUB(FFE2E338)
+STUB(FFE2E368)
 STUB(FFE5A6FC)
 STUB(FFE6C6B4)

trunk/platform/a410/sub/100f/stubs_entry_2.S

@@ -40 +40 @@
 
 NHSTUB(SetScriptMode,0xFFD3799C) //
+NHSTUB(MFOn,0xffd24c18)
+NHSTUB(MFOff,0xffd24c48)

trunk/platform/generic/wrappers.c

@@ -262 +262 @@
 #endif
         {
+#if defined(CAMERA_a410) // need to disable a (false) assert here to make this function work 
+                MoveFocusLensToDistanceA410((short*)&newpos);
+#else
                 _MoveFocusLensToDistance((short*)&newpos);
+#endif
                 //while (focus_busy);
                 while ((shooting_is_flash_ready()!=1) || (focus_busy));