Changeset 594 for trunk/core/luascript.c

Timestamp:

11/27/08 07:13:55 (4 years ago)

Author:

reyalp

Message:

+ raw operations for lua scripts, see ​http://chdk.setepontos.com/index.php/topic,2646.0.html

set_raw_develop("filename") -- develop raw on next shot. If filename is nil (or omitted), any pending raw develop is canceled.
raw_merge_start(operation) -- operation is a number: 0=sum 1=average. Other=error.
raw_merge_add("filename") -- merge a file.
raw_merge_end() -- complete merge operation.

• cleanup some formatting, consts, etc.

File:

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

trunk/core/luascript.c

@@ -11 +11 @@
 #include "ubasic.h"
 #include "stdlib.h"
+#include "raw.h"
+#include "raw_merge.h"
 
 static int luaCB_shoot( lua_State* L )
@@ -477 +479 @@
 {
   
-  if lua_isboolean( L, 1 ) script_print_screen_statement( lua_toboolean( L, 1 ) );
-  else script_print_screen_statement( luaL_checknumber( L, 1 )+10000 );
+  if (lua_isboolean( L, 1 ))
+    script_print_screen_statement( lua_toboolean( L, 1 ) );
+  else
+    script_print_screen_statement( luaL_checknumber( L, 1 )+10000 );
   return 0;
 }
@@ -491 +495 @@
 {
   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;
-}}
+  switch(luaL_checknumber( L, 1 )) {
+    case 1:
+      if (movie_status == 4) {
+        movie_status = 1;
+      }
+    break;
+    case 2:
+      if (movie_status == 1) {
+        movie_status = 4;
+      }
+    break;
+    case 3:
+      if (movie_status == 1 || movie_status == 4) {
+        movie_status = 5;
+      }
+    break;
+  }
   return 0;
 }
@@ -758 +765 @@
   lua_pushnumber( L, m );
   return 3;
+}
+
+// TODO sanity check file ?
+static int luaCB_set_raw_develop( lua_State* L )
+{
+  raw_prepare_develop(luaL_optstring( L, 1, NULL ));
+  return 0;
+}
+
+static int luaCB_raw_merge_start( lua_State* L )
+{
+  int op = luaL_checknumber(L,1);
+  if (op == RAW_OPERATION_SUM || op == RAW_OPERATION_AVERAGE) {
+    raw_merge_start(op);
+  }
+  else {
+    return luaL_argerror(L,1,"invalid raw merge op");
+  }
+  return 0;
+}
+
+// TODO sanity check file ?
+static int luaCB_raw_merge_add_file( lua_State* L )
+{
+  raw_merge_add_file(luaL_checkstring( L, 1 ));
+  return 0;
+}
+
+static int luaCB_raw_merge_end( lua_State* L )
+{
+  raw_merge_end();
+  return 0;
 }
 
@@ -885 +924 @@
   FUNC(get_buildinfo);
   FUNC(get_mode);
-}
+  
+  FUNC(set_raw_develop);
+  // NOTE these functions normally run in the spytask.
+  // called from lua they will run from kbd task instead
+  FUNC(raw_merge_start);
+  FUNC(raw_merge_add_file);
+  FUNC(raw_merge_end);
+}