Changeset 847 for trunk/platform/ixus60_sd600/shooting.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/ixus60_sd600/shooting.c (modified) (1 diff)

trunk/platform/ixus60_sd600/shooting.c

@@ -76 +76 @@
 };          
 
+static const CapturemodeMap modemap[] = {
+    { MODE_P,                  32772 }, // note, this is called Manual, but eqivalent to P on cameras with real manual
+    { MODE_AUTO,               32768 },
+    { MODE_DIGITAL_MACRO,      33288 },
+    { MODE_PORTRAIT,           32781 },
+    { MODE_NIGHT_SNAPSHOT,     32779 }, // "night scene" on dial, different from "night snapshot" under "scene" below
+    { MODE_SCN_COLOR_ACCENT,   16920 }, // "color accent"
+    { MODE_SCN_COLOR_SWAP,     16921 }, // "color swap"
+    { MODE_SCN_KIDS_PETS,      16399 }, // "kids and pets"
+    { MODE_SCN_INDOOR,         16400 }, // "indoor"
+    { MODE_SCN_FOLIAGE,        16401 }, // "foliage"
+    { MODE_SCN_SNOW,           16402 }, // "snow"
+    { MODE_SCN_BEACH,          16403 }, // "beach"
+    { MODE_STITCH,             33290 },
+    { MODE_SCN_FIREWORK,       16404 }, // "fireworks"
+    { MODE_SCN_UNDERWATER,     16405 }, // "under water"
+    { MODE_VIDEO_STD,          2593  },
+    { MODE_VIDEO_SPEED,        2594  }, // "fast frame rate"
+    { MODE_VIDEO_COMPACT,      2595  }, // "compact"
+    { MODE_VIDEO_COLOR_ACCENT, 2591  }, // "color accent"
+    { MODE_VIDEO_COLOR_SWAP,   2592  }, // "color swap"
+};
+
 #include "../generic/shooting.c"