Sat, 16 May 2015 17:39:30 +0200
Made the client-server protocol more robust. When a change to a unit is made using the web interface, the main process is stopped during the update. Splitted the PID in two PID's, one for heating and one for cooling. Adjusted the web edit scrreen for this, but there are still rough edges. Replaced the PID code, maybe this one works better for our purpose. The simulator air temperature changes on the simulator heater and cooler, but it is not realistic at all. This is a development version, do not use in production. The version is 0.3.0
123
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
1 | <?php |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
2 | /***************************************************************************** |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
3 | * Copyright (C) 2014 |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
4 | * |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
5 | * Michiel Broek <mbroek at mbse dot eu> |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
6 | * |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
7 | * This file is part of ThermFerm |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
8 | * |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
9 | * This is free software; you can redistribute it and/or modify it |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
10 | * under the terms of the GNU General Public License as published by the |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
11 | * Free Software Foundation; either version 2, or (at your option) any |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
12 | * later version. |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
13 | * |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
14 | * ThermFerm is distributed in the hope that it will be useful, but |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
15 | * WITHOUT ANY WARRANTY; without even the implied warranty of |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
17 | * General Public License for more details. |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
18 | * |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
19 | * You should have received a copy of the GNU General Public License |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
20 | * along with ThermFerm; see the file COPYING. If not, write to the Free |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
21 | * Software Foundation, 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
22 | *****************************************************************************/ |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
23 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
24 | require_once('utilities.php'); |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
25 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
26 | |
196 | 27 | $answer = send_cmd("LIST LOG ".$_GET["unit"]); |
123
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
28 | $arr = explode("\r\n", $answer); |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
29 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
30 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
31 | //$data[] = array('Date','Mode','Air','Beer','Target','Heater','Cooler','Fan','Door'); |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
32 | $row = '['; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
33 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
34 | /* We don't use json_encode because it doesn't work for our purpose */ |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
35 | if (startsWith($arr[0], "212")) { |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
36 | $j = 1; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
37 | while (1) { |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
38 | if (strcmp($arr[$j], ".") == 0) |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
39 | break; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
40 | if ($j > 1) |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
41 | $row .= ','; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
42 | $f = explode(",", $arr[$j]); |
299
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
43 | $heater = $f[5] / 100; |
d1c52fb43e30
Show heater/cooler usgae in percent on the web page. Bunped to version 0.2.5
Michiel Broek <mbroek@mbse.eu>
parents:
266
diff
changeset
|
44 | $cooler = $f[6] / 100; |
123
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
45 | $row .= '{"Date":"'.$f[0].'","Mode":"'.$f[1].'","Air":"'.$f[2].'","Beer":"'.$f[3].'","Target":"'.$f[4].'",'; |
358
8b7ef338bf49
Plot room temperature on the dashboard.
Michiel Broek <mbroek@mbse.eu>
parents:
299
diff
changeset
|
46 | $row .= '"Heater":'.$heater.',"Cooler":'.$cooler.',"HeatUse":'.$f[7].',"CoolUse":"'.$f[8].'","Room":"'.$f[9].'"}'; |
123
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
47 | $j++; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
48 | } |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
49 | } |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
50 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
51 | $row .= ']'; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
52 | echo $row; |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
53 | |
597688feda2f
Now uses the real data for the chart
Michiel Broek <mbroek@mbse.eu>
parents:
diff
changeset
|
54 | ?> |