opensensemap/blockly-app
1
0
Fork 0
mirror of https://github.com/sensebox/blockly-app synced 2025-07-01 00:00:25 +02:00
Code Issues Releases Wiki Activity

add defines on input

Browse source
This commit is contained in:
Thiemann96 2020-02-17 15:21:08 +01:00
parent eb5e7106a5
commit f472a8733d
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/assets/templates/homev2Wifi.tpl
View file

@ -62,7 +62,7 @@ const char SENSEBOX_ID[] PROGMEM = "@{SENSEBOX_ID}@";
static const uint8_t NUM_SENSORS = @{NUM_SENSORS}@; static const uint8_t NUM_SENSORS = @{NUM_SENSORS}@;
// Connected sensors // Connected sensors
@{SENSORS|toDefineWithSuffixPrefixAndKey~,_CONNECTED,sensorType}@ @{defineSensors}@
// Sensor SENSOR_IDs // Sensor SENSOR_IDs
// Temperatur // Temperatur

11
src/pages/configuration/configuration.ts
View file

@ -52,6 +52,7 @@ export class ConfigurationPage {
PASSWORD:this.pw, PASSWORD:this.pw,
INGRESS_DOMAIN:"ingress.opensensemap.org", INGRESS_DOMAIN:"ingress.opensensemap.org",
SENSEBOX_ID:this.senseboxid, SENSEBOX_ID:this.senseboxid,
defineSensors:this.buildDefines(),
NUM_SENSORS:this.sensors.length, NUM_SENSORS:this.sensors.length,
TEMPERSENSOR_ID:this.temp, TEMPERSENSOR_ID:this.temp,
RELLUFSENSOR_ID:this.humi, RELLUFSENSOR_ID:this.humi,
@ -61,13 +62,21 @@ export class ConfigurationPage {
REGENMSENSOR_ID:this.rain, REGENMSENSOR_ID:this.rain,
PM10SENSOR_ID:this.pm10, PM10SENSOR_ID:this.pm10,
PM25SENSOR_ID:this.pm25 PM25SENSOR_ID:this.pm25
}; };
this.http.get("assets/templates/homev2Wifi.tpl",{responseType:"text"}).subscribe(data=>{ this.http.get("assets/templates/homev2Wifi.tpl",{responseType:"text"}).subscribe(data=>{
let sketch = this.applyTemplate(data,values); let sketch = this.applyTemplate(data,values);
console.log(sketch)
this.navCtrl.push(OtaWizardPage, { sketch }) this.navCtrl.push(OtaWizardPage, { sketch })
}) })
} }
buildDefines(){
let defineString =""
this.sensors.map((sensor)=>{
defineString+="#define "+sensor.type+"_CONNECTED\n"
})
return defineString;
}
addSensor(){ addSensor(){
let addModal = this.modalCtrl.create(AddItemPage); let addModal = this.modalCtrl.create(AddItemPage);