mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-15 12:44:27 +05:00
Merge branch 'master' into hyst
This commit is contained in:
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
@@ -153,9 +154,14 @@
|
||||
<th scope="row" data-i18n>dashboard.states.sFlame</th>
|
||||
<td><i class="sFlame"></i></td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<th scope="row" data-i18n>dashboard.states.sCooling</th>
|
||||
<td><i class="sCooling"></i></td>
|
||||
<th scope="row" data-i18n>dashboard.states.sCoolingActive</th>
|
||||
<td><i class="sCoolingActive"></i></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th scope="row" data-i18n>dashboard.states.sCoolingSetpoint</th>
|
||||
<td><b class="sCoolingSetpoint"></b> %</td>
|
||||
</tr>
|
||||
|
||||
|
||||
@@ -557,7 +563,9 @@
|
||||
result.slave.connected ? "green" : "red"
|
||||
);
|
||||
setState('.sFlame', result.slave.flame);
|
||||
setState('.sCooling', result.slave.cooling);
|
||||
|
||||
setState('.sCoolingActive', result.slave.cooling.active);
|
||||
setValue('.sCoolingSetpoint', result.slave.cooling.setpoint);
|
||||
|
||||
setValue('.sModMin', result.slave.modulation.min);
|
||||
setValue('.sModMax', result.slave.modulation.max);
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
@@ -757,6 +758,11 @@
|
||||
<input type="checkbox" name="externalPump[use]" value="true">
|
||||
<span data-i18n>settings.extPump.use</span>
|
||||
</label>
|
||||
|
||||
<label>
|
||||
<input type="checkbox" name="externalPump[invertState]" value="true">
|
||||
<span data-i18n>settings.externalPump.invertState</span>
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<div class="grid">
|
||||
@@ -954,6 +960,7 @@
|
||||
// Extpump
|
||||
setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
|
||||
setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
|
||||
setCheckboxValue("[name='externalPump[invertState]']", data.externalPump.invertState);
|
||||
setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
|
||||
setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
|
||||
setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
|
||||
|
||||
@@ -23,6 +23,7 @@
|
||||
<option value="en" selected>EN</option>
|
||||
<option value="cn">CN</option>
|
||||
<option value="it">IT</option>
|
||||
<option value="nl">NL</option>
|
||||
<option value="ru">RU</option>
|
||||
</select>
|
||||
</li>
|
||||
|
||||
Reference in New Issue
Block a user