updates #22

interface/package.json

@@ -6,12 +6,12 @@
   "dependencies": {
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
-    "@msgpack/msgpack": "^2.7.2",
+    "@msgpack/msgpack": "^2.8.0",
     "@mui/icons-material": "^5.10.3",
-    "@mui/material": "^5.10.3",
+    "@mui/material": "^5.10.4",
     "@table-library/react-table-library": "4.0.18",
     "@types/lodash": "^4.14.184",
-    "@types/node": "^18.7.14",
+    "@types/node": "^18.7.15",
     "@types/react": "^18.0.18",
     "@types/react-dom": "^18.0.6",
     "@types/react-router-dom": "^5.3.3",
@@ -80,7 +80,7 @@
       "max-len": [
         1,
         {
-          "code": 200
+          "code": 220
         }
       ],
       "arrow-parens": 1

interface/src/SignIn.tsx

@@ -1,8 +1,8 @@
-import { FC, useContext, useState, ChangeEventHandler } from 'react';
+import { FC, useContext, useState } from 'react';
 import { ValidateFieldsError } from 'async-validator';
 import { useSnackbar } from 'notistack';
 
-import { Box, Fab, Paper, Typography, MenuItem } from '@mui/material';
+import { Box, Fab, Paper, Typography, Button } from '@mui/material';
 import ForwardIcon from '@mui/icons-material/Forward';
 
 import * as AuthenticationApi from './api/authentication';
@@ -18,9 +18,12 @@ import { SIGN_IN_REQUEST_VALIDATOR, validate } from './validators';
 
 import { I18nContext } from './i18n/i18n-react';
 import type { Locales } from './i18n/i18n-types';
-import { locales } from './i18n/i18n-util';
 import { loadLocaleAsync } from './i18n/i18n-util.async';
 
+import { ReactComponent as NLflag } from './i18n/NL.svg';
+import { ReactComponent as DEflag } from './i18n/DE.svg';
+import { ReactComponent as USflag } from './i18n/US.svg';
+
 const SignIn: FC = () => {
   const authenticationContext = useContext(AuthenticationContext);
   const { enqueueSnackbar } = useSnackbar();
@@ -66,10 +69,9 @@ const SignIn: FC = () => {
 
   const submitOnEnter = onEnterCallback(signIn);
 
-  const { locale, LL, setLocale } = useContext(I18nContext);
+  const { LL, setLocale, locale } = useContext(I18nContext);
 
-  const onLocaleSelected: ChangeEventHandler<HTMLInputElement> = async ({ target }) => {
+  const selectLocale = async (loc: Locales) => {
-    const loc = target.value as Locales;
     localStorage.setItem('lang', loc);
     await loadLocaleAsync(loc);
     setLocale(loc);
@@ -100,26 +102,32 @@ const SignIn: FC = () => {
         <Typography variant="h4">{PROJECT_NAME}</Typography>
         <Box
           sx={{
-            '& .MuiTextField-root': { m: 2, width: '15ch' }
+            '& button, & a, & .MuiCard-root': {
+              mt: 0,
+              mx: 0.6,
+              '&:last-child': {
+                mr: 0
+              },
+              '&:first-of-type': {
+                ml: 0
+              }
+            }
           }}
         >
-          <ValidatedTextField
+          <Button size="small" variant={locale === 'en' ? 'contained' : 'outlined'} onClick={() => selectLocale('en')}>
-            name="locale"
+            <USflag style={{ width: 24 }} />
-            label="Language/Sprache"
+            &nbsp;EN
-            variant="outlined"
+          </Button>
-            value={locale || ''}
+          <Button size="small" variant={locale === 'de' ? 'contained' : 'outlined'} onClick={() => selectLocale('de')}>
-            onChange={onLocaleSelected}
+            <DEflag style={{ width: 24 }} />
-            margin="normal"
+            &nbsp;DE
-            size="small"
+          </Button>
-            select
+          <Button size="small" variant={locale === 'nl' ? 'contained' : 'outlined'} onClick={() => selectLocale('nl')}>
-          >
+            <NLflag style={{ width: 24 }} />
-            {locales.map((loc) => (
+            &nbsp;NL
-              <MenuItem key={loc} value={loc}>
+          </Button>
-                {loc}
-              </MenuItem>
-            ))}
-          </ValidatedTextField>
         </Box>
+
         <ValidatedTextField
           fieldErrors={fieldErrors}
           disabled={processing}

interface/src/i18n/DE.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.333 512 341.333"><path fill="#D80027" d="M0 85.331h512v341.337H0z"/><path d="M0 85.331h512v113.775H0z"/><path fill="#FFDA44" d="M0 312.882h512v113.775H0z"/></svg>

interface/src/i18n/NL.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 85.5 513 342"><path fill="#FFF" d="M0 85.5h513v342H0z"/><path fill="#cd1f2a" d="M0 85.5h513v114H0z"/><path fill="#1d4185" d="M0 312h513v114H0z"/></svg>

interface/src/i18n/US.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 513 342"><path fill="#FFF" d="M0 0h513v342H0z"/><g fill="#D80027"><path d="M0 0h513v26.3H0zM0 52.6h513v26.3H0zM0 105.2h513v26.3H0zM0 157.8h513v26.3H0zM0 210.5h513v26.3H0zM0 263.1h513v26.3H0zM0 315.7h513V342H0z"/></g><path fill="#2E52B2" d="M0 0h256.5v184.1H0z"/><g fill="#FFF"><path d="m47.8 138.9-4-12.8-4.4 12.8H26.2l10.7 7.7-4 12.8 10.9-7.9 10.6 7.9-4.1-12.8 10.9-7.7zM104.1 138.9l-4.1-12.8-4.2 12.8H82.6l10.7 7.7-4 12.8 10.7-7.9 10.8 7.9-4-12.8 10.7-7.7zM160.6 138.9l-4.3-12.8-4 12.8h-13.5l11 7.7-4.2 12.8 10.7-7.9 11 7.9-4.2-12.8 10.7-7.7zM216.8 138.9l-4-12.8-4.2 12.8h-13.3l10.8 7.7-4 12.8 10.7-7.9 10.8 7.9-4.3-12.8 11-7.7zM100 75.3l-4.2 12.8H82.6L93.3 96l-4 12.6 10.7-7.8 10.8 7.8-4-12.6 10.7-7.9h-13.4zM43.8 75.3l-4.4 12.8H26.2L36.9 96l-4 12.6 10.9-7.8 10.6 7.8L50.3 96l10.9-7.9H47.8zM156.3 75.3l-4 12.8h-13.5l11 7.9-4.2 12.6 10.7-7.8 11 7.8-4.2-12.6 10.7-7.9h-13.2zM212.8 75.3l-4.2 12.8h-13.3l10.8 7.9-4 12.6 10.7-7.8 10.8 7.8-4.3-12.6 11-7.9h-13.5zM43.8 24.7l-4.4 12.6H26.2l10.7 7.9-4 12.7L43.8 50l10.6 7.9-4.1-12.7 10.9-7.9H47.8zM100 24.7l-4.2 12.6H82.6l10.7 7.9-4 12.7L100 50l10.8 7.9-4-12.7 10.7-7.9h-13.4zM156.3 24.7l-4 12.6h-13.5l11 7.9-4.2 12.7 10.7-7.9 11 7.9-4.2-12.7 10.7-7.9h-13.2zM212.8 24.7l-4.2 12.6h-13.3l10.8 7.9-4 12.7 10.7-7.9 10.8 7.9-4.3-12.7 11-7.9h-13.5z"/></g></svg>

interface/src/i18n/de/index.ts

@@ -142,19 +142,15 @@ const de: Translation = {
   CUSTOMIZATIONS_RESET:
     'Möchten Sie wirklich alle Anpassungen entfernen, einschließlich der benutzerdefinierten Einstellungen der Temperatur- und Analogsensoren?',
   DEVICE_ENTITIES: 'Geräteentitäten',
-  CONFIGURE: 'Konfigurieren von',
   USER_CUSTOMIZATION: 'Benutzeranpassung',
   SUPPORT_INFORMATION: 'Unterstützende Informationen',
-  HELP_INFORMATION_1: 'Besuchen Sie das Online',
+  CLICK_HERE: 'Klick hier',
-  HELP_INFORMATION_2: 'um Anweisungen zum',
+  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
-  HELP_INFORMATION_3: 'und andere Informationen zu erhalten',
+  HELP_INFORMATION_2: 'For live community chat join our Discord server',
-  HELP_INFORMATION_4: 'Für einen Live-Community-Chat verwenden Sie unseren ',
+  HELP_INFORMATION_3: 'Submit a support issue on Github for requesting a new feature or reporting a bug',
-  HELP_INFORMATION_5: 'Eröffnen Sie ein',
+  HELP_INFORMATION_4: 'remember to download and attach your system details for a faster response',
-  HELP_INFORMATION_6: 'Github-Issue',
+  HELP_INFORMATION_5:
-  HELP_INFORMATION_7: 'um neue Funktionen vorzuschlagen oder einen Fehler zu melden',
+    "EMS-ESP is a free and open-source project. Please support it's future development by giving it a star on Github!",
-  HELP_INFORMATION_8: 'Verwenden Sie den Systemdetails-',
-  HELP_INFORMATION_9: 'und hängen sie die Datei für eine schnellere Antwort an',
-  HELP_INFORMATION_10: 'EMS-ESP wird immer ein kostenloses Open-Source-Projekt sein. Belohnen Sie es mit einem ',
   UPLOAD: 'Hochladen',
   DOWNLOAD: 'Herunterladen',
   ABORTED: 'abgebrochen',

interface/src/i18n/en/index.ts

@@ -142,19 +142,15 @@ const en: BaseTranslation = {
   CUSTOMIZATIONS_RESET:
     'Are you sure you want remove all customizations including the custom settings of the Temperature and Analog sensors?',
   DEVICE_ENTITIES: 'Device Entities',
-  CONFIGURE: 'configure',
   USER_CUSTOMIZATION: 'User Customization',
   SUPPORT_INFORMATION: 'Support Information',
-  HELP_INFORMATION_1: 'Visit the online',
+  CLICK_HERE: 'Click Here',
-  HELP_INFORMATION_2: 'to get instructions on how to',
+  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
-  HELP_INFORMATION_3: 'and access other information',
+  HELP_INFORMATION_2: 'For live community chat join our Discord server',
-  HELP_INFORMATION_4: 'For live community chat join our',
+  HELP_INFORMATION_3: 'Submit a support issue on Github for requesting a new feature or reporting a bug',
-  HELP_INFORMATION_5: 'Submit a',
+  HELP_INFORMATION_4: 'remember to download and attach your system details for a faster response',
-  HELP_INFORMATION_6: 'support issue',
+  HELP_INFORMATION_5:
-  HELP_INFORMATION_7: 'for requesting a new feature or reporting a bug',
+    "EMS-ESP is a free and open-source project. Please support it's future development by giving it a star on Github!",
-  HELP_INFORMATION_8: 'Make sure you also',
-  HELP_INFORMATION_9: 'and attach your system details for a faster response',
-  HELP_INFORMATION_10: 'EMS-ESP will always be a free and open-source project. Please consider supporting it with a',
   UPLOAD: 'Upload',
   DOWNLOAD: 'Download',
   ABORTED: 'aborted',

interface/src/i18n/i18n-types.ts

@@ -572,10 +572,6 @@ type RootTranslation = {
 	 * Device Entities
 	 */
 	DEVICE_ENTITIES: string
-	/**
-	 * configure
-	 */
-	CONFIGURE: string
 	/**
 	 * User Customization
 	 */
@@ -585,45 +581,29 @@ type RootTranslation = {
 	 */
 	SUPPORT_INFORMATION: string
 	/**
-	 * Visit the online
+	 * Click Here
+	 */
+	CLICK_HERE: string
+	/**
+	 * Visit the online wiki to get instructions on how to configure EMS-ESP
 	 */
 	HELP_INFORMATION_1: string
 	/**
-	 * to get instructions on how to
+	 * For live community chat join our Discord server
 	 */
 	HELP_INFORMATION_2: string
 	/**
-	 * and access other information
+	 * Submit a support issue on Github for requesting a new feature or reporting a bug
 	 */
 	HELP_INFORMATION_3: string
 	/**
-	 * For live community chat join our
+	 * remember to download and attach your system details for a faster response
 	 */
 	HELP_INFORMATION_4: string
 	/**
-	 * Submit a
+	 * EMS-ESP is a free and open-source project. Please support it's future development by giving it a star on Github!
 	 */
 	HELP_INFORMATION_5: string
-	/**
-	 * support issue
-	 */
-	HELP_INFORMATION_6: string
-	/**
-	 * for requesting a new feature or reporting a bug
-	 */
-	HELP_INFORMATION_7: string
-	/**
-	 * Make sure you also
-	 */
-	HELP_INFORMATION_8: string
-	/**
-	 * and attach your system details for a faster response
-	 */
-	HELP_INFORMATION_9: string
-	/**
-	 * EMS-ESP will always be a free and open-source project. Please consider supporting it with a
-	 */
-	HELP_INFORMATION_10: string
 	/**
 	 * Upload
 	 */
@@ -1569,10 +1549,6 @@ export type TranslationFunctions = {
 	 * Device Entities
 	 */
 	DEVICE_ENTITIES: () => LocalizedString
-	/**
-	 * configure
-	 */
-	CONFIGURE: () => LocalizedString
 	/**
 	 * User Customization
 	 */
@@ -1582,45 +1558,29 @@ export type TranslationFunctions = {
 	 */
 	SUPPORT_INFORMATION: () => LocalizedString
 	/**
-	 * Visit the online
+	 * Click Here
+	 */
+	CLICK_HERE: () => LocalizedString
+	/**
+	 * Visit the online wiki to get instructions on how to configure EMS-ESP
 	 */
 	HELP_INFORMATION_1: () => LocalizedString
 	/**
-	 * to get instructions on how to
+	 * For live community chat join our Discord server
 	 */
 	HELP_INFORMATION_2: () => LocalizedString
 	/**
-	 * and access other information
+	 * Submit a support issue on Github for requesting a new feature or reporting a bug
 	 */
 	HELP_INFORMATION_3: () => LocalizedString
 	/**
-	 * For live community chat join our
+	 * remember to download and attach your system details for a faster response
 	 */
 	HELP_INFORMATION_4: () => LocalizedString
 	/**
-	 * Submit a
+	 * EMS-ESP is a free and open-source project. Please support it's future development by giving it a star on Github!
 	 */
 	HELP_INFORMATION_5: () => LocalizedString
-	/**
-	 * support issue
-	 */
-	HELP_INFORMATION_6: () => LocalizedString
-	/**
-	 * for requesting a new feature or reporting a bug
-	 */
-	HELP_INFORMATION_7: () => LocalizedString
-	/**
-	 * Make sure you also
-	 */
-	HELP_INFORMATION_8: () => LocalizedString
-	/**
-	 * and attach your system details for a faster response
-	 */
-	HELP_INFORMATION_9: () => LocalizedString
-	/**
-	 * EMS-ESP will always be a free and open-source project. Please consider supporting it with a
-	 */
-	HELP_INFORMATION_10: () => LocalizedString
 	/**
 	 * Upload
 	 */

interface/src/i18n/nl/index.ts

@@ -27,12 +27,12 @@ const nl: BaseTranslation = {
   ENTITIES: 'Entiteiten',
   REFRESH: 'Ververs',
   EXPORT: 'Export',
-  BRAND: "Merk",
+  BRAND: 'Merk',
   ENTITY_NAME: 'Entiteit',
   VALUE: 'Waarde',
   SHOW_FAV: 'alleen favorieten weergeven',
-  DEVICE_SENSOR_DATA: 'Apparaat en sensor data',
+  DEVICE_SENSOR_DATA: 'Apparaat en Sensor data',
-  DEVICES_SENSORS: 'Apparaten & sensoren',
+  DEVICES_SENSORS: 'Apparaten & Sensoren',
   ATTACHED_SENSORS: 'Aangesloten EMS-ESP sensoren',
   RUN_COMMAND: 'Call commando',
   CHANGE_VALUE: 'Wijzig waarde',
@@ -45,15 +45,15 @@ const nl: BaseTranslation = {
   PROBLEM_LOADING: 'Probleem met laden',
   ACCESS_DENIED: 'Toegang geweigerd',
   ANALOG_SENSOR: 'Analoge sensor{post}',
-  ANALOG_SENSORS: 'Analoge sensoren',
+  ANALOG_SENSORS: 'Analoge Sensoren',
-  OFFSET: "Offset",
+  OFFSET: 'Offset',
-  FACTOR: "Factor",
+  FACTOR: 'Factor',
-	FREQ: "Frequentie",
+  FREQ: 'Frequentie',
-	STARTVALUE: "Startwaarde",
+  STARTVALUE: 'Startwaarde',
-  WARN_GPIO: "Waarschuwing: let op met het koppelen van de juiste GPIO pin!",
+  WARN_GPIO: 'Waarschuwing: let op met het koppelen van de juiste GPIO pin!',
-  EDIT: "Wijzigen",
+  EDIT: 'Wijzigen',
   TEMP_SENSOR: 'Temperatuur sensor{post}',
-  TEMP_SENSORS: 'Temperatuur sensoren',
+  TEMP_SENSORS: 'Temperatuur Sensoren',
   WRITE_COMMAND: 'Schrijf commando {cmd}',
   EMS_BUS_WARNING:
     'EMS bus niet gevonden. Als deze waarschuwing blijft staan na een paar seconden dan loop de instellingen na en in het bijzonder het apparaat type profiel na.',
@@ -63,13 +63,13 @@ const nl: BaseTranslation = {
   DISCONNECTED: 'Niet verbonden',
   EMS_SCAN: 'Weet je zeker dat je een volledige EMS bus scan uit wilt voeren?',
   EMS_BUS_STATUS: 'EMS busstatus',
-  ACTIVE_DEVICES: 'Actieve apparaten & sensoren',
+  ACTIVE_DEVICES: 'Actieve Apparaten & Sensoren',
   DEVICE: 'Apparaat',
   SUCCESS: 'SUCCESS',
   FAIL: 'MISLUKT',
   QUALITY: 'QUALITEIT',
   SCAN_DEVICES: 'Scannen naar nieuwe apparaten',
-  EMS_BUS_STATUS_TITLE: 'EMS bus & activiteitenstatus',
+  EMS_BUS_STATUS_TITLE: 'EMS Bus & Activiteitenstatus',
   SCAN: 'Scan',
   STATUS_NAMES: [
     'EMS Telegrammen ontvangen (Rx)',
@@ -97,9 +97,9 @@ const nl: BaseTranslation = {
   BUTTON: 'Toets',
   TEMPERATURE: 'Temperatuur',
   DISABLED: 'Uitgeschakeld',
-  GENERAL_OPTIONS: 'Algemene opties',
+  GENERAL_OPTIONS: 'Algemene Opties',
   LANGUAGE_ENTITIES: 'Taal (voor apparaat entiteiten)',
-  HIDE_LED: 'verberg LED',
+  HIDE_LED: 'Verberg LED',
   ENABLE_TELNET: 'Activeer Telnet console',
   ENABLE_ANALOG: 'Activeer analoge sensoren',
   CONVERT_FAHRENHEIT: 'Converteer temperatuurwaarden naar Fahrenheit',
@@ -123,7 +123,7 @@ const nl: BaseTranslation = {
   SECONDS: 'seconden',
   MINUTES: 'minuten',
   RESTART: 'Herstarten',
-  HOURS: "uren",
+  HOURS: 'uren',
   RESTART_TEXT: 'EMS-ESP dient opnieuw gestart te worden om de wijzingen toe te passen',
   COMMAND: 'Commando',
   CUSTOMIZATIONS_RESTART: 'Alle custom profielen worden verwijderd. Herstarten...',
@@ -140,20 +140,16 @@ const nl: BaseTranslation = {
   NAME: 'Naam',
   CUSTOMIZATIONS_RESET:
     'Weet je zeker dat je alle custom aanpassingen wilt verwijderen inclusief de custom instellingen voor analoge temperatuursensoren?',
-  DEVICE_ENTITIES: 'Apparaat entiteiten',
+  DEVICE_ENTITIES: 'Apparaat Entiteiten',
-  CONFIGURE: 'configureren',
+  USER_CUSTOMIZATION: 'Custom Instellingen',
-  USER_CUSTOMIZATION: 'Custom instellingen',
+  SUPPORT_INFORMATION: 'Support Informatie',
-  SUPPORT_INFORMATION: 'Support informatie',
+  CLICK_HERE: 'Klik Hier',
-  HELP_INFORMATION_1: 'Bezoek de online',
+  HELP_INFORMATION_1: 'Visit the online wiki to get instructions on how to configure EMS-ESP',
-  HELP_INFORMATION_2: 'om instructies te vinden om',
+  HELP_INFORMATION_2: 'For live community chat join our Discord server',
-  HELP_INFORMATION_3: 'en toegang tot andere informatie',
+  HELP_INFORMATION_3: 'Submit a support issue on Github for requesting a new feature or reporting a bug',
-  HELP_INFORMATION_4: 'Voor de Live community ga naar',
+  HELP_INFORMATION_4: 'remember to download and attach your system details for a faster response',
-  HELP_INFORMATION_5: 'Dien een',
+  HELP_INFORMATION_5:
-  HELP_INFORMATION_6: 'support issue',
+    "EMS-ESP is a free and open-source project. Please support it's future development by giving it a star on Github!",
-  HELP_INFORMATION_7: 'om een nieuwe feature te vragen of een bug te rapporteren',
-  HELP_INFORMATION_8: 'Zorg dat je ook',
-  HELP_INFORMATION_9: 'en voeg je systeem details toe voor een sneller antwoord',
-  HELP_INFORMATION_10: 'EMS-ESP zal altijd een gratis en open source project zijn. Steun ons met een ',
   UPLOAD: 'Upload',
   DOWNLOAD: 'Download',
   ABORTED: 'afgebroken',
@@ -190,7 +186,7 @@ const nl: BaseTranslation = {
   UPLOAD_DROP_TEXT: 'Sleep bestand hierheen of klik hier',
   ERROR: 'Onverwachte fout, probeer opnieuw',
   TIME_SET: 'Tijd ingesteld',
-  MANAGE_USERS: 'Beheer gebruikers',
+  MANAGE_USERS: 'Beheer Gebruikers',
   IS_ADMIN: 'is Admin',
   USER_WARNING: 'U dient tenminste 1 admin gebruiker te configureren',
   ADD: 'Toevoegen',

interface/src/project/DashboardData.tsx

@@ -143,7 +143,7 @@ const DashboardData: FC = () => {
     common_theme,
     {
       Table: `
-        --data-table-library_grid-template-columns: 40px 100px repeat(1, minmax(0, 1fr)) 90px 40px;
+        --data-table-library_grid-template-columns: 40px 100px repeat(1, minmax(0, 1fr)) 100px 40px;
       `,
       BaseRow: `
         .td {

interface/src/project/HelpInformation.tsx

@@ -11,6 +11,7 @@ import MenuBookIcon from '@mui/icons-material/MenuBookTwoTone';
 import GitHubIcon from '@mui/icons-material/GitHub';
 import StarIcon from '@mui/icons-material/Star';
 import DownloadIcon from '@mui/icons-material/GetApp';
+import EastIcon from '@mui/icons-material/East';
 
 import { extractErrorMessage } from '../utils';
 
@@ -64,18 +65,11 @@ const HelpInformation: FC = () => {
           </ListItemAvatar>
           <ListItemText>
             {LL.HELP_INFORMATION_1()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
+            &nbsp;
             <Link target="_blank" href="https://emsesp.github.io/docs" color="primary">
-              {'Wiki'}
+            {LL.CLICK_HERE()}
             </Link>
-            &nbsp;{LL.HELP_INFORMATION_2()}&nbsp;
-            <Link
-              target="_blank"
-              href="https://emsesp.github.io/docs/#/Configure-firmware?id=ems-esp-settings"
-              color="primary"
-            >
-              {LL.CONFIGURE()}
-            </Link>
-            {' EMS-ESP ' + LL.HELP_INFORMATION_3() + '.'}
           </ListItemText>
         </ListItem>
 
@@ -84,11 +78,11 @@ const HelpInformation: FC = () => {
             <CommentIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
           </ListItemAvatar>
           <ListItemText>
-            {LL.HELP_INFORMATION_4()}&nbsp;
+            {LL.HELP_INFORMATION_2()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
             <Link target="_blank" href="https://discord.gg/3J3GgnzpyT" color="primary">
-              {'Discord'}
+            {LL.CLICK_HERE()}
             </Link>
-            &nbsp;server.
           </ListItemText>
         </ListItem>
 
@@ -97,24 +91,31 @@ const HelpInformation: FC = () => {
             <GitHubIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
           </ListItemAvatar>
           <ListItemText>
-            {LL.HELP_INFORMATION_5()}&nbsp;
+            {LL.HELP_INFORMATION_3()}&nbsp;
+            <EastIcon style={{ fontSize: 24, color: 'lightblue', verticalAlign: 'middle' }} />
             <Link target="_blank" href="https://github.com/emsesp/EMS-ESP32/issues/new/choose" color="primary">
-              {LL.HELP_INFORMATION_6()}
+            {LL.CLICK_HERE()}
             </Link>
-            &nbsp;{LL.HELP_INFORMATION_7()}.
+            <br />({LL.HELP_INFORMATION_4()}&nbsp;
-            <br />
+            <Button
-            {LL.HELP_INFORMATION_8()}&nbsp;
+              startIcon={<DownloadIcon />}
-            <Button startIcon={<DownloadIcon />} variant="outlined" color="primary" onClick={() => callAPI('info')}>
+              size="small"
-              download
+              variant="outlined"
+              color="primary"
+              onClick={() => callAPI('info')}
+            >
+              {LL.DOWNLOAD()}
             </Button>
-            &nbsp;&nbsp;{LL.HELP_INFORMATION_9()}.
+            &nbsp;)
           </ListItemText>
         </ListItem>
       </List>
 
       <Box border={1} p={1} mt={4}>
         <Typography align="center" variant="h6" color="orange">
-          {LL.HELP_INFORMATION_10()}&nbsp;
+          {LL.HELP_INFORMATION_5()}
+        </Typography>
+        <Typography align="center" >
           <Link href="https://github.com/emsesp/EMS-ESP32" color="primary">
             {'GitHub'}
           </Link>

interface/src/project/SettingsApplication.tsx

@@ -340,7 +340,7 @@ const SettingsApplication: FC = () => {
           >
             <MenuItem value="en">English (en)</MenuItem>
             <MenuItem value="de">Deutsch (de)</MenuItem>
-            <MenuItem value="nl">Dutch (nl)</MenuItem>
+            <MenuItem value="nl">Nederlands (nl)</MenuItem>
           </ValidatedTextField>
         </Box>
         {data.led_gpio !== 0 && (

mock-api/package-lock.json

@@ -9,7 +9,7 @@
             "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
-                "@msgpack/msgpack": "^2.7.2",
+                "@msgpack/msgpack": "^2.8.0",
                 "compression": "^1.7.4",
                 "express": "^4.18.1",
                 "express-sse": "^0.5.3",
@@ -18,9 +18,9 @@
             }
         },
         "node_modules/@msgpack/msgpack": {
-            "version": "2.7.2",
+            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz",
+            "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz",
-            "integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw==",
+            "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==",
             "engines": {
                 "node": ">= 10"
             }
@@ -1024,9 +1024,9 @@
     },
     "dependencies": {
         "@msgpack/msgpack": {
-            "version": "2.7.2",
+            "version": "2.8.0",
-            "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.7.2.tgz",
+            "resolved": "https://registry.npmjs.org/@msgpack/msgpack/-/msgpack-2.8.0.tgz",
-            "integrity": "sha512-rYEi46+gIzufyYUAoHDnRzkWGxajpD9vVXFQ3g1vbjrBm6P7MBmm+s/fqPa46sxa+8FOUdEuRQKaugo5a4JWpw=="
+            "integrity": "sha512-h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ=="
         },
         "abbrev": {
             "version": "1.1.1",

mock-api/package.json

@@ -11,7 +11,7 @@
     "author": "proddy",
     "license": "ISC",
     "dependencies": {
-        "@msgpack/msgpack": "^2.7.2",
+        "@msgpack/msgpack": "^2.8.0",
         "compression": "^1.7.4",
         "express": "^4.18.1",
         "express-sse": "^0.5.3",

src/locale_translations.h

@@ -213,20 +213,52 @@ MAKE_PSTR_LIST(emergencyTemp, F("emergencytemp"), F("emergency temperature"), F(
 
 // heatpump/compress specific
 MAKE_PSTR_LIST(upTimeControl, F("uptimecontrol"), F("total operating time heat"), F("Betriebszeit Heizen gesamt"), F("Totale bedrijfstijd"))
-MAKE_PSTR_LIST(upTimeCompHeating, F("uptimecompheating"), F("operating time compressor heating"), F("Betriebszeit Kompressor heizen") ,F("Bedrijfstijd compressor verwarmingsbedrijf"))
+MAKE_PSTR_LIST(upTimeCompHeating,
-MAKE_PSTR_LIST(upTimeCompCooling, F("uptimecompcooling"), F("operating time compressor cooling"), F("Betriebszeit Kompressor kühlen") ,F("Bedrijfstijd compressor koelbedrijf"))
+               F("uptimecompheating"),
+               F("operating time compressor heating"),
+               F("Betriebszeit Kompressor heizen"),
+               F("Bedrijfstijd compressor verwarmingsbedrijf"))
+MAKE_PSTR_LIST(upTimeCompCooling,
+               F("uptimecompcooling"),
+               F("operating time compressor cooling"),
+               F("Betriebszeit Kompressor kühlen"),
+               F("Bedrijfstijd compressor koelbedrijf"))
 MAKE_PSTR_LIST(upTimeCompWw, F("uptimecompww"), F("operating time compressor dhw"), F("Betriebszeit Kompressor"), F("Bedrijfstijd compressor warmwaterbedrijf"))
-MAKE_PSTR_LIST(upTimeCompPool, F("uptimecomppool"), F("operating time compressor pool"), F("Betriebszeit Kompressor Pool") ,F("Bedrijfstijd compressor voor zwembadbedrijf"))
+MAKE_PSTR_LIST(upTimeCompPool,
+               F("uptimecomppool"),
+               F("operating time compressor pool"),
+               F("Betriebszeit Kompressor Pool"),
+               F("Bedrijfstijd compressor voor zwembadbedrijf"))
 MAKE_PSTR_LIST(totalCompStarts, F("totalcompstarts"), F("total compressor control starts"), F("Kompressor Starts gesamt"), F("Totaal compressorstarts"))
 MAKE_PSTR_LIST(heatingStarts, F("heatingstarts"), F("heating control starts"), F("Heizen Starts"), F("Starts verwarmingsbedrijf"))
 MAKE_PSTR_LIST(coolingStarts, F("coolingstarts"), F("cooling control starts"), F("Kühlen Starts"), F("Starts koelbedrijf"))
 MAKE_PSTR_LIST(poolStarts, F("poolstarts"), F("pool control starts"), F("Pool Starts"), F("Starts zwembadbedrijf"))
 MAKE_PSTR_LIST(nrgConsTotal, F("nrgconstotal"), F("total energy consumption"), F("totaler Energieverbrauch"), F("Energieverbrauch gesamt"), F("Energieverbruik totaal"))
-MAKE_PSTR_LIST(nrgConsCompTotal, F("nrgconscomptotal"), F("total energy consumption compressor"), F("Energieverbrauch Kompressor gesamt") ,F("Energieverbruik compressor totaal"))
+MAKE_PSTR_LIST(nrgConsCompTotal,
-MAKE_PSTR_LIST(nrgConsCompHeating, F("nrgconscompheating"), F("energy consumption compressor heating"), F("Energieverbrauch Kompressor heizen") ,F("Energieverbruik compressor verwarmingsbedrijf"))
+               F("nrgconscomptotal"),
-MAKE_PSTR_LIST(nrgConsCompWw, F("nrgconscompww"), F("energy consumption compressor dhw"), F("Energieverbrauch Kompressor") ,F("Energieverbruik compressor warmwaterbedrijf"))
+               F("total energy consumption compressor"),
-MAKE_PSTR_LIST(nrgConsCompCooling, F("nrgconscompcooling"), F("energy consumption compressor cooling"), F("Energieverbrauch Kompressor kühlen") ,F("Energieverbruik compressor koelbedrijf"))
+               F("Energieverbrauch Kompressor gesamt"),
-MAKE_PSTR_LIST(nrgConsCompPool, F("nrgconscomppool"), F("energy consumption compressor pool"), F("Energieverbrauch Kompressor Pool") ,F("Energiebedrijf compressor zwembadbedrijf"))
+               F("Energieverbruik compressor totaal"))
+MAKE_PSTR_LIST(nrgConsCompHeating,
+               F("nrgconscompheating"),
+               F("energy consumption compressor heating"),
+               F("Energieverbrauch Kompressor heizen"),
+               F("Energieverbruik compressor verwarmingsbedrijf"))
+MAKE_PSTR_LIST(nrgConsCompWw,
+               F("nrgconscompww"),
+               F("energy consumption compressor dhw"),
+               F("Energieverbrauch Kompressor"),
+               F("Energieverbruik compressor warmwaterbedrijf"))
+MAKE_PSTR_LIST(nrgConsCompCooling,
+               F("nrgconscompcooling"),
+               F("energy consumption compressor cooling"),
+               F("Energieverbrauch Kompressor kühlen"),
+               F("Energieverbruik compressor koelbedrijf"))
+MAKE_PSTR_LIST(nrgConsCompPool,
+               F("nrgconscomppool"),
+               F("energy consumption compressor pool"),
+               F("Energieverbrauch Kompressor Pool"),
+               F("Energiebedrijf compressor zwembadbedrijf"))
 MAKE_PSTR_LIST(nrgSuppTotal, F("nrgsupptotal"), F("total energy supplied"), F("gesamte Energieabgabe"), F("Totaal opgewekte energie"))
 MAKE_PSTR_LIST(nrgSuppHeating, F("nrgsuppheating"), F("total energy supplied heating"), F("gesamte Energieabgabe heizen"), F("Opgewekte energie verwarmingsbedrijf"))
 MAKE_PSTR_LIST(nrgSuppWw, F("nrgsuppww"), F("total energy warm supplied dhw"), F("gesamte Energieabgabe"), F("Opgewekte energie warmwaterbedrijf"))
@@ -245,8 +277,8 @@ MAKE_PSTR_LIST(auxElecHeatNrgConsHeating,
 MAKE_PSTR_LIST(auxElecHeatNrgConsWW,
                F("auxelecheatnrgconsww"),
                F("auxiliary electrical heater energy consumption dhw"),
-               F("Energieverbrauch el. Zusatzheizung")
+               F("Energieverbrauch el. Zusatzheizung"),
-               ,F("Energieverbruik electrisch verwarmingselement voor warmwaterbedrijf"))
+               F("Energieverbruik electrisch verwarmingselement voor warmwaterbedrijf"))
 MAKE_PSTR_LIST(auxElecHeatNrgConsPool,
                F("auxelecheatnrgconspool"),
                F("auxiliary electrical heater energy consumption pool"),
@@ -272,11 +304,19 @@ MAKE_PSTR_LIST(hpPower, F("hppower"), F("compressor power output"), F("Kopressor
 MAKE_PSTR_LIST(hpTc0, F("hptc0"), F("heat carrier return (TC0)"), F("Kältemittel Rücklauf (TC0)"), F("Koudemiddel retour (TC0O"))
 MAKE_PSTR_LIST(hpTc1, F("hptc1"), F("heat carrier forward (TC1)"), F("Kältemittel Vorlauf (TC1)"), F("Koudemiddel aanvoer (TC1)"))
 MAKE_PSTR_LIST(hpTc3, F("hptc3"), F("condenser temperature (TC3)"), F("Verflüssigertemperatur (TC3)"), F("Condensortemperatuur (TC3)"))
-MAKE_PSTR_LIST(hpTr3, F("hptr3"), F("refrigerant temperature liquid side (condenser output) (TR3)"), F("Kältemittel (flüssig) (TR3)") ,F("Temperatuur koudemiddel vloeibare zijde (TR3)"))
+MAKE_PSTR_LIST(hpTr3,
+               F("hptr3"),
+               F("refrigerant temperature liquid side (condenser output) (TR3)"),
+               F("Kältemittel (flüssig) (TR3)"),
+               F("Temperatuur koudemiddel vloeibare zijde (TR3)"))
 MAKE_PSTR_LIST(hpTr4, F("hptr4"), F("evaporator inlet temperature (TR4)"), F("Verdampfer Eingang (TR4)"), F("Verdamper ingangstemperatuur (TR4)"))
 MAKE_PSTR_LIST(hpTr5, F("hptr5"), F("compressor inlet temperature (TR5)"), F("Kompessoreingang (TR5)"), F("Compressor ingangstemperatuur (TR5)"))
 MAKE_PSTR_LIST(hpTr6, F("hptr6"), F("compressor outlet temperature (TR6)"), F("Kompressorausgang (TR6)"), F("Compressor uitgangstemperatuur (TR6)"))
-MAKE_PSTR_LIST(hpTr7, F("hptr7"), F("refrigerant temperature gas side (condenser input) (TR7)"), F("Kältemittel (gasförmig) (TR7)") ,F("Temperatuur koudemiddel gasvormig (TR7)"))
+MAKE_PSTR_LIST(hpTr7,
+               F("hptr7"),
+               F("refrigerant temperature gas side (condenser input) (TR7)"),
+               F("Kältemittel (gasförmig) (TR7)"),
+               F("Temperatuur koudemiddel gasvormig (TR7)"))
 MAKE_PSTR_LIST(hpTl2, F("hptl2"), F("air inlet temperature (TL2)"), F("Außenluft-Einlasstemperatur (TL2)"), F("Temperatuur luchtinlaat (TL2)"))
 MAKE_PSTR_LIST(hpPl1, F("hppl1"), F("low pressure side temperature (PL1)"), F("Niedrigdruckfühler (PL1)"), F("Temperatuur lage drukzijde (PL1)"))
 MAKE_PSTR_LIST(hpPh1, F("hpph1"), F("high pressure side temperature (PH1)"), F("Hochdruckfühler (PH1)"), F("Temperatuur hoge drukzijde (PH1)"))
@@ -292,7 +332,11 @@ MAKE_PSTR_LIST(hpIn4Opt, F("hpin4opt"), F("input 4 options"), F("Eingang 4 Einst
 
 // hybrid heatpump
 MAKE_PSTR_LIST(hybridStrategy, F("hybridstrategy"), F("hybrid control strategy"), F("Hybrid Strategie"), F("Hybride strategie"))
-MAKE_PSTR_LIST(switchOverTemp, F("switchovertemp"), F("outside switchover temperature"), F("Außentemperatur für Umschaltung") ,F("Schakeltemperatuur buitentemperatuur"))
+MAKE_PSTR_LIST(switchOverTemp,
+               F("switchovertemp"),
+               F("outside switchover temperature"),
+               F("Außentemperatur für Umschaltung"),
+               F("Schakeltemperatuur buitentemperatuur"))
 MAKE_PSTR_LIST(energyCostRatio, F("energycostratio"), F("energy cost ratio"), F("Energie-Kosten-Verhältnis"), F("Energiekostenratio"))
 MAKE_PSTR_LIST(fossileFactor, F("fossilefactor"), F("fossile energy factor"), F("Energiefaktor Fossil"), F("Energiefactor fossiele brandstof"))
 MAKE_PSTR_LIST(electricFactor, F("electricfactor"), F("electric energy factor"), F("Energiefaktor elektrisch"), F("Energiefactor electrisch"))
@@ -303,8 +347,16 @@ MAKE_PSTR_LIST(tempDiffBoiler, F("tempdiffboiler"), F("temp diff boiler support"
 MAKE_PSTR_LIST(aCylTopTemp, F("cyltoptemp"), F("cylinder top temperature"), F("Speicher oben Temperatur"), F("Buffer temperatuur boven"))
 MAKE_PSTR_LIST(aCylCenterTemp, F("cylcentertemp"), F("cylinder center temperature"), F("Speicher mitte Temperatur"), F("Buffer temperatuur midden"))
 MAKE_PSTR_LIST(aCylBottomTemp, F("cylbottomtemp"), F("cylinder bottom temperature"), F("Speicher unten Temperatur"), F("Buffer temperatuur onder"))
-MAKE_PSTR_LIST(aFlowTemp, F("altflowtemp"), F("alternative hs flow temperature"), F("Alternativer WE Vorlauftemperatur") ,F("Alternatieve warmtebron aanvoertemperatuur"))
+MAKE_PSTR_LIST(aFlowTemp,
-MAKE_PSTR_LIST(aRetTemp, F("altrettemp"), F("alternative hs return temperature"), F("Alternativer WE Rücklauftemperatur") ,F("Alternatieve warmtebron retourtemperatuur"))
+               F("altflowtemp"),
+               F("alternative hs flow temperature"),
+               F("Alternativer WE Vorlauftemperatur"),
+               F("Alternatieve warmtebron aanvoertemperatuur"))
+MAKE_PSTR_LIST(aRetTemp,
+               F("altrettemp"),
+               F("alternative hs return temperature"),
+               F("Alternativer WE Rücklauftemperatur"),
+               F("Alternatieve warmtebron retourtemperatuur"))
 MAKE_PSTR_LIST(sysFlowTemp, F("sysflowtemp"), F("system flow temperature"), F("System Vorlauftemperatur"), F("Systeem aanvoertemperatuur"))
 MAKE_PSTR_LIST(sysRetTemp, F("sysrettemp"), F("system return temperature"), F("System Rücklauftemperatur"), F("Systeem retourtemperatuur"))
 MAKE_PSTR_LIST(valveByPass, F("valvebypass"), F("bypass valve"), F("Bypass-Ventil"), F("Bypass klep"))
@@ -378,7 +430,11 @@ MAKE_PSTR_LIST(switchtime, F("switchtime"), F("program switchtime"), F("Programm
 MAKE_PSTR_LIST(switchtime1, F("switchtime1"), F("own1 program switchtime"), F("Programm 1 Schaltzeit"), F("Schakeltijd programma 1"))
 MAKE_PSTR_LIST(switchtime2, F("switchtime2"), F("own2 program switchtime"), F("Programm 2 Schaltzeit"), F("Schakeltijd programma 2"))
 MAKE_PSTR_LIST(wwswitchtime, F("wwswitchtime"), F("program switchtime"), F("Programm Schaltzeit"), F("Warm water programma schakeltijd"))
-MAKE_PSTR_LIST(wwcircswitchtime, F("wwcircswitchtime"), F("circulation program switchtime"), F("Zirculationsprogramm Schaltzeit"), F("Schakeltijd circulatieprogramma"))
+MAKE_PSTR_LIST(wwcircswitchtime,
+               F("wwcircswitchtime"),
+               F("circulation program switchtime"),
+               F("Zirculationsprogramm Schaltzeit"),
+               F("Schakeltijd circulatieprogramma"))
 MAKE_PSTR_LIST(dateTime, F("datetime"), F("date/time"), F("Datum/Zeit"), F("Datum/Tijd"))
 MAKE_PSTR_LIST(errorCode, F("errorcode"), F("error code"), F("Fehlermeldung"), F("Foutmeldingscode"))
 MAKE_PSTR_LIST(ibaMainDisplay, F("display"), F("display"), F("Anzeige"), F("Display"))
@@ -396,7 +452,11 @@ MAKE_PSTR_LIST(dampedoutdoortemp, F("dampedoutdoortemp"), F("damped outdoor temp
 MAKE_PSTR_LIST(floordrystatus, F("floordry"), F("floor drying"), F("Estrichtrocknung"), F("Vloerdroogprogramma"))
 MAKE_PSTR_LIST(floordrytemp, F("floordrytemp"), F("floor drying temperature"), F("Estrichtrocknungs Temperatur"), F("Temperatuur vloerdroogprogramma"))
 MAKE_PSTR_LIST(brightness, F("brightness"), F("screen brightness"), F("Bildschirmhelligkeit"), F("Schermhelderheid"))
-MAKE_PSTR_LIST(autodst, F("autodst"), F("automatic change daylight saving time"), F("automatische Sommerzeit Umstellung"), F("Automatische omschakeling zomer-wintertijd"))
+MAKE_PSTR_LIST(autodst,
+               F("autodst"),
+               F("automatic change daylight saving time"),
+               F("automatische Sommerzeit Umstellung"),
+               F("Automatische omschakeling zomer-wintertijd"))
 MAKE_PSTR_LIST(preheating, F("preheating"), F("preheating in the clock program"), F("Vorheizen im Zeitprogramm"), F("Voorverwarming in het klokprogramma"))
 MAKE_PSTR_LIST(offtemp, F("offtemp"), F("temperature when mode is off"), F("Temperatur bei AUS"), F("Temperatuur bij UIT"))
 MAKE_PSTR_LIST(mixingvalves, F("mixingvalves"), F("mixing valves"), F("Mischventile"), F("Mengkleppen"))
@@ -432,8 +492,16 @@ MAKE_PSTR_LIST(nighttemp, F("nighttemp"), F("night temperature"), F("Nachttemper
 MAKE_PSTR_LIST(nighttemp2, F("nighttemp"), F("night temperature T1"), F("Nachttemperatur T1"), F("Nachttemperatuur T1"))
 MAKE_PSTR_LIST(ecotemp, F("ecotemp"), F("eco temperature"), F("eco Temperatur"), F("Temperatuur eco"))
 MAKE_PSTR_LIST(manualtemp, F("manualtemp"), F("manual temperature"), F("manuelle Temperatur"), F("temperatuur handmatig"))
-MAKE_PSTR_LIST(tempautotemp, F("tempautotemp"), F("temporary set temperature automode"), F("zwischenzeitliche Solltemperatur"), F("Streeftemperatuur automodus tijdelijk"))
+MAKE_PSTR_LIST(tempautotemp,
-MAKE_PSTR_LIST(remoteseltemp, F("remoteseltemp"), F("temporary set temperature from remote"), F("Temperatur von Fernsteuerung"), F("Temperatuur van afstandsbedieding"))
+               F("tempautotemp"),
+               F("temporary set temperature automode"),
+               F("zwischenzeitliche Solltemperatur"),
+               F("Streeftemperatuur automodus tijdelijk"))
+MAKE_PSTR_LIST(remoteseltemp,
+               F("remoteseltemp"),
+               F("temporary set temperature from remote"),
+               F("Temperatur von Fernsteuerung"),
+               F("Temperatuur van afstandsbedieding"))
 MAKE_PSTR_LIST(comforttemp, F("comforttemp"), F("comfort temperature"), F("Komforttemperatur"), F("Comforttemperatuur"))
 MAKE_PSTR_LIST(summertemp, F("summertemp"), F("summer temperature"), F("Sommertemperatur"), F("Zomertemperatuur"))
 MAKE_PSTR_LIST(designtemp, F("designtemp"), F("design temperature"), F("Auslegungstemperatur"), F("Ontwerptemperatuur"))
@@ -461,7 +529,11 @@ MAKE_PSTR_LIST(flowtempoffset, F("flowtempoffset"), F("flow temperature offset f
 MAKE_PSTR_LIST(reducemode, F("reducemode"), F("reduce mode"), F("Absenkmodus"), F("Gereduceerde modus"))
 MAKE_PSTR_LIST(noreducetemp, F("noreducetemp"), F("no reduce below temperature"), F("Absenkung unterbrechen unter"), F("Reduceermodus onderbreken onder"))
 MAKE_PSTR_LIST(reducetemp, F("reducetemp"), F("off/reduce switch temperature"), F("Absenkmodus unter"), F("Onderste afschakeltemperatuur"))
-MAKE_PSTR_LIST(vacreducetemp, F("vacreducetemp"), F("vacations off/reduce switch temperature"), F("Urlaub Absenkmodus unter"), F("Vakantiemodus onderste afschakeltemperatuur"))
+MAKE_PSTR_LIST(vacreducetemp,
+               F("vacreducetemp"),
+               F("vacations off/reduce switch temperature"),
+               F("Urlaub Absenkmodus unter"),
+               F("Vakantiemodus onderste afschakeltemperatuur"))
 MAKE_PSTR_LIST(vacreducemode, F("vacreducemode"), F("vacations reduce mode"), F("Urlaub Absenkmodus"), F("Vakantie afschakelmodus"))
 MAKE_PSTR_LIST(nofrostmode, F("nofrostmode"), F("nofrost mode"), F("Frostschutz Modus"), F("Vorstbeveiligingsmodus"))
 MAKE_PSTR_LIST(remotetemp, F("remotetemp"), F("room temperature from remote"), F("Raumtemperatur der Fernsteuerung"), F("Ruimtetemperatuur van afstandsbediening"))
@@ -485,24 +557,48 @@ MAKE_PSTR_LIST(flowSetTemp, F("flowsettemp"), F("setpoint flow temperature"), F(
 MAKE_PSTR_LIST(flowTempHc, F("flowtemphc"), F("flow temperature (TC1)"), F("Vorlauftemperatur des HK (TC1)"), F("Aanvoertemperatuut circuit (TC1)"))
 MAKE_PSTR_LIST(pumpStatus, F("pumpstatus"), F("pump status (PC1)"), F("Pumpenstatus des HK (PC1)"), F("pompstatus circuit (PC1)"))
 MAKE_PSTR_LIST(mixerStatus, F("valvestatus"), F("mixing valve actuator (VC1)"), F("Mischerventil Position (VC1)"), F("positie mixerklep (VC1)"))
-MAKE_PSTR_LIST(flowTempVf, F("flowtempvf"), F("flow temperature in header (T0/Vf)"), F("Vorlauftemperatur am Verteiler (T0/Vf)"), F("aanvoertemperatuur verdeler (T0/Vf)"))
+MAKE_PSTR_LIST(flowTempVf,
+               F("flowtempvf"),
+               F("flow temperature in header (T0/Vf)"),
+               F("Vorlauftemperatur am Verteiler (T0/Vf)"),
+               F("aanvoertemperatuur verdeler (T0/Vf)"))
 MAKE_PSTR_LIST(mixerSetTime, F("valvesettime"), F("time to set valve"), F("Zeit zum Einstellen des Ventils"), F("Inschakeltijd mengklep"))
 // mixer prefixed with wwc
 MAKE_PSTR_LIST(wwPumpStatus, F("pumpstatus"), F("pump status in assigned wwc (PC1)"), F("Pumpenstatus des wwk (PC1)"), F("Pompstatus in WW circuit (PC1)"))
-MAKE_PSTR_LIST(wwTempStatus, F("wwtempstatus"), F("temperature switch in assigned wwc (MC1)"), F("Temperaturschalter des wwk (MC1)"), F("Temperatuurschakeling in WW circuit (MC1)"))
+MAKE_PSTR_LIST(wwTempStatus,
+               F("wwtempstatus"),
+               F("temperature switch in assigned wwc (MC1)"),
+               F("Temperaturschalter des wwk (MC1)"),
+               F("Temperatuurschakeling in WW circuit (MC1)"))
 MAKE_PSTR_LIST(wwTemp, F("wwtemp"), F("current temperature"), F("aktuelle Temperatur"), F("huidige temperatuur"))
 // mixer pool
 MAKE_PSTR_LIST(poolSetTemp, F("poolsettemp"), F("pool set temperature"), F("Pool Solltemperatur"), F("Streeftemperatuur zwembad"))
 MAKE_PSTR_LIST(poolTemp, F("pooltemp"), F("pool temperature"), F("Pool Temperatur"), F("Zwembadtemperatuur"))
-MAKE_PSTR_LIST(poolShuntStatus, F("poolshuntstatus"), F("pool shunt status opening/closing"), F("Pool Ventil öffnen/schließen"), F("Zwembadklep status openen/sluiten"))
+MAKE_PSTR_LIST(poolShuntStatus,
+               F("poolshuntstatus"),
+               F("pool shunt status opening/closing"),
+               F("Pool Ventil öffnen/schließen"),
+               F("Zwembadklep status openen/sluiten"))
 MAKE_PSTR_LIST(poolShunt, F("poolshunt"), F("pool shunt open/close (0% = pool / 100% = heat)"), F("Pool Ventil Öffnung"), F("Mengklep zwembad stand"))
 MAKE_PSTR_LIST(hydrTemp, F("hydrTemp"), F("hydraulic header temperature"), F("Verteilertemperatur"), F("Temperatuur open verdeler"))
 
 // solar
-MAKE_PSTR_LIST(cylMiddleTemp, F("cylmiddletemp"), F("cylinder middle temperature (TS3)"), F("Speichertemperatur Mitte (TS3)"), F("Zonneboilertemperatuur midden (TS3)"))
+MAKE_PSTR_LIST(cylMiddleTemp,
-MAKE_PSTR_LIST(retHeatAssist, F("retheatassist"), F("return temperature heat assistance (TS4)"), F("Rücklaufanhebungs-Temp. (TS4)"), F("Retourtemperatuur verwarmingsassistentie (TS4)"))
+               F("cylmiddletemp"),
+               F("cylinder middle temperature (TS3)"),
+               F("Speichertemperatur Mitte (TS3)"),
+               F("Zonneboilertemperatuur midden (TS3)"))
+MAKE_PSTR_LIST(retHeatAssist,
+               F("retheatassist"),
+               F("return temperature heat assistance (TS4)"),
+               F("Rücklaufanhebungs-Temp. (TS4)"),
+               F("Retourtemperatuur verwarmingsassistentie (TS4)"))
 MAKE_PSTR_LIST(m1Valve, F("heatassistvalve"), F("heat assistance valve (M1)"), F("Ventil Heizungsunterstützung (M1)"), F("Klep verwarmingsassistentie (M1)"))
-MAKE_PSTR_LIST(m1Power, F("heatassistpower"), F("heat assistance valve power (M1)"), F("Ventilleistung Heizungsunterstützung (M1)"), F("Vermogen klep verwarmingsassistentie (M1)"))
+MAKE_PSTR_LIST(m1Power,
+               F("heatassistpower"),
+               F("heat assistance valve power (M1)"),
+               F("Ventilleistung Heizungsunterstützung (M1)"),
+               F("Vermogen klep verwarmingsassistentie (M1)"))
 MAKE_PSTR_LIST(pumpMinMod, F("pumpminmod"), F("minimum pump modulation"), F("minimale Pumpenmodulation"), F("Minimale pompmodulatie"))
 MAKE_PSTR_LIST(maxFlow, F("maxflow"), F("maximum solar flow"), F("maximaler Durchfluss"), F("Maximale doorstroom solar"))
 MAKE_PSTR_LIST(solarPower, F("solarpower"), F("actual solar power"), F("aktuelle Solarleistung"), F("Huidig solar vermogen"))
@@ -514,9 +610,21 @@ MAKE_PSTR_LIST(solarPump2TurnoffDiff, F("turnoffdiff2"), F("pump 2 turn off diff
 
 MAKE_PSTR_LIST(collectorTemp, F("collectortemp"), F("collector temperature (TS1)"), F("Kollektortemperatur (TS1)"), F("Collectortemperatuur (TS1)"))
 MAKE_PSTR_LIST(collector2Temp, F("collector2temp"), F("collector 2 temperature (TS7)"), F("Kollector 2 Temperatur (TS7)"), F("Collector 2 temperatuur (TS7)"))
-MAKE_PSTR_LIST(cylBottomTemp, F("cylbottomtemp"), F("cylinder bottom temperature (TS2)"), F("Speicher Bodentemperatur (TS2)"), F("Bodemtemperatuur zonneboiler (TS2)"))
+MAKE_PSTR_LIST(cylBottomTemp,
-MAKE_PSTR_LIST(cyl2BottomTemp, F("cyl2bottomtemp"), F("second cylinder bottom temperature (TS5)"), F("2. Speicher Bodentemperatur (TS5)"), F("Bodemtemperatuur 2e boiler"))
+               F("cylbottomtemp"),
-MAKE_PSTR_LIST(heatExchangerTemp, F("heatexchangertemp"), F("heat exchanger temperature (TS6)"), F("wärmetauscher Temperatur (TS6)"), F("Temperatuur warmtewisselaar (TS6)"))
+               F("cylinder bottom temperature (TS2)"),
+               F("Speicher Bodentemperatur (TS2)"),
+               F("Bodemtemperatuur zonneboiler (TS2)"))
+MAKE_PSTR_LIST(cyl2BottomTemp,
+               F("cyl2bottomtemp"),
+               F("second cylinder bottom temperature (TS5)"),
+               F("2. Speicher Bodentemperatur (TS5)"),
+               F("Bodemtemperatuur 2e boiler"))
+MAKE_PSTR_LIST(heatExchangerTemp,
+               F("heatexchangertemp"),
+               F("heat exchanger temperature (TS6)"),
+               F("wärmetauscher Temperatur (TS6)"),
+               F("Temperatuur warmtewisselaar (TS6)"))
 MAKE_PSTR_LIST(collectorMaxTemp, F("collectormaxtemp"), F("maximum collector temperature"), F("maximale Kollektortemperatur"), F("Maximale collectortemperatuur"))
 MAKE_PSTR_LIST(collectorMinTemp, F("collectormintemp"), F("minimum collector temperature"), F("minimale Kollektortemperatur"), F("Minimale collectortemperatuur"))
 MAKE_PSTR_LIST(cylMaxTemp, F("cylmaxtemp"), F("maximum cylinder temperature"), F("maximale Speichertemperatur"), F("maximale temperatuur zonneboiler"))
@@ -582,11 +690,27 @@ MAKE_PSTR_LIST(collector2Area, F("collector2area"), F("collector 2 area"), F("Ko
 MAKE_PSTR_LIST(collector2Type, F("collector2type"), F("collector 2 type"), F("Kollektor 2 Typ"), F("Type collector 2"))
 
 // telegram 0x0363 heatCounter
-MAKE_PSTR_LIST(heatCntFlowTemp, F("heatcntflowtemp"), F("heat counter flow temperature"), F("Wärmezähler Vorlauf-Temperatur"), F("Aanvoertemperatuur warmteenergiemeter"))
+MAKE_PSTR_LIST(heatCntFlowTemp,
-MAKE_PSTR_LIST(heatCntRetTemp, F("heatcntrettemp"), F("heat counter return temperature"), F("Wärmezähler Rücklauf-Temperatur"), F("Retourtemperatuur warmteenergiemeter"))
+               F("heatcntflowtemp"),
+               F("heat counter flow temperature"),
+               F("Wärmezähler Vorlauf-Temperatur"),
+               F("Aanvoertemperatuur warmteenergiemeter"))
+MAKE_PSTR_LIST(heatCntRetTemp,
+               F("heatcntrettemp"),
+               F("heat counter return temperature"),
+               F("Wärmezähler Rücklauf-Temperatur"),
+               F("Retourtemperatuur warmteenergiemeter"))
 MAKE_PSTR_LIST(heatCnt, F("heatcnt"), F("heat counter impulses"), F("Wärmezähler Impulse"), F("Warmteenergiemeter pulsen"))
-MAKE_PSTR_LIST(swapFlowTemp, F("swapflowtemp"), F("swap flow temperature (TS14)"), F("Austausch Vorlauf-Temperatur (TS14)"), F("Aanvoertemperatuur verwisselaar (TS14)"))
+MAKE_PSTR_LIST(swapFlowTemp,
-MAKE_PSTR_LIST(swapRetTemp, F("swaprettemp"), F("swap return temperature (TS15)"), F("Austausch Rücklauf-Temperatur (TS15)"), F("Retourtemperatuur verwisselaar (TS15)"))
+               F("swapflowtemp"),
+               F("swap flow temperature (TS14)"),
+               F("Austausch Vorlauf-Temperatur (TS14)"),
+               F("Aanvoertemperatuur verwisselaar (TS14)"))
+MAKE_PSTR_LIST(swapRetTemp,
+               F("swaprettemp"),
+               F("swap return temperature (TS15)"),
+               F("Austausch Rücklauf-Temperatur (TS15)"),
+               F("Retourtemperatuur verwisselaar (TS15)"))
 
 // switch
 MAKE_PSTR_LIST(activated, F("activated"), F("activated"), F("Aktiviert"), F("Geactiveerd"))