Changeset 847 for trunk/include/platform.h

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/include/platform.h (modified) (5 diffs)

trunk/include/platform.h

@@ -13 +13 @@
 #define MODE_SHOOTING_MASK      0x00FF
 
-enum {
-MODE_AUTO               =1,
-MODE_P                  ,
-MODE_TV                 ,
-MODE_AV                 ,
-MODE_M                  ,
-MODE_PORTRAIT           ,
-MODE_NIGHT              ,
-MODE_LANDSCAPE          ,
-MODE_VIDEO_STD          ,
-MODE_VIDEO_SPEED        ,
-MODE_VIDEO_COMPACT      ,
-MODE_VIDEO_MY_COLORS    ,
-MODE_VIDEO_COLOR_ACCENT ,
-MODE_VIDEO_COLOR_SWAP   ,
-MODE_STITCH             ,
-MODE_MY_COLORS          ,
-MODE_SCN_WATER          ,
-MODE_SCN_NIGHT          ,
-MODE_SCN_CHILD          ,
-MODE_SCN_PARTY          ,
-MODE_SCN_GRASS          ,
-MODE_SCN_SNOW           ,
-MODE_SCN_BEACH          ,
-MODE_SCN_FIREWORK       ,
-MODE_SCN_COLOR_ACCENT   ,
-MODE_SCN_COLOR_SWAP     ,
-MODE_VIDEO_HIRES        ,
-MODE_SCN_AQUARIUM       ,
-MODE_COLOR_ACCENT       ,
-MODE_SCN_NIGHT1         ,
-MODE_SCN_ISO_3200       ,
-MODE_SCN_SPORT          ,
-MODE_SCN_KIDS_PETS      ,
-MODE_INDOOR             ,
-MODE_KIDS_PETS          ,
-MODE_NIGHT_SNAPSHOT     ,
-MODE_DIGITAL_MACRO      ,
-MODE_SCN_FOLIAGE        ,
-MODE_VIDEO_TIME_LAPSE   ,
-MODE_SCN_INDOOR         ,
-MODE_SCN_PORTRAIT       ,
-MODE_SUPER_MACRO        ,
-MODE_VIDEO_PORTRAIT     ,
-MODE_VIDEO_NIGHT        ,
-MODE_VIDEO_INDOOR       ,
-MODE_VIDEO_FOLIAGE      ,
-MODE_VIDEO_SNOW         ,
-MODE_VIDEO_BEACH        ,
-MODE_VIDEO_AQUARIUM     ,
-MODE_VIDEO_SUPER_MACRO  ,
-MODE_VIDEO_STITCH       ,
-MODE_VIDEO_MANUAL       ,
-MODE_SPORTS             ,
-MODE_QUICK                          ,
-MODE_SCN_SUNSET         ,
-MODE_SCN_UNDERWATER     ,
-MODE_EASY               ,
-MODE_SCN_DIGITAL_MACRO  ,
-MODE_SCN_STITCH         ,
-};
+/* capture mode constants. These are in their own header for easier sed processing*/
+#include "modelist.h"
 
 // this is nasty, but not as nasty as checking each of the flags all over the place
@@ -93 +34 @@
                             ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_STITCH || \
                             ((m)&MODE_SHOOTING_MASK)==MODE_VIDEO_MANUAL)
+/* propcase ID constants. These are in their own header files for easier sed processing */
 #if CAM_PROPSET == 2     // most digic3 cameras
  #include "propset2.h"
@@ -137 +79 @@
 #define ZOOM_DIGITAL_OUT         12
 #define ZOOM_DIGITAL_REACHED_MAX 13
+
+typedef struct {
+        int hackmode; // platform independent mode values from MODE_xxx enum
+        int canonmode; // PROPCASE_SHOOTING_MODE value
+} CapturemodeMap;
 
 typedef struct {
@@ -412 +359 @@
 void shooting_iso_bracketing();
 /******************************************************************/
+// capture mode functions
+// return a CHDK mode enum for a PROPCASE_SHOOTING_MODE value, or 0 if not found
+int shooting_mode_canon2chdk(int canonmode);
+// return a PROPCASE_SHOOTING_MODE value for a CHDK mode enum value, or -1 if not found. 0 is a valid mode on some cameras.
+int shooting_mode_chdk2canon(int hackmode);
+// set capture mode from CHDK mode, returns 0 if mode not found or not in rec, otherwise 1
+int shooting_set_mode_chdk(int mode);
+// set capture mode from PROPCASE_SHOOTING_MODE value. return 0 if not in rec or mode is -1, otherwise 1
+int shooting_set_mode_canon(int mode);
+
+// returns 0 if in play, nonzero if rec
+int rec_mode_active(void); 
+
+// not used. Right now this is just to preserve code from earlier version of mode_get()
+// in case we want to check play/rec switch state in the future.
+// WARNING: it isn't known if all variants of this check the switch state or some other bit.
+// should return 0 is switch is in play position, non-zero otherwise
+//int rec_switch_state(void);
+
+// swivel screen state.
+#ifdef CAM_SWIVEL_SCREEN
+// 0 not open, non-zero open
+int screen_opened(void);
+// 0 not rotated, non-zero rotated
+int screen_rotated(void);
+#endif
+
+/******************************************************************/
 void clear_values();
 /******************************************************************/
-
 
 int mode_get();
@@ -502 +476 @@
 void  SetLogicalEventActive(unsigned event, unsigned state);
 void SetScriptMode(unsigned mode);
-void SetCurrentCaptureModeType(unsigned mode);
 
 #define started() debug_led(1)