feat: fault state gpio setting replaced with cascade control

This commit is contained in:
Yurii
2024-10-18 06:14:09 +03:00
parent 57cf98ca19
commit 7f701a74e7
9 changed files with 506 additions and 117 deletions

View File

@@ -230,7 +230,7 @@
</div>
<fieldset>
<legend data-i18n>settings.section.emergency.events</legend>
<legend data-i18n>settings.emergency.events.title</legend>
<label for="emergency-on-network-fault">
<input type="checkbox" id="emergency-on-network-fault" name="emergency[onNetworkFault]" value="true">
@@ -254,7 +254,7 @@
</fieldset>
<fieldset>
<legend data-i18n>settings.section.emergency.regulators</legend>
<legend data-i18n>settings.emergency.regulators.title</legend>
<label for="emergency-use-equitherm">
<input type="checkbox" id="emergency-use-equitherm" name="emergency[useEquitherm]" value="true">
@@ -429,7 +429,8 @@
</div>
<fieldset>
<legend data-i18n>settings.section.ot.options</legend>
<legend data-i18n>settings.ot.options.title</legend>
<label for="opentherm-dhw-present">
<input type="checkbox" id="opentherm-dhw-present" name="opentherm[dhwPresent]" value="true">
<span data-i18n>settings.ot.options.dhwPresent</span>
@@ -503,9 +504,7 @@
<hr />
<fieldset>
<legend>
<span data-i18n>settings.ot.fnv.title</span>
</legend>
<legend data-i18n>settings.ot.fnv.title</legend>
<label for="opentherm-fnv-enable">
<input type="checkbox" id="opentherm-fnv-enable" name="opentherm[filterNumValues][enable]" value="true">
@@ -520,20 +519,6 @@
<small data-i18n>settings.ot.fnv.factor.note</small>
</label>
</fieldset>
<hr />
<fieldset>
<label for="opentherm-fault-state-gpio">
<span data-i18n>settings.ot.faultState.gpio</span>
<input type="number" inputmode="numeric" id="opentherm-fault-state-gpio" name="opentherm[faultStateGpio]" min="0" max="254" step="1">
<small data-i18n>settings.ot.faultState.note</small>
</label>
<label for="opentherm-invert-fault-state">
<input type="checkbox" id="opentherm-invert-fault-state" name="opentherm[invertFaultState]" value="true">
<span data-i18n>settings.ot.faultState.invert</span>
</label>
</fieldset>
</div>
</details>
@@ -753,6 +738,91 @@
</form>
</div>
</details>
<hr />
<details>
<summary><b data-i18n>settings.section.cascadeControl</b></summary>
<div>
<div id="cc-settings-busy" aria-busy="true"></div>
<form action="/api/settings" id="cc-settings" class="hidden">
<fieldset>
<label for="cc-input-enable">
<input type="checkbox" id="cc-input-enable" name="cascadeControl[input][enable]" value="true">
<span data-i18n>settings.cascadeControl.input.enable</span>
<br>
<small data-i18n>settings.cascadeControl.input.desc</small>
</label>
<label for="cc-input-invert-state">
<input type="checkbox" id="cc-input-invert-state" name="cascadeControl[input][invertState]" value="true">
<span data-i18n>settings.cascadeControl.input.invertState</span>
</label>
</fieldset>
<div class="grid">
<label for="cc-input-gpio">
<span data-i18n>settings.cascadeControl.input.gpio</span>
<input type="number" inputmode="numeric" id="cc-input-gpio" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
</label>
<label for="cc-input-tt">
<span data-i18n>settings.cascadeControl.input.thresholdTime</span>
<input type="number" inputmode="numeric" id="cc-input-tt" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
</label>
</div>
<hr />
<fieldset>
<label for="cc-output-enable">
<input type="checkbox" id="cc-output-enable" name="cascadeControl[output][enable]" value="true">
<span data-i18n>settings.cascadeControl.output.enable</span>
<br>
<small data-i18n>settings.cascadeControl.output.desc</small>
</label>
<label for="cc-output-invert-state">
<input type="checkbox" id="cc-output-invert-state" name="cascadeControl[output][invertState]" value="true">
<span data-i18n>settings.cascadeControl.output.invertState</span>
</label>
</fieldset>
<div class="grid">
<label for="cc-output-gpio">
<span data-i18n>settings.cascadeControl.output.gpio</span>
<input type="number" outputmode="numeric" id="cc-output-gpio" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
</label>
<label for="cc-output-tt">
<span data-i18n>settings.cascadeControl.output.thresholdTime</span>
<input type="number" outputmode="numeric" id="cc-output-tt" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
</label>
</div>
<fieldset>
<legend data-i18n>settings.cascadeControl.output.events.title</legend>
<label for="cc-on-fault">
<input type="checkbox" id="cc-on-fault" name="cascadeControl[output][onFault]" value="true">
<span data-i18n>settings.cascadeControl.output.events.onFault</span>
</label>
<label for="cc-on-loss-conn">
<input type="checkbox" id="cc-on-loss-conn" name="cascadeControl[output][onLossConnection]" value="true">
<span data-i18n>settings.cascadeControl.output.events.onLossConnection</span>
</label>
<label for="cc-on-enabled-heating">
<input type="checkbox" id="cc-on-enabled-heating" name="cascadeControl[output][onEnabledHeating]" value="true">
<span data-i18n>settings.cascadeControl.output.events.onEnabledHeating</span>
</label>
</fieldset>
<button type="submit" data-i18n>button.save</button>
</form>
</div>
</details>
</article>
</main>
@@ -796,8 +866,6 @@
setInputValue('#opentherm-in-gpio', data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
setInputValue('#opentherm-out-gpio', data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
setInputValue('#opentherm-rx-led-gpio', data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
setInputValue('#opentherm-fault-state-gpio', data.opentherm.faultStateGpio < 255 ? data.opentherm.faultStateGpio : '');
setCheckboxValue('#opentherm-invert-fault-state', data.opentherm.invertFaultState);
setInputValue('#opentherm-member-id-code', data.opentherm.memberIdCode);
setInputValue('#opentherm-max-modulation', data.opentherm.maxModulation);
setInputValue('#opentherm-pressure-factor', data.opentherm.pressureFactor);
@@ -851,6 +919,21 @@
setInputValue('#extpump-as-time', data.externalPump.antiStuckTime);
setBusy('#extpump-settings-busy', '#extpump-settings', false);
// Cascade control
setCheckboxValue('#cc-input-enable', data.cascadeControl.input.enable);
setInputValue('#cc-input-gpio', data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
setCheckboxValue('#cc-input-invert-state', data.cascadeControl.input.invertState);
setInputValue('#cc-input-tt', data.cascadeControl.input.thresholdTime);
setCheckboxValue('#cc-output-enable', data.cascadeControl.output.enable);
setInputValue('#cc-output-gpio', data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
setCheckboxValue('#cc-output-invert-state', data.cascadeControl.output.invertState);
setInputValue('#cc-output-tt', data.cascadeControl.output.thresholdTime);
setCheckboxValue('#cc-on-fault', data.cascadeControl.output.onFault);
setCheckboxValue('#cc-on-loss-conn', data.cascadeControl.output.onLossConnection);
setCheckboxValue('#cc-on-enabled-heating', data.cascadeControl.output.onEnabledHeating);
setBusy('#cc-settings-busy', '#cc-settings', false);
// Heating
setInputValue('#heating-min-temp', data.heating.minTemp, {
"min": data.system.unitSystem == 0 ? 0 : 32,
@@ -934,6 +1017,7 @@
setupForm('#outdoor-sensor-settings', fillData);
setupForm('#indoor-sensor-settings', fillData, ['sensors.indoor.bleAddress']);
setupForm('#extpump-settings', fillData);
setupForm('#cc-settings', fillData);
} catch (error) {
console.log(error);