Merge branch 'master' into feat/mybadges

sensebox · Oct 11, 2023 · cdba0db · cdba0db
2 parents 8810503 + 108d4a6
commit cdba0db
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 20 deletions.
diff --git a/packages/models/package.json b/packages/models/package.json
@@ -10,7 +10,7 @@
     "@sensebox/osem-protos": "^1.1.0",
     "@sensebox/sketch-templater": "1.13.1",
     "bcrypt": "^5.1.0",
-    "bullmq": "^3.10.1",
+    "bullmq": "^4.12.3",
     "config": "^3.3.6",
     "got": "^11.8.2",
     "isemail": "^3.0.0",

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'Temperatur',
+  unit: '°C',
+  sensorType: 'SHT3X',
+  icon: 'osem-thermometer'
+};
diff --git a/yarn.lock b/yarn.lock
@@ -751,17 +751,18 @@ buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-bullmq@^3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/bullmq/-/bullmq-3.10.1.tgz#798ce661cdb9dd3acb9a5748c4e7e351a2b46edd"
-  integrity sha512-NHysIgywLRB0C1OXY1YQPXsDRnozBWBREPTyeX72ARolkHMkj0IXY+nG36N1pxc2OToPkMHyhSQxaY4jmaM0VQ==
+bullmq@^4.12.3:
+  version "4.12.3"
+  resolved "https://registry.yarnpkg.com/bullmq/-/bullmq-4.12.3.tgz#0c649b9a5e48227519c526ee9edd96b982eee22d"
+  integrity sha512-4uPp4NQTALFF+eFK7g8VJM+rt0aiduQdzBomgiEO1OK4OE+TdgC6cjGXooKI/asuB8iDhSZ+pSnGYy5Xyr6qRA==
   dependencies:
     cron-parser "^4.6.0"
     glob "^8.0.3"
-    ioredis "^5.3.0"
+    ioredis "^5.3.2"
     lodash "^4.17.21"
     msgpackr "^1.6.2"
-    semver "^7.3.7"
+    node-abort-controller "^3.1.1"
+    semver "^7.5.4"
     tslib "^2.0.0"
     uuid "^9.0.0"
 
@@ -2092,10 +2093,10 @@ inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, i
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
-ioredis@^5.3.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.1.tgz#55d394a51258cee3af9e96c21c863b1a97bf951f"
-  integrity sha512-C+IBcMysM6v52pTLItYMeV4Hz7uriGtoJdz7SSBDX6u+zwSYGirLdQh3L7t/OItWITcw3gTFMjJReYUwS4zihg==
+ioredis@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ioredis/-/ioredis-5.3.2.tgz#9139f596f62fc9c72d873353ac5395bcf05709f7"
+  integrity sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==
   dependencies:
     "@ioredis/commands" "^1.1.1"
     cluster-key-slot "^1.1.0"
@@ -2713,6 +2714,11 @@ negotiator@^0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
+node-abort-controller@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
+  integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
+
 node-addon-api@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.0.0.tgz#7d7e6f9ef89043befdb20c1989c905ebde18c501"
@@ -3372,14 +3378,14 @@ select-hose@^2.0.0:
   integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
 semver@^6.0.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.2.1, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
-  version "7.3.8"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
-  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
+semver@^7.2.1, semver@^7.3.5, semver@^7.3.8, semver@^7.5.4:
+  version "7.5.4"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+  integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"