Skip to content

Commit ed38ec5

Browse files
Thiemann96Thiemann96
authored
added sps30 to newBox form (#459)
* added sps30 to new Box form * added sps30 to edu hardware setup
1 parent 047e675 commit ed38ec5

File tree

4 files changed

+150
-45
lines changed

4 files changed

+150
-45
lines changed

‎app/scripts/controllers/account.box.dataupload.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
////
3535

3636
function activate () {
37-
console.log(navigator);
3837
vm.fileReader = new FileReader();
3938
vm.fileReader.onload = function (e) {
4039
$scope.$apply(function () {
@@ -46,7 +45,6 @@
4645
function onFileSelect (event, $flow, file) {
4746
event.preventDefault();
4847
vm.error = '';
49-
console.log(file);
5048
if (mimeTypes.indexOf(file.file.type) === -1) {
5149
vm.error = { code: 'FORMAT' };
5250

‎app/scripts/controllers/register.js‎

Lines changed: 39 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@
3636
pollution: false,
3737
bme680: false,
3838
co2: false,
39-
dps310: false
39+
dps310: false,
40+
sps30: false
4041
},
4142
serialPort: 'Serial1',
4243
soilDigitalPort: 'A',
@@ -440,6 +441,9 @@
440441
case 'dps310':
441442
vm.newSenseBox.sensorTemplates.push('dps310');
442443
break;
444+
case 'sps30':
445+
vm.newSenseBox.sensorTemplates.push('sps30');
446+
break;
443447
}
444448
}
445449
}
@@ -648,6 +652,30 @@
648652
unit = '°C';
649653
sensorType = 'DPS310';
650654
break;
655+
case 'SPS30_PM1':
656+
icon = 'osem-cloud';
657+
title = 'PM1';
658+
unit = 'µg/m³';
659+
sensorType = 'SPS30';
660+
break;
661+
case 'SPS30_PM25':
662+
icon = 'osem-cloud';
663+
title = 'PM25';
664+
unit = 'µg/m³';
665+
sensorType = 'SPS30';
666+
break;
667+
case 'SPS30_PM4':
668+
icon = 'osem-cloud';
669+
title = 'PM4';
670+
unit = 'µg/m³';
671+
sensorType = 'SPS30';
672+
break;
673+
case 'SPS30_PM10':
674+
icon = 'osem-cloud';
675+
title = 'PM10';
676+
unit = 'µg/m³';
677+
sensorType = 'SPS30';
678+
break;
651679
}
652680

653681
return {
@@ -913,6 +941,11 @@
913941
} else if (newValue.dps310 && oldValue.dps310 === false) {
914942
addSensorTemplate('DPS310_AIRPRESSURE');
915943
addSensorTemplate('DPS310_TEMPERATURE');
944+
} else if (newValue.sps30 && oldValue.sps30 === false) {
945+
addSensorTemplate('SPS30_PM1');
946+
addSensorTemplate('SPS30_PM25');
947+
addSensorTemplate('SPS30_PM4');
948+
addSensorTemplate('SPS30_PM10');
916949
}
917950

918951
// Remove sensor templates
@@ -934,6 +967,11 @@
934967
} else if (oldValue.dps310 && newValue.dps310 === '') {
935968
removeSensorTemplate(generateSensorTemplate('DPS310_AIRPRESSURE'));
936969
removeSensorTemplate(generateSensorTemplate('DPS310_TEMPERATURE'));
970+
} else if (oldValue.sps30 && newValue.sps30 === '') {
971+
removeSensorTemplate(generateSensorTemplate('SPS30_PM1'));
972+
removeSensorTemplate(generateSensorTemplate('SPS30_P25'));
973+
removeSensorTemplate(generateSensorTemplate('SPS30_PM4'));
974+
removeSensorTemplate(generateSensorTemplate('SPS30_PM10'));
937975
}
938976

939977
// Check on change for sensors with same address

‎app/views/account.box.register.html‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -520,6 +520,23 @@ <h3>{{'SENSORS' | translate}}</h3>
520520
</div>
521521
</div>
522522
</div>
523+
<div class="row">
524+
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-6"
525+
style="border-right: 1px solid #e1e4e8;">
526+
<div style="text-align: left;">
527+
<div class="checkbox checkbox-success checkbox-inline"
528+
style="vertical-align: middle;">
529+
<input type="checkbox" id="sps30" ng-true-value="'sps30'"
530+
ng-false-value="''" ng-model="register.newModel.sensors.sps30">
531+
<label for="sps30"> </label>
532+
</div>
533+
<img
534+
src="https://raw.githubusercontent.com/sensebox/resources/master/images/home/sps30.png"
535+
style="vertical-align: middle; height: 90px; width: 90px;" />
536+
<span style="vertical-align: middle;">{{'SENSOR_PM_SPS'| translate }}</span>
537+
</div>
538+
</div>
539+
</div>
523540
</div>
524541
</div>
525542
</li>
@@ -880,6 +897,66 @@ <h4>CO<sub>2</sub></h4>
880897
</div>
881898
</div>
882899
</div>
900+
<div class="col-sm-3 col-md-3 col-lg-3">
901+
<div class="thumbnail">
902+
<img
903+
src="https://raw.githubusercontent.com/sensebox/resources/master/images/home/sps30.png"
904+
style="vertical-align: middle; height: 90px; width: 90px;" alt="">
905+
<div class="caption">
906+
<h4>Feinstaub PM1<sub></sub></h4>
907+
<p>(SPS30)</p>
908+
<p>
909+
<button type="button" class="btn btn-success"
910+
ng-click="register.addSensorTemplate('SPS30_PM1')">{{'ADD_SENSOR'|translate}}</button>
911+
</p>
912+
</div>
913+
</div>
914+
</div>
915+
<div class="col-sm-3 col-md-3 col-lg-3">
916+
<div class="thumbnail">
917+
<img
918+
src="https://raw.githubusercontent.com/sensebox/resources/master/images/home/sps30.png"
919+
style="vertical-align: middle; height: 90px; width: 90px;" alt="">
920+
<div class="caption">
921+
<h4>Feinstaub PM25<sub></sub></h4>
922+
<p>(SPS30)</p>
923+
<p>
924+
<button type="button" class="btn btn-success"
925+
ng-click="register.addSensorTemplate('SPS30_PM25')">{{'ADD_SENSOR'|translate}}</button>
926+
</p>
927+
</div>
928+
</div>
929+
</div>
930+
<div class="col-sm-3 col-md-3 col-lg-3">
931+
<div class="thumbnail">
932+
<img
933+
src="https://raw.githubusercontent.com/sensebox/resources/master/images/home/sps30.png"
934+
style="vertical-align: middle; height: 90px; width: 90px;" alt="">
935+
<div class="caption">
936+
<h4>Feinstaub PM4<sub></sub></h4>
937+
<p>(SPS30)</p>
938+
<p>
939+
<button type="button" class="btn btn-success"
940+
ng-click="register.addSensorTemplate('SPS30_PM4')">{{'ADD_SENSOR'|translate}}</button>
941+
</p>
942+
</div>
943+
</div>
944+
</div>
945+
<div class="col-sm-3 col-md-3 col-lg-3">
946+
<div class="thumbnail">
947+
<img
948+
src="https://raw.githubusercontent.com/sensebox/resources/master/images/home/sps30.png"
949+
style="vertical-align: middle; height: 90px; width: 90px;" alt="">
950+
<div class="caption">
951+
<h4>Feinstaub PM10<sub></sub></h4>
952+
<p>(SPS30)</p>
953+
<p>
954+
<button type="button" class="btn btn-success"
955+
ng-click="register.addSensorTemplate('SPS30_PM10')">{{'ADD_SENSOR'|translate}}</button>
956+
</p>
957+
</div>
958+
</div>
959+
</div>
883960
</div>
884961
<br>
885962
<hr>

‎package-lock.json‎

Lines changed: 34 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)