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

增加外接传感器ucs12071\spl06_001

Browse Source
This commit is contained in:
Irene-Maxine
2024-10-18 23:08:48 +08:00
parent 6d3eb28887
commit ee8605b986
6 changed files with 83 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -436,6 +436,24 @@ export const sensor_ltr381_extern = {
}
};
export const sensor_ucs12071_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.HTML_COLOUR + Blockly.Msg.MSG.catSensor + " UCS12071")
.setCheck("var");
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_GET +'RGB'+ Blockly.Msg.HTML_COLOUR, "0"],
[Blockly.Msg.MIXLY_GET + Blockly.Msg.MIXLY_RGB_RAW, "1"],
[Blockly.Msg.MIXLY_GET_ENV_LIGHT + Blockly.Msg.MIXLY_BRIGHTNESS, "2"],
[Blockly.Msg.GET_IR_STRENGTH+Blockly.Msg.MIXLY_BRIGHTNESS,"3"]
]), "key");
this.setOutput(true, Number);
this.setInputsInline(true);
}
};
export const sensor_LTR390UV_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
@@ -534,6 +552,23 @@ export const sensor_hp203_extern = {
}
};
export const sensor_spl06_001_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);
this.appendValueInput('SUB')
.appendField(Blockly.Msg.MIXLY_Altitude + Blockly.Msg.MSG.catSensor + " SPL06_001")
.setCheck("var");
this.appendDummyInput("")
.appendField(new Blockly.FieldDropdown([
[Blockly.Msg.MIXLY_GETPRESSURE, "pressure()"],
[Blockly.Msg.MIXLY_GETTEMPERATUE, "temperature()"],
[Blockly.Msg.MIXLY_GET_ALTITUDE, "altitude()"],
]), "key");
this.setOutput(true, Number);
this.setInputsInline(true);
}
};
export const sensor_QMC5883L_extern = {
init: function () {
this.setColour(SENSOR_EXTERN_HUE);

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

@@ -241,6 +241,14 @@ export const sensor_hp203_extern = function (_, generator) {
return [code, generator.ORDER_ATOMIC];
}
export const sensor_spl06_001_extern = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
generator.definitions_['import_spl06_001'] = 'import spl06_001';
var code = sub + '.' + key;
return [code, generator.ORDER_ATOMIC];
}
export const sensor_ltr381_extern = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
@@ -249,6 +257,25 @@ export const sensor_ltr381_extern = function (_, generator) {
return [code, generator.ORDER_ATOMIC];
}
export const sensor_ucs12071_extern = function (_, generator) {
var sub = generator.valueToCode(this, 'SUB', generator.ORDER_ATOMIC);
var key = this.getFieldValue('key');
generator.definitions_['import_ucs12071'] = 'import ucs12071';
if (key == '0'){
var code = sub + '.color()';
}
else if(key == '1'){
var code = sub + '.color_raw()';
}
else if(key == '2'){
var code = sub + '.als()';
}
else{
var code = sub + '.ir()';
}
return [code, generator.ORDER_ATOMIC];
}
export const sensor_LTR390UV_extern = function (_, generator) {
generator.definitions_['import_machine'] = 'import machine';
generator.definitions_['import_time'] = 'import time';

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

@@ -3604,6 +3604,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">
@@ -3625,6 +3632,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">

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

@@ -3758,4 +3758,6 @@ En.MIXLY_TIMESTAMP_TO_DATA ="convert to data";
En.MIXLY_TO_INDEX_SEQUENCE = "sequence number and content combine into an index sequence";
En.MIXLY_INDEX = "index";
En.MIXLY_TOTO_INDEX_SEQUENC_TOOLTIP = "Combine all the items and ordinals of the list into an index sequence, for example (0,'A') into one index sequence";
})();
En.MIXLY_RGB_RAW = 'RGB color primitive value';
En.GET_IR_STRENGTH = 'get Infrared light';
})();

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

@@ -3911,4 +3911,6 @@ ZhHans.MIXLY_PRODUCT = "生成";
ZhHans.MIXLY_GENERATE_CARTESIAN_PRODUCT = "笛卡尔积";
ZhHans.MIXLY_EVERY_PER_ELEPER_ELEMENT = "每个元素重复";
ZhHans.MIXLY_EMPTY_REMINDER = "至少需要一个可迭代对象";
ZhHans.MIXLY_RGB_RAW = 'RGB颜色原始值';
ZhHans.GET_IR_STRENGTH = '获取红外光';
})();

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

@@ -3761,4 +3761,6 @@ ZhHant.MIXLY_TIMESTAMP_TO_DATA ="轉化爲日期";
ZhHant.MIXLY_TO_INDEX_SEQUENCE = "的序號和內容組合為索引序列";
ZhHant.MIXLY_INDEX = "序號";
ZhHant.MIXLY_TOTO_INDEX_SEQUENC_TOOLTIP = "將列表的所有項和序號組合為索引序列，例如(0,'A')為一個索引序列";
ZhHant.MIXLY_RGB_RAW = 'RGB顏色原始值';
ZhHant.GET_IR_STRENGTH = '獲取紅外光';
})();