Changeset 1850

Timestamp:

05/14/12 02:37:11 (12 months ago)

Author:

reyalp

Message:

s100 updates from c10ud in ​http://chdk.setepontos.com/index.php?topic=650.msg85140#msg85140

• long press power button to start in rec mode
• adjust circle of confusion and default battery voltages

Location:

trunk/platform/s100

Files:

• main.c (modified) (1 diff)
• notes.txt (modified) (2 diffs)
• shooting.c (modified) (1 diff)
• sub/100d/boot.c (modified) (1 diff)
• sub/100e/boot.c (modified) (1 diff)
• sub/101a/boot.c (modified) (1 diff)

trunk/platform/s100/main.c

@@ -55 +55 @@
 }
 
-long get_vbatt_min() // TODO:
+long get_vbatt_min()
 {
-    return 3000;
+    return 3200;
 }
 
-long get_vbatt_max() // TODO:
+long get_vbatt_max()
 {
-    return 4100;
+    return 4050;
 }
 

trunk/platform/s100/notes.txt

@@ -7 +7 @@
 
 CAMERA TODO/KNOWN ISSUES:
-- manual loading with "firm update" loading crashes (confirmed on 100d and 101a), so PS.FI2 is not included in the autobuild.
-- battery values min/max need to be checked
-- circle_of_confusion value needs to be checked
+- manual loading with "firm update" loading crashes (confirmed on 100d and 101a), so PS.FI2 is not included in the autobuild. (to be fixed soon http://chdk.setepontos.com/index.php?topic=7889.msg85060#msg85060)
 - various defines in platform_camera.h needs to be checked
 - value for SleepTask in kbd.c instead of hardcoded 10 (minor issue)
@@ -16 +14 @@
 - 100d, 100e, 101a: movie override quality seems to be working but values might be wrong (stock Canon reaches 4MB/s, CHDK quality 99 2MB/s)
 - 100d, 100e, 101a: jogdial is untested and needs correct rear_dial_position address in stubs_min.S
-- 100d, 100e, 101a: address and values for custom power-on need to be checked in boot.c

trunk/platform/s100/shooting.c

@@ -168 +168 @@
 #endif
 
-int circle_of_confusion = 5; //TODO:
+int circle_of_confusion = 6;

trunk/platform/s100/sub/100d/boot.c

@@ -172 +172 @@
         *(int*)0x1938=(int)taskHook;
         *(int*)0x193C=(int)taskHook; // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
-    
-        // TODO: check C022xxxx address and 0x800000 because it's always starting in PLAY mode
-    // replacement for correct power-on. see sub_FF024AF4 -> 0xFF05867C and/or SX40HS port
-        *(int*)(0x26E4) = (*(int*)0xC022F48C)&1 ? 0x200000 : 0x100000; 
+
+        *(int*)(0x26E0+0x4) = (*(int*)0xC022F48C)&4 ? 0x200000 : 0x100000;
 
 asm volatile (

trunk/platform/s100/sub/100e/boot.c

@@ -172 +172 @@
         *(int*)0x1938=(int)taskHook;
         *(int*)0x193C=(int)taskHook; // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
-    
-        // TODO: check C022xxxx address and 0x800000 because it's always starting in PLAY mode
-    // replacement for correct power-on. see sub_FF024AF4 -> 0xFF05867C and/or SX40HS port
-        *(int*)(0x26E4) = (*(int*)0xC022F48C)&1 ? 0x200000 : 0x100000; 
+
+        *(int*)(0x26E0+0x4) = (*(int*)0xC022F48C)&4 ? 0x200000 : 0x100000;
 
 asm volatile (

trunk/platform/s100/sub/101a/boot.c

@@ -172 +172 @@
         *(int*)0x1938=(int)taskHook;
         *(int*)0x193C=(int)taskHook; // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
-    
-        // TODO: check C022xxxx address and 0x800000 because it's always starting in PLAY mode
-    // replacement for correct power-on. see sub_FF024AF4 -> 0xFF05867C and/or SX40HS port
-        *(int*)(0x26E4) = (*(int*)0xC022F48C)&1 ? 0x200000 : 0x100000; 
+
+        *(int*)(0x26E0+0x4) = (*(int*)0xC022F48C)&4 ? 0x200000 : 0x100000;
 
 asm volatile (