Changeset 847 for trunk/platform/s2is/main.c

Timestamp:

12/02/09 09:31:02 (4 years ago)

Author:

reyalp

Message:

Mode override support. See ​http://chdk.kernreaktor.org/mantis/view.php?id=64
All cameras except ixus40_sd400 should be supported

• add capture mode API. NOTE: behavior of set_capture_mode in lua HAS CHANGED! see ​http://chdk.wikia.com/wiki/CHDK_firmware_usage/MoreBest#set_record.28state.29 and following
• move modemap to platform/<cam>/shooting.c so mode handling can be generic
• move mode_get to platform/generic/shooting.c
• add helper functions so mode_get can be generic

rec_mode_active (checks play_rec_mode, weak, can be overriden on cameras that need it)
screen_opened, screen_rotated: only defined on swivel screen cams, check phsw_ bits for screen pos

• move old play/rec checking code to rec_switch_state. #ifdef'd out for now
• move mode enum into it's own header file: modelist.h to allow easy lua generation.
• use playrec_mode on tx1

+ add new generated lua file LUALIB/GEN/modelist.lua
+ add lua library LUALIB/capmode.lua see ​http://chdk.wikia.com/wiki/LUA/Scripts:Standard/Lualib/Capmode
+ add test scripts see

​http://chdk.wikia.com/wiki/UBASIC/Scripts:Standard/Test/Setmode
​http://chdk.wikia.com/wiki/LUA/Scripts:Standard/Test/Setmode

File:

• trunk/platform/s2is/main.c (modified) (1 diff)

trunk/platform/s2is/main.c

@@ -203 +203 @@
 }
 
-static struct {
-        int hackmode;
-        int canonmode;
-} modemap[] = {
-    { MODE_AUTO,                5 },
-    { MODE_P,                   1 },
-    { MODE_TV,                  3 },
-    { MODE_AV,                  2 },
-    { MODE_M,                   0 },
-    { MODE_PORTRAIT,            6 },
-    { MODE_NIGHT,               8 },
-    { MODE_LANDSCAPE,           7 },
-    { MODE_VIDEO_STD,           16 },
-    { MODE_STITCH,              15 },
-    { MODE_MY_COLORS,           4 },
-    { MODE_SCN_NIGHT,           14 },
-    { MODE_SCN_INDOOR,          13 },
-    { MODE_SCN_FOLIAGE,         9 },
-    { MODE_SCN_SNOW,            10 },
-    { MODE_SCN_BEACH,           11 },
-    { MODE_SCN_FIREWORK,        12 }, 
-};
-#define MODESCNT (sizeof(modemap)/sizeof(modemap[0]))
-
-int mode_get() {
-    int mode, i, t=0xFF;
-    mode  = (playrec_mode==1)?MODE_REC:MODE_PLAY;
-    mode |= (physw_copy[1] & 0x00000001)?0:MODE_SCREEN_OPENED;
-    mode |= (physw_copy[1] & 0x00000002)?0:MODE_SCREEN_ROTATED;
-    
-    t=0xFF;
-    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4);
-    for (i=0; i<MODESCNT; ++i) {
-        if (modemap[i].canonmode == t) {
-            return (mode | (modemap[i].hackmode & MODE_SHOOTING_MASK));
-        }
-    }
-    return (mode);
-}
+
+int screen_opened(void) {
+//    mode |= (physw_copy[1] & 0x00000001)?0:MODE_SCREEN_OPENED;
+        return !(physw_copy[1] & 0x00000001);
+}
+
+int screen_rotated(void) {
+//    mode |= (physw_copy[1] & 0x00000002)?0:MODE_SCREEN_ROTATED;
+        return !(physw_copy[1] & 0x00000002);
+}
+
+int rec_mode_active(void) {
+//    mode  = (playrec_mode==1)?MODE_REC:MODE_PLAY;
+        return (playrec_mode==1);
+}