Changeset 847 for trunk/platform/ixus960_sd950/shooting.c

Timestamp:

12/02/09 09:31:02 (3 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/ixus960_sd950/shooting.c (modified) (1 diff)

trunk/platform/ixus960_sd950/shooting.c

@@ -71 +71 @@
 {  6, 1600, "1600", -1},
 };          
+
+static const CapturemodeMap modemap[] = {
+        { MODE_AUTO,               32768 }, 
+        { MODE_P,                  32772 },
+        { MODE_DIGITAL_MACRO,      33288 },
+        { MODE_PORTRAIT,           16397 },
+        { MODE_NIGHT_SNAPSHOT,     16395 },
+        { MODE_COLOR_ACCENT,       33306 }, 
+        { MODE_MY_COLORS,          33307 },
+        { MODE_SCN_KIDS_PETS,      16400 }, 
+        { MODE_SCN_INDOOR,         16401 }, 
+        { MODE_SCN_FOLIAGE,        16402 }, 
+        { MODE_SCN_SNOW,           16403 },
+        { MODE_SCN_BEACH,          16404 },
+        { MODE_SCN_FIREWORK,       16405 },
+        { MODE_SCN_AQUARIUM,       16407 },
+        { MODE_SCN_WATER,          16406 },
+        { MODE_VIDEO_STD,          2597  },
+        { MODE_VIDEO_COMPACT,      2599  },
+        { MODE_VIDEO_COLOR_ACCENT, 2595  },
+        { MODE_VIDEO_MY_COLORS,    2596  },
+        { MODE_VIDEO_TIME_LAPSE,   2601  },
+        { MODE_STITCH,             33290 },
+};
+
 #include "../generic/shooting.c"
 long get_file_next_counter() {