admin/mixly3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

板卡补充颜色和气压传感器、修改radar块

Browse Source
This commit is contained in:
Irene-Maxine
2024-11-19 16:51:48 +08:00
parent 448fa016d2
commit cab3df0d17
10 changed files with 106 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
boards/default_src/micropython/blocks/sensor_extern.js
View File

@@ -341,8 +341,8 @@ export const sensor_use_i2c_init = {
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"(LTR-308-ALS)", "LTR308"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"(LTR-381-RGB)", "LTR381RGB"],
[Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"(LTR308ALS)", "LTR308"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"(LTR381RGB)", "LTR381RGB"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"(UCS12071)","UCS12071"],
[Blockly.Msg.MIXLY_EXTERN_LIGHTUV +"(LTR390UV)","LTR390UV"],
[Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"(HP203X)", "HP203X"],
@@ -391,8 +391,11 @@ export const radar_set_DETECTION_THRESHOLD = {
export const interaction_whether_to_interaction = {
init:function(){
this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_RADAR)
.setCheck("var");
this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_RADAR + Blockly.Msg.MIXLY_GET_TO_INTERACTION)
.appendField(Blockly.Msg.MIXLY_GET_TO_INTERACTION)
this.setOutput(true);
this.setInputsInline(true);
}
@@ -442,7 +445,7 @@ export const sensor_LTR308_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT + " LTR308");
.appendField(Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT + " LTR308ALS");
this.appendValueInput('SUB')
//.appendField("BMP280")
.setCheck("var");

15
boards/default_src/micropython/generators/sensor_extern.js
View File

@@ -222,19 +222,14 @@ export const sensor_use_i2c_init = function (_, generator) {
export const radar_set_DETECTION_THRESHOLD = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var value = generator.valueToCode(this, 'VAR', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
if(key=='threshold'){
var code = sub + '.threshold(' + value +')\n';
return code;
}else if(key=='delay_ms'){
var code = sub + '.delay_ms(' + value +')\n';
return code;
}
var value2 = generator.valueToCode(this, 'VAR2', generator.ORDER_ATOMIC);
var code = sub + '.threshold(' + value +')\n'+sub + '.delay_ms(' + value2 +')\n';
return code;
}
export const interaction_whether_to_interaction = function(_,generator){
var code = 'radar.result()';
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var code = sub+'.result()';
return [code,generator.ORDER_ATOMIC];
}

22
boards/default_src/micropython_esp32/template.xml
View File

@@ -3759,6 +3759,13 @@
</shadow>
</value>
</block>
<block type="sensor_spl06_001_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_shtc3_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -3780,6 +3787,13 @@
</shadow>
</value>
</block>
<block type="sensor_ucs12071_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_VL530LX_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -3825,7 +3839,13 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction"></block>
<block type="interaction_whether_to_interaction">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="communicate_spi_init">
<value name="VAR">
<shadow type="variables_get">

8
boards/default_src/micropython_esp32c2/template.xml
View File

@@ -3684,7 +3684,13 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction"></block>
<block type="interaction_whether_to_interaction">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="communicate_spi_init" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="VAR">
<shadow type="variables_get">

22
boards/default_src/micropython_esp32c3/template.xml
View File

@@ -3556,6 +3556,13 @@
</shadow>
</value>
</block>
<block type="sensor_spl06_001_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_shtc3_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
@@ -3577,6 +3584,13 @@
</shadow>
</value>
</block>
<block type="sensor_ucs12071_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_VL530LX_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
@@ -3622,7 +3636,13 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction"></block>
<block type="interaction_whether_to_interaction">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="communicate_spi_init" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="VAR">
<shadow type="variables_get">

22
boards/default_src/micropython_esp32s2/template.xml
View File

@@ -3352,6 +3352,13 @@
</shadow>
</value>
</block>
<block type="sensor_spl06_001_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_shtc3_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -3373,6 +3380,13 @@
</shadow>
</value>
</block>
<block type="sensor_ucs12071_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_VL530LX_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -3418,7 +3432,13 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction"></block>
<block type="interaction_whether_to_interaction">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="communicate_spi_init">
<value name="VAR">
<shadow type="variables_get">

22
boards/default_src/micropython_esp32s3/template.xml
View File

@@ -3991,6 +3991,13 @@
</shadow>
</value>
</block>
<block type="sensor_spl06_001_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_shtc3_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -4012,6 +4019,13 @@
</shadow>
</value>
</block>
<block type="sensor_ucs12071_extern" m-hide='micropython:esp32c3:mixgocar_c3'>
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="sensor_VL530LX_extern">
<value name="SUB">
<shadow type="variables_get">
@@ -4057,7 +4071,13 @@
</shadow>
</value>
</block>
<block type="interaction_whether_to_interaction"></block>
<block type="interaction_whether_to_interaction">
<value name="SUB">
<shadow type="variables_get">
<field name="VAR">xsensor</field>
</shadow>
</value>
</block>
<block type="communicate_spi_init">
<value name="VAR">
<shadow type="variables_get">

2
common/msg/blockly/en.js
View File

@@ -1120,7 +1120,7 @@ En.MIXLY_RTCSETTIME = 'Set time';
En.MIXLY_RTCSETDATE = 'Set date ';
En.MIXLY_GET = 'get';
En.MIXLY_SYSTEM = 'system';
En.MIXLY_ADXL345 = 'Acceleration_ADXL345';
En.MIXLY_ADXL345 = 'Acceleration sensor ADXL345';
En.MIXLY_ADXL345_XA = 'X-axis angle';
En.MIXLY_ADXL345_YA = 'Y-axis angle';
En.MIXLY_ADXL345_ZA = 'Z-axis angle';

2
common/msg/blockly/zh-hans.js
View File

@@ -1133,7 +1133,7 @@ ZhHans.MIXLY_RTCSETTIME = '设置时间';
ZhHans.MIXLY_RTCSETDATE = '设置日期';
ZhHans.MIXLY_GET = '获取';
ZhHans.MIXLY_SYSTEM = '系统';
ZhHans.MIXLY_ADXL345 = 'ADXL345重力传感器';
ZhHans.MIXLY_ADXL345 = '加速度传感器 ADXL345';
ZhHans.MIXLY_ADXL345_X = 'X轴加速度';
ZhHans.MIXLY_ADXL345_Y = 'Y轴加速度';
ZhHans.MIXLY_ADXL345_Z = 'Z轴加速度';

2
common/msg/blockly/zh-hant.js
View File

@@ -1120,7 +1120,7 @@ ZhHant.MIXLY_RTCSETTIME = '設置時間：';
ZhHant.MIXLY_RTCSETDATE = '設置日期：';
ZhHant.MIXLY_GET = '獲取';
ZhHant.MIXLY_SYSTEM = '系統';
ZhHant.MIXLY_ADXL345 = 'ADXL345重力感測器';
ZhHant.MIXLY_ADXL345 = '加速度傳感器 ADXL345';
ZhHant.MIXLY_ADXL345_X = 'X軸加速度';
ZhHant.MIXLY_ADXL345_Y = 'Y軸加速度';
ZhHant.MIXLY_ADXL345_Z = 'Z軸加速度';