Skip to content

Commit b4ebeab

Browse files
oxxostudiooxxostudio
committed
edit RFID's block
1 parent 206e14a commit b4ebeab

5 files changed

Lines changed: 42 additions & 24 deletions

File tree

‎blocks/msg/zh-hant.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,12 @@ Blockly.Msg.WEBDUINO_FIREBASE_ATTRONCE = "屬性";
414414

415415
// RFID
416416

417-
Blockly.Msg.WEBDUINO_RFID_ON = "開始偵測";
418-
Blockly.Msg.WEBDUINO_RFID_UID = "偵測到的代碼";
417+
Blockly.Msg.WEBDUINO_RFID_ON = "偵測到訊號";
418+
Blockly.Msg.WEBDUINO_RFID_UID = "所偵測到的代碼";
419419
Blockly.Msg.WEBDUINO_RFID_UIDIS = "偵測到的代碼為";
420420
Blockly.Msg.WEBDUINO_RFID_IF = "如果";
421421
Blockly.Msg.WEBDUINO_RFID_DO = "執行";
422-
Blockly.Msg.WEBDUINO_RFID_OUT = "離開偵測範圍";
422+
Blockly.Msg.WEBDUINO_RFID_OUT = "訊號離開";
423423
Blockly.Msg.WEBDUINO_RFID_OFF = "停止偵測";
424424

425425
/*

‎blocks/webduino.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3002,12 +3002,13 @@ Blockly.Blocks['rfid_new'] = {
30023002
}
30033003
};
30043004

3005-
Blockly.Blocks['rfid_on'] = {
3005+
Blockly.Blocks['rfid_enter'] = {
30063006
init: function () {
30073007
this.appendDummyInput()
30083008
.appendField(new Blockly.FieldVariable("rfid"), "name_")
30093009
.appendField(Blockly.Msg.WEBDUINO_RFID_ON, "開始偵測");
3010-
this.appendStatementInput("on_");
3010+
this.appendStatementInput("on_")
3011+
.appendField(Blockly.Msg.WEBDUINO_RFID_DO, "執行");
30113012
this.setPreviousStatement(true);
30123013
this.setNextStatement(true);
30133014
this.setColour(65);
@@ -3028,7 +3029,7 @@ Blockly.Blocks['rfid_uid'] = {
30283029
}
30293030
};
30303031

3031-
Blockly.Blocks['rfid_in'] = {
3032+
Blockly.Blocks['rfid_if'] = {
30323033
init: function () {
30333034
this.appendValueInput("uid_")
30343035
.appendField(Blockly.Msg.WEBDUINO_RFID_IF, "如果")
@@ -3044,7 +3045,7 @@ Blockly.Blocks['rfid_in'] = {
30443045
}
30453046
};
30463047

3047-
Blockly.Blocks['rfid_out'] = {
3048+
Blockly.Blocks['rfid_leave'] = {
30483049
init: function () {
30493050
this.appendDummyInput()
30503051
.appendField(Blockly.Msg.WEBDUINO_RFID_IF, "如果")
@@ -3055,12 +3056,12 @@ Blockly.Blocks['rfid_out'] = {
30553056
this.setPreviousStatement(true);
30563057
this.setNextStatement(true);
30573058
this.setTooltip('');
3058-
this.setColour(35);
3059+
this.setColour(65);
30593060
this.setHelpUrl('http://www.example.com/');
30603061
}
30613062
};
30623063

3063-
Blockly.Blocks['rfid_off'] = {
3064+
Blockly.Blocks['rfid_stopread'] = {
30643065
init: function () {
30653066
this.appendDummyInput()
30663067
.appendField(new Blockly.FieldVariable("rfid"), "name_")

‎generators/webduino.js‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1936,13 +1936,14 @@ Blockly.JavaScript['rfid_new'] = function (block) {
19361936
};
19371937

19381938

1939-
Blockly.JavaScript['rfid_on'] = function (block) {
1939+
Blockly.JavaScript['rfid_enter'] = function (block) {
19401940
var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
19411941
var statements_on_ = Blockly.JavaScript.statementToCode(block, 'on_');
1942-
var code = variable_name_ + '.on(function(_uid){\n' +
1943-
' ' + variable_name_ + '._uid = _uid;\n' +
1944-
statements_on_ +
1945-
'});\n';
1942+
var code = variable_name_+'.read();\n'+
1943+
variable_name_+'.on("enter",function(_uid){\n'+
1944+
' ' + variable_name_ + '._uid = _uid;\n' +
1945+
statements_on_+
1946+
'});\n';
19461947
return code;
19471948
};
19481949

@@ -1954,7 +1955,7 @@ Blockly.JavaScript['rfid_uid'] = function(block) {
19541955
};
19551956

19561957

1957-
Blockly.JavaScript['rfid_in'] = function(block) {
1958+
Blockly.JavaScript['rfid_if'] = function(block) {
19581959
var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
19591960
var value_uid_ = Blockly.JavaScript.valueToCode(block, 'uid_', Blockly.JavaScript.ORDER_ATOMIC);
19601961
var statements_do_ = Blockly.JavaScript.statementToCode(block, 'do_');
@@ -1965,17 +1966,17 @@ Blockly.JavaScript['rfid_in'] = function(block) {
19651966
};
19661967

19671968

1968-
Blockly.JavaScript['rfid_out'] = function(block) {
1969+
Blockly.JavaScript['rfid_leave'] = function(block) {
19691970
var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
19701971
var statements_do_ = Blockly.JavaScript.statementToCode(block, 'do_');
1971-
var code = 'if('+variable_name_+'._uid == 0){\n'+
1972-
statements_do_+
1973-
'}\n';
1972+
var code = variable_name_+'.on("leave",function(_uid){\n'+
1973+
statements_do_+
1974+
'});\n';
19741975
return code;
19751976
};
19761977

19771978

1978-
Blockly.JavaScript['rfid_off'] = function (block) {
1979+
Blockly.JavaScript['rfid_stopread'] = function (block) {
19791980
var variable_name_ = Blockly.JavaScript.variableDB_.getName(block.getFieldValue('name_'), Blockly.Variables.NAME_TYPE);
19801981
var code = variable_name_ + '.off();\n';
19811982
return code;

‎index-tutorials.html‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,22 @@ <h4><a href="./?lang=zh-hant&page=tutorials/irrecv-3" target="_blank">紅外線
290290
</li>
291291
</ul>
292292
<br/>
293+
<h3>16、RFID</h3>
294+
<ul>
295+
<li>
296+
<h4><a href="./?lang=zh-hant&page=tutorials/irrecv-1" target="_blank">偵測 RFID</a><i>new</i></h4>
297+
<div>( <a href="./?lang=zh-hant&page=tutorials/irrecv-1#-K0qf8JH7bENOyJgc25r" target="_blank">解答</a> )</div>
298+
</li>
299+
<li>
300+
<h4><a href="./?lang=zh-hant&page=tutorials/irrecv-2" target="_blank">RFID 紅綠燈</a><i>new</i></h4>
301+
<div>( <a href="./?lang=zh-hant&page=tutorials/irrecv-2#-K0qhamTHkjMc9nZg4rc" target="_blank">解答</a> )</div>
302+
</li>
303+
<li>
304+
<h4><a href="./?lang=zh-hant&page=tutorials/irrecv-3" target="_blank">利用 RFID 切換 Youtube</a><i>new</i></h4>
305+
<div>( <a href="./?lang=zh-hant&page=tutorials/irrecv-3#-K0qllY_jNznqTDWliZ4" target="_blank">解答</a> )</div>
306+
</li>
307+
</ul>
308+
<br/>
293309
<h3>綜合應用：自走車</h3>
294310
<ul>
295311
<li>

‎views/index.handlebars‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -889,17 +889,17 @@
889889
</block>
890890
</value>
891891
</block>
892-
<block type="rfid_on"></block>
892+
<block type="rfid_enter"></block>
893893
<block type="rfid_uid"></block>
894-
<block type="rfid_in">
894+
<block type="rfid_if">
895895
<value name="uid_">
896896
<block type="text">
897897
<field name="TEXT">...</field>
898898
</block>
899899
</value>
900900
</block>
901-
<block type="rfid_out"></block>
902-
<block type="rfid_off"></block>
901+
<block type="rfid_leave"></block>
902+
<block type="rfid_stopread"></block>
903903
</category>
904904
<sep></sep>
905905
</category>

0 commit comments

Comments
 (0)