Changeset 335 for trunk

Timestamp:

06/13/10 15:52:27 (3 years ago)

Author:

CHDKLover

Message:

• neuer LUA-Befehl zum setzen bzw. erfragen eines CHDK-Config-Wertes:

<value>=get_config_value(<ID>,<DefaultValue>)
set_config_value(<ID>,<newValue>)

Die <ID> entspricht der ID aus core/conf.c
<DefaultValue> wird von get_config_value() zurückgegeben, falls der Wert für die <ID> nicht gelesen werden konnte
set_config_value() gibt bei Erfolg true zurück, bei Misserfolg false
Die Funktionen funktionieren nur für Integer-Werte

Bsp:
ext=get_config_value(37,-1) -- holt aktuelle RAW Endung, falls <ID>=37 nicht gelesen werden konnte, wird ext=-1
set_config_value(37,2) --setzt die RAW Endung auf "CR2"

Location:

trunk

Files:

• core/conf.c (modified) (1 diff)
• core/luascript.c (modified) (2 diffs)
• include/conf.h (modified) (1 diff)

trunk/core/conf.c

@@ -629 +629 @@
 
 //-------------------------------------------------------------------
+int conf_getValue(unsigned short id, int _default) {
+    unsigned short i;
+    int ret=_default;
+    for(i=0; i<CONF_NUM; ++i) {
+        if(conf_info[i].id==id && conf_info[i].type==CONF_DEF_VALUE) {
+            ret=*(int*)conf_info[i].var;
+            break;
+        }
+    }
+    return ret;
+}
+
+//-------------------------------------------------------------------
+int conf_setValue(unsigned short id, int value) {
+    unsigned short i;
+    int ret=0;
+    for(i=0; i<CONF_NUM; ++i) {
+        if(conf_info[i].id==id && conf_info[i].type==CONF_DEF_VALUE) {
+            *(int*)conf_info[i].var=value;
+            ret=1;
+            break;
+        }
+    }
+    return ret;
+}
+
+//-------------------------------------------------------------------

trunk/core/luascript.c

@@ -1324 +1324 @@
 
 #endif // OPT_LUA_CALL_NATIVE
- 
+
+static int luaCB_get_config_value( lua_State* L ) {
+  unsigned int argc = lua_gettop(L);
+  unsigned int id;
+  int _default;
+  
+  if(argc>=2) {
+    id=luaL_checknumber(L,1);
+    _default=luaL_checknumber(L,2);
+    lua_pushnumber(L, conf_getValue(id,_default));
+  } else lua_pushnil(L);
+  return 1;
+}
+
+static int luaCB_set_config_value( lua_State* L ) {
+  unsigned int argc = lua_gettop(L);
+  unsigned int id;
+  int value;
+  
+  if(argc>=2) {
+    id=luaL_checknumber(L,1);
+    value=luaL_checknumber(L,2);
+    lua_pushboolean(L, conf_setValue(id,value));
+  } else lua_pushboolean(L,0);
+  return 1;
+}
+
+
 void register_lua_funcs( lua_State* L )
 {
@@ -1489 +1516 @@
    FUNC(call_func_ptr);
 #endif
-}
+   FUNC(get_config_value);
+   FUNC(set_config_value);
+}

trunk/include/conf.h

@@ -311 +311 @@
 extern int shutter_int;
 extern void conf_change_dng(void);
+extern int conf_getValue(unsigned short id, int _default);
+extern int conf_setValue(unsigned short id, int value);
 
 // reyalp: putting these in conf, since the conf values are lookups for them