From 922814fb09e5b70743b86e2c8a915e58a4fa57f0 Mon Sep 17 00:00:00 2001
From: Thiemann96 <e_thie10@uni-muenster.de>
Date: Mon, 17 Feb 2020 16:51:38 +0100
Subject: [PATCH] debug checkbox

---
 src/assets/templates/homev2Wifi.tpl        |  2 +-
 src/pages/add-item/add-item.html           |  3 +--
 src/pages/add-item/add-item.ts             |  2 +-
 src/pages/configuration/configuration.html |  6 ++++++
 src/pages/configuration/configuration.ts   | 18 +++++++-----------
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/assets/templates/homev2Wifi.tpl b/src/assets/templates/homev2Wifi.tpl
index 152a94b..71538b7 100644
--- a/src/assets/templates/homev2Wifi.tpl
+++ b/src/assets/templates/homev2Wifi.tpl
@@ -25,7 +25,7 @@
 
 // Uncomment the next line to get debugging messages printed on the Serial port
 // Do not leave this enabled for long time use
-// #define ENABLE_DEBUG
+@{DEBUG_ENABLED}@
 
 #ifdef ENABLE_DEBUG
 #define DEBUG(str) Serial.println(str)
diff --git a/src/pages/add-item/add-item.html b/src/pages/add-item/add-item.html
index a7d8310..452816e 100644
--- a/src/pages/add-item/add-item.html
+++ b/src/pages/add-item/add-item.html
@@ -1,7 +1,7 @@
 <ion-header>
   <ion-toolbar color="secondary">
     <ion-title>
-      Add Item
+      Add sensor
     </ion-title>
       <ion-buttons end>
         <button ion-button icon-only (click)="close()"><ion-icon name="close"></ion-icon></button>
@@ -11,7 +11,6 @@
 
 <ion-content>
   <ion-list>
-
     <ion-item>
       <ion-label floating>Phenomenon</ion-label>
       <ion-select [(ngModel)]="typ">
diff --git a/src/pages/add-item/add-item.ts b/src/pages/add-item/add-item.ts
index c492466..f628506 100644
--- a/src/pages/add-item/add-item.ts
+++ b/src/pages/add-item/add-item.ts
@@ -14,7 +14,7 @@ import { IonicPage, NavController, ViewController } from 'ionic-angular';
   templateUrl: 'add-item.html',
 })
 export class AddItemPage {
-
+  
   title:string;
   typ:string;
   id:string;
diff --git a/src/pages/configuration/configuration.html b/src/pages/configuration/configuration.html
index 98aaa40..1907efc 100644
--- a/src/pages/configuration/configuration.html
+++ b/src/pages/configuration/configuration.html
@@ -57,6 +57,12 @@
                       <ion-icon name="add" item-start></ion-icon>
                     </button>
                   </ion-col>
+            </ion-row>
+            <ion-row>
+              <ion-item>
+                <ion-label>Enable debug</ion-label>
+                <ion-checkbox [(ngModel)]="DEBUG_ENABLED"></ion-checkbox>
+              </ion-item>
             </ion-row>
               <ion-row>
                 <button ion-item (click)="uploadStandardSketch()">
diff --git a/src/pages/configuration/configuration.ts b/src/pages/configuration/configuration.ts
index 2f3855f..d1de3fa 100644
--- a/src/pages/configuration/configuration.ts
+++ b/src/pages/configuration/configuration.ts
@@ -18,16 +18,9 @@ import { SensorDetailPage } from '../sensor-detail/sensor-detail';
 })
 export class ConfigurationPage {
   public sensors = [];
-  temp: string;
-  humi: string;
-  lux: string;
-  uv: string;
-  pm10: string;
-  pm25: string;
-  ssid: string;
-  pw: string;
-  pressure: string;
-  rain: string;
+  ssid:string;
+  pw:string;
+  DEBUG_ENABLED:boolean;
   senseboxid: string;
   constructor(public navCtrl: NavController, public navParams: NavParams, private http: HttpClient, public modalCtrl: ModalController) {
   }
@@ -53,6 +46,7 @@ export class ConfigurationPage {
       INGRESS_DOMAIN: "ingress.opensensemap.org",
       SENSEBOX_ID: this.senseboxid,
       defineSensors: this.buildDefines(),
+      DEBUG_ENABLED:this.DEBUG_ENABLED?"#define ENABLE_DEBUG":"//#define ENABLE_DEBUG",
       NUM_SENSORS: this.sensors.length,
     };
     this.sensors.map((sensor)=>{
@@ -92,8 +86,10 @@ export class ConfigurationPage {
     this.sensors.map((sensor) => {
       defineString += "#define " + sensor.typ + "_CONNECTED\n"
     })
+    
     return defineString;
   }
+
   addSensor() {
     let addModal = this.modalCtrl.create(AddItemPage);
 
@@ -126,7 +122,7 @@ export class ConfigurationPage {
 
   ionViewDidLoad() {
     this.sensors = [
-      { typ: "HDC1080", id: "5bb610bf043f3f001b6a4c55" },
+      { typ: "HDC1080", id: "5ca1e336cbf9ae001a6f1d88" },
     ]
   }