diff --git a/src_data/locales/cn.json b/src_data/locales/cn.json index 221b55f..9b8f90e 100644 --- a/src_data/locales/cn.json +++ b/src_data/locales/cn.json @@ -8,13 +8,18 @@ "issues": "问题与反馈", "releases": "发行版" }, - "dbm": "dBm", - "kw": "kW", - "time": { + "units": { "days": "天", "hours": "小时", "min": "分", - "sec": "秒" + "sec": "秒", + "dbm": "dBm", + "mhz": "MHz", + "kw": "kW", + "rpm": "RPM", + "ppm": "ppm", + "byte": "byte", + "mbyte": "MB" }, "button": { @@ -51,7 +56,8 @@ }, "uptime": "运行时间", "memory": { - "title": "可用内存", + "heap": "Heap", + "psram": "Psram", "maxFreeBlock": "max free block", "min": "min" }, @@ -120,6 +126,7 @@ "mHeatEnabled": "供暖功能已启用", "mHeatBlocking": "供暖", "mHeatOverheat": "供暖超热保护", + "mHeatFreezing": "防冻保护", "sHeatActive": "供暖激活状态", "mHeatSetpointTemp": "供暖供水设定温度", "mHeatTargetTemp": "供暖供水目标温度", diff --git a/src_data/locales/en.json b/src_data/locales/en.json index bcb23ae..90e2a68 100644 --- a/src_data/locales/en.json +++ b/src_data/locales/en.json @@ -8,13 +8,18 @@ "issues": "Issues & questions", "releases": "Releases" }, - "dbm": "dBm", - "kw": "kW", - "time": { + "units": { "days": "d.", "hours": "h.", "min": "min.", - "sec": "sec." + "sec": "sec.", + "dbm": "dBm", + "mhz": "MHz", + "kw": "kW", + "rpm": "RPM", + "ppm": "ppm", + "byte": "byte", + "mbyte": "MB" }, "button": { @@ -51,7 +56,8 @@ }, "uptime": "Uptime", "memory": { - "title": "Free memory", + "heap": "Heap", + "psram": "Psram", "maxFreeBlock": "max free block", "min": "min" }, diff --git a/src_data/locales/it.json b/src_data/locales/it.json index a0e6662..9b0292a 100644 --- a/src_data/locales/it.json +++ b/src_data/locales/it.json @@ -8,13 +8,18 @@ "issues": "Problemi e domande", "releases": "Versione" }, - "dbm": "dBm", - "kw": "kW", - "time": { + "units": { "days": "d.", "hours": "h.", "min": "min.", - "sec": "sec." + "sec": "sec.", + "dbm": "dBm", + "mhz": "MHz", + "kw": "kW", + "rpm": "RPM", + "ppm": "ppm", + "byte": "byte", + "mbyte": "MB" }, "button": { @@ -51,7 +56,8 @@ }, "uptime": "Tempo di attività", "memory": { - "title": "Memoria libera", + "heap": "Heap", + "psram": "Psram", "maxFreeBlock": "max free block", "min": "min" }, @@ -120,6 +126,7 @@ "mHeatEnabled": "Riscaldamento attivato", "mHeatBlocking": "Riscaldamento bloccato", "mHeatOverheat": "Riscaldamento surriscaldamento", + "mHeatFreezing": "Protezione antigelo", "sHeatActive": "Riscaldamento attivo", "mHeatSetpointTemp": "Temp riscaldamento impostato", "mHeatTargetTemp": "Target Temp caldaia", diff --git a/src_data/locales/nl.json b/src_data/locales/nl.json index e79f5df..eadab19 100644 --- a/src_data/locales/nl.json +++ b/src_data/locales/nl.json @@ -8,13 +8,18 @@ "issues": "Problemen & vragen", "releases": "Releases" }, - "dbm": "dBm", - "kw": "kW", - "time": { + "units": { "days": "d.", "hours": "u.", "min": "min.", - "sec": "sec." + "sec": "sec.", + "dbm": "dBm", + "mhz": "MHz", + "kw": "kW", + "rpm": "RPM", + "ppm": "ppm", + "byte": "byte", + "mbyte": "MB" }, "button": { "upgrade": "Upgraden", @@ -47,7 +52,8 @@ }, "uptime": "Uptime", "memory": { - "title": "Vrij geheugen", + "heap": "Heap", + "psram": "Psram", "maxFreeBlock": "max. vrij blok", "min": "min" }, @@ -109,6 +115,7 @@ "mHeatEnabled": "Verwarming ingeschakeld", "mHeatBlocking": "Verwarming geblokkeerd", "mHeatOverheat": "Verwarming oververhit", + "mHeatFreezing": "Verwarming vorstbescherming", "sHeatActive": "Verwarming actief", "mHeatSetpointTemp": "Insteltemperatuur verwarming", "mHeatTargetTemp": "Doeltemperatuur verwarming", diff --git a/src_data/locales/ru.json b/src_data/locales/ru.json index 5c2ac57..5e1e5c3 100644 --- a/src_data/locales/ru.json +++ b/src_data/locales/ru.json @@ -8,13 +8,19 @@ "issues": "Проблемы и вопросы", "releases": "Релизы" }, - "dbm": "дБм", - "kw": "кВт", - "time": { + + "units": { "days": "д.", "hours": "ч.", "min": "мин.", - "sec": "сек." + "sec": "сек.", + "dbm": "дБм", + "mhz": "МГц", + "kw": "кВт", + "rpm": "RPM", + "ppm": "ppm", + "byte": "байт", + "mbyte": "мбайт" }, "button": { @@ -51,7 +57,8 @@ }, "uptime": "Аптайм", "memory": { - "title": "ОЗУ", + "heap": "Heap", + "psram": "Psram", "maxFreeBlock": "макс. блок", "min": "мин." }, @@ -120,6 +127,7 @@ "mHeatEnabled": "Отопление", "mHeatBlocking": "Блокировка отопления", "mHeatOverheat": "Отопление, перегрев", + "mHeatFreezing": "Отопление, защита от замерзания", "sHeatActive": "Активность отопления", "mHeatSetpointTemp": "Отопление, уставка", "mHeatTargetTemp": "Отопление, целевая температура", diff --git a/src_data/pages/dashboard.html b/src_data/pages/dashboard.html index ac62719..7e87834 100644 --- a/src_data/pages/dashboard.html +++ b/src_data/pages/dashboard.html @@ -769,7 +769,7 @@ } if (sData.rssi !== undefined) { - appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: ${sData.rssi.toFixed(0)} ${i18n('dbm')}`, `
`, sensorNode); + appendValue(".sValue", `${i18n('dashboard.sensors.values.rssi')}: ${sData.rssi.toFixed(0)} ${i18n('units.dbm')}`, `
`, sensorNode); } } diff --git a/src_data/pages/index.html b/src_data/pages/index.html index 3e92b0f..80026c2 100644 --- a/src_data/pages/index.html +++ b/src_data/pages/index.html @@ -113,25 +113,32 @@ index.system.uptime - time.days, - time.hours, - time.min, - time.sec + units.days, + units.hours, + units.min, + units.sec - index.system.memory.title + index.system.memory.heap - of bytes (index.system.memory.min: bytes)
- index.system.memory.maxFreeBlock: bytes (index.system.memory.min: bytes) + of units.byte (index.system.memory.min: units.byte)
+ index.system.memory.maxFreeBlock: units.byte (index.system.memory.min: units.byte) + + + + index.system.memory.psram + + of units.byte (index.system.memory.min: units.byte)
+ index.system.memory.maxFreeBlock: units.byte index.system.board index.system.chip.model: (rev. )
- index.system.chip.cores: , index.system.chip.freq: mHz
- index.system.flash.size: MB (index.system.flash.realSize: MB) + index.system.chip.cores: , index.system.chip.freq: units.mhz
+ index.system.flash.size: units.mbyte (index.system.flash.realSize: units.mbyte) @@ -219,6 +226,11 @@ setValue('#heap-max-free-block', result.heap.maxFreeBlock); setValue('#heap-min-max-free-block', result.heap.minMaxFreeBlock); + setValue('#psram-total', result.psram.total); + setValue('#psram-free', result.psram.free); + setValue('#psram-min-free', result.psram.minFree); + setValue('#psram-max-free-block', result.psram.maxFreeBlock); + setValue('#chip-model', result.chip.model); setValue('#chip-rev', result.chip.rev); setValue('#chip-cores', result.chip.cores); diff --git a/src_data/scripts/utils.js b/src_data/scripts/utils.js index 8b45324..689ffb9 100644 --- a/src_data/scripts/utils.js +++ b/src_data/scripts/utils.js @@ -784,9 +784,9 @@ const purposeUnit = (purpose, unitSystem) => { 7: tUnit, 8: "%", 248: "%", - 249: i18n('kw'), - 250: "RPM", - 251: "ppm", + 249: i18n('units.kw'), + 250: i18n('units.rpm'), + 251: i18n('units.ppm'), 252: pressureUnit(unitSystem), 253: "%", 254: tUnit