From 647443a9886d694c845bda9699027848f50c8860 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=AB=8B=E5=B8=AE?= <3294713004@qq.com> Date: Sat, 5 Oct 2024 00:33:34 +0800 Subject: [PATCH] =?UTF-8?q?Update:=20=E7=A7=BB=E9=99=A4Arduino=20BMP280?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B9=BF=E5=BA=A6=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default_src/arduino_avr/blocks/sensor.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/boards/default_src/arduino_avr/blocks/sensor.js b/boards/default_src/arduino_avr/blocks/sensor.js index c40190f9..3a8022b1 100644 --- a/boards/default_src/arduino_avr/blocks/sensor.js +++ b/boards/default_src/arduino_avr/blocks/sensor.js @@ -709,19 +709,34 @@ export const sensor_encoder_handle = { } }; +const BMX280_VALUE_TYPE = { + bme: [ + [Blockly.Msg.blynk_IOT_IR_TEMP, "readTemperature()"], + [Blockly.Msg.MIXLY_Humidity, "readHumidity()"], + [Blockly.Msg.MIXLY_Altitude, "readPressure()"], + [Blockly.Msg.MIXLY_HEIGHT, "readAltitude(SEALEVELPRESSURE_HPA)"] + ], + bmp: [ + [Blockly.Msg.blynk_IOT_IR_TEMP, "readTemperature()"], + [Blockly.Msg.MIXLY_Altitude, "readPressure()"], + [Blockly.Msg.MIXLY_HEIGHT, "readAltitude(SEALEVELPRESSURE_HPA)"] + ] +}; + //BME280读取 export const BME280_READ = { init: function () { this.setColour(SENSOR_HUE); this.appendDummyInput() .appendField(Blockly.Msg.MIXLY_SERIAL_READ) - .appendField(new Blockly.FieldDropdown([["BME280", "bme"], ["BMP280", "bmp"]]), "TYPE"); + .appendField(new Blockly.FieldDropdown([["BME280", "bme"], ["BMP280", "bmp"]]), 'TYPE'); this.appendValueInput("address") .appendField(Blockly.Msg.MIXLY_LCD_ADDRESS); this.appendDummyInput() .appendField(Blockly.Msg.MIXLY_GET) - .appendField(new Blockly.FieldDropdown([[Blockly.Msg.blynk_IOT_IR_TEMP, "readTemperature()"], [Blockly.Msg.MIXLY_Humidity, "readHumidity()"], [Blockly.Msg.MIXLY_Altitude, "readPressure()"], [Blockly.Msg.MIXLY_HEIGHT, "readAltitude(SEALEVELPRESSURE_HPA)"]]), "BME_TYPE") + .appendField(new Blockly.FieldDependentDropdown("TYPE", BMX280_VALUE_TYPE, BMX280_VALUE_TYPE['bme']), 'BME_TYPE'); this.setOutput(true, null); + this.setInputsInline(true); this.setTooltip(""); this.setHelpUrl(""); }