Changeset 607 for trunk/core/luascript.c

Timestamp:

11/30/08 10:40:36 (4 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

File:

• trunk/core/luascript.c (modified) (4 diffs)

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);