Skip to content

Commit 37badd5

Browse files
committed
更新SHT30
1 parent 1bf0bc8 commit 37badd5

File tree

5 files changed

+15
-3
lines changed

5 files changed

+15
-3
lines changed

_locales/ru/bosonKit-strings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"bosonKit.BosonSensorAnalogRead.BosonHumidity|block": "датчика влажности (i18)",
4444
"bosonKit.BosonSensorAnalogRead.BosonWaterproofTemperature|block": "датчика температуры водонепроницаемого (i19)",
4545
"bosonKit.BosonSensorAnalogRead.BosonUltrasonicDistance|block": "датчика растояния УЗ (i22)",
46+
"bosonKit.BosonSensorAnalogRead.BosonSHT30Temperature|block": "датчика температуры (i27)",
4647
"bosonKit.BosonSensorAnalogRead.BosonSHT30Humidity|block": "датчика влажности (i27)",
4748
"bosonKit.BosonSensorAnalogRead.BosonV2Ph|block": "датчика pH (i28)",
4849
"bosonKit.BosonSensorAnalogRead.BosonWaterLevel|block": "Датчик уровня воды (i31)",

_locales/zh-cn/bosonKit-strings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"bosonKit.BosonSensorAnalogRead.BosonHumidity|block": "空气湿度 (i18)",
4444
"bosonKit.BosonSensorAnalogRead.BosonWaterproofTemperature|block": "防水温度 (i19)",
4545
"bosonKit.BosonSensorAnalogRead.BosonUltrasonicDistance|block": "超声波测量距离 (i22)",
46+
"bosonKit.BosonSensorAnalogRead.BosonSHT30Temperature|block": "空气温度 SHT30 (i27)",
4647
"bosonKit.BosonSensorAnalogRead.BosonSHT30Humidity|block": "空气湿度 SHT30 (i27)",
4748
"bosonKit.BosonSensorAnalogRead.BosonV2Ph|block": "PH值(V2) (i28)",
4849
"bosonKit.BosonSensorAnalogRead.BosonWaterLevel|block": "水位传感器 (i31)",

bosonKit.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ namespace bosonKit {
3030
BosonWaterproofTemperature = 10,
3131
//% blockId="bosonAnalogReadUltrasonicDistance" block="ultrasonic distance sensor (i22)"
3232
BosonUltrasonicDistance = 11,
33+
//% blockId="bosonAnalogReadSHT30Temperature" block="SHT30 Temperature (i27)"
34+
BosonSHT30Temperature = 15,
3335
//% blockId="bosonAnalogReadSHT30Humidity" block="SHT30 humidity (i27)"
3436
BosonSHT30Humidity = 12,
3537
//% blockId="bosonAnalogReadPhV2" block="pH sensor V2 (i28)"
@@ -370,6 +372,7 @@ namespace bosonKit {
370372
case BosonSensorAnalogRead.BosonHumidity: value = humiditySensor(pin); break;
371373
case BosonSensorAnalogRead.BosonWaterproofTemperature: value = waterproofTemperatureSensor(pin); break;
372374
case BosonSensorAnalogRead.BosonUltrasonicDistance: value = ultrasonicDistanceSensor(pin); break;
375+
case BosonSensorAnalogRead.BosonSHT30Temperature: value = temperatureSht30(pin); break;
373376
case BosonSensorAnalogRead.BosonSHT30Humidity: value = humiditySht30(pin); break;
374377
case BosonSensorAnalogRead.BosonV2Ph: value = V2pHSensor(pin); break;
375378
default: value = pins.analogReadPin(pin); break;
@@ -1219,11 +1222,18 @@ namespace bosonKit {
12191222
let value: number = Math.round(10 * pins.analogReadPin(pin) * (100 / 1023)) / 10;
12201223
return value;
12211224
}
1225+
1226+
function temperatureSht30(pin: AnalogPin): number {
1227+
1228+
let value: number = pins.analogReadPin(pin);
1229+
return Math.round((((value * 3.3) / 1024) * 72.917 - 66.875) * 10) / 10;
1230+
}
12221231

12231232
function humiditySht30(pin: AnalogPin): number {
12241233

12251234
let value: number = pins.analogReadPin(pin);
1226-
return Math.round(value / 10);
1235+
return Math.round((((value * 3.3) / 1024) * 41.667 - 12.5) * 10) / 10;
1236+
// return Math.round(value / 10);
12271237
}
12281238

12291239
function V2pHSensor(pin: AnalogPin): number {

main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
# ...
1+

pxt.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"test.ts"
2222
],
2323
"targetVersions": {
24-
"target": "7.0.57",
24+
"target": "8.0.17",
2525
"targetId": "microbit"
2626
},
2727
"supportedTargets": [

0 commit comments

Comments
 (0)