finished adding arm custom blocks, needs testing

Author: explosivose

.gitignore

@@ -49,3 +49,7 @@ static/blockly-tutorial
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+# autosave 'tilde' files #
+##########################
+*~

static/images/blocks/arm_lower.png

@@ -768,7 +768,7 @@ Blockly.Blocks['coderbot_armRaise'] = {
      */
   init: function() {
     this.setHelpUrl(Blockly.Msg.CODERBOT_ARM_RAISE_HELPURL);
-    this.setColour(40);
+    this.setColour(290);
     var di = this.appendDummyInput()    
     if (CODERBOT_PROG_LEVEL.indexOf("basic")>=0) {
       di.appendField(new Blockly.FieldImage('/images/blocks/arm_raise.png', 32, 32, '*'));
@@ -798,7 +798,7 @@ Blockly.Blocks['coderbot_armLower'] = {
      */
   init: function() {
     this.setHelpUrl(Blockly.Msg.CODERBOT_ARM_RAISE_HELPURL);
-    this.setColour(40);
+    this.setColour(290);
     var di = this.appendDummyInput()
     if (CODERBOT_PROG_LEVEL.indexOf("basic")>=0) {
       di.appendField(new Blockly.FieldImage('/image/blocks/arm_lower.png', 32, 32, '*'));

static/images/blocks/arm_raise.png

@@ -8,6 +8,8 @@ Blockly.Msg.CODERBOT_MOVE_FORWARD = "move forward";
 Blockly.Msg.CODERBOT_MOVE_BACKWARD = "move backward";
 Blockly.Msg.CODERBOT_MOVE_LEFT = "turn left";
 Blockly.Msg.CODERBOT_MOVE_RIGHT = "turn right";
+Blockly.Msg.CODERBOT_ARM_LOWER = "drop arm";
+Blockly.Msg.CODERBOT_ARM_RAISE = "raise arm";
 Blockly.Msg.CODERBOT_MOVE_ADV_MOVE = "move bot";
 Blockly.Msg.CODERBOT_MOVE_MOTION_MOVE = "move bot (motion control)";
 Blockly.Msg.CODERBOT_MOVE_MOTION_TURN = "turn bot (motion control)";

static/js/blockly/blocks.js

@@ -226,6 +226,10 @@
         </value>
       </block>
     </category>
+    <category name ="{% trans %}Arm{% endtrans %}">
+      <block type="coderbot_armRaise"></block>
+      <block type="coderbot_armLower"></block>
+    </category>
     <category name="{% trans %}Camera{% endtrans %}">
       <block type="coderbot_camera_photoTake"></block>
       <block type="coderbot_camera_videoRec"></block>

static/js/blockly/bot_en.js

@@ -3,6 +3,8 @@
       <block type="coderbot_moveBackward"></block>
       <block type="coderbot_turnLeft"></block>
       <block type="coderbot_turnRight"></block>
+      <block type="coderbot_armRaise"></block>
+      <block type="coderbot_armLower"></block>
       <block type="coderbot_say">
         <value name="TEXT">
           <block type="text">

templates/blocks_adv.xml

@@ -3,4 +3,6 @@
       <block type="coderbot_moveBackward"></block>
       <block type="coderbot_turnLeft"></block>
       <block type="coderbot_turnRight"></block>
+      <block type="coderbot_armRaise"></block>
+      <block type="coderbot_armLower"></block>
   </xml>