fix #96 49

Author: previ

..txt

@@ -83,8 +83,6 @@ def serve_docs_app(subpath):
     'cb_docs' is the output of `npx vuepress build pages/`
     from the 'docs' repository
     """
-    print("Running docs path")
-    print(subpath)
     if (subpath[-1] == '/'):
         subpath = subpath + 'index.html'
     return send_from_directory('cb_docs', subpath)

_programs.json

@@ -428,6 +428,39 @@ Blockly.Python['coderbot_adv_stop'] = function(block) {
   return 'get_bot().stop()\n';
 };
 
+// servo
+Blockly.Blocks['coderbot_move_servo'] = {
+  // Block for moving forward.
+  init: function() {
+    this.setHelpUrl('http://code.google.com/p/blockly/wiki/Motor');
+    this.setColour(40);
+
+    this.appendDummyInput()
+        .appendField(Blockly.Msg.CODERBOT_MOVE_SERVO)
+        .appendField(new Blockly.FieldDropdown([[Blockly.Msg.CODERBOT_MOVE_SERVO_1, "0"],
+                                                [Blockly.Msg.CODERBOT_MOVE_SERVO_2, "1"]]), 'SERVO');
+    this.appendValueInput('ANGLE')
+        .setCheck('Number')
+        .appendField(Blockly.Msg.CODERBOT_MOVE_SERVO_ANGLE);
+    this.setInputsInline(true);
+    // Assign 'this' to a variable for use in the tooltip closure below.
+    var thisBlock = this;
+    this.setTooltip(function() {
+      var mode = thisBlock.getFieldValue('ACTION');
+      return TOOLTIPS[mode] + Blockly.Msg.CODERBOT_MOVE_SERVO_TIP_TAIL;
+    });
+    this.setPreviousStatement(true);
+    this.setNextStatement(true);
+  }
+};
+
+Blockly.Python['coderbot_move_servo'] = function(block) {
+  // Generate Python for servo control.
+  var servo = block.getFieldValue('SERVO');
+  var angle = Blockly.Python.valueToCode(block, 'ANGLE', Blockly.Python.ORDER_NONE);
+  var code = "get_bot().servo(servo=" + servo + ", angle=" + angle + ")\n";
+  return code;
+};
 
 Blockly.Blocks['coderbot_camera_photoTake'] = {
   // Block for taking a picture.

main.py

@@ -25,6 +25,11 @@ Blockly.Msg.CODERBOT_MOVE_ADV_TIP_LEFT = "left"
 Blockly.Msg.CODERBOT_MOVE_ADV_TIP_TAIL= " at speed (0-100%) for time (seconds)"
 Blockly.Msg.CODERBOT_MOVE_MOTION_MOVE_TIP = "move bot, using vision to control"
 Blockly.Msg.CODERBOT_MOVE_MOTION_TURN_TIP = "turn bot, using vision to control"
+Blockly.Msg.CODERBOT_MOVE_SERVO = "move servo";
+Blockly.Msg.CODERBOT_MOVE_SERVO_1 = "1";
+Blockly.Msg.CODERBOT_MOVE_SERVO_2 = "2";
+Blockly.Msg.CODERBOT_MOVE_SERVO_ANGLE = "angle";
+Blockly.Msg.CODERBOT_MOVE_SERVO_TIP_TAIL= " servo angle (-90..90°)"
 Blockly.Msg.CODERBOT_MOVE_STOP = "stop";
 Blockly.Msg.CODERBOT_SAY = "say";
 Blockly.Msg.CODERBOT_LOCALE_EN = "English";

static/js/blockly/blocks.js

@@ -23,6 +23,11 @@ Blockly.Msg.CODERBOT_MOVE_ADV_TIP_LEFT = "à gauche"
 Blockly.Msg.CODERBOT_MOVE_ADV_TIP_TAIL= " avec une vitesse (0-100%) durant (secondes)"
 Blockly.Msg.CODERBOT_MOVE_MOTION_MOVE_TIP = "déplace le robot, en utilisant la caméra pour controller"
 Blockly.Msg.CODERBOT_MOVE_MOTION_TURN_TIP = "tourne le robot, en utilisant la caméra pour controller"
+Blockly.Msg.CODERBOT_MOVE_SERVO = "move servo";
+Blockly.Msg.CODERBOT_MOVE_SERVO_1 = "1";
+Blockly.Msg.CODERBOT_MOVE_SERVO_2 = "2";
+Blockly.Msg.CODERBOT_MOVE_SERVO_ANGLE = "angle";
+Blockly.Msg.CODERBOT_MOVE_SERVO_TIP_TAIL= " servo angle (90..90°)"
 Blockly.Msg.CODERBOT_MOVE_STOP = "stop";
 Blockly.Msg.CODERBOT_SAY = "dit";
 Blockly.Msg.CODERBOT_LOCALE_EN = "English";

static/js/blockly/bot_en.js

@@ -25,6 +25,11 @@ Blockly.Msg.CODERBOT_MOVE_ADV_TIP_LEFT = "sinistra"
 Blockly.Msg.CODERBOT_MOVE_ADV_TIP_TAIL= " a velocità (0-100%) per tempo (secondi)"
 Blockly.Msg.CODERBOT_MOVE_MOTION_MOVE_TIP = "muovi bot, usando la camera per il posizionamento"
 Blockly.Msg.CODERBOT_MOVE_MOTION_TURN_TIP = "gira il bot, usando la camera per il posizionamento"
+Blockly.Msg.CODERBOT_MOVE_SERVO = "muovi servo";
+Blockly.Msg.CODERBOT_MOVE_SERVO_1 = "1";
+Blockly.Msg.CODERBOT_MOVE_SERVO_2 = "2";
+Blockly.Msg.CODERBOT_MOVE_SERVO_ANGLE = "angolo";
+Blockly.Msg.CODERBOT_MOVE_SERVO_TIP_TAIL= " angolo del servo (-90..90°)"
 Blockly.Msg.CODERBOT_MOVE_STOP = "stop";
 Blockly.Msg.CODERBOT_SAY = "pronuncia in";
 Blockly.Msg.CODERBOT_LOCALE_EN = "Inglese";

static/js/blockly/bot_fr.js

@@ -279,6 +279,13 @@
           </block>
         </value>
       </block>
+      <block type="coderbot_move_servo">
+        <value name="ANGLE">
+          <block type="math_number">
+            <field name="NUM">1</field>
+          </block>
+        </value>
+      </block>
       <block type="coderbot_adv_stop"></block>
       <block type="coderbot_sleep">
         <value name="ELAPSE">