Changeset 344

Timestamp:

06/21/10 08:19:54 (2 years ago)

Author:

msl

Message:

Erweiterung der Konfiguration-Skript-Befehle auf uBasic

Location:

branches/msl/lib/ubasic

Files:

• camera_functions.c (modified) (1 diff)
• tokenizer.c (modified) (2 diffs)
• tokenizer.h (modified) (1 diff)
• ubasic.c (modified) (4 diffs)

branches/msl/lib/ubasic/camera_functions.c

@@ -576 +576 @@
         return 1;
 }
+int get_config_value(int id, int v)
+{
+    printf("*** get config value %d def: %d ***\n",id, v);
+}
+void set_config_value(int id, int v)
+{
+    printf("*** set config value %d %d ***\n",id, v);
+}
 #endif

branches/msl/lib/ubasic/tokenizer.c

@@ -151 +151 @@
   {"get_zoom",                TOKENIZER_GET_ZOOM},
   {"get_exp_count",           TOKENIZER_GET_EXP_COUNT},
-
-
-
-//SET  
+  {"get_config_value",        TOKENIZER_GET_CONFIG_VALUE},
+
+//SET
   {"set_av96_direct",         TOKENIZER_SET_AV96_DIRECT},
   {"set_av_rel",              TOKENIZER_SET_USER_AV_BY_ID_REL}, //FOR COMPATIBILITY
@@ -190 +189 @@
   {"set_zoom",                TOKENIZER_SET_ZOOM},
   {"set_record",              TOKENIZER_SET_RECORD},
+  {"set_config_value",        TOKENIZER_SET_CONFIG_VALUE},
   
   

branches/msl/lib/ubasic/tokenizer.h

@@ -200 +200 @@
   TOKENIZER_GET_FOCUS_OK,
   TOKENIZER_GET_MIN_STACK_DIST,
+  TOKENIZER_GET_CONFIG_VALUE,
+  TOKENIZER_SET_CONFIG_VALUE,
   
 } ubasic_token;

branches/msl/lib/ubasic/ubasic.c

@@ -544 +544 @@
     r = shooting_get_min_stack_distance();
     break;
+  case TOKENIZER_GET_CONFIG_VALUE:
+    accept(TOKENIZER_GET_CONFIG_VALUE);
+    int var = expr();
+    int var1 = expr();
+    r = conf_getValue(var,var1);
+    break;
   }
   default:
@@ -1725 +1731 @@
 }
 
+static void get_config_value_statement()
+{
+    int var, var1, var2;
+    accept(TOKENIZER_GET_CONFIG_VALUE);
+    var = expr();
+    var1 = expr();
+    var2 = tokenizer_variable_num();
+    accept(TOKENIZER_VARIABLE);
+    ubasic_set_variable(var2, conf_getValue(var,var1));
+    accept_cr();
+}
+
 #endif
 
@@ -2081 +2099 @@
     to = expr();
     shooting_set_mode_chdk(to);
+    accept_cr();
+}
+
+static void set_config_value_statement()
+{
+    int to, to1;
+    accept(TOKENIZER_SET_CONFIG_VALUE);
+    to = expr();
+    to1 = expr();
+    conf_setValue(to, to1);
     accept_cr();
 }
@@ -2646 +2674 @@
     break;
 
+  case TOKENIZER_GET_CONFIG_VALUE:
+    get_config_value_statement();
+    break;
+
+  case TOKENIZER_SET_CONFIG_VALUE:
+    set_config_value_statement();
+    break;
 
   default: