@@ -675,7 +675,7 @@ Blockly.JavaScript['board_ready'] = function (block) {
675675
676676Blockly . JavaScript [ 'board_error' ] = function ( block ) {
677677 var statements_callbacks_ = Blockly . JavaScript . statementToCode ( block , 'callbacks_' ) ;
678- var code = "board.on('error', function (err) {\n board.error = err;\n" +
678+ var code = "board.on('error',async function (err) {\n board.error = err;\n" +
679679 statements_callbacks_ +
680680 "});\n" ;
681681 return code ;
@@ -883,7 +883,7 @@ Blockly.JavaScript['fish_move'] = function (block) {
883883Blockly . JavaScript [ 'timer' ] = function ( block ) {
884884 var value_secs_ = Blockly . JavaScript . valueToCode ( block , 'secs_' , Blockly . JavaScript . ORDER_NONE ) ;
885885 var statements_do_ = Blockly . JavaScript . statementToCode ( block , 'do_' ) ;
886- var code = 'setTimeout(function () {\n' + statements_do_ + '}, ' + 1000 * value_secs_ + ');\n' ;
886+ var code = 'setTimeout(async function () {\n' + statements_do_ + '}, ' + 1000 * value_secs_ + ');\n' ;
887887 return code ;
888888} ;
889889
@@ -907,7 +907,7 @@ Blockly.JavaScript['ultrasonic_get'] = function (block) {
907907 var variable_var_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'var_' ) , Blockly . Variables . NAME_TYPE ) ;
908908 var value_time = Blockly . JavaScript . valueToCode ( block , 'time' , Blockly . JavaScript . ORDER_ATOMIC ) ;
909909 var statements_do = Blockly . JavaScript . statementToCode ( block , 'do' ) ;
910- var code = variable_var_ + '.ping(function(cm){\n' +
910+ var code = variable_var_ + '.ping(async function(cm){\n' +
911911 ' console.log(' + variable_var_ + '.distance);\n' +
912912 statements_do +
913913 '}, ' + value_time + ');\n' ;
@@ -945,7 +945,7 @@ Blockly.JavaScript['button_event'] = function (block) {
945945 var variable_var_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'var_' ) , Blockly . Variables . NAME_TYPE ) ;
946946 var dropdown_event_ = block . getFieldValue ( 'event_' ) ;
947947 var statements_do_ = Blockly . JavaScript . statementToCode ( block , 'do_' ) ;
948- var code = variable_var_ + '.on("' + dropdown_event_ + '",function(){\n' +
948+ var code = variable_var_ + '.on("' + dropdown_event_ + '",async function(){\n' +
949949 ' console.log("' + dropdown_event_ + '");\n' +
950950 ' ' + statements_do_ + '\n' +
951951 '});\n' ;
@@ -964,7 +964,7 @@ Blockly.JavaScript['pir_status'] = function (block) {
964964 var variable_item_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'item_' ) , Blockly . Variables . NAME_TYPE ) ;
965965 var dropdown_status_ = block . getFieldValue ( 'status_' ) ;
966966 var statements_var_ = Blockly . JavaScript . statementToCode ( block , 'var_' ) ;
967- var code = variable_item_ + '.on("' + dropdown_status_ + '",function(){\n' +
967+ var code = variable_item_ + '.on("' + dropdown_status_ + '",async function(){\n' +
968968 statements_var_ + '\n' +
969969 '});\n' ;
970970 return code ;
@@ -984,11 +984,11 @@ Blockly.JavaScript['sound_status'] = function (block) {
984984 var statements_var_ = Blockly . JavaScript . statementToCode ( block , 'var_' ) ;
985985 var code ;
986986 if ( dropdown_status_ == 'detected' ) {
987- code = variable_item_ + '.on("' + dropdown_status_ + '",function(){\n' +
987+ code = variable_item_ + '.on("' + dropdown_status_ + '",async function(){\n' +
988988 ' ' + statements_var_ + '\n' +
989989 '});\n' ;
990990 } else {
991- code = variable_item_ + '.on("' + dropdown_status_ + '",function(){\n' +
991+ code = variable_item_ + '.on("' + dropdown_status_ + '",async function(){\n' +
992992 ' setTimeout(function(){\n' +
993993 ' ' + statements_var_ + '\n' +
994994 ' },300);\n' +
@@ -1008,7 +1008,7 @@ Blockly.JavaScript['shock_event'] = function (block) {
10081008 var variable_var_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'var_' ) , Blockly . Variables . NAME_TYPE ) ;
10091009 var dropdown_event_ = block . getFieldValue ( 'event_' ) ;
10101010 var statements_do_ = Blockly . JavaScript . statementToCode ( block , 'do_' ) ;
1011- var code = variable_var_ + '.on("' + dropdown_event_ + '",function(){\n' +
1011+ var code = variable_var_ + '.on("' + dropdown_event_ + '",async function(){\n' +
10121012 ' console.log("' + dropdown_event_ + '");\n' +
10131013 ' ' + statements_do_ + '\n' +
10141014 '});\n' ;
@@ -1027,7 +1027,7 @@ Blockly.JavaScript['dht_get'] = function (block) {
10271027 var variable_var_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'var_' ) , Blockly . Variables . NAME_TYPE ) ;
10281028 var value_time = Blockly . JavaScript . valueToCode ( block , 'time' , Blockly . JavaScript . ORDER_ATOMIC ) ;
10291029 var statements_do = Blockly . JavaScript . statementToCode ( block , 'do' ) ;
1030- var code = variable_var_ + '.read(function(evt){\n' +
1030+ var code = variable_var_ + '.read(async function(evt){\n' +
10311031 statements_do +
10321032 '}, ' + value_time + ');\n' ;
10331033 return code ;
@@ -1600,7 +1600,7 @@ Blockly.JavaScript['status_repeat'] = function (block) {
16001600 code = 'alert("時間格式錯誤!請填入數字!Time format error! Please enter number!");' ;
16011601 } else {
16021602 code = 'var ' + timer + ', ' + repeatNum + '=0;\n' +
1603- 'var ' + repeat + ' = function(){\n' +
1603+ 'var ' + repeat + ' = async function(){\n' +
16041604 ' if(' + repeatNum + '<' + value_times_ + '){\n' +
16051605 ' ' + argument0 +
16061606 ' ' + repeatNum + ' = ' + repeatNum + ' + 1;\n' +
@@ -1618,7 +1618,7 @@ Blockly.JavaScript['status_repeat'] = function (block) {
16181618 codeArray . argument [ n ] = Blockly . JavaScript . statementToCode ( block , 'ADD' + n ) ;
16191619 codeArray . delayTime [ n ] = block . getFieldValue ( 'time' + n ) ;
16201620 if ( isNaN ( codeArray . delayTime [ n ] * 1 ) ) {
1621- codeArray . code [ n ] = '.then(function(){\n' +
1621+ codeArray . code [ n ] = '.then(async function(){\n' +
16221622 ' alert("時間格式錯誤!請填入數字!Time format error! Please enter number!");\n' +
16231623 ' })' ;
16241624 } else {
@@ -1630,15 +1630,15 @@ Blockly.JavaScript['status_repeat'] = function (block) {
16301630 }
16311631 var codeContent = codeArray . code . join ( '' ) ;
16321632 code = 'var ' + timer + ', ' + repeatNum + '=0;\n' +
1633- 'var ' + repeat + ' = function(){\n' +
1633+ 'var ' + repeat + ' = async function(){\n' +
16341634 ' var ' + time + ';\n' +
1635- ' var ' + repeatDelay + ' = function(' + time + '){\n' +
1635+ ' var ' + repeatDelay + ' = async function(' + time + '){\n' +
16361636 ' return new Promise(function(resolve){\n' +
16371637 ' ' + timer + ' = setTimeout(resolve,' + time + ');\n' +
16381638 ' });\n' +
16391639 ' };\n' +
1640- ' var ' + repeatPromise + ' = function(){\n' +
1641- ' ' + repeatDelay + '(1)' + codeContent + '.then(function(){\n' +
1640+ ' var ' + repeatPromise + ' = async function(){\n' +
1641+ ' ' + repeatDelay + '(1)' + codeContent + '.then(async function(){\n' +
16421642 ' if(' + repeatNum + '<' + ( value_times_ - 1 ) + '){\n' +
16431643 ' ' + repeatNum + ' = ' + repeatNum + ' + 1;\n' +
16441644 ' ' + repeatPromise + '();\n' +
@@ -1679,7 +1679,7 @@ Blockly.JavaScript['status_repeat_forever'] = function (block) {
16791679 if ( isNaN ( time0 * 1 ) ) {
16801680 code = 'alert("時間格式錯誤!請填入數字!Time format error! Please enter number!");' ;
16811681 } else {
1682- code = 'var ' + repeat + ' = function(){\n' +
1682+ code = 'var ' + repeat + ' = async function(){\n' +
16831683 ' ' + argument0 +
16841684 ' ' + value_name_ + ' = setTimeout(' + repeat + ',' + ( time0 * 1000 ) + ');\n' +
16851685 '};\n' +
@@ -1691,26 +1691,26 @@ Blockly.JavaScript['status_repeat_forever'] = function (block) {
16911691 codeArray . argument [ n ] = Blockly . JavaScript . statementToCode ( block , 'ADD' + n ) ;
16921692 codeArray . delayTime [ n ] = block . getFieldValue ( 'time' + n ) ;
16931693 if ( isNaN ( codeArray . delayTime [ n ] * 1 ) ) {
1694- codeArray . code [ n ] = '.then(function(){\n' +
1694+ codeArray . code [ n ] = '.then(async function(){\n' +
16951695 ' alert("時間格式錯誤!請填入數字!Time format error! Please enter number!");\n' +
16961696 ' })' ;
16971697 } else {
1698- codeArray . code [ n ] = '.then(function(){\n' +
1698+ codeArray . code [ n ] = '.then(async function(){\n' +
16991699 ' ' + codeArray . argument [ n ] +
17001700 ' return ' + repeatDelay + '(' + ( 1000 * codeArray . delayTime [ n ] ) + ');\n' +
17011701 ' })' ;
17021702 }
17031703 }
17041704 var codeContent = codeArray . code . join ( '' ) ;
1705- code = 'var ' + repeat + ' = function(){\n' +
1705+ code = 'var ' + repeat + ' = async function(){\n' +
17061706 ' var ' + time + ';\n' +
1707- ' var ' + repeatDelay + ' = function(' + time + '){\n' +
1708- ' return new Promise(function(resolve){\n' +
1707+ ' var ' + repeatDelay + ' = async function(' + time + '){\n' +
1708+ ' return new Promise(async function(resolve){\n' +
17091709 ' ' + value_name_ + ' = setTimeout(resolve,' + time + ');\n' +
17101710 ' });\n' +
17111711 ' };\n' +
1712- ' var ' + repeatPromise + ' = function(){\n' +
1713- ' ' + repeatDelay + '(1)' + codeContent + '.then(function(){\n' +
1712+ ' var ' + repeatPromise + ' = async function(){\n' +
1713+ ' ' + repeatDelay + '(1)' + codeContent + '.then(async function(){\n' +
17141714 ' ' + repeatPromise + '();\n' +
17151715 ' });\n' +
17161716 ' };\n' +
@@ -2120,7 +2120,7 @@ Blockly.JavaScript['photocell_new'] = function (block) {
21202120Blockly . JavaScript [ 'photocell_detected' ] = function ( block ) {
21212121 var variable_name_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'name_' ) , Blockly . Variables . NAME_TYPE ) ;
21222122 var statements_detected_ = Blockly . JavaScript . statementToCode ( block , 'detected_' ) ;
2123- var code = variable_name_ + '.on(function(val){\n' +
2123+ var code = variable_name_ + '.on(async function(val){\n' +
21242124 ' ' + variable_name_ + '.detectedVal = val;\n' +
21252125 statements_detected_ +
21262126 '});\n' ;
@@ -2152,10 +2152,10 @@ Blockly.JavaScript['irrecv_new'] = function (block) {
21522152Blockly . JavaScript [ 'irrecv_on' ] = function ( block ) {
21532153 var variable_name_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'name_' ) , Blockly . Variables . NAME_TYPE ) ;
21542154 var statements_on_ = Blockly . JavaScript . statementToCode ( block , 'on_' ) ;
2155- var code = variable_name_ + '.on(function(val){\n' +
2155+ var code = variable_name_ + '.on(async function(val){\n' +
21562156 ' ' + variable_name_ + '.onVal = val;\n' +
21572157 statements_on_ +
2158- '},function(){});\n' ;
2158+ '},async function(){});\n' ;
21592159 return code ;
21602160} ;
21612161
@@ -2207,7 +2207,7 @@ Blockly.JavaScript['adxl345_on'] = function (block) {
22072207 var statements_on_ = Blockly . JavaScript . statementToCode ( block , 'on_' ) ;
22082208 var code = variable_name_ + '.setSensitivity = 0;\n' +
22092209 variable_name_ + '.setBaseAxis = "x";\n' +
2210- variable_name_ + '.on(function(_x,_y,_z,_r,_p){\n' +
2210+ variable_name_ + '.on(async function(_x,_y,_z,_r,_p){\n' +
22112211 ' ' + variable_name_ + '._x = _x;\n' +
22122212 ' ' + variable_name_ + '._y = _y;\n' +
22132213 ' ' + variable_name_ + '._z = _z;\n' +
@@ -2277,7 +2277,7 @@ Blockly.JavaScript['document_keyboard'] = function (block) {
22772277 var dropdown_event_ = block . getFieldValue ( 'event_' ) ;
22782278 var e = Blockly . JavaScript . variableDB_ . getDistinctName (
22792279 'e' , Blockly . Variables . NAME_TYPE ) ;
2280- var code = 'document.' + dropdown_event_ + ' = function(' + e + '){\n' +
2280+ var code = 'document.' + dropdown_event_ + ' = async function(' + e + '){\n' +
22812281 ' console.log(' + e + '.keyCode);\n' +
22822282 ' switch(' + e + '.keyCode){\n' +
22832283 statements_do_ +
@@ -2327,7 +2327,7 @@ Blockly.JavaScript['rfid_enter'] = function (block) {
23272327 var variable_name_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'name_' ) , Blockly . Variables . NAME_TYPE ) ;
23282328 var statements_on_ = Blockly . JavaScript . statementToCode ( block , 'on_' ) ;
23292329 var code = variable_name_ + '.read();\n' +
2330- variable_name_ + '.on("enter",function(_uid){\n' +
2330+ variable_name_ + '.on("enter",async function(_uid){\n' +
23312331 ' ' + variable_name_ + '._uid = _uid;\n' +
23322332 statements_on_ +
23332333 '});\n' ;
@@ -2356,7 +2356,7 @@ Blockly.JavaScript['rfid_if'] = function (block) {
23562356Blockly . JavaScript [ 'rfid_leave' ] = function ( block ) {
23572357 var variable_name_ = Blockly . JavaScript . variableDB_ . getName ( block . getFieldValue ( 'name_' ) , Blockly . Variables . NAME_TYPE ) ;
23582358 var statements_do_ = Blockly . JavaScript . statementToCode ( block , 'do_' ) ;
2359- var code = variable_name_ + '.on("leave",function(_uid){\n' +
2359+ var code = variable_name_ + '.on("leave",async function(_uid){\n' +
23602360 statements_do_ +
23612361 '});\n' ;
23622362 return code ;
0 commit comments