set menu

Author: Marty

blockly.json

@@ -1,6 +1,6 @@
 {
     "types": ["wabot_new", "wabot_step", "wabot_backyard", "wabot_turn", "wabot_action", "wabot_tempo", "wabot_servo"],
-    "category": "catMenu3",
+    "category": "catMenu5",
     "scripts": [
         "blockly/blocks.js",
         "blockly/javascript.js"

wabot.js

@@ -6,7 +6,7 @@
     }
 }(function(scope) {
     'use strict';
-    var SENSOR_WABOT = 0x2A;
+    var SENSOR_WABOT = 0x2A; //dec:42
     var self;
     var proto;
     var Module = scope.Module;
@@ -16,25 +16,28 @@
         this._board = board;
         self = this;
         self.callback = {};
-        board.send([0xF0, 0x04, SENSOR_WABOT, 0x01 /*standard*/ , 0xF7]);
+        //console.log("wabot ready...");
+        sendCmd([0xF0, 0x04, SENSOR_WABOT, 0x01 /*standard*/ , 0x00, 0xF7]);
         board.on(webduino.BoardEvent.SYSEX_MESSAGE, function(event) {
             var m = event.message;
             if (m[0] == 0x04 && m[1] == SENSOR_WABOT) {
                 var callbackType = m[2];
+                //console.log("waBot response:",m);
                 switch (callbackType) {
                     case 0:
-                        console.log("waBot create OK");
+                        //console.log("waBot create OK...");
                         break;
-                        /*walk done*/
+                        //walk done
                     case 2:
-                        console.log("walk callback:", m[3]);
+                        //console.log("walk callback:", m[3]);
                         if ('walk' in self.callback) {
                             self.callback['walk']();
                         }
                         break;
                 }
             }
         });
+        //*/
     }
 
     wabot.prototype = proto = Object.create(Module.prototype, {
@@ -48,117 +51,121 @@
         var a1 = (pos & 0xf0) >> 4,
             a2 = (pos & 0x0f);
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x20, n, a1, a2, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.standard = function(step, callback) {
         this.callback['standard'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x01, 0, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.walk = function(step, callback) {
         this.callback['walk'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x02, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.run = function(step, callback) {
         this.callback['run'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x03, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.backyard = function(step, callback) {
         this.callback['backyard'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x04, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.backyardSlow = function(step, callback) {
         this.callback['backyardSlow'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x05, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.turnLeft = function(step, callback) {
         this.callback['turnLeft'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x07, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.turnRight = function(step, callback) {
         this.callback['turnRight'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x06, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.moonWalkLeft = function(step, callback) {
         this.callback['moonWalkLeft'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x08, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.moonWalkRight = function(step, callback) {
         this.callback['moonWalkRight'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x09, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.crusaito = function(step, callback) {
         this.callback['crusaito'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0A, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.swing = function(step, callback) {
         this.callback['swing'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0B, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.upDown = function(step, callback) {
         this.callback['upDown'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0C, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
     proto.flapping = function(step, callback) {
         this.callback['swing'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0D, step, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.dance = function(step, callback) {
         this.callback['dance'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0E, 0, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.kickLeft = function(tempo, callback) {
         this.callback['kickLeft'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x0F, tempo, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.kickRight = function(tempo, callback) {
         this.callback['kickRight'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x10, tempo, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.goingUp = function(tempo, callback) {
         this.callback['goingUp'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x11, tempo, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.noGravity = function(tempo, callback) {
         this.callback['noGravity'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x12, tempo, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
     proto.drunk = function(tempo, callback) {
         this.callback['drunk'] = callback;
         var cmd = [0xF0, 0x04, SENSOR_WABOT, 0x13, tempo, 0xF7];
-        this._board.send(cmd);
+        sendCmd(cmd);
     }
 
+    function sendCmd(cmd) {
+        //console.log("send wabot cmd:",cmd);
+        self._board.send(cmd);
+    }
 
     scope.module.wabot = wabot;
 }));