Skip to content

Commit abe3eae

Browse files
vongombenvongomben
committed
test module done!
great
1 parent c96c1ad commit abe3eae

5 files changed

Lines changed: 22 additions & 9 deletions

File tree

‎blocks/blocks_vertical/wioterminal/grove.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,10 @@ Blockly.Blocks['grove_wioterminal_seeed_ult'] = {
141141
{
142142
"type": "field_vertical_separator"
143143
},
144+
{
145+
"type": "input_value",
146+
"name": "PIN"
147+
},
144148
],
145149
"extensions": ["colours_arduino_grove_igure", "output_number"],
146150
});

‎blocks/msg/scratch_msgs.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3327,7 +3327,7 @@ Blockly.ScratchMsgs.locales["cs"] = {
33273327
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 Chainable RGB LED show %3 count %4",
33283328
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 Mini Fan state %3",
33293329
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 IR Distance Interrupter activated",
3330-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm)",
3330+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm) %3",
33313331
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 PIR Sensor detects motion",
33323332
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 Temperature&Humidity Sensor（DHT11）%3",
33333333
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 Temperature&Humidity Sensor（DHT20）%3",
@@ -5501,7 +5501,7 @@ Blockly.ScratchMsgs.locales["de"] = {
55015501
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 Chainable RGB LED show %3 count %4",
55025502
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 Mini Fan state %3",
55035503
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 IR Distance Interrupter activated",
5504-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm)",
5504+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm) %3",
55055505
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 PIR Sensor detects motion",
55065506
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 Temperature&Humidity Sensor（DHT11）%3",
55075507
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 Temperature&Humidity Sensor（DHT20）%3",
@@ -7691,7 +7691,7 @@ Blockly.ScratchMsgs.locales["en"] = {
76917691
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 Chainable RGB LED show %3 count %4",
76927692
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 Mini Fan state %3",
76937693
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 IR Distance Interrupter activated",
7694-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm)",
7694+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm) %3",
76957695
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 PIR Sensor detects motion",
76967696
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 Temperature&Humidity Sensor（DHT11）%3",
76977697
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 Temperature&Humidity Sensor（DHT20）%3",
@@ -11704,7 +11704,7 @@ Blockly.ScratchMsgs.locales["fr"] = {
1170411704
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 Chainable RGB LED show %3 count %4",
1170511705
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 Mini Fan state %3",
1170611706
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 IR Distance Interrupter activated",
11707-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm)",
11707+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm) %3",
1170811708
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 PIR Sensor detects motion",
1170911709
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 Temperature&Humidity Sensor（DHT11）%3",
1171011710
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 Temperature&Humidity Sensor（DHT20）%3",
@@ -17882,7 +17882,7 @@ Blockly.ScratchMsgs.locales["nl"] = {
1788217882
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 Chainable RGB LED show %3 count %4",
1788317883
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 Mini Fan state %3",
1788417884
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 IR Distance Interrupter activated",
17885-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm)",
17885+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 Ultrasonic Ranger distance(cm) %3",
1788617886
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 PIR Sensor detects motion",
1788717887
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 Temperature&Humidity Sensor（DHT11）%3",
1788817888
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 Temperature&Humidity Sensor（DHT20）%3",
@@ -23742,7 +23742,7 @@ Blockly.ScratchMsgs.locales["zh-cn"] = {
2374223742
"WIO_TERMINAL_SEEED_RGB_LED": "%1 %2 炫彩RGB LED灯 显示为 %3 序号 %4",
2374323743
"WIO_TERMINAL_SEEED_MINI_FAN": "%1 %2 迷你风扇模块设为 %3",
2374423744
"WIO_TERMINAL_SEEED_LINE_FINDER": "%1 %2 红外接近传感器被触发",
23745-
"WIO_TERMINAL_SEEED_ULT": "%1 %2 超声波测距传感器距离(cm)",
23745+
"WIO_TERMINAL_SEEED_ULT": "%1 %2 超声波测距传感器距离(cm) %3",
2374623746
"WIO_TERMINAL_SEEED_PIR_MOTION": "%1 %2 人体红外传感器检测到动作",
2374723747
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT11": "%1 %2 温湿度传感器（DHT11）%3 值",
2374823748
"WIO_TERMINAL_SEEED_TEMPERATURE_HUMIDITY_DHT20": "%1 %2 温湿度传感器（DHT20）%3 值",

‎gui/src/lib/generators/wioterminal/grove.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ export default (Blockly) => {
3838

3939
//超声波
4040
Blockly.Arduino['grove_wioterminal_seeed_ult'] = function (block) {
41+
var th = Blockly.Arduino.valueToCode(block, 'PIN', Blockly.Arduino.ORDER_ATOMIC) || '0';
42+
4143
Blockly.Arduino.definitions_['include_ultrasonic'] = '#include <Ultrasonic.h>';
42-
Blockly.Arduino.definitions_[`var_ult`] = `Ultrasonic ult(0);`;
44+
Blockly.Arduino.definitions_[`var_ult`] = `Ultrasonic ult(${th});`;
4345
var code = `(long)ult.MeasureInCentimeters()`;
4446
return [code, Blockly.Arduino.ORDER_ATOMIC];
4547
}

‎gui/src/lib/toolboxs/toolbox-1010-xml.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,14 @@ const grove = function () {
566566
</block>
567567
<block type="grove_wioterminal_seeed_line_finder">
568568
</block>
569-
<block type="grove_wioterminal_seeed_ult">
569+
<block type="grove_wioterminal_seeed_ult">
570+
571+
<value name="PIN">
572+
<shadow type="math_number">
573+
<field name="NUM">0</field>
574+
</shadow>
575+
</value>
576+
570577
</block>
571578
<block type="grove_wioterminal_seeed_pir_motion">
572579
</block>

‎vm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"pngjs": "3.3.3",
6868
"scratch-audio": "latest",
6969
"scratch-blocks": "latest",
70-
"scratch-render": "latest",
70+
"scratch-render": "0.1.0-prerelease.20231018030724",
7171
"scratch-render-fonts": "latest",
7272
"scratch-storage": "^1.0.0",
7373
"scratch-svg-renderer": "latest",

0 commit comments

Comments
 (0)