Changeset 607

Timestamp:

11/30/08 10:40:36 (5 years ago)

Author:

reyalp

Message:

+ add lua functions for flash parameters (onboard flash memory, not light)

num=get_flash_params_count() -- num is the number of parameters
str,num=get_parameter_data(id) -- str is the parameter value as a lua string,

which may contain embedded NULLs or other non-printable characters. If the size of the flash parameter is 4 bytes or less, a second value is returned, containing the parameter value as a number if the parameter id is invalid, or the parameter size is 0, then nil is returned.

scripts/examples/paramdmp.lua contains an example

• added CAMERA_HAS_JOGDAIL for g7/g9/sx100is, and used it instead of checking individual camera defines

Location:

trunk

Files:

• CHDK/SCRIPTS/examples/paramdmp.lua (added)
• core/luascript.c (modified) (4 diffs)
• doc/version.txt (modified) (1 diff)
• include/camera.h (modified) (4 diffs)
• lib/ubasic/ubasic.c (modified) (2 diffs)
• version.inc (modified) (1 diff)

trunk/core/luascript.c

@@ -201 +201 @@
 }
 
+static int luaCB_get_parameter_data( lua_State* L )
+{
+  extern long* FlashParamsTable[]; 
+
+  unsigned size;
+  unsigned id = luaL_checknumber( L, 1 );
+  unsigned val;
+
+  if (id >= get_flash_params_count()) {
+    // return nil
+    return 0;
+  }
+
+  size = FlashParamsTable[id][1]>>16;
+  if (size == 0) {
+    // return nil
+    return 0;
+  }
+  if (size >= 1 && size <= 4) {
+    val = 0;
+    get_parameter_data( id, &val, size );
+    lua_pushlstring( L, (char *)&val, size );
+    // for convenience, params that fit in a number are returned in one as a second result
+    lua_pushnumber( L, val );
+    return 2;
+  }
+  else {
+    char *buf = malloc(size);
+    if(!buf) {
+      luaL_error( L, "malloc failed in luaCB_get_parameter_data" );
+    }
+    get_parameter_data( id, buf, size );
+    lua_pushlstring( L, buf, size );
+    free(buf);
+    return 1;
+  }
+}
+
+static int luaCB_get_flash_params_count( lua_State* L )
+{
+  lua_pushnumber( L, get_flash_params_count() );
+  return 1;
+}
+
 static int luaCB_set_av96_direct( lua_State* L )
 {
@@ -383 +427 @@
 }
 
-#if defined (CAMERA_g7) || defined (CAMERA_sx100is) || defined (CAMERA_g9)
+#if CAM_HAS_JOGDIAL
 static int luaCB_wheel_right( lua_State* L )
 {
@@ -857 +901 @@
   FUNC(get_zoom);
   FUNC(get_exp_count);
+  FUNC(get_flash_params_count);
+  FUNC(get_parameter_data);
 
   FUNC(set_av96_direct);
@@ -884 +930 @@
   FUNC(is_pressed);
   FUNC(is_key);
-#if defined (CAMERA_g7) || defined (CAMERA_sx100is)
+#ifdef CAM_HAS_JOGDIAL
   FUNC(wheel_right);
   FUNC(wheel_left);

trunk/doc/version.txt

@@ -2 +2 @@
 
 version / revision / author
+
+0.8.7 / #606-607 / reyalp
++ add lua functions for flash parameters (onboard flash memory, not light)
+  num=get_flash_params_count() -- num is the number of parameters
+  str,num=get_parameter_data(id) -- str is the parameter value as a lua string,
+    which may contain embedded NULLs or other non-printable characters. If the size of the flash
+    parameter is 4 bytes or less, a second value is returned, containing the parameter value as a number
+    if the parameter id is invalid, or the parameter size is 0, then nil is returned.
+  scripts/examples/paramdmp.lua contains an example
+* added CAMERA_HAS_JOGDAIL for g7/g9/sx100is, and used it instead of checking individual camera defines
++ Lua string lib. see http://www.lua.org/manual/5.1/manual.html#5.4
+* Updated get_buildinfo to return two additional fields:
+  os: string, either "dryos" or "vxworks"
+  platformid: number
+* llibtst.lua is updated to test string lib, and no longer reports a listdir failure under dryos.
+* removed some redundant entries from sig_ref_vxworks_2.txt
 
 

trunk/include/camera.h

@@ -34 +34 @@
     #undef  CAM_FEATURE_FEATHER             // Cameras with "feather" or touch wheel.
     #define CAM_HAS_IS                  1   // Camera has image stabilizer
+        #undef  CAM_HAS_JOGDIAL                 // Camera has a "jog dial"
 
     #undef  CAM_CONSOLE_LOG_ENABLED         // Development: internal camera stdout -> A/stdout.txt
@@ -71 +72 @@
     #undef  CAM_HAS_IS
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+        #define CAM_HAS_JOGDIAL             1
     #define DNG_SUPPORT                 1
     // pattern
@@ -110 +112 @@
     #define CAM_EMUL_KEYPRESS_DURATION  10
     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+        #define CAM_HAS_JOGDIAL             1
     #define CAM_EV_IN_VIDEO             1
 //      #define CAM_CONSOLE_LOG_ENABLED     1
@@ -1393 +1396 @@
     #define CAM_RAW_ROWS                2480   // for new 8 MP
     #undef CAM_SYNCH 
-#define CAM_CAN_MUTE_MICROPHONE     1 
-#define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
-   #define CAM_ADJUSTABLE_ALT_BUTTON   1
-   #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
-   #undef  CAM_VIDEO_CONTROL
-   #define DNG_SUPPORT                 1
-   #define CAM_REAR_CURTAIN            1
+    #define CAM_CAN_MUTE_MICROPHONE     1 
+    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
+    #define CAM_ADJUSTABLE_ALT_BUTTON   1
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1
+    #undef  CAM_VIDEO_CONTROL
+    #define DNG_SUPPORT                 1
+    #define CAM_REAR_CURTAIN            1
+    #define CAM_HAS_JOGDIAL             1
     // pattern
     #define cam_CFAPattern 0x01000201 // Green  Blue  Red  Green

trunk/lib/ubasic/ubasic.c

@@ -1908 +1908 @@
 static void wheel_left_statement(void){
   accept(TOKENIZER_WHEEL_LEFT);
-#if defined (CAMERA_g7) || defined (CAMERA_sx100is) || defined (CAMERA_g9)
+#ifdef CAM_HAS_JOGDIAL
   JogDial_CCW();
 #endif
@@ -1917 +1917 @@
 static void wheel_right_statement(void){
   accept(TOKENIZER_WHEEL_RIGHT);
-#if defined (CAMERA_g7) || defined (CAMERA_sx100is)
+#ifdef CAM_HAS_JOGIDAL
   JogDial_CW();
 #endif

trunk/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.8.6
+BUILD_NUMBER := 0.8.7