Skip to content

Commit a99f72f

Browse files
osk2osk2
committed
Adjust code to match code standard
1 parent 4bbd9e6 commit a99f72f

2 files changed

Lines changed: 44 additions & 38 deletions

File tree

‎blocks/webduino.js‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -966,14 +966,14 @@ Blockly.Blocks['board'] = {
966966
function dropdown_options() {
967967
var board_type = Blockly.Blocks['board']['board_type'];
968968
var options_full = [
969-
[Blockly.Msg.WEBDUINO_BOARD_WIFI, "1"],
970-
[Blockly.Msg.WEBDUINO_BOARD_SERIAL, "2"],
971-
[Blockly.Msg.WEBDUINO_BOARD_BLUETOOTH, "3"],
972-
[Blockly.Msg.WEBDUINO_BOARD_WEBSOCKET, "4"]
969+
[Blockly.Msg.WEBDUINO_BOARD_WIFI, '1'],
970+
[Blockly.Msg.WEBDUINO_BOARD_SERIAL, '2'],
971+
[Blockly.Msg.WEBDUINO_BOARD_BLUETOOTH, '3'],
972+
[Blockly.Msg.WEBDUINO_BOARD_WEBSOCKET, '4']
973973
];
974974
var options_smart = [
975-
[Blockly.Msg.WEBDUINO_BOARD_WIFI, "1"],
976-
[Blockly.Msg.WEBDUINO_BOARD_WEBSOCKET, "4"]
975+
[Blockly.Msg.WEBDUINO_BOARD_WIFI, '1'],
976+
[Blockly.Msg.WEBDUINO_BOARD_WEBSOCKET, '4']
977977
];
978978

979979

@@ -984,32 +984,32 @@ Blockly.Blocks['board'] = {
984984
}
985985
}
986986

987-
this.appendValueInput("device_")
988-
.setCheck("String")
989-
.appendField(Blockly.Msg.WEBDUINO_BOARD, "開發板")
987+
this.appendValueInput('device_')
988+
.setCheck('String')
989+
.appendField(Blockly.Msg.WEBDUINO_BOARD, '開發板')
990990
.appendField(new Blockly.FieldDropdown([
991-
[Blockly.Msg.WEBDUINO_MARK_OR_FLY, "1"],
992-
[Blockly.Msg.WEBDUINO_SMART, "2"]
993-
]), "board_")
994-
.appendField(Blockly.Msg.WEBDUINO_USE, "透過")
995-
.appendField(new Blockly.FieldDropdown(dropdown_options), "type_")
996-
.appendField(Blockly.Msg.WEBDUINO_CONNECT_TO, "連線至");
997-
this.appendDummyInput()
998-
.appendField(Blockly.Msg.WEBDUINO_BOARD_SAMPLING, " 類比取樣")
991+
[Blockly.Msg.WEBDUINO_MARK_OR_FLY, '1'],
992+
[Blockly.Msg.WEBDUINO_SMART, '2']
993+
]), 'board_')
994+
.appendField(Blockly.Msg.WEBDUINO_USE, '透過')
995+
.appendField(new Blockly.FieldDropdown(dropdown_options), 'type_')
996+
.appendField(Blockly.Msg.WEBDUINO_CONNECT_TO, '連線至');
997+
this.appendDummyInput()
998+
.appendField(Blockly.Msg.WEBDUINO_BOARD_SAMPLING, ' 類比取樣')
999999
.appendField(new Blockly.FieldDropdown([
1000-
["20 ms", "20"],
1001-
["50 ms", "50"],
1002-
["75 ms", "75"],
1003-
["100 ms", "100"],
1004-
["250 ms", "250"],
1005-
["500 ms", "500"],
1006-
["1 sec", "1000"]
1007-
]), "rate_")
1008-
.appendField(Blockly.Msg.WEBDUINO_BOARD_CHAIN, "串聯")
1009-
.appendField(new Blockly.FieldCheckbox("FALSE"), "check_")
1010-
.appendField(Blockly.Msg.WEBDUINO_BOARD_MULTI, "協同控制")
1011-
.appendField(new Blockly.FieldCheckbox("FALSE"), "multi_");
1012-
this.appendStatementInput("callbacks_");
1000+
['20 ms', '20'],
1001+
['50 ms', '50'],
1002+
['75 ms', '75'],
1003+
['100 ms', '100'],
1004+
['250 ms', '250'],
1005+
['500 ms', '500'],
1006+
['1 sec', '1000']
1007+
]), 'rate_')
1008+
.appendField(Blockly.Msg.WEBDUINO_BOARD_CHAIN, '串聯')
1009+
.appendField(new Blockly.FieldCheckbox('FALSE'), 'check_')
1010+
.appendField(Blockly.Msg.WEBDUINO_BOARD_MULTI, '協同控制')
1011+
.appendField(new Blockly.FieldCheckbox('FALSE'), 'multi_');
1012+
this.appendStatementInput('callbacks_');
10131013
this.setTooltip('');
10141014
this.setColour(290);
10151015
this.setHelpUrl('https://webduino.io');

‎generators/webduino.js‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -825,38 +825,44 @@ Blockly.JavaScript['board'] = function (block) {
825825
var statements_callbacks_ = Blockly.JavaScript.statementToCode(block, 'callbacks_');
826826
var type, board, transport, ws;
827827

828-
if (dropdown_board_ == '2') {
828+
if (dropdown_board_ === '2') {
829+
// Smart
829830
board = 'board: \'Smart\', ';
830831
transport = ', transport: \'mqtt\'';
831832
ws = '';
832833
} else {
834+
// Mark 1 or Fly
833835
board = '';
834836
transport = '';
835837
ws = ', transport: \'websocket\''
836838
}
837839

838-
if (dropdown_type_ == '1') {
839-
if (checkbox_multi_ == 'TRUE') {
840+
if (dropdown_type_ === '1') {
841+
// Wi-Fi
842+
if (checkbox_multi_ === 'TRUE') {
840843
type = 'boardReady({' + board + 'device: ' + value_device_ + transport + ', multi: true}, async function (board) {\n';
841844
} else {
842845
type = 'boardReady({' + board + 'device: ' + value_device_ + transport + '}, async function (board) {\n';
843846
}
844-
} else if (dropdown_type_ == '2') {
847+
} else if (dropdown_type_ === '2') {
848+
// Serial
845849
type = 'boardReady({' + board + 'transport: \'serial\', path: ' + value_device_ + '}, async function (board) {\n';
846-
} else if (dropdown_type_ == '3') {
850+
} else if (dropdown_type_ === '3') {
851+
// Bluetooth
847852
type = 'boardReady({' + board + 'transport: \'bluetooth\', address: ' + value_device_ + '}, async function (board) {\n';
848-
} else if (dropdown_type_ == '4') {
853+
} else if (dropdown_type_ === '4') {
854+
// WebSocket
849855
type = 'boardReady({' + board + 'url: ' + value_device_ + ws +'}, async function (board) {\n';
850856
}
851857

852858
var code;
853-
if (checkbox_check_ == 'FALSE') {
859+
if (checkbox_check_ === 'FALSE') {
854860
code = type +
855861
' board.systemReset();\n' +
856862
' board.samplingInterval = ' + dropdown_rate_ + ';\n' +
857863
statements_callbacks_ +
858864
'});\n';
859-
} else if (checkbox_check_ == 'TRUE') {
865+
} else if (checkbox_check_ === 'TRUE') {
860866
code = 'if(window.readyBoardLength){\n' +
861867
' window.readyBoardLength = window.readyBoardLength + 1;\n' +
862868
'}else{\n' +

0 commit comments

Comments
 (0)