mirror of
https://github.com/Laxilef/OTGateway.git
synced 2025-12-11 18:54:28 +05:00
Compare commits
2 Commits
e751c3aba0
...
ff89c6d478
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff89c6d478 | ||
|
|
d867c355ed |
@@ -376,7 +376,7 @@
|
|||||||
},
|
},
|
||||||
"exponent": {
|
"exponent": {
|
||||||
"title": "Exponent",
|
"title": "Exponent",
|
||||||
"note": "Radiator efficiency. Typical values: 1.1 - Floor heating, 1.2 - Cast iron, 1.3 - Panel radiators, 1.4 - Convectors."
|
"note": "Radiator efficiency. Typical values: <code>1.1</code> - Floor heating, <code>1.2</code> - Cast iron, <code>1.3</code> - Panel radiators, <code>1.4</code> - Convectors."
|
||||||
},
|
},
|
||||||
"shift": {
|
"shift": {
|
||||||
"title": "Shift",
|
"title": "Shift",
|
||||||
@@ -384,7 +384,7 @@
|
|||||||
},
|
},
|
||||||
"targetDiffFactor": {
|
"targetDiffFactor": {
|
||||||
"title": "T factor",
|
"title": "T factor",
|
||||||
"note": "Not used if PID is enabled"
|
"note": "Not used if PID is enabled. Adds to the setpoint the difference between the target and current indoor temp: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
||||||
},
|
},
|
||||||
"chart": {
|
"chart": {
|
||||||
"targetTemp": "Target indoor temperature",
|
"targetTemp": "Target indoor temperature",
|
||||||
|
|||||||
@@ -376,7 +376,7 @@
|
|||||||
},
|
},
|
||||||
"exponent": {
|
"exponent": {
|
||||||
"title": "Esponente",
|
"title": "Esponente",
|
||||||
"note": "Efficienza del radiatore. Valori tipici: 1.1 - Riscaldamento a pavimento, 1.2 - Radiatori in ghisa, 1.3 - Radiatori a pannelli, 1.4 - Convetttori."
|
"note": "Efficienza del radiatore. Valori tipici: <code>1.1</code> - Riscaldamento a pavimento, <code>1.2</code> - Radiatori in ghisa, <code>1.3</code> - Radiatori a pannelli, <code>1.4</code> - Convetttori."
|
||||||
},
|
},
|
||||||
"shift": {
|
"shift": {
|
||||||
"title": "Spostare",
|
"title": "Spostare",
|
||||||
@@ -384,7 +384,7 @@
|
|||||||
},
|
},
|
||||||
"targetDiffFactor": {
|
"targetDiffFactor": {
|
||||||
"title": "Fattore T",
|
"title": "Fattore T",
|
||||||
"note": "Non usato se PID è attivato"
|
"note": "Non usato se PID è attivato. Aggiunge al setpoint la differenza tra la temperatura interna target e quella attuale: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
||||||
},
|
},
|
||||||
"chart": {
|
"chart": {
|
||||||
"targetTemp": "Temperatura interna target",
|
"targetTemp": "Temperatura interna target",
|
||||||
|
|||||||
@@ -376,7 +376,7 @@
|
|||||||
},
|
},
|
||||||
"exponent": {
|
"exponent": {
|
||||||
"title": "Экспонента",
|
"title": "Экспонента",
|
||||||
"note": "Эффективность радиатора. Типичные значения: 1.1 - Тёплый пол, 1.2 - Чугунные радиаторы, 1.3 - Панельные радиаторы, 1.4 - Конвекторы."
|
"note": "Эффективность радиатора. Типичные значения: <code>1.1</code> - Тёплый пол, <code>1.2</code> - Чугунные радиаторы, <code>1.3</code> - Панельные радиаторы, <code>1.4</code> - Конвекторы."
|
||||||
},
|
},
|
||||||
"shift": {
|
"shift": {
|
||||||
"title": "Смещение",
|
"title": "Смещение",
|
||||||
@@ -384,7 +384,7 @@
|
|||||||
},
|
},
|
||||||
"targetDiffFactor": {
|
"targetDiffFactor": {
|
||||||
"title": "Коэффициент T",
|
"title": "Коэффициент T",
|
||||||
"note": "Не используется, если ПИД включен"
|
"note": "Не используется, если ПИД включен. Добавляет разницу между целевой и текущей температурой в помещении: <code>setpoint = setpoint + ((target - indoor) * T)</code>."
|
||||||
},
|
},
|
||||||
"chart": {
|
"chart": {
|
||||||
"targetTemp": "Целевая внутренняя температура",
|
"targetTemp": "Целевая внутренняя температура",
|
||||||
|
|||||||
@@ -105,7 +105,7 @@
|
|||||||
<option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
|
<option disabled selected data-i18n>settings.system.ntp.timezonePresets</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</label>
|
</label>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
<fieldset>
|
<fieldset>
|
||||||
@@ -340,7 +340,7 @@
|
|||||||
</details>
|
</details>
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><b data-i18n>settings.section.equitherm</b></summary>
|
<summary><b data-i18n>settings.section.equitherm</b></summary>
|
||||||
<div>
|
<div>
|
||||||
@@ -365,7 +365,7 @@
|
|||||||
<input class="etChartTargetTemp" type="range" value="0" min="0" max="0" step="0.5">
|
<input class="etChartTargetTemp" type="range" value="0" min="0" max="0" step="0.5">
|
||||||
</label>
|
</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="grid">
|
<div class="grid">
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.equitherm.slope.title</span>
|
<span data-i18n>settings.equitherm.slope.title</span>
|
||||||
@@ -400,7 +400,7 @@
|
|||||||
</details>
|
</details>
|
||||||
|
|
||||||
<hr />
|
<hr />
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary><b data-i18n>settings.section.pid</b></summary>
|
<summary><b data-i18n>settings.section.pid</b></summary>
|
||||||
<div>
|
<div>
|
||||||
@@ -446,7 +446,7 @@
|
|||||||
<span data-i18n>settings.temp.min</span>
|
<span data-i18n>settings.temp.min</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[minTemp]" min="0" max="0" step="1" required>
|
<input type="number" inputmode="decimal" name="pid[minTemp]" min="0" max="0" step="1" required>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.temp.max</span>
|
<span data-i18n>settings.temp.max</span>
|
||||||
<input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
|
<input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
|
||||||
@@ -475,12 +475,12 @@
|
|||||||
<span data-i18n>settings.pid.deadband.p_multiplier</span>
|
<span data-i18n>settings.pid.deadband.p_multiplier</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[deadband][p_multiplier]" min="0" max="5" step="0.001" required>
|
<input type="number" inputmode="decimal" name="pid[deadband][p_multiplier]" min="0" max="5" step="0.001" required>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.pid.deadband.i_multiplier</span>
|
<span data-i18n>settings.pid.deadband.i_multiplier</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[deadband][i_multiplier]" min="0" max="1" step="0.001" required>
|
<input type="number" inputmode="decimal" name="pid[deadband][i_multiplier]" min="0" max="1" step="0.001" required>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.pid.deadband.d_multiplier</span>
|
<span data-i18n>settings.pid.deadband.d_multiplier</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[deadband][d_multiplier]" min="0" max="1" step="0.001" required>
|
<input type="number" inputmode="decimal" name="pid[deadband][d_multiplier]" min="0" max="1" step="0.001" required>
|
||||||
@@ -492,7 +492,7 @@
|
|||||||
<span data-i18n>settings.pid.deadband.thresholdHigh</span>
|
<span data-i18n>settings.pid.deadband.thresholdHigh</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[deadband][thresholdHigh]" min="0" max="5" step="0.01" required>
|
<input type="number" inputmode="decimal" name="pid[deadband][thresholdHigh]" min="0" max="5" step="0.01" required>
|
||||||
</label>
|
</label>
|
||||||
|
|
||||||
<label>
|
<label>
|
||||||
<span data-i18n>settings.pid.deadband.thresholdLow</span>
|
<span data-i18n>settings.pid.deadband.thresholdLow</span>
|
||||||
<input type="number" inputmode="decimal" name="pid[deadband][thresholdLow]" min="0" max="5" step="0.01" required>
|
<input type="number" inputmode="decimal" name="pid[deadband][thresholdLow]" min="0" max="5" step="0.01" required>
|
||||||
@@ -674,7 +674,7 @@
|
|||||||
</fieldset>
|
</fieldset>
|
||||||
</div>
|
</div>
|
||||||
</details>
|
</details>
|
||||||
|
|
||||||
<br />
|
<br />
|
||||||
<button type="submit" data-i18n>button.save</button>
|
<button type="submit" data-i18n>button.save</button>
|
||||||
</form>
|
</form>
|
||||||
@@ -916,7 +916,7 @@
|
|||||||
datasets: [{
|
datasets: [{
|
||||||
borderColor: (context) => {
|
borderColor: (context) => {
|
||||||
const chart = context.chart;
|
const chart = context.chart;
|
||||||
const {ctx, chartArea} = chart;
|
const { ctx, chartArea } = chart;
|
||||||
|
|
||||||
if (!chartArea) {
|
if (!chartArea) {
|
||||||
return;
|
return;
|
||||||
@@ -1032,8 +1032,8 @@
|
|||||||
1 / etChartConfig.exponent
|
1 / etChartConfig.exponent
|
||||||
);
|
);
|
||||||
const result = etChartConfig.targetTemp + etChartConfig.shift + sf * (
|
const result = etChartConfig.targetTemp + etChartConfig.shift + sf * (
|
||||||
tempDelta >= 0
|
tempDelta >= 0
|
||||||
? Math.pow(tempDelta, 1 / etChartConfig.exponent)
|
? Math.pow(tempDelta, 1 / etChartConfig.exponent)
|
||||||
: -(Math.pow(-(tempDelta), 1 / etChartConfig.exponent))
|
: -(Math.pow(-(tempDelta), 1 / etChartConfig.exponent))
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -1218,7 +1218,7 @@
|
|||||||
const etMinTemp = parseInt(data.system.unitSystem == 0 ? 5 : 41);
|
const etMinTemp = parseInt(data.system.unitSystem == 0 ? 5 : 41);
|
||||||
const etMaxTemp = parseInt(data.system.unitSystem == 0 ? 30 : 86);
|
const etMaxTemp = parseInt(data.system.unitSystem == 0 ? 30 : 86);
|
||||||
const etTargetTemp = constrain(parseFloat(data.heating.target), etMinTemp, etMaxTemp);
|
const etTargetTemp = constrain(parseFloat(data.heating.target), etMinTemp, etMaxTemp);
|
||||||
|
|
||||||
setInputValue(".etChartTargetTemp", etTargetTemp.toFixed(1), {
|
setInputValue(".etChartTargetTemp", etTargetTemp.toFixed(1), {
|
||||||
"min": etMinTemp,
|
"min": etMinTemp,
|
||||||
"max": etMaxTemp
|
"max": etMaxTemp
|
||||||
@@ -1261,7 +1261,7 @@
|
|||||||
cache: "no-cache",
|
cache: "no-cache",
|
||||||
credentials: "include"
|
credentials: "include"
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error('Response not valid');
|
throw new Error('Response not valid');
|
||||||
}
|
}
|
||||||
@@ -1329,7 +1329,7 @@
|
|||||||
window.addEventListener('resize', async (event) => {
|
window.addEventListener('resize', async (event) => {
|
||||||
if (etChart) {
|
if (etChart) {
|
||||||
etChart.resize();
|
etChart.resize();
|
||||||
|
|
||||||
if (etChartConfig.decimated != hasNeedDecimationChart()) {
|
if (etChartConfig.decimated != hasNeedDecimationChart()) {
|
||||||
makeEquithermChart();
|
makeEquithermChart();
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user