Skip to content

Commit 765d310

Browse files
committed
add multi option in board
1 parent 708107c commit 765d310

3 files changed

Lines changed: 12 additions & 6 deletions

File tree

blocks/msg/zh-hant.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Blockly.Msg.WEBDUINO_BOARD_SERVER = "私有雲 Server,IP";
190190
Blockly.Msg.WEBDUINO_BOARD_WIFI = "Wi-Fi";
191191
Blockly.Msg.WEBDUINO_BOARD_SERIAL = "序列埠";
192192
Blockly.Msg.WEBDUINO_BOARD_BLUETOOTH = "藍芽";
193-
Blockly.Msg.WEBDUINO_BOARD_MULTI = " 共用";
193+
Blockly.Msg.WEBDUINO_BOARD_MULTI = " 協同控制";
194194
Blockly.Msg.WEBDUINO_BOARD_CHAIN = " 串聯";
195195
Blockly.Msg.WEBDUINO_BOARD_CHAIN_OK = "當開發板串連完成";
196196
Blockly.Msg.WEBDUINO_BOARD_CHAIN_DO = "執行";

blocks/webduino.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,9 @@ Blockly.Blocks['board_ready'] = {
795795
["1 sec", "1000"]
796796
]), "rate_")
797797
.appendField(Blockly.Msg.WEBDUINO_BOARD_CHAIN, "串聯")
798-
.appendField(new Blockly.FieldCheckbox("FALSE"), "check_");
798+
.appendField(new Blockly.FieldCheckbox("FALSE"), "check_")
799+
.appendField(Blockly.Msg.WEBDUINO_BOARD_MULTI, "協同控制")
800+
.appendField(new Blockly.FieldCheckbox("FALSE"), "multi_");
799801
this.appendStatementInput("callbacks_");
800802
this.setTooltip('');
801803
this.setColour(290);

generators/webduino.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -632,16 +632,20 @@ Blockly.JavaScript['board_ready'] = function (block) {
632632
var value_device_ = Blockly.JavaScript.valueToCode(block, 'device_', Blockly.JavaScript.ORDER_ATOMIC);
633633
var checkbox_type_ = block.getFieldValue('type_');
634634
var checkbox_check_ = block.getFieldValue('check_');
635+
var checkbox_multi_ = block.getFieldValue('multi_');
635636
var dropdown_rate_ = block.getFieldValue('rate_');
636637
var statements_callbacks_ = Blockly.JavaScript.statementToCode(block, 'callbacks_');
637-
638638
var type;
639639
if (checkbox_type_ == '1') {
640-
type = 'boardReady(' + value_device_ + ', async function (board) {\n';
640+
if(checkbox_multi_=='TRUE'){
641+
type = 'boardReady({device:' + value_device_ + ' , multi:true}, async function (board) {\n';
642+
}else{
643+
type = 'boardReady(' + value_device_ + ', async function (board) {\n';
644+
}
641645
} else if (checkbox_type_ == '2') {
642-
type = 'boardReady({ transport: \'serial\', path:' + value_device_ + ' }, async function (board) {\n';
646+
type = 'boardReady({ transport: \'serial\', path:' + value_device_ + '}, async function (board) {\n';
643647
} else if (checkbox_type_ == '3') {
644-
type = 'boardReady({ transport: \'bluetooth\', address:' + value_device_ + ' }, async function (board) {\n';
648+
type = 'boardReady({ transport: \'bluetooth\', address:' + value_device_ + '}, async function (board) {\n';
645649
}
646650

647651
var code;

0 commit comments

Comments
 (0)