From d58ee1e6930956865824ed4ce82fde301acaa406 Mon Sep 17 00:00:00 2001 From: proddy Date: Sat, 7 Aug 2021 21:46:22 +0200 Subject: [PATCH] renamed ww names --- src/locale_EN.h | 96 ++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/src/locale_EN.h b/src/locale_EN.h index 0e7f9d454..4e2686033 100644 --- a/src/locale_EN.h +++ b/src/locale_EN.h @@ -18,8 +18,6 @@ #pragma once -/* spell-checker: disable */ - // common words MAKE_PSTR_WORD(debug) MAKE_PSTR_WORD(exit) @@ -101,7 +99,6 @@ MAKE_PSTR_WORD(unknown) MAKE_PSTR_WORD(Dallassensor) // format strings -MAKE_PSTR(EMSESP, "EMS-ESP") MAKE_PSTR(master_thermostat_fmt, "Master Thermostat Device ID: %s") MAKE_PSTR(host_fmt, "Host: %s") MAKE_PSTR(port_fmt, "Port: %d") @@ -115,7 +112,10 @@ MAKE_PSTR(tx_mode_fmt, "Tx mode: %d") MAKE_PSTR(bus_id_fmt, "Bus ID: %02X") MAKE_PSTR(log_level_fmt, "Log level: %s") +MAKE_STR(productid_fmt, "%s EMS Product ID") + // strings +MAKE_PSTR(EMSESP, "EMS-ESP") MAKE_PSTR(cmd_optional, "[cmd]") MAKE_PSTR(ha_optional, "[ha]") MAKE_PSTR(deep_optional, "[deep]") @@ -437,38 +437,39 @@ MAKE_PSTR_LIST(hpTl2, F("hptl2"), F("air inlet temperature (TL2)")) MAKE_PSTR_LIST(hpPl1, F("hppl1"), F("low pressure side temperature (PL1)")) MAKE_PSTR_LIST(hpPh1, F("hpph1"), F("high pressure side temperature (PH1)")) -MAKE_PSTR_LIST(wWSelTemp, F("wwseltemp"), F("ww selected temperature")) -MAKE_PSTR_LIST(wWSetTemp, F("wwsettemp"), F("ww set temperature")) -MAKE_PSTR_LIST(wWType, F("wwtype"), F("ww type")) -MAKE_PSTR_LIST(wWComfort, F("wwcomfort"), F("ww comfort")) -MAKE_PSTR_LIST(wWFlowTempOffset, F("wwflowtempoffset"), F("ww flow temperature offset")) -MAKE_PSTR_LIST(wWMaxPower, F("wwmaxpower"), F("ww max power")) -MAKE_PSTR_LIST(wWCircPump, F("wwcircpump"), F("ww circulation pump available")) -MAKE_PSTR_LIST(wWChargeType, F("wwchargetype"), F("ww charging type")) -MAKE_PSTR_LIST(wWDisinfectionTemp, F("wwdisinfectiontemp"), F("ww disinfection temperature")) -MAKE_PSTR_LIST(wWCircMode, F("wwcircmode"), F("ww circulation pump frequency")) -MAKE_PSTR_LIST(wWCirc, F("wwcirc"), F("ww circulation active")) -MAKE_PSTR_LIST(wWCurTemp, F("wwcurtemp"), F("ww current intern temperature")) -MAKE_PSTR_LIST(wWCurTemp2, F("wwcurtemp2"), F("ww current extern temperature")) -MAKE_PSTR_LIST(wWCurFlow, F("wwcurflow"), F("ww current tap water flow")) -MAKE_PSTR_LIST(wWStorageTemp1, F("wwstoragetemp1"), F("ww storage intern temperature")) -MAKE_PSTR_LIST(wWStorageTemp2, F("wwstoragetemp2"), F("ww storage extern temperature")) -MAKE_PSTR_LIST(wWActivated, F("wwactivated"), F("ww activated")) -MAKE_PSTR_LIST(wWOneTime, F("wwonetime"), F("ww one time charging")) -MAKE_PSTR_LIST(wWDisinfecting, F("wwdisinfecting"), F("ww disinfecting")) -MAKE_PSTR_LIST(wWCharging, F("wwcharging"), F("ww charging")) -MAKE_PSTR_LIST(wWRecharging, F("wwrecharging"), F("ww recharging")) -MAKE_PSTR_LIST(wWTempOK, F("wwtempok"), F("ww temperature ok")) -MAKE_PSTR_LIST(wWActive, F("wwactive"), F("ww active")) -MAKE_PSTR_LIST(wWHeat, F("wwheat"), F("ww heating")) -MAKE_PSTR_LIST(wWSetPumpPower, F("wwsetpumppower"), F("ww set pump power")) -MAKE_PSTR_LIST(mixerTemp, F("mixertemp"), F("ww mixer temperature")) -MAKE_PSTR_LIST(tankMiddleTemp, F("tankmiddletemp"), F("ww tank middle temperature (TS3)")) -MAKE_PSTR_LIST(wWStarts, F("wwstarts"), F("ww # starts")) -MAKE_PSTR_LIST(wWStarts2, F("wwstarts2"), F("ww # control starts")) -MAKE_PSTR_LIST(wWWorkM, F("wwworkm"), F("ww active time")) -MAKE_PSTR_LIST(wWHystOn, F("wwhyston"), F("ww hysteresis on temperature")) -MAKE_PSTR_LIST(wWHystOff, F("wwhystoff"), F("ww hysteresis off temperature")) +// the following are warm water for the boiler and automatically tagged with 'ww' +MAKE_PSTR_LIST(wwSelTemp, F("wwseltemp"), F("selected temperature")) +MAKE_PSTR_LIST(wwSetTemp, F("wwsettemp"), F("set temperature")) +MAKE_PSTR_LIST(wwType, F("wwtype"), F("type")) +MAKE_PSTR_LIST(wwComfort, F("wwcomfort"), F("comfort")) +MAKE_PSTR_LIST(wwFlowTempOffset, F("wwflowtempoffset"), F("flow temperature offset")) +MAKE_PSTR_LIST(wwMaxPower, F("wwmaxpower"), F("max power")) +MAKE_PSTR_LIST(wwCircPump, F("wwcircpump"), F("circulation pump available")) +MAKE_PSTR_LIST(wwChargeType, F("wwchargetype"), F("charging type")) +MAKE_PSTR_LIST(wwDisinfectionTemp, F("wwdisinfectiontemp"), F("disinfection temperature")) +MAKE_PSTR_LIST(wwCircMode, F("wwcircmode"), F("circulation pump frequency")) +MAKE_PSTR_LIST(wwCirc, F("wwcirc"), F("circulation active")) +MAKE_PSTR_LIST(wwCurTemp, F("wwcurtemp"), F("current intern temperature")) +MAKE_PSTR_LIST(wwCurTemp2, F("wwcurtemp2"), F("current extern temperature")) +MAKE_PSTR_LIST(wwCurFlow, F("wwcurflow"), F("current tap water flow")) +MAKE_PSTR_LIST(wwStorageTemp1, F("wwstoragetemp1"), F("storage intern temperature")) +MAKE_PSTR_LIST(wwStorageTemp2, F("wwstoragetemp2"), F("storage extern temperature")) +MAKE_PSTR_LIST(wwActivated, F("wwactivated"), F("activated")) +MAKE_PSTR_LIST(wwOneTime, F("wwonetime"), F("one time charging")) +MAKE_PSTR_LIST(wwDisinfecting, F("wwdisinfecting"), F("disinfecting")) +MAKE_PSTR_LIST(wwCharging, F("wwcharging"), F("charging")) +MAKE_PSTR_LIST(wwRecharging, F("wwrecharging"), F("recharging")) +MAKE_PSTR_LIST(wwTempOK, F("wwtempok"), F("temperature ok")) +MAKE_PSTR_LIST(wwActive, F("wwactive"), F("active")) +MAKE_PSTR_LIST(wwHeat, F("wwheat"), F("heating")) +MAKE_PSTR_LIST(wwSetPumpPower, F("wwsetpumppower"), F("set pump power")) +MAKE_PSTR_LIST(wwMixerTemp, F("wwMixerTemp"), F("mixer temperature")) +MAKE_PSTR_LIST(wwTankMiddleTemp, F("wwtankmiddletemp"), F("tank middle temperature (TS3)")) +MAKE_PSTR_LIST(wwStarts, F("wwstarts"), F("# starts")) +MAKE_PSTR_LIST(wwStarts2, F("wwstarts2"), F("# control starts")) +MAKE_PSTR_LIST(wwWorkM, F("wwworkm"), F("active time")) +MAKE_PSTR_LIST(wwHystOn, F("wwhyston"), F("hysteresis on temperature")) +MAKE_PSTR_LIST(wwHystOff, F("wwhystoff"), F("hysteresis off temperature")) // thermostat // extra commands @@ -493,11 +494,10 @@ MAKE_PSTR_LIST(dampedoutdoortemp, F("dampedoutdoortemp"), F("damped outdoor temp MAKE_PSTR_LIST(floordrystatus, F("floordry"), F("floor drying")) MAKE_PSTR_LIST(dampedoutdoortemp2, F("dampedoutdoortemp"), F("damped outdoor temperature")) MAKE_PSTR_LIST(floordrytemp, F("floordrytemp"), F("floor drying temperature")) -MAKE_PSTR_LIST(wwMode, F("wwmode"), F("ww mode")) -MAKE_PSTR_LIST(wwSetTemp, F("wwsettemp"), F("ww set temperature")) -MAKE_PSTR_LIST(wwSetTempLow, F("wwsettemplow"), F("ww set low temperature")) -MAKE_PSTR_LIST(wwExtra1, F("wwextra1"), F("ww circuit 1 extra")) -MAKE_PSTR_LIST(wwExtra2, F("wwextra2"), F("ww circuit 2 extra")) +MAKE_PSTR_LIST(wwMode, F("wwmode"), F("mode")) +MAKE_PSTR_LIST(wwSetTempLow, F("wwsettemplow"), F("set low temperature")) +MAKE_PSTR_LIST(wwExtra1, F("wwextra1"), F("circuit 1 extra")) +MAKE_PSTR_LIST(wwExtra2, F("wwextra2"), F("circuit 2 extra")) MAKE_PSTR_LIST(setpoint_roomTemp, F("seltemp"), F("selected room temperature")) MAKE_PSTR_LIST(curr_roomTemp, F("currtemp"), F("current room temperature")) MAKE_PSTR_LIST(mode, F("mode"), F("mode")) @@ -545,7 +545,7 @@ MAKE_PSTR_LIST(mixerStatus, F("valvestatus"), F("mixing valve actuator in assign MAKE_PSTR_LIST(flowTempVf, F("flowtempvf"), F("flow temperature in header (T0/Vf)")) MAKE_PSTR_LIST(wwPumpStatus, F("pumpstatus"), F("pump status in assigned wwc (PC1)")) MAKE_PSTR_LIST(wwTempStatus, F("wwtempstatus"), F("temperature switch in assigned wwc (MC1)")) -MAKE_PSTR_LIST(wwTemp, F("wwtemp"), F("ww current temperature")) +MAKE_PSTR_LIST(wwTemp, F("wwtemp"), F("current temperature")) // solar MAKE_PSTR_LIST(type, F("type"), F("type")) @@ -566,13 +566,13 @@ MAKE_PSTR_LIST(pumpWorkTime, F("pumpworktime"), F("pump working time")) MAKE_PSTR_LIST(energyLastHour, F("energylasthour"), F("energy last hour")) MAKE_PSTR_LIST(energyTotal, F("energytotal"), F("energy total")) MAKE_PSTR_LIST(energyToday, F("energytoday"), F("energy today")) -MAKE_PSTR_LIST(wwTemp1, F("wwtemp1"), F("ww temperature 1")) -MAKE_PSTR_LIST(wwTemp3, F("wwtemp3"), F("ww temperature 3")) -MAKE_PSTR_LIST(wwTemp4, F("wwtemp4"), F("ww temperature 4")) -MAKE_PSTR_LIST(wwTemp5, F("wwtemp5"), F("ww temperature 5")) -MAKE_PSTR_LIST(wwTemp7, F("wwtemp7"), F("ww temperature 7")) -MAKE_PSTR_LIST(wwPump, F("wwpump"), F("ww pump")) -MAKE_PSTR_LIST(wwMinTemp, F("wwmintemp"), F("ww minimum temperature")) +MAKE_PSTR_LIST(wwTemp1, F("wwtemp1"), F("temperature 1")) +MAKE_PSTR_LIST(wwTemp3, F("wwtemp3"), F("temperature 3")) +MAKE_PSTR_LIST(wwTemp4, F("wwtemp4"), F("temperature 4")) +MAKE_PSTR_LIST(wwTemp5, F("wwtemp5"), F("temperature 5")) +MAKE_PSTR_LIST(wwTemp7, F("wwtemp7"), F("temperature 7")) +MAKE_PSTR_LIST(wwPump, F("wwpump"), F("pump")) +MAKE_PSTR_LIST(wwMinTemp, F("wwmintemp"), F("minimum temperature")) MAKE_PSTR_LIST(pumpMinMod, F("pumpminmod"), F("minimum pump modulation")) MAKE_PSTR_LIST(maxFlow, F("maxflow"), F("maximum solar flow")) MAKE_PSTR_LIST(solarPower, F("solarpower"), F("actual solar power"))