Skip to content

Commit 33cb524

Browse files
committed
finished adding arm custom blocks, needs testing
1 parent 7fcfadc commit 33cb524

File tree

8 files changed

+16
-2
lines changed

8 files changed

+16
-2
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,3 +49,7 @@ static/blockly-tutorial
4949
.Trashes
5050
ehthumbs.db
5151
Thumbs.db
52+
53+
# autosave 'tilde' files #
54+
##########################
55+
*~

static/images/blocks/arm_lower.png

2.25 KB
Loading

static/images/blocks/arm_raise.png

1.55 KB
Loading

static/js/blockly/blocks.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ Blockly.Blocks['coderbot_armRaise'] = {
768768
*/
769769
init: function() {
770770
this.setHelpUrl(Blockly.Msg.CODERBOT_ARM_RAISE_HELPURL);
771-
this.setColour(40);
771+
this.setColour(290);
772772
var di = this.appendDummyInput()
773773
if (CODERBOT_PROG_LEVEL.indexOf("basic")>=0) {
774774
di.appendField(new Blockly.FieldImage('/images/blocks/arm_raise.png', 32, 32, '*'));
@@ -798,7 +798,7 @@ Blockly.Blocks['coderbot_armLower'] = {
798798
*/
799799
init: function() {
800800
this.setHelpUrl(Blockly.Msg.CODERBOT_ARM_RAISE_HELPURL);
801-
this.setColour(40);
801+
this.setColour(290);
802802
var di = this.appendDummyInput()
803803
if (CODERBOT_PROG_LEVEL.indexOf("basic")>=0) {
804804
di.appendField(new Blockly.FieldImage('/image/blocks/arm_lower.png', 32, 32, '*'));

static/js/blockly/bot_en.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Blockly.Msg.CODERBOT_MOVE_FORWARD = "move forward";
88
Blockly.Msg.CODERBOT_MOVE_BACKWARD = "move backward";
99
Blockly.Msg.CODERBOT_MOVE_LEFT = "turn left";
1010
Blockly.Msg.CODERBOT_MOVE_RIGHT = "turn right";
11+
Blockly.Msg.CODERBOT_ARM_LOWER = "drop arm";
12+
Blockly.Msg.CODERBOT_ARM_RAISE = "raise arm";
1113
Blockly.Msg.CODERBOT_MOVE_ADV_MOVE = "move bot";
1214
Blockly.Msg.CODERBOT_MOVE_MOTION_MOVE = "move bot (motion control)";
1315
Blockly.Msg.CODERBOT_MOVE_MOTION_TURN = "turn bot (motion control)";

templates/blocks_adv.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,10 @@
226226
</value>
227227
</block>
228228
</category>
229+
<category name ="{% trans %}Arm{% endtrans %}">
230+
<block type="coderbot_armRaise"></block>
231+
<block type="coderbot_armLower"></block>
232+
</category>
229233
<category name="{% trans %}Camera{% endtrans %}">
230234
<block type="coderbot_camera_photoTake"></block>
231235
<block type="coderbot_camera_videoRec"></block>

templates/blocks_basic.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<block type="coderbot_moveBackward"></block>
44
<block type="coderbot_turnLeft"></block>
55
<block type="coderbot_turnRight"></block>
6+
<block type="coderbot_armRaise"></block>
7+
<block type="coderbot_armLower"></block>
68
<block type="coderbot_say">
79
<value name="TEXT">
810
<block type="text">

templates/blocks_basic_move.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,6 @@
33
<block type="coderbot_moveBackward"></block>
44
<block type="coderbot_turnLeft"></block>
55
<block type="coderbot_turnRight"></block>
6+
<block type="coderbot_armRaise"></block>
7+
<block type="coderbot_armLower"></block>
68
</xml>

0 commit comments

Comments
 (0)