diff --git a/packages/models/src/box/sensorLayouts/index.js b/packages/models/src/box/sensorLayouts/index.js index f5b2adab..c26b27cb 100644 --- a/packages/models/src/box/sensorLayouts/index.js +++ b/packages/models/src/box/sensorLayouts/index.js @@ -16,6 +16,8 @@ const senseboxhome = require('./sensebox.home'), luftdaten_pms5003_bme280 = require('./luftdaten/pms5003.bme280'), luftdaten_pms7003 = require('./luftdaten/pms7003'), luftdaten_pms7003_bme280 = require('./luftdaten/pms7003.bme280'), + luftdaten_sps30_bme280 = require('./luftdaten/sps30.bme280'), + luftdaten_sps30_sht3x = require('./luftdaten/sps30.shtx3'), hackair_home_v2 = require('./hackair/home.v2'), addonFeinstaub = require('./addons/feinstaubAddon'); @@ -52,6 +54,8 @@ const modelDefinitions = { 'luftdaten_pms5003_bme280': luftdaten_pms5003_bme280, 'luftdaten_pms7003': luftdaten_pms7003, 'luftdaten_pms7003_bme280': luftdaten_pms7003_bme280, + 'luftdaten_sps30_bme280': luftdaten_sps30_bme280, + 'luftdaten_sps30_sht3x': luftdaten_sps30_sht3x, 'hackair_home_v2': hackair_home_v2 }; diff --git a/packages/models/src/box/sensorLayouts/luftdaten/sps30.bme280.js b/packages/models/src/box/sensorLayouts/luftdaten/sps30.bme280.js new file mode 100644 index 00000000..45fefff6 --- /dev/null +++ b/packages/models/src/box/sensorLayouts/luftdaten/sps30.bme280.js @@ -0,0 +1,12 @@ +'use strict'; + +const { bme280_humidity, bme280_temperature, bme280_pressure_pa, sps30_pm1, sps30_pm10, sps30_pm25 } = require('../sensorDefinitions'); + +module.exports = [ + sps30_pm1, + sps30_pm25, + sps30_pm10, + bme280_temperature, + bme280_humidity, + bme280_pressure_pa +]; diff --git a/packages/models/src/box/sensorLayouts/luftdaten/sps30.shtx3.js b/packages/models/src/box/sensorLayouts/luftdaten/sps30.shtx3.js new file mode 100644 index 00000000..19c85458 --- /dev/null +++ b/packages/models/src/box/sensorLayouts/luftdaten/sps30.shtx3.js @@ -0,0 +1,11 @@ +'use strict'; + +const { sps30_pm10, sps30_pm25, sps30_pm1, sht3x_temperature, sht3x_humidity } = require('../sensorDefinitions'); + +module.exports = [ + sht3x_temperature, + sht3x_humidity, + sps30_pm1, + sps30_pm25, + sps30_pm10 +]; diff --git a/packages/models/src/box/sensorLayouts/sensorDefinitions/index.js b/packages/models/src/box/sensorLayouts/sensorDefinitions/index.js index 2fb2aba7..f3e669fb 100644 --- a/packages/models/src/box/sensorLayouts/sensorDefinitions/index.js +++ b/packages/models/src/box/sensorLayouts/sensorDefinitions/index.js @@ -47,7 +47,9 @@ const veml6070_uvintensity = require('./veml6070_uvintensity'), sps30_pm1 = require('./sps30_pm1'), sps30_pm25 = require('./sps30_pm25'), sps30_pm4 = require('./sps30_pm4'), - sps30_pm10 = require('./sps30_pm10'); + sps30_pm10 = require('./sps30_pm10'), + sht3x_temperature = require('./sht3x_temperature'), + sht3x_humidity = require('./sht3x_humidity'); module.exports = { hdc1008_temperature, hdc1080_temperature, @@ -95,5 +97,7 @@ module.exports = { sps30_pm1, sps30_pm25, sps30_pm4, - sps30_pm10 + sps30_pm10, + sht3x_temperature, + sht3x_humidity }; diff --git a/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_humidity.js b/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_humidity.js new file mode 100644 index 00000000..f8d8f842 --- /dev/null +++ b/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_humidity.js @@ -0,0 +1,8 @@ +'use strict'; + +module.exports = { + title: 'rel. Luftfeuchte', + unit: '%', + sensorType: 'SHT3X', + icon: 'osem-humidity' +}; diff --git a/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_temperature.js b/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_temperature.js new file mode 100644 index 00000000..3063183e --- /dev/null +++ b/packages/models/src/box/sensorLayouts/sensorDefinitions/sht3x_temperature.js @@ -0,0 +1,8 @@ +'use strict'; + +module.exports = { + title: 'Temperatur', + unit: '°C', + sensorType: 'SHT3X', + icon: 'osem-thermometer' +};