Mercurial > mbsePi-apps / file comparison
comparison: www-thermferm/getlog.php
www-thermferm/getlog.php
- changeset 299
- d1c52fb43e30
- parent 266
- 07819a7ad3c1
- child 358
- 8b7ef338bf49
equal
deleted
inserted
replaced
| 298:b88c60e8369e | 299:d1c52fb43e30 |
|---|---|
| 38 if (strcmp($arr[$j], ".") == 0) | 38 if (strcmp($arr[$j], ".") == 0) |
| 39 break; | 39 break; |
| 40 if ($j > 1) | 40 if ($j > 1) |
| 41 $row .= ','; | 41 $row .= ','; |
| 42 $f = explode(",", $arr[$j]); | 42 $f = explode(",", $arr[$j]); |
| 43 $heater = $f[5] / 100; | 43 $heater = $f[5] / 100; |
| 44 $cooler = $f[6] / 100; | 44 $cooler = $f[6] / 100; |
| 45 $fan = $f[7] / 100; | |
| 46 $row .= '{"Date":"'.$f[0].'","Mode":"'.$f[1].'","Air":"'.$f[2].'","Beer":"'.$f[3].'","Target":"'.$f[4].'",'; | 45 $row .= '{"Date":"'.$f[0].'","Mode":"'.$f[1].'","Air":"'.$f[2].'","Beer":"'.$f[3].'","Target":"'.$f[4].'",'; |
| 47 $row .= '"Heater":'.$heater.',"Cooler":'.$cooler.',"Fan":'.$fan.',"Door":"'.$f[8].'"}'; | 46 $row .= '"Heater":'.$heater.',"Cooler":'.$cooler.',"HeatUse":'.$f[7].',"CoolUse":"'.$f[8].'"}'; |
| 48 $j++; | 47 $j++; |
| 49 } | 48 } |
| 50 } | 49 } |
| 51 | 50 |
| 52 $row .= ']'; | 51 $row .= ']'; |
