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

修改传感器 设备名+英文名

Browse Source
This commit is contained in:
Irene-Maxine
2024-11-19 11:18:47 +08:00
parent 6c97e1454a
commit 3160024ae7
7 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -251,7 +251,7 @@ export const sensor_bmp = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("BMP280") .appendField(Blockly.Msg.MIXLY_ALTITUDE_SENSOR+" BMP280")
.setCheck("var"); .setCheck("var");
this.appendDummyInput("") this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([ .appendField(new Blockly.FieldDropdown([
@@ -276,7 +276,7 @@ export const sensor_sht = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("SHT20") .appendField(Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR +" SHT20")
.setCheck("var"); .setCheck("var");
this.appendDummyInput("") this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([ .appendField(new Blockly.FieldDropdown([
@@ -341,24 +341,24 @@ export const sensor_use_i2c_init = {
this.appendDummyInput("") this.appendDummyInput("")
.appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO) .appendField(Blockly.Msg.MIXLY_SETUP + Blockly.Msg.LISTS_SET_INDEX_INPUT_TO)
.appendField(new Blockly.FieldDropdown([ .appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"LTR-308-ALS", "LTR308"], [Blockly.Msg.MIXLY_ESP32_EXTERN_LIGHT+"(LTR-308-ALS)", "LTR308"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"LTR-381-RGB", "LTR381RGB"], [Blockly.Msg.MIXLY_COLOR_SENSOR+"(LTR-381-RGB)", "LTR381RGB"],
[Blockly.Msg.MIXLY_COLOR_SENSOR+"UCS12071","UCS12071"], [Blockly.Msg.MIXLY_COLOR_SENSOR+"(UCS12071)","UCS12071"],
[Blockly.Msg.MIXLY_EXTERN_LIGHTUV +"LTR390UV","LTR390UV"], [Blockly.Msg.MIXLY_EXTERN_LIGHTUV +"(LTR390UV)","LTR390UV"],
[Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"HP203X", "HP203X"], [Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"(HP203X)", "HP203X"],
[Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"SPL06_001","SPL06_001"], [Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"(SPL06_001)","SPL06_001"],
[Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"BMP280", "BMP280"], [Blockly.Msg.MIXLY_ALTITUDE_SENSOR+"(BMP280)", "BMP280"],
[Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "SHTC3", "SHTC3"], [Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "(SHTC3)", "SHTC3"],
[Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "AHT21", "AHT21"], [Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "(AHT21)", "AHT21"],
[Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "SHT20", "SHT20"], [Blockly.Msg.MIXLY_TEMP_AND_HUMIDITY_SENSOR + "(SHT20)", "SHT20"],
[Blockly.Msg.MIXLY_LASER_RANGE_SENSOR + "VL53L0X", "VL53L0X"], [Blockly.Msg.MIXLY_LASER_RANGE_SENSOR + "(VL53L0X)", "VL53L0X"],
[Blockly.Msg.MIXLY_GEOMAGNETIC_SENSOR + "QMC5883L", "QMC5883L"], [Blockly.Msg.MIXLY_GEOMAGNETIC_SENSOR + "(QMC5883L)", "QMC5883L"],
[Blockly.Msg.MIXLY_ESP32_MAX30102+"MAX30102", "MAX30102"], [Blockly.Msg.MIXLY_ESP32_MAX30102+"(MAX30102)", "MAX30102"],
[Blockly.Msg.HTML_COLOUR +"、"+ Blockly.Msg.MIXLY_ENVIRONMENT_LIGHT+"、"+Blockly.Msg.MIXLY_NEXT+"、"+Blockly.Msg.MIXLY_ESP32_APDS9960+"APDS9960", "APDS9960"], [Blockly.Msg.HTML_COLOUR +"、"+ Blockly.Msg.MIXLY_ENVIRONMENT_LIGHT+"、"+Blockly.Msg.MIXLY_NEXT+"、"+Blockly.Msg.MIXLY_ESP32_APDS9960+"(APDS9960)", "APDS9960"],
[Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+"MPU9250", "MPU9250"], [Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+"(MPU9250)", "MPU9250"],
[Blockly.Msg.MixGo_MPU9250+"ADXL345", "ADXL345"], [Blockly.Msg.MixGo_MPU9250+"(ADXL345)", "ADXL345"],
["RFID", "RFID"], ["RFID", "RFID"],
[Blockly.Msg.MIXLY_RADAR_SENSOR+"CBR817", "CBR817"] [Blockly.Msg.MIXLY_RADAR_SENSOR+"(CBR817)", "CBR817"]
]), "key"); ]), "key");
this.setInputsInline(true); this.setInputsInline(true);
this.setPreviousStatement(true, null); this.setPreviousStatement(true, null);
@@ -667,7 +667,7 @@ export const sensor_mpu9250_get_acceleration = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("MPU9250") .appendField(Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+" MPU9250")
.setCheck("var"); .setCheck("var");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_ACCELERATION) .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_ACCELERATION)
@@ -701,7 +701,7 @@ export const sensor_mpu9250_get_magnetic = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("MPU9250") .appendField(Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+" MPU9250")
.setCheck("var"); .setCheck("var");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET + Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH) .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_GET + Blockly.Msg.MIXLY_MICROBIT_JS_FIELD_STRENGTH)
@@ -734,7 +734,7 @@ export const sensor_mpu9250_get_gyro = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("MPU9250") .appendField(Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+" MPU9250")
.setCheck("var"); .setCheck("var");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET + Blockly.Msg.MIXLY_ESP32_SENOR_GYRO) .appendField(Blockly.Msg.MIXLY_MICROBIT_PY_STORAGE_GET + Blockly.Msg.MIXLY_ESP32_SENOR_GYRO)
@@ -767,7 +767,7 @@ export const sensor_mpu9250_calibrate_compass = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("MPU9250") .appendField(Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+" MPU9250")
.setCheck("var"); .setCheck("var");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CALIBRATE_COMPASS) .appendField(Blockly.Msg.MIXLY_MICROBIT_JS_CALIBRATE_COMPASS)
@@ -783,7 +783,7 @@ export const sensor_mpu9250_temperature = {
init: function () { init: function () {
this.setColour(SENSOR_EXTERN_HUE); this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB') this.appendValueInput('SUB')
.appendField("MPU9250") .appendField(Blockly.Msg.MIXLY_NINE_AXIS_SENSOR+" MPU9250")
.setCheck("var"); .setCheck("var");
this.appendDummyInput() this.appendDummyInput()
.appendField(Blockly.Msg.MIXLY_GETTEMPERATUE) .appendField(Blockly.Msg.MIXLY_GETTEMPERATUE)

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

@@ -181,7 +181,7 @@ export const sensor_use_i2c_init = function (_, generator) {
code = v + ' = ltr381rgb.LTR_381RGB(' + iv + ')\n'; code = v + ' = ltr381rgb.LTR_381RGB(' + iv + ')\n';
} else if(key == 'UCS12071'){ } else if(key == 'UCS12071'){
generator.definitions_['import_ucs12071'] = 'import ucs12071'; generator.definitions_['import_ucs12071'] = 'import ucs12071';
ode = v + ' = ucs12071.UCS12071(' + iv + ')\n'; code = v + ' = ucs12071.UCS12071(' + iv + ')\n';
} else if (key == 'LTR390UV'){ } else if (key == 'LTR390UV'){
generator.definitions_['import_ltr390uv'] = 'import ltr390uv'; generator.definitions_['import_ltr390uv'] = 'import ltr390uv';
code = v + ' = ltr390uv.ALS_UVS(' + iv +')\n'; code = v + ' = ltr390uv.ALS_UVS(' + iv +')\n';

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

@@ -4128,7 +4128,7 @@
<block type="radar_set_DETECTION_THRESHOLD"> <block type="radar_set_DETECTION_THRESHOLD">
<value name="SUB"> <value name="SUB">
<shadow type="variables_get"> <shadow type="variables_get">
<field name="VAR">radar</field> <field name="VAR">xsensor</field>
</shadow> </shadow>
</value> </value>
<value name="VAR"> <value name="VAR">

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

@@ -3990,7 +3990,7 @@
<block type="radar_set_DETECTION_THRESHOLD"> <block type="radar_set_DETECTION_THRESHOLD">
<value name="SUB"> <value name="SUB">
<shadow type="variables_get"> <shadow type="variables_get">
<field name="VAR">radar</field> <field name="VAR">xsensor</field>
</shadow> </shadow>
</value> </value>
<value name="VAR"> <value name="VAR">

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

@@ -3928,7 +3928,7 @@
<block type="radar_set_DETECTION_THRESHOLD"> <block type="radar_set_DETECTION_THRESHOLD">
<value name="SUB"> <value name="SUB">
<shadow type="variables_get"> <shadow type="variables_get">
<field name="VAR">radar</field> <field name="VAR">xsensor</field>
</shadow> </shadow>
</value> </value>
<value name="VAR"> <value name="VAR">

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

@@ -3721,7 +3721,7 @@
<block type="radar_set_DETECTION_THRESHOLD"> <block type="radar_set_DETECTION_THRESHOLD">
<value name="SUB"> <value name="SUB">
<shadow type="variables_get"> <shadow type="variables_get">
<field name="VAR">radar</field> <field name="VAR">xsensor</field>
</shadow> </shadow>
</value> </value>
<value name="VAR"> <value name="VAR">

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

@@ -4360,7 +4360,7 @@
<block type="radar_set_DETECTION_THRESHOLD"> <block type="radar_set_DETECTION_THRESHOLD">
<value name="SUB"> <value name="SUB">
<shadow type="variables_get"> <shadow type="variables_get">
<field name="VAR">radar</field> <field name="VAR">xsensor</field>
</shadow> </shadow>
</value> </value>
<value name="VAR"> <value name="VAR">