v2.1 fix home onoff

README.md

@@ -1,4 +1,4 @@
-# Arduino-Home-Thermostat Version 2.0
+# Arduino-Home-Thermostat Version 2.1
 10 rooms thermostat
 
 

app/src/ardThermostatApp/src/pages/configs-inputs/configs-inputs.html

@@ -14,14 +14,14 @@
 
 
 <ion-content padding>
-    <ion-list *ngFor = "let input of inputs">
+    <ion-list *ngFor = "let input of inputs; let i = index">
       <div>
-        <h5>{{input.canal}} : </h5>
-        <h3 class="h3temp">{{input.temperature}} \xB0C</h3>
-        <h3 class="h3offset"> Offset {{input.offset}}</h3>
+        <button ion-button round (tap)="minus(i)">-</button>
+        <h3>{{input.canal}} : </h3>
+        <h3> Offset {{input.offset}}</h3>
+        <button ion-button round (tap)="plus(i)">+</button>
       </div>
-      <ion-item>
-        <ion-range [(ngModel)]="input.offset" color="darkblue" pin="true"min="-25" max="25" step="1" list="tickmarks" (ionChange)="changeOffset(input.canal, input.offset)"></ion-range>
-      </ion-item>
+      <!--<h3 class="tcenter">{{input.temperature}} \xB0C</h3>-->
+      <h3 class="tcenter">{{input.temperature.toFixed(2)}} \xB0C</h3>
     </ion-list> 
 </ion-content>

app/src/ardThermostatApp/src/pages/configs-inputs/configs-inputs.scss

@@ -11,6 +11,18 @@
 
                     }
                 }
+                div.inputContner {
+                    display: inline-block;
+                }
+                .tcenter {
+                    justify-content: center;
+                    text-align: center;
+                }
+                border-radius: 20px 19px 70px 70px;
+                -moz-border-radius: 20px 19px 70px 70px;
+                -webkit-border-radius: 20px 19px 40px 40px;
+                border: 4px solid #3a7080;
+
             }
         }
     }

app/src/ardThermostatApp/src/pages/configs-inputs/configs-inputs.ts

@@ -71,6 +71,20 @@ export class ConfigsInputsPage {
     request: 'unsubscribe'
   }
 
+  plus(chan: number) {
+    if (this.inputs[chan].offset < 25) {
+      this.inputs[chan].offset++;
+      this.changeOffset(chan, this.inputs[chan].offset);
+    }
+  }
+
+  minus(chan: number) {
+    if (this.inputs[chan].offset > -25) {
+      this.inputs[chan].offset--;
+      this.changeOffset(chan, this.inputs[chan].offset);
+    }
+  }
+
   changeOffset(chan: number, input: number): void {
 
     let configChannel = {

app/src/ardThermostatApp/src/pages/home/home.ts

@@ -130,7 +130,9 @@ export class HomePage {
   }*/
 
   switchChannel(cb: Channel) { //version websocket
-    let switchCh = cb.canal; 
+    let switchCh = {
+      canal: cb.canal
+    } 
 
     let postMessage = {
       id: "homeSwitch",

app/src/ardThermostatApp/src/pages/load/load.ts

@@ -23,7 +23,7 @@ export class LoadPage {
 
   ionViewDidEnter() {
     console.log('ionViewDidLoad LoadPage');
-    this.statusMessage = "Getting adrresse from storage";
+    this.statusMessage = "Getting addresse from storage";
     //console.log(this.statusMessage);
     this.server.getServer().then(()=>{
       this.statusMessage = "Got data. Check for server response";

multi_room_thermostat/Backup.ino

@@ -91,12 +91,6 @@ void restore() {
     //alarm.prettyPrintTo(Serial);
     SPAlarm[alarmTag].parseJSON(alarm);
 
-    /*byte alarmType = alarm["type"];  ////???
-    bool alarmSwitch = alarm["switch"];
-    byte wHour = alarm["hour"];
-    byte wMin = alarm["minute"];
-    SPAlarm.set(alarmTag, alarmType, alarmSwitch, wHour, wMin);*/
-
     JsonArray& setpoints = alarm["setpoints"];
     //setpoints.prettyPrintTo(Serial);
 

multi_room_thermostat/Setup.ino

@@ -186,3 +186,9 @@ void init_alarmMemory() {   //initiane alarm memory matrix to 21C by default
     }
   }
 }
+
+void blink13() {
+  static bool state = false;
+  digitalWrite(13, state);
+  state = !state;
+}

multi_room_thermostat/WebCmd.ino

@@ -176,7 +176,7 @@ JsonObject& JSONconfigs__Corrected(JsonBuffer& jsonBuffer) {
     JsonObject& chan_in = jsonBuffer.createObject();
     chan_in["offset"] = inChannelID[i].offset;
     chan_in["canal"] = String(i);
-    chan_in["temperature"] = inChannelID[i].Ainput;
+    chan_in["temperature"] = roundToDigit(inChannelID[i].Ainput, 2);//inChannelID[i].Ainput;
     chan.add(chan_in);
   }
   configs["systemTime"] = systemTime(jsonBuffer);

multi_room_thermostat/WebSocket.ino

@@ -102,6 +102,7 @@ void wsRequestHandler(JsonObject& root, int num) {
       for (int i = 0; i < SWSPC; i++) { //i for request index
         if ( strcmp(root["id"], wsPutContainer[i].id) == 0 ) {
           Serial << "found put request: " << wsPutContainer[i].id << endl;
+          root["data"].printTo(Serial); Serial << endl;
           wsPutContainer[i].parse(root["data"]);
           backup(); //store any change data
         }
@@ -166,18 +167,18 @@ void wsSubscribeDataHome() {
 }
 
 void wsParseHomeSwitch(JsonObject& data) {
-
-  //root.prettyPrintTo(Serial);
-  uint8_t  chanId = data["switchCh"]["canal"];
+  uint8_t  chanId = data["canal"];
   outChannelID[chanId].channelSwitch = !outChannelID[chanId].channelSwitch;
   //if (outChannelID[chanId].channelSwitch) Serial.println("true"); else  Serial.println("false");
+  wsSubscribeDataHome();//update live data to devices
 }
 
 void wsParseHomePutSetpoint(JsonObject& data) {
   //data.prettyPrintTo(Serial);  // for debug
   byte  chanId = data["canal"];
   strcpy(inChannelID[chanId].channelName, data["name"]);
   outChannelID[chanId].sp = data["setpoint"];
+  wsSubscribeDataHome();//update live data to devices
 }
 
 //-----------------------------------------------------------

multi_room_thermostat/multi_room_thermostat.ino

@@ -93,6 +93,8 @@ Interval timerMainRegulator;
 Interval timerWeeklyAlarm;
 Interval timerSSROutput;
 Interval timerWebSocket[WEBSOCKETS_SERVER_CLIENT_MAX];
+Interval led13;
+void blink13();
 
 //programable alarm section
 const byte numAlarm = 10; // set the number of alarm
@@ -148,7 +150,8 @@ void setup() {
 
   Serial.print("Free memory is: ");
   Serial.println(freeMemory());
-
+  pinMode(13, OUTPUT);
+  led13.interval(2000, blink13);
 }
 
 //-----------------------------------------------------------

version_history.md

@@ -0,0 +1,10 @@
+version history:
+
+2.1
+-Fix on/off home button
+-Change slider to +- button and fix to 2 digit temps on input calibration
+-Add led13 flash to track arduino status ok
+
+Knowed bugs:
+-Windows platform seem to not connect with local connection.
+-Silder temp adjust setpoint do not display properly on windows.