Changeset 467

Timestamp:

08/05/08 09:39:29 (5 years ago)

Author:

Jucifer

Message:

• adding missing scripting commands to Lua

Location:

branches/juciphox

Files:

• core/luascript.c (modified) (4 diffs)
• version.inc (modified) (1 diff)

branches/juciphox/core/luascript.c

@@ -479 +479 @@
 }
 
-
-
-static int luaCB_get_moviestate( lua_State* L )
+static int luaCB_get_movie_status( lua_State* L )
 {
   lua_pushnumber( L, movie_status );
   return 1;
+}
+
+static int luaCB_set_movie_status( lua_State* L )
+{
+  int to;
+  to = luaL_checknumber( L, 1 );
+if (to==1) {
+        if (movie_status == 4) {
+        movie_status = 1;
+}}
+if (to==2) {
+        if (movie_status == 1) {
+        movie_status = 4;
+}
+}
+if (to==3) {
+        if (movie_status == 1 || 4) {
+        movie_status = 5;
+}}
+  return 0;
 }
 
@@ -593 +611 @@
 }
 
+static int luaCB_play_sound( lua_State* L )
+{
+  play_sound(luaL_checknumber( L, 1 ));
+  return 0;
+}
+
+static int luaCB_get_temperature( lua_State* L )
+{
+  int which = (luaL_checknumber( L, 1 ));
+  int temp;
+  switch (which)
+  {
+    case 0:
+      temp = get_optical_temp(); 
+      break;
+    case 1:
+      temp = get_ccd_temp(); 
+      break;
+    case 2:
+      temp = get_battery_temp();
+      break;
+  }
+  lua_pushnumber( L, temp );
+  return 1;
+}
 
 void register_lua_funcs( lua_State* L )
@@ -672 +715 @@
   FUNC(is_pressed);
   FUNC(is_key);
-#if defined (CAMERA_g7)
+#if defined (CAMERA_g7) || defined (CAMERA_sx100is)
   FUNC(wheel_right);
   FUNC(wheel_left);
@@ -698 +741 @@
   FUNC(get_orientation_sensor);
   FUNC(get_nd_present);
-  FUNC(get_moviestate);
+  FUNC(get_movie_status);
+  FUNC(set_movie_status);
   
   FUNC(get_histo_range);
   FUNC(shot_histo_enable);
-}
+  FUNC(play_sound);
+  FUNC(get_temperature);
+}

branches/juciphox/version.inc

@@ -1 @@
-BUILD_NUMBER := 0.2.1
+BUILD_NUMBER := 0.2.2