remove step

o4c · o4c · commit fef4ac6e5e6a · 2018-04-16T10:45:34.000+08:00
diff --git a/blockly.json b/blockly.json
@@ -1,13 +1,13 @@
 {
-    "types": ["wabots_new", "wabots_basic_action","wabots_status","wabots_tempo", "wabots_stop"],
-    "category": "catMenu0",
+    "types": ["wabot_new", "wabot_basic_action","wabot_status","wabot_tempo", "wabot_stop"],
+    "category": "catMenu5",
     "scripts": [
         "blockly/blocks.js",
         "blockly/javascript.js"
     ],
     "dependencies": [
-        "wabots.js",
-        "wabots-blockly.js"
+        "wabot.js",
+        "wabot-blockly.js"
     ],
     "msg": "blockly/msg",
     "blocksMsg": "blockly/msg/blocks",
diff --git a/blockly/blocks.js b/blockly/blocks.js
@@ -1,18 +1,18 @@
-Blockly.Blocks['wabots_new'] = {
+Blockly.Blocks['wabot_new'] = {
     init: function() {
         this.appendDummyInput()
-            .appendField(Blockly.Msg.WEBDUINO_WABOTS, "哇寶機器人");
+            .appendField(Blockly.Msg.WEBDUINO_WABOT, "哇寶機器人");
         this.setOutput(true);
         this.setColour(230);
         this.setTooltip('');
         this.setHelpUrl('https://webduino.io');
     }
 };
 
-Blockly.Blocks['wabots_basic_action'] = {
+Blockly.Blocks['wabot_basic_action'] = {
     init: function() {
         this.appendDummyInput()
-        .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+        .appendField(new Blockly.FieldVariable("wabot"), "wabot")
         .appendField("動作")
         .appendField(new Blockly.FieldDropdown(
             [
@@ -32,15 +32,15 @@ Blockly.Blocks['wabots_basic_action'] = {
     }
 };
 
-Blockly.Blocks['wabots_tempo'] = {
+Blockly.Blocks['wabot_tempo'] = {
     init: function() {
         this.appendDummyInput()
-            .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+            .appendField(new Blockly.FieldVariable("wabot"), "wabot")
             .appendField("動作")
             .appendField(new Blockly.FieldDropdown(
                 [
                     ["裝可愛", "swing"],
-                    ["上下跳動", "upDown"],
+                    // ["上下跳動", "upDown"],
                     ["快樂向前", "flapping"],
                     ["玻璃舞", "crusaito"],
                     ["跑步", "run"]
@@ -53,10 +53,10 @@ Blockly.Blocks['wabots_tempo'] = {
     }
 };
 
-Blockly.Blocks['wabots_status'] = {
+Blockly.Blocks['wabot_status'] = {
     init: function() {
         this.appendDummyInput()
-        .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+        .appendField(new Blockly.FieldVariable("wabot"), "wabot")
         .appendField("動作")
         .appendField(new Blockly.FieldDropdown(
             [
@@ -76,10 +76,10 @@ Blockly.Blocks['wabots_status'] = {
     }
 };
 
-Blockly.Blocks['wabots_angle'] = {
+Blockly.Blocks['wabot_angle'] = {
     init: function() {
         this.appendValueInput("angle")
-        .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+        .appendField(new Blockly.FieldVariable("wabot"), "wabot")
         .appendField("設定")
         .appendField(new Blockly.FieldDropdown(
             [
@@ -100,10 +100,10 @@ Blockly.Blocks['wabots_angle'] = {
     }
 };
 
-Blockly.Blocks['wabots_angle_tool'] = {
+Blockly.Blocks['wabot_angle_tool'] = {
     init: function() {
         this.appendDummyInput()
-            .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+            .appendField(new Blockly.FieldVariable("wabot"), "wabot")
             .appendField("設定")
             .appendField(new Blockly.FieldDropdown(
             [
@@ -124,10 +124,10 @@ Blockly.Blocks['wabots_angle_tool'] = {
     }
 };
 
-Blockly.Blocks['wabots_stop'] = {
+Blockly.Blocks['wabot_stop'] = {
     init: function() {
         this.appendDummyInput()
-          .appendField(new Blockly.FieldVariable("wabots"), "wabots")
+          .appendField(new Blockly.FieldVariable("wabot"), "wabot")
           .appendField("停止動作");
         this.setColour(65);
         this.setPreviousStatement(true, null);
diff --git a/blockly/javascript.js b/blockly/javascript.js
@@ -1,48 +1,47 @@
-Blockly.JavaScript['wabots_new'] = function(block) {
-    var code = 'getwabots(board)';
+Blockly.JavaScript['wabot_new'] = function(block) {
+    var code = 'getwabot(board)';
     return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
 };
 
-Blockly.JavaScript['wabots_basic_action'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_basic_action'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     var dropdown_action = block.getFieldValue('action');
     var code = variable_ + '.' + dropdown_action + '();\n';
     return code;
 };
 
-Blockly.JavaScript['wabots_tempo'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_tempo'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     var dropdown_special = block.getFieldValue('special');
     var code = variable_ + '.' + dropdown_special +'();\n';
     return code;
 };
 
-Blockly.JavaScript['wabots_status'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_status'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     var dropdown_step = block.getFieldValue('status');
-    // var value_step = Blockly.JavaScript.valueToCode(block, 'step', Blockly.JavaScript.ORDER_ATOMIC);
     var code = variable_ + '.' + dropdown_step + '(' + 0 + ',function(){});\n';
     return code;
 };
 
-Blockly.JavaScript['wabots_angle'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_angle'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     var dropdown_limb = block.getFieldValue('limb');
     var value_angle = Blockly.JavaScript.valueToCode(block, 'angle', Blockly.JavaScript.ORDER_ATOMIC);
     var code = variable_ + '.servo' + '(' + dropdown_limb + ','+ value_angle + ',function(){});\n';
     return code;
 };
 
-Blockly.JavaScript['wabots_angle_tool'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_angle_tool'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     var dropdown_limb = block.getFieldValue('limb');
     var angle_pos = block.getFieldValue('pos');
     var code = variable_ + '.servo' + '(' + dropdown_limb + ','+ angle_pos + ',function(){});\n';
     return code;
 };
 
-Blockly.JavaScript['wabots_stop'] = function(block) {
-    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabots'), Blockly.Variables.NAME_TYPE);
+Blockly.JavaScript['wabot_stop'] = function(block) {
+    var variable_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('wabot'), Blockly.Variables.NAME_TYPE);
     // var value_step = Blockly.JavaScript.valueToCode(block, 'step', Blockly.JavaScript.ORDER_ATOMIC);
     var code = variable_ + '.stop();\n';
     return code;
diff --git a/blockly/msg/blocks/zh-hant.js b/blockly/msg/blocks/zh-hant.js
@@ -1,3 +1,3 @@
 // waBot
-Blockly.Msg.WEBDUINO_WABOTS = "哇寶機器人";
-Blockly.Msg.WEBDUINO_WABOTS_WALK = "往前走 ";
+Blockly.Msg.WEBDUINO_WABOT = "哇寶機器人";
+Blockly.Msg.WEBDUINO_WABOT_WALK = "往前走 ";
diff --git a/blockly/msg/zh-hant.js b/blockly/msg/zh-hant.js
@@ -1 +1 @@
-MSG.catwabots = "哇寶機器人s";
+MSG.catwabot = "哇寶機器人";
diff --git a/blockly/toolbox.xml b/blockly/toolbox.xml
@@ -1,29 +1,27 @@
-<category id="catwabots" tags="fly,mark1,smart">
+<category id="catwabot" tags="fly,mark1,smart">
   <block type="variables_set">
-    <field name="VAR">wabots</field>
+    <field name="VAR">wabot</field>
     <value name="VALUE">
-      <block type="wabots_new">
+      <block type="wabot_new">
       </block>
     </value>
   </block>
-  <block type="wabots_basic_action">
+  <block type="wabot_basic_action">
   </block>
-  <block type="wabots_tempo">
+  <block type="wabot_tempo">
   </block>
-  <block type="wabots_status">
-    <value name="step">
-    </value>
+  <block type="wabot_status">
   </block>
-  <block type="wabots_angle">
+  <block type="wabot_angle">
     <value name="angle">
       <block type="math_number">
         <field name="NUM">90</field>
       </block>
     </value>
   </block>
-  <block type="wabots_angle_tool">
+  <block type="wabot_angle_tool">
   </block>
-  <block type="wabots_stop">
+  <block type="wabot_stop">
   </block>
 
 </category>
diff --git a/bower.json b/bower.json
@@ -1,13 +1,13 @@
 {
-  "name": "webduino-module-wabots",
-  "description": "WABots Module for Webduino",
-  "main": "wabots.js",
+  "name": "webduino-module-wabot",
+  "description": "WABot Module for Webduino",
+  "main": "wabot.js",
   "authors": "",
   "license": "ISC",
   "keywords": [
     "arduino",
     "webduino",
-    "wabots"
+    "wabot"
   ],
   "ignore": [
     "**/.*",
diff --git a/package.json b/package.json
@@ -1,8 +1,8 @@
 {
-  "name": "webduino-module-wabots",
+  "name": "webduino-module-wabot",
   "version": "1.0.0",
-  "description": "WABots Module for Webduino",
-  "main": "wabots.js",
+  "description": "WABot Module for Webduino",
+  "main": "wabot.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
@@ -11,7 +11,7 @@
   "keywords": [
     "arduino",
     "webduino",
-    "wabots"
+    "wabot"
   ],
   "dependencies": {
     "webduino-js": "0.x"
diff --git a/wabot-blockly.js b/wabot-blockly.js
@@ -0,0 +1,9 @@
++(function (window, webduino) {
+
+  'use strict';
+
+  window.getwabot = function (board) {
+    return new webduino.module.wabot(board);
+  };
+
+}(window, window.webduino));
diff --git a/wabot.js b/wabot.js
diff --git a/wabots-blockly.js b/wabots-blockly.js

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-MSG.catwabots = "哇寶機器人s";`
	`1`	`+MSG.catwabot = "哇寶機器人";`