From fcd819832a80237c3eb3be9ba3e50f13ccb85fd8 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 19 Oct 2020 23:17:32 +0200 Subject: [PATCH] removed Boiler from names --- src/locale_EN.h | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/src/locale_EN.h b/src/locale_EN.h index 8df1efd29..618a3c563 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -160,7 +160,7 @@ MAKE_PSTR(curFlowTemp, "Current flow temperature") MAKE_PSTR(retTemp, "Return temperature") MAKE_PSTR(switchTemp, "Mixing switch temperature") MAKE_PSTR(sysPress, "System pressure") -MAKE_PSTR(boilTemp, "Max boiler temperature") +MAKE_PSTR(boilTemp, "Max temperature") MAKE_PSTR(wwStorageTemp1, "Warm water storage temperature (intern)") MAKE_PSTR(wwStorageTemp2, "Warm water storage temperature (extern)") MAKE_PSTR(exhaustTemp, "Exhaust temperature") @@ -173,28 +173,28 @@ MAKE_PSTR(wWTempOK, "Warm water temperature ok") MAKE_PSTR(wWActive, "Warm water active") MAKE_PSTR(burnGas, "Gas") MAKE_PSTR(flameCurr, "Flame current") -MAKE_PSTR(heatPump, "Boiler pump") +MAKE_PSTR(heatPump, "Pump") MAKE_PSTR(fanWork, "Fan") MAKE_PSTR(ignWork, "Ignition") MAKE_PSTR(wWHeat, "Warm water heating") MAKE_PSTR(heatingActivated, "Heating activated") -MAKE_PSTR(heatingTemp, "Heating temperature setting on the boiler") -MAKE_PSTR(pumpModMax, "Boiler circuit pump modulation max power") -MAKE_PSTR(pumpModMin, "Boiler circuit pump modulation min power") -MAKE_PSTR(pumpDelay, "Boiler circuit pump delay time") -MAKE_PSTR(burnMinPeriod, "Boiler burner min period") -MAKE_PSTR(burnMinPower, "Boiler burner min power") -MAKE_PSTR(burnMaxPower, "Boiler burner max power") -MAKE_PSTR(boilHystOn, "Boiler temperature hysteresis on") -MAKE_PSTR(boilHystOff, "Boiler temperature hysteresis off") +MAKE_PSTR(heatingTemp, "Heating temperature setting") +MAKE_PSTR(pumpModMax, "Circuit pump modulation max power") +MAKE_PSTR(pumpModMin, "Circuit pump modulation min power") +MAKE_PSTR(pumpDelay, "Circuit pump delay time") +MAKE_PSTR(burnMinPeriod, "Burner min period") +MAKE_PSTR(burnMinPower, "Burner min power") +MAKE_PSTR(burnMaxPower, "Burner max power") +MAKE_PSTR(boilHystOn, "Temperature hysteresis on") +MAKE_PSTR(boilHystOff, "Temperature hysteresis off") MAKE_PSTR(setFlowTemp, "Set flow temperature") MAKE_PSTR(wWSetPumpPower, "Warm water pump set power") MAKE_PSTR(wwMixTemperature, "Warm water mix temperature") -MAKE_PSTR(wwBufferBoilerTemperature, "Warm water buffer boiler temperature") +MAKE_PSTR(wwBufferTemperature, "Warm water buffer temperature") MAKE_PSTR(wWStarts, "Warm water # starts") MAKE_PSTR(wWWorkM, "Warm water active time") -MAKE_PSTR(setBurnPow, "Boiler burner set power") -MAKE_PSTR(burnStarts, "Burner # starts") +MAKE_PSTR(setBurnPow, "Burner set power") +MAKE_PSTR(burnStarts, "# starts") // solar MAKE_PSTR(collectorTemp, "Collector temperature (TS1)") @@ -270,3 +270,7 @@ MAKE_PSTR(iconimport, "mdi:home-import-outline") MAKE_PSTR(iconcruise, "mdi:car-cruise-control") MAKE_PSTR(iconvalve, "mdi:valve") MAKE_PSTR(iconpower, "mdi:power-cycle") + +// MQTT topic suffix +MAKE_PSTR(mqtt_suffix_main, "_main") +MAKE_PSTR(mqtt_suffix_ww, "_ww")