Merge pull request #457 from dukess/master

Bugfix: EEPROM was overwritten too frequently. Automatic room temperature measurement and sending to boiler in PPS mode

BSB_LAN/BSB_LAN_EEPROMconfig.h

@@ -1,3 +1,8 @@
+#define CF_LOGMODE_SD_CARD 1
+#define CF_LOGMODE_SD_CARD_24AVG 2
+#define CF_LOGMODE_MQTT 4
+#define CF_LOGMODE_UDP 8
+
 typedef enum{
 // Version 0 (header + PPS values + space for MAX! devices)
   CF_USEEEPROM, //Size: 1 byte. 0x96 - read config from EEPROM. Other values - read predefined values from BSB_lan_config
@@ -13,9 +18,9 @@ typedef enum{
   CF_DEST_BSBLPBADDR, ///Size: 1 byte. LPB/BSB bus destination address (0x0)
   CF_PPS_MODE, ///Size: 1 byte. PPS can write
   CF_LOGTELEGRAM, //Size: 1 byte. Bitwise: LOGTELEGRAM_OFF = 0, LOGTELEGRAM_ON = 1, LOGTELEGRAM_UNKNOWN_ONLY = 2, LOGTELEGRAM_BROADCAST_ONLY = 4, LOGTELEGRAM_UNKNOWNBROADCAST_ONLY = 6
-  CF_LOGAVERAGES, //Size: 1 byte. Log average values. 0 - disabled, 1 - enabled. Program list will be set in CF_AVERAGESLIST
+  CF_LOGAVERAGES, //Size: 1 byte. Log average values. 0 - disabled, 1 - enabled. Program list will be set in CF_AVERAGESLIST. NOT USED. CAN BE REPLACED WITH OTHER VARIABLE WITH SAME SIZE.
   CF_AVERAGESLIST, //Size 2 * 40 bytes. Array of prognrs 1-65535. prognr 0 will be ignored
-  CF_LOGCURRVALUES, //Size: 1 byte. Log current values. 0 - disabled, 1 - enabled. Program list will be set in CF_CURRVALUESLIST
+  CF_LOGCURRVALUES, //Size: 1 byte. Log current values. 0 - disabled, 1 - enabled. Program list will be set in CF_CURRVALUESLIST. NOT USED. CAN BE REPLACED WITH OTHER VARIABLE WITH SAME SIZE.
   CF_LOGCURRINTERVAL, //Size 4 bytes. Unsigned. logging current values interval in seconds
   CF_CURRVALUESLIST, //Size 2 * 40 bytes. Array of prognrs 1-65535. prognr 0 will be ignored
 // Version 2 (Web-config)
@@ -70,10 +75,12 @@ typedef enum{
 // Version 8 (bus pins and device family and variant)
   CF_RX_PIN, //Size: 1 byte. RX pin
   CF_TX_PIN, //Size: 1 byte. TX pin
-  CF_DEVICE_FAMILY, //Size: 2 byte. Heater family ID
-  CF_DEVICE_VARIANT, //Size: 2 byte. Heater variant ID
+  CF_DEVICE_FAMILY, //Size: 2 bytes. Heater family ID
+  CF_DEVICE_VARIANT, //Size: 2 bytes. Heater variant ID
 // Version 9 (config level)
   CF_CONFIG_LEVEL, // Size: 1 byte. Configuration webconfig complexity. 0 - basic, 1 - advanced.
+// Version 10 (Logger switcher)
+  CF_LOGMODE, // Size: 1 byte. Bitwise value. Logging: 0 - disabled, 1 - SD card logging, 2 - send to MQTT, 4 - send to UDP
 //Maximim version can be 254 (0xFE). In other case initConfigTable() will locked in infinite loop
 //Maximum options count can be 253 for same reason (or must changing uint8_t type to uint16_t)
   CF_LAST_OPTION //Virtual option. Must be last in enum. Only for internal usage.
@@ -84,7 +91,8 @@ typedef enum {
   CPI_NOTHING,
   CPI_TEXT, // general text field
   CPI_SWITCH,
-  CPI_DROPDOWN
+  CPI_DROPDOWN,
+  CPI_CHECKBOXES
 } cpi_params;
 
 //according to var_type in configuration_struct
@@ -123,7 +131,7 @@ typedef struct {
 	uint8_t id;		// a unique identifier that can be used for the input tag name (cf_params)
   uint8_t version; //config version which can manage this parameter
   uint8_t category;	// for grouping configuration options (cdt_params)
-  uint8_t input_type;	// input type (text, dropdown etc.) 0 - none 1 - text field, 2 - switch, 3 - dropdown
+  uint8_t input_type;	// input type (text, dropdown etc.) 0 - none 1 - text field, 2 - switch, 3 - dropdown, 4 - bitwise (checkboxes)
   uint8_t var_type;	// variable type (string, integer, float, boolean etc.), could maybe be derived from input_type or vice versa
   uint8_t flags; // options flags: 1 - basic option, 2 - advanced option
   const char* desc;	// pointer to text to be displayed for option - is text length necessary if we just read until NULL?
@@ -192,16 +200,20 @@ PROGMEM_LATE const configuration_struct config[]={
   {CF_WIFI_SSID,        4, CCAT_IPV4,     CPI_TEXT,      CDT_STRING,         OPT_FL_BASIC|OPT_FL_ADVANCED, CF_WIFI_SSID_TXT, sizeof(wifi_ssid)}, //need reboot
   {CF_WIFI_PASSWORD,    4, CCAT_IPV4,     CPI_TEXT,      CDT_STRING,         OPT_FL_BASIC|OPT_FL_ADVANCED, CF_WIFI_PASSWORD_TXT, sizeof(wifi_pass)},//need reboot
   {CF_MDNS_HOSTNAME,    6, CCAT_IPV4,     CPI_TEXT,      CDT_STRING,         OPT_FL_ADVANCED, CF_MDNS_HOSTNAME_TXT, sizeof(mDNS_hostname)},//need reboot
+  #endif
+  {CF_LOGMODE,          10,CCAT_LOGGING,  CPI_CHECKBOXES,CDT_BYTE,           OPT_FL_BASIC|OPT_FL_ADVANCED, CF_LOGMODE_TXT, sizeof(LoggingMode)}, //immediately apply
+  #ifdef WEBCONFIG
   {CF_MQTT,             2, CCAT_MQTT,     CPI_DROPDOWN,  CDT_BYTE,           OPT_FL_ADVANCED, CF_USE_TXT, sizeof(mqtt_mode)},//need handler
   {CF_MQTT_IPADDRESS,   2, CCAT_MQTT,     CPI_TEXT,      CDT_IPV4,           OPT_FL_ADVANCED, CF_MQTT_IPADDRESS_TXT, sizeof(mqtt_broker_ip_addr)},//need handler
   {CF_MQTT_USERNAME,    2, CCAT_MQTT,     CPI_TEXT,      CDT_STRING,         OPT_FL_ADVANCED, CF_MQTT_USERNAME_TXT, sizeof(MQTTUsername)},//immediately apply
   {CF_MQTT_PASSWORD,    2, CCAT_MQTT,     CPI_TEXT,      CDT_STRING,         OPT_FL_ADVANCED, CF_MQTT_PASSWORD_TXT, sizeof(MQTTPassword)},//immediately apply
   {CF_MQTT_DEVICE,      2, CCAT_MQTT,     CPI_TEXT,      CDT_STRING,         OPT_FL_ADVANCED, CF_MQTT_DEVICE_TXT, sizeof(MQTTDeviceID)}, //immediately apply
   {CF_MQTT_TOPIC,       2, CCAT_MQTT,     CPI_TEXT,      CDT_STRING,         OPT_FL_ADVANCED, CF_MQTT_TOPIC_TXT, sizeof(MQTTTopicPrefix)},//immediately apply
+
 #endif
-  {CF_LOGAVERAGES,      1, CCAT_24HAVG,   CPI_SWITCH,    CDT_BYTE,           OPT_FL_BASIC|OPT_FL_ADVANCED, CF_LOGAVERAGES_TXT, sizeof(logAverageValues)},//immediately apply
+  {CF_LOGAVERAGES,      1, CCAT_24HAVG,   CPI_NOTHING,   CDT_VOID,           OPT_FL_BASIC|OPT_FL_ADVANCED, NULL, sizeof(bool)},//Empty 1 byte
   {CF_AVERAGESLIST,     1, CCAT_24HAVG,   CPI_TEXT,      CDT_PROGNRLIST,     OPT_FL_BASIC|OPT_FL_ADVANCED, CF_PROGLIST_TXT, sizeof(avg_parameters)},//immediately apply
-  {CF_LOGCURRVALUES,    1, CCAT_LOGGING,  CPI_SWITCH,    CDT_BYTE,           OPT_FL_BASIC|OPT_FL_ADVANCED, CF_LOGCURRVALUES_TXT, sizeof(logCurrentValues)},//immediately apply
+  {CF_LOGCURRVALUES,    1, CCAT_LOGGING,  CPI_NOTHING,   CDT_VOID,           OPT_FL_BASIC|OPT_FL_ADVANCED, NULL, sizeof(bool)},//Empty 1 byte
   {CF_LOGCURRINTERVAL,  1, CCAT_LOGGING,  CPI_TEXT,      CDT_UINT32,         OPT_FL_BASIC|OPT_FL_ADVANCED, CF_LOGCURRINTERVAL_TXT, sizeof(log_interval)},//immediately apply
   {CF_CURRVALUESLIST,   1, CCAT_LOGGING,  CPI_TEXT,      CDT_PROGNRLIST,     OPT_FL_BASIC|OPT_FL_ADVANCED, CF_PROGLIST_TXT, sizeof(log_parameters)},//immediately apply
   {CF_LOGTELEGRAM,      1, CCAT_LOGGING,  CPI_DROPDOWN,  CDT_BYTE,           OPT_FL_BASIC|OPT_FL_ADVANCED, CF_LOGTELEGRAM_TXT, sizeof(logTelegram)},//immediately apply

BSB_LAN/BSB_LAN_config.h.default

@@ -111,8 +111,7 @@ byte BME_Sensors = 0; //Define number of BME280 sensors
 
 // Compile module for calculation 24h averages for selected programs
 #define AVERAGES
-bool logAverageValues = false;  // calculate and save data into averages.txt on SD-card.
-// Create 24h averages from these parameters
+// Create 24h averages from these parameters and save data into averages.txt on SD-card.
 int avg_parameters[40] = {
   8700,                         // Außentemperatur
   8326                          // Brenner-Modulation
@@ -141,7 +140,6 @@ int logTelegram = LOGTELEGRAM_OFF;
 // Logging data from parameters
 // Interval and list of parameters can be redefined through /L command during runtime
 // Data will be written to "datalog.txt"
-bool logCurrentValues = false;      // Save data in datalog.txt on SD-card.
 unsigned long log_interval = 3600;  // Logging interval (to SD card and MQTT broker) in seconds
 int log_parameters[40] = {
   8700,                   // Außentemperatur
@@ -161,7 +159,7 @@ int log_parameters[40] = {
 
 // Compile MQTT extension: activate sending log_parameters to MQTT broker every log_interval seconds
 #define MQTT
-byte mqtt_mode = 0; // MQTT: 0 - disabled, 1 - send messages in plain text format, 2 - send messages in JSON format, 3 - send messages in rich JSON format. Use this if you want a json package of your logging information printed to the mqtt topic
+byte mqtt_mode = 1; // MQTT: 1 - send messages in plain text format, 2 - send messages in JSON format, 3 - send messages in rich JSON format. Use this if you want a json package of your logging information printed to the mqtt topic
 // JSON payload will be of the structure: {"MQTTDeviceID": {"status":{"log_param1":"value1"}}}
 // rich JSON payload will be of the structure: {"MQTTDeviceID": {"id": "parmeter number from log values", "name": "parameter name from logvalues", "value": "query result", "desc": "enum value description", "unit": "unit of measurement", "error", error code}}
 byte mqtt_broker_ip_addr[4] = {192,168,178,20}; // MQTT broker ip address. Please use commas instead of dots!!!
@@ -173,6 +171,10 @@ char MQTTTopicPrefix[32] = "BSB-LAN"; 	        // Optional: Choose the "topic" f
 // This value is also used as a client ID towards the MQTT broker, change it if you have more than one BSB-LAN on your broker.
 char MQTTDeviceID[32] = "BSB-LAN";
 
+// Logging mode: 0 - disabled, 1 - write values to SD card, 2 - write 24h averages to SD card, 4 - send values to MQTT, 8 -  send values to UDP. Can be conjunction of these values.
+byte LoggingMode = 1; //CF_LOGMODE_SD_CARD | CF_LOGMODE_SD_CARD_24AVG | CF_LOGMODE_MQTT | CF_LOGMODE_UDP
+
+
 // Compile IPWE extension
 #define IPWE
 bool enable_ipwe = false;  // true - activate IPWE extension (http://xxx.xxx.xxx.xxx/ipwe.cgi)
@@ -276,7 +278,7 @@ boolean enable_ota_update = false;
 #define JSONCONFIG
 
 #define RGT_EMULATOR
-int rgte_sensorid[3][5] = {{0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}; //Temperature sensor program IDs for RGT1 - RGT3. If zero then RGT will not be emulated. If more than one program set per RGT then average will be calculated and used.
+int rgte_sensorid[3][5] = {{0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}, {0, 0, 0, 0, 0}}; //Temperature sensor program IDs for RGT1/PPS - RGT3. If zero then RGT will not be emulated. If more than one program set per RGT then average will be calculated and used.
 
 //Enable presence buttons and TWW/DHW push on selected pins.
 // Pins on Mega can be (Digital) 2, 3, 18, 19, 20, 21

BSB_LAN/BSB_LAN_defs.h

@@ -896,8 +896,6 @@ const char CF_OWN_BSBLPBADDR_TXT[] PROGMEM = CF_OWN_ADDR_TEXT;
 const char CF_DEST_BSBLPBADDR_TXT[] PROGMEM = CF_DEST_ADDR_TEXT;
 const char CF_PPS_WRITE_TXT[] PROGMEM = CF_PPS_WRITE_TEXT;
 const char CF_LOGTELEGRAM_TXT[] PROGMEM = CF_LOGTELEGRAM_TEXT;
-const char CF_LOGAVERAGES_TXT[] PROGMEM = CF_LOGAVERAGES_TEXT;
-const char CF_LOGCURRVALUES_TXT[] PROGMEM = CF_LOGCURRVALUES_TEXT;
 const char CF_LOGCURRINTERVAL_TXT[] PROGMEM = CF_LOGCURRINTERVAL_TEXT;
 const char CF_PROGLIST_TXT[] PROGMEM = CF_PROGLIST_TEXT;
 const char CF_DEVICES_TXT[] PROGMEM = CF_DEVICES_TEXT;
@@ -927,6 +925,7 @@ const char CF_MQTT_USERNAME_TXT[] PROGMEM = CF_MQTT_USERNAME_TEXT;
 const char CF_MQTT_PASSWORD_TXT[] PROGMEM = CF_MQTT_PASSWORD_TEXT;
 const char CF_MQTT_TOPIC_TXT[] PROGMEM = CF_MQTT_TOPIC_TEXT;
 const char CF_MQTT_DEVICE_TXT[] PROGMEM = CF_MQTT_DEVICE_TEXT;
+const char CF_LOGMODE_TXT[] PROGMEM = CF_LOGMODE_TEXT;
 const char CF_CHECKUPDATE_TXT[] PROGMEM = CF_CHECKUPDATE_TEXT;
 const char CF_MDNS_HOSTNAME_TXT[] PROGMEM = CF_MDNS_HOSTNAME_TEXT;
 const char CF_NUM_TXT[] PROGMEM = CF_NUM_TEXT;
@@ -8248,14 +8247,13 @@ const char ENUM_DEBUG[] PROGMEM_LATEST = {
 "\x02 " ENUM_DEBUG_TELNET_TEXT
 };
 const char ENUM_MQTT[] PROGMEM_LATEST = {
-"\x00 " MENU_TEXT_OFF "\0"
 "\x01 " ENUM_MQTT_PLAIN_TEXT "\0"
 "\x02 " ENUM_MQTT_JSON_TEXT "\0"
 "\x03 " ENUM_MQTT_JSON2_TEXT
 };
 const char ENUM_PPS_MODE[] PROGMEM_LATEST = {
-"\x00 " ENUM_BUS_PPS_MODE_PASSIVE "\0"
-"\x01 " ENUM_BUS_PPS_MODE_QAA
+"\x00 " ENUM_PPS_MODE_PASSIVE_TEXT "\0"
+"\x01 " ENUM_PPS_MODE_QAA_TEXT
 };
 const char ENUM_WRITEMODE[] PROGMEM_LATEST = {
 "\x00 " MENU_TEXT_OFF "\0"
@@ -8278,6 +8276,20 @@ const char ENUM_CLOSEDOPEN[] PROGMEM_LATEST = {
 const char ENUM_VOLTAGEONOFF[] PROGMEM_LATEST = {
 "\x00 " "0 " UNIT_VOLT_TEXT "\0"
 "\x01 " "230 " UNIT_VOLT_TEXT
+};
+//TODO: Move to translations
+const char ENUM_LOGGER_MODE[] PROGMEM_LATEST = {
+"\x01\x01 " ENUM_LOGMODE_01_TEXT
+#ifdef AVERAGES
+"\0\x02\x02 " ENUM_LOGMODE_02_TEXT
+#endif
+#ifdef MQTT
+"\0\x04\x04 " ENUM_LOGMODE_04_TEXT
+#endif
+//#ifdef UDP
+"\0\x08\x08 " ENUM_LOGMODE_08_TEXT
+//#endif
+
 };
 
 /*
@@ -13910,7 +13922,8 @@ PROGMEM_LATE const cmd_t cmdtbl3[]={
 
 //{CMD_END,     CAT_UNKNOWN,          VT_UNKNOWN,       65535, "",       0,                    NULL,         DEFAULT_FLAG, DEV_ALL}
 
-  //Prognr 65527 - 65534 is a dirty trick for reducing enumerations addresses to the same type
+  //Prognr 65526 - 65534 is a dirty trick for reducing enumerations addresses to the same type
+{0xDEADBEEF,  CAT_UNKNOWN,          VT_ENUM,          65526, STR65535, sizeof(ENUM_LOGGER_MODE),  ENUM_LOGGER_MODE,   DEFAULT_FLAG, DEV_ALL}, //
 {0xDEADBEEF,  CAT_UNKNOWN,          VT_ENUM,          65527, STR65535, sizeof(ENUM_PPS_MODE),     ENUM_PPS_MODE,      DEFAULT_FLAG, DEV_ALL}, //
 {0xDEADBEEF,  CAT_UNKNOWN,          VT_ENUM,          65528, STR65535, sizeof(ENUM_WRITEMODE),    ENUM_WRITEMODE,     DEFAULT_FLAG, DEV_ALL}, //
 {0xDEADBEEF,  CAT_UNKNOWN,          VT_ENUM,          65529, STR65535, sizeof(ENUM_MQTT),         ENUM_MQTT,          DEFAULT_FLAG, DEV_ALL}, //

BSB_LAN/include/eeprom_io.h

@@ -14,7 +14,7 @@
 
 uint32_t initConfigTable(uint8_t version) {
   CRC32 crc;
-  if (version == 0xFF) version--; //protection fromm infinite loop
+  if (version == 0xFF) version--; //protection from infinite loop
   // look for parameters vith selected version
   for (uint8_t v = 0; v <= version; v++) {
     //select config parameter
@@ -108,6 +108,10 @@ bool writeToEEPROM(uint8_t id) {
   if (!options[id].option_address) return false;
 //  printFmtToDebug(PSTR("Option %d, EEPROM Address %04X, set value: "), id, options[id].eeprom_address);
   for (uint16_t i = 0; i < getVariableSize(id); i++) {
+//Some PPS values will changing and writing too frequently. For prevention EEPROM deterioration  if PPS value has no flag it will be skipped.
+    if(id == CF_PPS_VALUES && !(allow_write_pps_values[(i / sizeof(pps_values[0])) / 8] & (1 << ((i / sizeof(pps_values[0])) % 8)))){
+      continue;
+    }
     if (options[id].option_address[i] != EEPROM.read(i + options[id].eeprom_address)) {
       EEPROM.write(i + options[id].eeprom_address, options[id].option_address[i]);
 //      printFmtToDebug(PSTR("%02X "), options[id].option_address[i]);

BSB_LAN/include/print_ipwe.h

@@ -38,7 +38,7 @@
    }
 
  #ifdef AVERAGES
-   if (logAverageValues) {
+   if (LoggingMode & CF_LOGMODE_SD_CARD_24AVG) {
      for (int i=0; i<numAverages; i++) {
        if (avg_parameters[i] > 0) {
          counter++;

BSB_LAN/include/print_webpage.h

@@ -51,7 +51,7 @@
    printToWebClient(PSTR("</a></td>"));
    printToWebClient(PSTR("<td class=\"header\" width=20% align=center>"));
 
-   if (!logCurrentValues) {
+   if (!(LoggingMode & CF_LOGMODE_SD_CARD)) {
      printToWebClient(PSTR("<font color=#000000>" MENU_TEXT_DLG "</font></td>"));
    } else {
      printToWebClient(PSTR("<a href='/"));

BSB_LAN/localization/LANG_C.h

@@ -204,7 +204,6 @@
 #define CF_LOGTELEGRAM_TEXT "CF_LOGTELEGRAM_TEXT"
 #define CF_LOGCURRVALUES_TEXT "CF_LOGCURRVALUES_TEXT"
 #define CF_LOGCURRINTERVAL_TEXT "CF_LOGCURRINTERVAL_TEXT"
-#define CF_LOGAVERAGES_TEXT "CF_LOGAVERAGES_TEXT"
 #define CF_PROGLIST_TEXT "CF_PROGLIST_TEXT"
 #define CF_DEVICES_TEXT "CF_DEVICES_TEXT"
 #define CF_DHCP_TEXT "CF_DHCP_TEXT"
@@ -228,6 +227,7 @@
 #define CF_MQTT_PASSWORD_TEXT "CF_MQTT_PASSWORD_TEXT"
 #define CF_MQTT_TOPIC_TEXT "CF_MQTT_TOPIC_TEXT"
 #define CF_MQTT_DEVICE_TEXT "CF_MQTT_DEVICE_TEXT"
+#define CF_LOGMODE_TEXT "CF_LOGMODE_TEXT"
 #define CF_CHECKUPDATE_TEXT "CF_CHECKUPDATE_TEXT"
 #define CF_RGT1_SENSOR_TEXT "CF_RGT1_SENSOR_TEXT"
 #define CF_RGT2_SENSOR_TEXT "CF_RGT2_SENSOR_TEXT"
@@ -2219,6 +2219,12 @@
 #define ENUM_WRITE_ENG_TEXT "ENUM_WRITE_ENG_TEXT"
 #define ENUM_WRITE_OEM_TEXT "ENUM_WRITE_OEM_TEXT"
 
+#define ENUM_LOGMODE_01_TEXT "ENUM_LOGMODE_01_TEXT"
+#define ENUM_LOGMODE_02_TEXT "ENUM_LOGMODE_02_TEXT"
+#define ENUM_LOGMODE_04_TEXT "ENUM_LOGMODE_04_TEXT"
+#define ENUM_LOGMODE_08_TEXT "ENUM_LOGMODE_08_TEXT"
+#define ENUM_LOGMODE_10_TEXT "ENUM_LOGMODE_10_TEXT"
+
 #define ENUM20_01_TEXT "ENUM20_01_TEXT"
 #define ENUM20_02_TEXT "ENUM20_02_TEXT"
 #define ENUM20_03_TEXT "ENUM20_03_TEXT"

BSB_LAN/localization/LANG_DE.h

@@ -204,7 +204,6 @@
 #define CF_LOGTELEGRAM_TEXT "Bustelegramme"
 #define CF_LOGCURRVALUES_TEXT "Logging aktiv"
 #define CF_LOGCURRINTERVAL_TEXT "Logintervall (Sekunden)"
-#define CF_LOGAVERAGES_TEXT "Berechnung"
 #define CF_PROGLIST_TEXT "Parameter"
 #define CF_DEVICES_TEXT "Geräte"
 #define CF_DHCP_TEXT "DHCP verwenden"
@@ -228,8 +227,9 @@
 #define CF_MQTT_PASSWORD_TEXT "Passwort"
 #define CF_MQTT_TOPIC_TEXT "Topic Präfix"
 #define CF_MQTT_DEVICE_TEXT "Geräte ID"
+#define CF_LOGMODE_TEXT "Logging mode"
 #define CF_CHECKUPDATE_TEXT "Auf Updates überprüfen"
-#define CF_RGT1_SENSOR_TEXT "RGT1 Temperatursensor Parameter"
+#define CF_RGT1_SENSOR_TEXT "RGT1/PPS Temperatursensor Parameter"
 #define CF_RGT2_SENSOR_TEXT "RGT2 Temperatursensor Parameter"
 #define CF_RGT3_SENSOR_TEXT "RGT3 Temperatursensor Parameter"
 #define CF_TWW_PUSH_PIN_TEXT "TWW-Push Taste: Pin"
@@ -2208,8 +2208,8 @@
 #define STR99999_TEXT "UNKNOWN command code"
 
 
-#define ENUM_BUS_PPS_MODE_PASSIVE "Passiv"
-#define ENUM_BUS_PPS_MODE_QAA "Als Raumgerät"
+#define ENUM_PPS_MODE_PASSIVE_TEXT "Passiv"
+#define ENUM_PPS_MODE_QAA_TEXT "Als Raumgerät"
 #define ENUM_DEBUG_SERIAL_TEXT "Serial"
 #define ENUM_DEBUG_TELNET_TEXT "Telnet"
 #define ENUM_MQTT_PLAIN_TEXT "Plain text"
@@ -2219,6 +2219,11 @@
 #define ENUM_WRITE_ENG_TEXT "Ein (Standard)"
 #define ENUM_WRITE_OEM_TEXT "Ein (Komplett)"
 
+#define ENUM_LOGMODE_01_TEXT "Write to SD card"
+#define ENUM_LOGMODE_02_TEXT "Write 24h avg to SD card"
+#define ENUM_LOGMODE_04_TEXT "Send to MQTT broker"
+#define ENUM_LOGMODE_08_TEXT "Send to UDP"
+
 #define ENUM20_01_TEXT "English"
 #define ENUM20_02_TEXT "Deutsch"
 #define ENUM20_03_TEXT "Francais"

BSB_LAN/localization/LANG_EN.h

@@ -173,7 +173,6 @@
 #define CF_LOGTELEGRAM_TEXT "Bus telegrams"
 #define CF_LOGCURRVALUES_TEXT "Logging enabled"
 #define CF_LOGCURRINTERVAL_TEXT "Interval (seconds)"
-#define CF_LOGAVERAGES_TEXT "Calculation"
 #define CF_PROGLIST_TEXT "Parameters"
 #define CF_DEVICES_TEXT "Devices"
 #define CF_DHCP_TEXT "DHCP usage"
@@ -190,11 +189,13 @@
 #define CF_MAX_IPADDRESS_TEXT "IP address cube"
 #define CF_WRITEMODE_TEXT "Write access (level)"
 #define CF_MQTT_IPADDRESS_TEXT "IP address broker"
+#define CF_MQTT_PORT_TEXT "Broker port"
 #define CF_MQTT_PASSWORD_TEXT "Password"
 #define CF_MQTT_DEVICE_TEXT "Device ID"
 #define CF_MQTT_TOPIC_TEXT "Topic prefix"
+#define CF_LOGMODE_TEXT "Logging mode"
 #define CF_CHECKUPDATE_TEXT "Check for updates"
-#define CF_RGT1_SENSOR_TEXT "RU1 temperature sensor parameter"
+#define CF_RGT1_SENSOR_TEXT "RU1/PPS temperature sensor parameter"
 #define CF_RGT2_SENSOR_TEXT "RU2 temperature sensor parameter"
 #define CF_RGT3_SENSOR_TEXT "RU3 temperature sensor parameter"
 #define CF_TWW_PUSH_PIN_TEXT "DHW push button: pin"
@@ -484,11 +485,16 @@
 #define STR9563_TEXT "Fan speed for full charging of stratific. tank"
 #define STR10100_TEXT "System status"
 
-#define ENUM_BUS_PPS_MODE_PASSIVE "passive"
-#define ENUM_BUS_PPS_MODE_QAA "as room unit"
+#define ENUM_PPS_MODE_PASSIVE_TEXT "passive"
+#define ENUM_PPS_MODE_QAA_TEXT "as room unit"
 #define ENUM_WRITE_ENG_TEXT "On (Standard)"
 #define ENUM_WRITE_OEM_TEXT "On (Complete)"
 
+#define ENUM_LOGMODE_01_TEXT "Write to SD card"
+#define ENUM_LOGMODE_02_TEXT "Write 24h avg to SD card"
+#define ENUM_LOGMODE_04_TEXT "Send to MQTT broker"
+#define ENUM_LOGMODE_08_TEXT "Send to UDP"
+
 #define ENUM8000_04_TEXT "Manual control active"
 #define ENUM8000_11_TEXT "Overrun active"
 #define ENUM8000_16_TEXT "Frost prot plant active"