Add SPS30 sensors (#678)

* added sps30 to models and routes

* remove logs and bump models version

* added sps30 to the documentation

packages/api/lib/controllers/boxesController.js

@@ -393,7 +393,7 @@ const getBox = async function getBox (req, res) {
  * @apiParam (RequestBody) {Location} location the coordinates of this senseBox.
  * @apiParam (RequestBody) {String="homeV2Lora","homeV2Ethernet","homeV2Wifi","homeEthernet","homeWifi","homeEthernetFeinstaub","homeWifiFeinstaub","luftdaten_sds011","luftdaten_sds011_dht11","luftdaten_sds011_dht22","luftdaten_sds011_bmp180","luftdaten_sds011_bme280","hackair_home_v2"} [model] specify the model if you want to use a predefined senseBox model, autocreating sensor definitions.
  * @apiParam (RequestBody) {Sensor[]} [sensors] an array containing the sensors of this senseBox. Only use if `model` is unspecified.
- * @apiParam (RequestBody) {String[]="hdc1080","bmp280","tsl45315","veml6070","sds011","bme680","smt50","soundlevelmeter","windspeed","scd30","dps310"} [sensorTemplates] Specify which sensors should be included.
+ * @apiParam (RequestBody) {String[]="hdc1080","bmp280","tsl45315","veml6070","sds011","bme680","smt50","soundlevelmeter","windspeed","scd30","dps310","sps30"} [sensorTemplates] Specify which sensors should be included.
  * @apiParam (RequestBody) {Object} [mqtt] specify parameters of the MQTT integration for external measurement upload. Please see below for the accepted parameters
  * @apiParam (RequestBody) {Object} [ttn] specify parameters for the TTN integration for measurement from TheThingsNetwork.org upload. Please see below for the accepted parameters
  * @apiParam (RequestBody) {Boolean="true","false"} [useAuth] whether to use access_token or not for authentication
@@ -745,6 +745,7 @@ module.exports = {
           'windspeed',
           'scd30',
           'dps310',
+          'sps30'
         ],
       },
       {

packages/models/CHANGELOG.md

@@ -20,6 +20,10 @@
 - Added `findLatestMeasurementsForSensorsWithCount` static method to Measurement schema (#588)
 - Added `sharedBoxes` functionality (#605)
 
+## v1.3.1
+- Add SPS30 sensor 
+- Update @sensebox/node-sketch-templater to v1.13.0
+
 ## v1.2.0
 
 - Extend `luftdatenHandler` (#578)

packages/models/package.json

@@ -8,7 +8,7 @@
     "@grpc/grpc-js": "^1.3.7",
     "@grpc/proto-loader": "^0.6.4",
     "@sensebox/osem-protos": "^1.1.0",
-    "@sensebox/sketch-templater": "1.12.1",
+    "@sensebox/sketch-templater": "1.13.0",
     "bcrypt": "^5.1.0",
     "config": "^3.3.6",
     "got": "^11.8.2",

packages/models/src/box/sensorLayouts/sensebox.home.mcu.js

@@ -19,7 +19,11 @@ const {
   soundlevelmeter,
   windspeed,
   scd30_co2,
-  dps310_pressure
+  dps310_pressure,
+  sps30_pm1,
+  sps30_pm25,
+  sps30_pm4,
+  sps30_pm10
 } = sensorDefinitions;
 
 module.exports = [
@@ -40,4 +44,8 @@ module.exports = [
   windspeed,
   scd30_co2,
   dps310_pressure,
+  sps30_pm1,
+  sps30_pm25,
+  sps30_pm4,
+  sps30_pm10
 ];

packages/models/src/box/sensorLayouts/sensorDefinitions/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+
 const veml6070_uvintensity = require('./veml6070_uvintensity'),
   tsl45315_lightintensity = require('./tsl45315_lightintensity'),
   bmp280_pressure = require('./bmp280_pressure'),
@@ -42,8 +43,11 @@ const veml6070_uvintensity = require('./veml6070_uvintensity'),
   windspeed = require('./windspeed'),
   scd30_co2 = require('./scd30_co2'),
   dps310_temperature = require('./dps310_temperature'),
-  dps310_pressure = require('./dps310_pressure');
-
+  dps310_pressure = require('./dps310_pressure'),
+  sps30_pm1 = require('./sps30_pm1'),
+  sps30_pm25 = require('./sps30_pm25'),
+  sps30_pm4 = require('./sps30_pm4'),
+  sps30_pm10 = require('./sps30_pm10');
 module.exports = {
   hdc1008_temperature,
   hdc1080_temperature,
@@ -87,5 +91,9 @@ module.exports = {
   windspeed,
   scd30_co2,
   dps310_temperature,
-  dps310_pressure
+  dps310_pressure,
+  sps30_pm1,
+  sps30_pm25,
+  sps30_pm4,
+  sps30_pm10
 };

packages/models/src/box/sensorLayouts/sensorDefinitions/sps30_pm1.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'PM1',
+  unit: 'µg/m³',
+  sensorType: 'SPS30',
+  icon: 'osem-cloud'
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/sps30_pm10.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'PM10',
+  unit: 'µg/m³',
+  sensorType: 'SPS30',
+  icon: 'osem-cloud'
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/sps30_pm25.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'PM2.5',
+  unit: 'µg/m³',
+  sensorType: 'SPS30',
+  icon: 'osem-cloud'
+};

packages/models/src/box/sensorLayouts/sensorDefinitions/sps30_pm4.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = {
+  title: 'PM4',
+  unit: 'µg/m³',
+  sensorType: 'SPS30',
+  icon: 'osem-cloud'
+};

yarn.lock

@@ -143,10 +143,10 @@
   resolved "https://registry.yarnpkg.com/@sensebox/osem-protos/-/osem-protos-1.1.0.tgz#a7de8bc6be867953f1309181a012063c23299e79"
   integrity sha512-H+nUVcWlT0dvIqfJnYHuX9JBcCkP1ZKGE5YTRNWPbAEdZ11h+srpQsmeI58wK5hJcdukaZAjc4Dy96IeGM77aA==
 
-"@sensebox/sketch-templater@1.12.1":
-  version "1.12.1"
-  resolved "https://registry.yarnpkg.com/@sensebox/sketch-templater/-/sketch-templater-1.12.1.tgz#4640fc22d5ae652d00b9ab7c590488bf25da2cee"
-  integrity sha512-LtHyUPsZSFTDIqzSce8Rgh25CRhZkj2NIVjNUrMFeB7WgoNwYJuq+aYr1QDGaL0AkREKL3JsUi+O4rjji3Uw3w==
+"@sensebox/sketch-templater@1.13.0":
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/@sensebox/sketch-templater/-/sketch-templater-1.13.0.tgz#f2af96a67014cb6e7fe1d1f9e48aad433a98e2b2"
+  integrity sha512-8ZYvXlhrTiVXpD5tuf8nhYCk8iR/uxI5fiYQO9e3mR20aHiVIVlsEI4QysGhVxAsOsgntHD5IOOikpY7XaC2Ig==
   dependencies:
     config "^3.3.7"
     dedent "^0.7.0"