Mercurial > mbsePi-apps / file comparison
comparison: www-thermferm/liveview.php
www-thermferm/liveview.php
- changeset 115
- 81c7433004ed
- parent 113
- cf3f906ffe0d
- child 116
- 065a242ed7ec
equal
deleted
inserted
replaced
| 114:f50c17d68028 | 115:81c7433004ed |
|---|---|
| 64 | 64 |
| 65 if (startsWith($arr[0], "213")) { | 65 if (startsWith($arr[0], "213")) { |
| 66 | 66 |
| 67 $outstr .= ' <div id="fermentor">'.PHP_EOL; | 67 $outstr .= ' <div id="fermentor">'.PHP_EOL; |
| 68 | 68 |
| 69 $set_temperature = "N/A"; | |
| 70 $air_temperature = "N/A"; | |
| 71 $beer_temperature = "N/A"; | |
| 72 | |
| 69 foreach($arr as $l) { | 73 foreach($arr as $l) { |
| 70 $vals = explode(",", $l); | 74 $vals = explode(",", $l); |
| 71 if (strcmp($vals[0], "NAME") == 0) { | 75 if (strcmp($vals[0], "NAME") == 0) { |
| 72 /* | 76 /* |
| 73 * The name is allways first, so when we have it | 77 * The name is allways first, so when we have it |
| 84 $mode = $vals[1]; | 88 $mode = $vals[1]; |
| 85 } | 89 } |
| 86 if (strcmp($vals[0], "AIR_STATE") == 0) { | 90 if (strcmp($vals[0], "AIR_STATE") == 0) { |
| 87 $air_state = $vals[1]; | 91 $air_state = $vals[1]; |
| 88 } | 92 } |
| 89 if (strcmp($vals[0], "AIR_TEMPERATURE") == 0) { | 93 if ((strcmp($vals[0], "AIR_TEMPERATURE") == 0) && ($air_state == 0)) { |
| 90 if ($air_state == 0) | 94 $air_temperature = $vals[1]; |
| 91 $air_temperature = $vals[1]; | |
| 92 else | |
| 93 $air_temperature = "N/A"; | |
| 94 } | 95 } |
| 95 if (strcmp($vals[0], "BEER_STATE") == 0) { | 96 if (strcmp($vals[0], "BEER_STATE") == 0) { |
| 96 $beer_state = $vals[1]; | 97 $beer_state = $vals[1]; |
| 97 } | 98 } |
| 98 if (strcmp($vals[0], "BEER_TEMPERATURE") == 0) { | 99 if ((strcmp($vals[0], "BEER_TEMPERATURE") == 0) && ($beer_state == 0)) { |
| 99 if ($beer_state == 0) | 100 $beer_temperature = $vals[1]; |
| 100 $beer_temperature = $vals[1]; | |
| 101 else | |
| 102 $beer_temperature = "N/A"; | |
| 103 } | 101 } |
| 104 } | 102 } |
| 105 $outstr .= ' <div id="fermentor_panel">'.PHP_EOL; | 103 $outstr .= ' <div id="fermentor_panel">'.PHP_EOL; |
| 106 $outstr .= ' <div id="fermentor_selector">'.PHP_EOL; | 104 $outstr .= ' <div id="fermentor_selector">'.PHP_EOL; |
| 107 $outstr .= ' Mode '.$mode.PHP_EOL; | 105 $outstr .= ' Mode '.$mode.PHP_EOL; |
| 108 $outstr .= ' </div>'.PHP_EOL; | 106 $outstr .= ' </div>'.PHP_EOL; |
| 109 $outstr .= ' <div id="fermentor_powerled">'.PHP_EOL; | 107 $outstr .= ' <div id="fermentor_powerled">'.PHP_EOL; |
| 108 $outstr .= ' PwrLED'.PHP_EOL; | |
| 110 $outstr .= ' </div>'.PHP_EOL; | 109 $outstr .= ' </div>'.PHP_EOL; |
| 111 $outstr .= ' <div id="fermentor_display1">'.PHP_EOL; | 110 $outstr .= ' <div id="fermentor_display1">'.PHP_EOL; |
| 111 $outstr .= ' '.$set_temperature.'<br>Set'.PHP_EOL; | |
| 112 $outstr .= ' </div>'.PHP_EOL; | 112 $outstr .= ' </div>'.PHP_EOL; |
| 113 $outstr .= ' <div id="fermentor_display2">'.PHP_EOL; | 113 $outstr .= ' <div id="fermentor_display2">'.PHP_EOL; |
| 114 $outstr .= ' Air<br>'.$air_temperature.PHP_EOL; | 114 $outstr .= ' '.$air_temperature.'<br>Air'.PHP_EOL; |
| 115 $outstr .= ' </div>'.PHP_EOL; | 115 $outstr .= ' </div>'.PHP_EOL; |
| 116 $outstr .= ' <div id="fermentor_display3">'.PHP_EOL; | 116 $outstr .= ' <div id="fermentor_display3">'.PHP_EOL; |
| 117 $outstr .= ' Beer<br>'.$beer_temperature.PHP_EOL; | 117 $outstr .= ' '.$beer_temperature.'<br>Beer'.PHP_EOL; |
| 118 $outstr .= ' </div>'.PHP_EOL; | 118 $outstr .= ' </div>'.PHP_EOL; |
| 119 $outstr .= ' <div id="fermentor_led1">'.PHP_EOL; | 119 $outstr .= ' <div id="fermentor_led1">'.PHP_EOL; |
| 120 $outstr .= ' CoolLED'.PHP_EOL; | |
| 120 $outstr .= ' </div>'.PHP_EOL; | 121 $outstr .= ' </div>'.PHP_EOL; |
| 121 $outstr .= ' <div id="fermentor_led2">'.PHP_EOL; | 122 $outstr .= ' <div id="fermentor_led2">'.PHP_EOL; |
| 123 $outstr .= ' HeatLED'.PHP_EOL; | |
| 122 $outstr .= ' </div>'.PHP_EOL; | 124 $outstr .= ' </div>'.PHP_EOL; |
| 123 $outstr .= ' <div id="fermentor_led3">'.PHP_EOL; | 125 $outstr .= ' <div id="fermentor_led3">'.PHP_EOL; |
| 126 $outstr .= ' FanLED'.PHP_EOL; | |
| 124 $outstr .= ' </div>'.PHP_EOL; | 127 $outstr .= ' </div>'.PHP_EOL; |
| 125 $outstr .= ' <div id="fermentor_toggle1">'.PHP_EOL; | 128 $outstr .= ' <div id="fermentor_toggle1">'.PHP_EOL; |
| 129 $outstr .= ' CoolSW'.PHP_EOL; | |
| 126 $outstr .= ' </div>'.PHP_EOL; | 130 $outstr .= ' </div>'.PHP_EOL; |
| 127 $outstr .= ' <div id="fermentor_toggle2">'.PHP_EOL; | 131 $outstr .= ' <div id="fermentor_toggle2">'.PHP_EOL; |
| 132 $outstr .= ' HeatSW'.PHP_EOL; | |
| 128 $outstr .= ' </div>'.PHP_EOL; | 133 $outstr .= ' </div>'.PHP_EOL; |
| 129 $outstr .= ' <div id="fermentor_toggle3">'.PHP_EOL; | 134 $outstr .= ' <div id="fermentor_toggle3">'.PHP_EOL; |
| 135 $outstr .= ' FanSW'.PHP_EOL; | |
| 130 $outstr .= ' </div>'.PHP_EOL; | 136 $outstr .= ' </div>'.PHP_EOL; |
| 131 $outstr .= ' </div>'.PHP_EOL; | 137 $outstr .= ' </div>'.PHP_EOL; |
| 132 $outstr .= ' <div id="fermentor_control">'.PHP_EOL; | 138 $outstr .= ' <div id="fermentor_control">'.PHP_EOL; |
| 133 // $outstr .= ' mode ' . $mode . '<br>' .PHP_EOL; | |
| 134 // $outstr .= ' air temperature ' . $air_temperature . '<br>' .PHP_EOL; | |
| 135 // $outstr .= ' beer temperature ' . $beer_temperature . '<br>' .PHP_EOL; | |
| 136 $outstr .= ' </div>'.PHP_EOL; | 139 $outstr .= ' </div>'.PHP_EOL; |
| 137 $outstr .= ' <div id="fermentor_edit">'.PHP_EOL; | 140 $outstr .= ' <div id="fermentor_edit">'.PHP_EOL; |
| 138 $outstr .= ' <button id="fermentor_setup" class="ui-state-default">Edit fermentor</button>'.PHP_EOL; | 141 $outstr .= ' <button id="fermentor_setup" class="ui-state-default">Edit fermentor</button>'.PHP_EOL; |
| 142 $outstr .= ' <button id="fermentor_history" class="ui-state-default">History</button>'.PHP_EOL; | |
| 139 $outstr .= ' </div>'.PHP_EOL; | 143 $outstr .= ' </div>'.PHP_EOL; |
| 140 $outstr .= ' </div> <!-- fermentor -->'.PHP_EOL; | 144 $outstr .= ' </div> <!-- fermentor -->'.PHP_EOL; |
| 141 } | 145 } |
| 142 | 146 |
| 143 return $outstr; | 147 return $outstr; |
