Skip to content

Commit 6d28aa2

Browse files
author
Ke, Mingze
committed
Removed car(1)
1 parent bfc806f commit 6d28aa2

8 files changed

Lines changed: 80 additions & 298 deletions

File tree

‎blocks/msg/en.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,14 +349,6 @@ Blockly.Msg.WEBDUINO_SERVO = "Servo , pin:";
349349
Blockly.Msg.WEBDUINO_SERVO_TEXT = "Servo:";
350350
Blockly.Msg.WEBDUINO_SERVO_ANGLE = " angle ( 0-180 ) :";
351351

352-
Blockly.Msg.WEBDUINO_CAR = "Car";
353-
Blockly.Msg.WEBDUINO_CAR_F = "Forward";
354-
Blockly.Msg.WEBDUINO_CAR_B = "Backward";
355-
Blockly.Msg.WEBDUINO_CAR_L = "Left";
356-
Blockly.Msg.WEBDUINO_CAR_R = "Right";
357-
Blockly.Msg.WEBDUINO_CAR_MOVE_FOR = "for";
358-
Blockly.Msg.WEBDUINO_CAR_MOVE_SEC = "secs";
359-
360352
Blockly.Msg.WEBDUINO_FISH = "Fish";
361353
Blockly.Msg.WEBDUINO_FISH_MOVE_FOR = "for";
362354
Blockly.Msg.WEBDUINO_FISH_MOVE_SEC = "secs";

‎blocks/msg/zh-hant.js‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -468,17 +468,7 @@ Blockly.Msg.WEBDUINO_ADXL345_S = "的";
468468
Blockly.Msg.WEBDUINO_ADXL345_VAL = "數值";
469469
Blockly.Msg.WEBDUINO_ADXL345_OFF = "停止偵測";
470470

471-
// Car 1
472-
473-
Blockly.Msg.WEBDUINO_CAR = "遙控車";
474-
Blockly.Msg.WEBDUINO_CAR_F = "前進";
475-
Blockly.Msg.WEBDUINO_CAR_B = "後退";
476-
Blockly.Msg.WEBDUINO_CAR_L = "左轉";
477-
Blockly.Msg.WEBDUINO_CAR_R = "右轉";
478-
Blockly.Msg.WEBDUINO_CAR_MOVE_FOR = "持續";
479-
Blockly.Msg.WEBDUINO_CAR_MOVE_SEC = "秒";
480-
481-
// Car 2
471+
// Car
482472

483473
Blockly.Msg.WEBDUINO_TESTCAR = "自走車";
484474
Blockly.Msg.WEBDUINO_TESTCAR_PINRF = "腳位設定右前";

‎blocks/webduino.js‎

Lines changed: 0 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1410,100 +1410,6 @@ Blockly.Blocks['rgbled_setcolor_callback'] = {
14101410
}
14111411
};
14121412

1413-
Blockly.Blocks['car_new'] = {
1414-
init: function () {
1415-
this.appendDummyInput()
1416-
.appendField(Blockly.Msg.WEBDUINO_CAR)
1417-
.appendField(Blockly.Msg.WEBDUINO_CAR_F)
1418-
.appendField(new Blockly.FieldDropdown([
1419-
["2", "2"],
1420-
["3", "3"],
1421-
["4", "4"],
1422-
["5", "5"],
1423-
["6", "6"],
1424-
["7", "7"],
1425-
["8", "8"],
1426-
["9", "9"],
1427-
["10", "10"],
1428-
["11", "11"],
1429-
["12", "12"],
1430-
["13", "13"]
1431-
]), "f_")
1432-
.appendField(Blockly.Msg.WEBDUINO_CAR_B)
1433-
.appendField(new Blockly.FieldDropdown([
1434-
["2", "2"],
1435-
["3", "3"],
1436-
["4", "4"],
1437-
["5", "5"],
1438-
["6", "6"],
1439-
["7", "7"],
1440-
["8", "8"],
1441-
["9", "9"],
1442-
["10", "10"],
1443-
["11", "11"],
1444-
["12", "12"],
1445-
["13", "13"]
1446-
]), "b_")
1447-
.appendField(Blockly.Msg.WEBDUINO_CAR_L)
1448-
.appendField(new Blockly.FieldDropdown([
1449-
["2", "2"],
1450-
["3", "3"],
1451-
["4", "4"],
1452-
["5", "5"],
1453-
["6", "6"],
1454-
["7", "7"],
1455-
["8", "8"],
1456-
["9", "9"],
1457-
["10", "10"],
1458-
["11", "11"],
1459-
["12", "12"],
1460-
["13", "13"]
1461-
]), "l_")
1462-
.appendField(Blockly.Msg.WEBDUINO_CAR_R)
1463-
.appendField(new Blockly.FieldDropdown([
1464-
["2", "2"],
1465-
["3", "3"],
1466-
["4", "4"],
1467-
["5", "5"],
1468-
["6", "6"],
1469-
["7", "7"],
1470-
["8", "8"],
1471-
["9", "9"],
1472-
["10", "10"],
1473-
["11", "11"],
1474-
["12", "12"],
1475-
["13", "13"]
1476-
]), "r_");
1477-
this.setOutput(true);
1478-
this.setColour(230);
1479-
this.setTooltip('');
1480-
this.setHelpUrl('https://webduino.io');
1481-
}
1482-
};
1483-
1484-
Blockly.Blocks['car_move'] = {
1485-
init: function () {
1486-
this.appendValueInput("secs_")
1487-
.appendField(new Blockly.FieldVariable(" "), "car_")
1488-
.appendField(new Blockly.FieldDropdown([
1489-
["↑", "forward"],
1490-
["↓", "backward"],
1491-
["↺", "left"],
1492-
["↻", "right"],
1493-
["✕", "stop"]
1494-
]), "move_")
1495-
.appendField(Blockly.Msg.WEBDUINO_CAR_MOVE_FOR);
1496-
this.appendDummyInput()
1497-
.appendField(Blockly.Msg.WEBDUINO_CAR_MOVE_SEC);
1498-
this.setInputsInline(true);
1499-
this.setPreviousStatement(true);
1500-
this.setNextStatement(true);
1501-
this.setColour(65);
1502-
this.setTooltip('');
1503-
this.setHelpUrl('https://webduino.io');
1504-
}
1505-
};
1506-
15071413
Blockly.Blocks['fish_new'] = {
15081414
init: function () {
15091415
this.appendDummyInput()

‎generators/webduino.js‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -906,25 +906,6 @@ Blockly.JavaScript['rgbled_setcolor_callback'] = function (block) {
906906
};
907907

908908

909-
Blockly.JavaScript['car_new'] = function (block) {
910-
var dropdown_f_ = block.getFieldValue('f_');
911-
var dropdown_b_ = block.getFieldValue('b_');
912-
var dropdown_l_ = block.getFieldValue('l_');
913-
var dropdown_r_ = block.getFieldValue('r_');
914-
var code = 'getCar(board, ' + dropdown_f_ + ', ' + dropdown_b_ + ', ' + dropdown_l_ + ', ' + dropdown_r_ + ')';
915-
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
916-
};
917-
918-
919-
Blockly.JavaScript['car_move'] = function (block) {
920-
var variable_car_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('car_'), Blockly.Variables.NAME_TYPE);
921-
var dropdown_move_ = block.getFieldValue('move_');
922-
var value_secs_ = Blockly.JavaScript.valueToCode(block, 'secs_', Blockly.JavaScript.ORDER_NONE);
923-
var code = 'await ' + variable_car_ + '.' + dropdown_move_ + '(' + value_secs_ + ');\n';
924-
return code;
925-
};
926-
927-
928909
Blockly.JavaScript['fish_new'] = function (block) {
929910
var code = 'getFish(board)';
930911
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];

‎msg/en.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ var MSG = {
5959
linkToBin: "Let's Coding",
6060
catDatabase: "Data base",
6161
catFirebase: "Firebase",
62-
catCarTest: "Car (2)",
63-
catCar: "Car (1)",
62+
catCarTest: "Car",
6463
catFish: "Fly Fish",
6564
catBasic: "Basic Blocks",
6665
catWebduino: "Webduino Blocks",

‎msg/zh-hant.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,7 @@ var MSG = {
5959
linkToBin: "程式編輯",
6060
catDatabase: "資料庫",
6161
catFirebase: "Firebase",
62-
catCarTest: "自走車 (2)",
63-
catCar: "自走車 (1)",
62+
catCarTest: "自走車",
6463
catFish: "飛天魚",
6564
catBasic: "基本積木",
6665
catWebduino: "Webduino 積木",

‎toolbox/index.xml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -818,28 +818,6 @@
818818
<sep></sep>
819819
</category>
820820
<category id="catMenu3">
821-
<category id="catCar">
822-
<block type="variables_set">
823-
<field name="VAR">car</field>
824-
<value name="VALUE">
825-
<block type="car_new">
826-
<field name="f_">9</field>
827-
<field name="b_">8</field>
828-
<field name="l_">6</field>
829-
<field name="r_">7</field>
830-
</block>
831-
</value>
832-
</block>
833-
<block type="car_move">
834-
<field name="car_">car</field>
835-
<field name="move_">forward</field>
836-
<value name="secs_">
837-
<block type="math_number">
838-
<field name="NUM">1</field>
839-
</block>
840-
</value>
841-
</block>
842-
</category>
843821
<category id="catCarTest">
844822
<block type="car_test_new">
845823
<value name="var_">

0 commit comments

Comments
 (0)