Implemented digital output write function

Author: chrisws

include/module.h

@@ -16,14 +16,6 @@
 extern "C" {
 #endif
 
-typedef struct {
-  // the parameter
-  var_t *var_p;
-
-  // whether the parameter can be used by reference
-  uint8_t byref;
-} slib_par_t;
-
 /**
  * @ingroup modstd
  *

include/param.cpp

@@ -581,10 +581,11 @@ const char *format_text(int argc, slib_par_t *params, int param) {
   return buffer;
 }
 
-void v_create_func(var_p_t map, const char *name, method cb) {
+void v_create_func(var_p_t map, const char *name, callback mcb) {
   var_p_t v_func = map_add_var(map, name, 0);
   v_func->type = V_FUNC;
-  v_func->v.fn.cb = cb;
+  v_func->v.fn.cb = nullptr;
+  v_func->v.fn.mcb = mcb;
   v_func->v.fn.id = map->v.m.id;
 }
 

include/var.h

@@ -47,6 +47,19 @@ extern "C" {
 #endif
 
 struct var_s;
+
+typedef struct {
+  // the parameter
+  struct var_s *var_p;
+
+  // whether the parameter can be used by reference
+  uint8_t byref;
+} slib_par_t;
+
+// signature for module callback/virtual functions
+typedef int (*callback) (struct var_s *self, int param_count, slib_par_t *params, struct var_s *retval);
+
+// signature for internal v_funcs
 typedef void (*method) (struct var_s *self, struct var_s *retval);
 
 typedef struct var_s {
@@ -83,6 +96,7 @@ typedef struct var_s {
     // object method
     struct {
       method cb;
+      callback mcb;
       uint32_t id;
     } fn;
 
@@ -487,7 +501,7 @@ int v_strlen(const var_t *v);
  *
  * setup a method on the map using the given name
  */
-void v_create_func(var_p_t map, const char *name, method cb);
+void v_create_func(var_p_t map, const char *name, callback cb);
 
 #if defined(__cplusplus)
 }

ioio/main.cpp

@@ -81,43 +81,49 @@ struct IOClass {
 };
 
 #define CLS_IOCLASS 1
-robin_hood::unordered_map<int, IOClass> _ioClassMap;
+robin_hood::unordered_map<int, IOClass> _classMap;
 int _nextId = 1;
 
 static int get_io_class_id(var_s *map) {
   int result = -1;
   if (is_map(map)) {
     int id = map->v.m.id;
-    if (id != -1 && _ioClassMap.find(id) != _ioClassMap.end()) {
+    if (id != -1 && _classMap.find(id) != _classMap.end()) {
       result = id;
     }
   }
   return result;
 }
 
-int value = 0;
-static void cmd_digital_output_write(var_s *map, var_s *retval) {
-  value = !value;
-  int id = get_io_class_id(map);
-  if (id != -1) {
-    _ioClassMap.at(id).write(value);
+static int cmd_digital_output_write(var_s *self, int param_count, slib_par_t *params, var_s *retval) {
+  int result = 0;
+  if (param_count == 1) {
+    int id = get_io_class_id(self);
+    if (id != -1) {
+      int value = get_param_int(param_count, params, 0, 0);
+      _classMap.at(id).write(value);
+      result = 1;
+    } else {
+      error(retval, "IOClass not found");
+    }
   } else {
-    error(retval, "IOClass not found");
+    error(retval, "Missing value argument");
   }
+  return result;
 }
 
 static int cmd_openanaloginput(int argc, slib_par_t *params, var_t *retval) {
   int result;
   int pin = get_param_int(argc, params, 0, 0);
   int id = ++_nextId;
-  IOClass &input = _ioClassMap[id];
+  IOClass &input = _classMap[id];
   if (input.create("net/sourceforge/smallbasic/ioio/AnalogInput") &&
       input.open(pin)) {
     map_init_id(retval, id, CLS_IOCLASS);
     //v_create_func(retval, "write", cmd_digital_output_write);
     result = 1;
   } else {
-    _ioClassMap.erase(id);
+    _classMap.erase(id);
     error(retval, "openAnalogInput() failed");
     result = 0;
   }
@@ -128,14 +134,14 @@ static int cmd_opendigitaloutput(int argc, slib_par_t *params, var_t *retval) {
   int result;
   int pin = get_param_int(argc, params, 0, 0);
   int id = ++_nextId;
-  IOClass &output = _ioClassMap[id];
+  IOClass &output = _classMap[id];
   if (output.create("net/sourceforge/smallbasic/ioio/DigitalOutput") &&
       output.open(pin)) {
     map_init_id(retval, id, CLS_IOCLASS);
     v_create_func(retval, "write", cmd_digital_output_write);
     result = 1;
   } else {
-    _ioClassMap.erase(id);
+    _classMap.erase(id);
     error(retval, "openDigitalOutput() failed");
     result = 0;
   }
@@ -182,16 +188,16 @@ SBLIB_API void sblib_free(int cls_id, int id) {
   if (id != -1) {
     switch (cls_id) {
     case CLS_IOCLASS:
-      _ioClassMap.erase(id);
+      _classMap.erase(id);
       break;
     }
   }
 }
 
 void sblib_close(void) {
-  if (!_ioClassMap.empty()) {
+  if (!_classMap.empty()) {
     fprintf(stderr, "IOClass leak detected\n");
-    _ioClassMap.clear();
+    _classMap.clear();
   }
   jvm->DetachCurrentThread();
   // hangs

ioio/samples/led.bas

@@ -5,7 +5,7 @@ out = ioio.openDigitalOutput(0)
 value = false
 for i = 0 to 5
   print "setting LED "+ value
-  out.write()
+  out.write(value)
   value = !value
   delay 1000
 next