From 5c282b7a7edaa9e1b2f0adaa4faaebc56d7ac4b7 Mon Sep 17 00:00:00 2001
From: MichaelDvP <59284019+MichaelDvP@users.noreply.github.com>
Date: Tue, 8 Jun 2021 16:04:41 +0200
Subject: [PATCH 1/2] fix charging type

---
 src/locale_EN.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/locale_EN.h b/src/locale_EN.h
index ef7a90892..a4de5c076 100644
--- a/src/locale_EN.h
+++ b/src/locale_EN.h
@@ -237,7 +237,7 @@ MAKE_PSTR_WORD(error)
 // boiler lists
 MAKE_PSTR_LIST(enum_off_time_date, F_(off), F_(time), F_(date))
 MAKE_PSTR_LIST(enum_freq, F_(off), F_(1x3min), F_(2x3min), F_(3x3min), F_(4x3min), F_(5x3min), F_(6x3min), F_(continuous))
-MAKE_PSTR_LIST(enum_charge, F_(3wayvalve), F_(chargepump))
+MAKE_PSTR_LIST(enum_charge, F_(chargepump), F_(3wayvalve))
 MAKE_PSTR_LIST(enum_comfort, F_(hot), F_(eco), F_(intelligent))
 MAKE_PSTR_LIST(enum_flow, F_(off), F_(flow), F_(bufferedflow), F_(buffer), F_(layeredbuffer))
 MAKE_PSTR_LIST(enum_reset, F_(maintenance), F_(error))

From 40206a27ac0d3e3c443bdf47e36b72b836f0d934 Mon Sep 17 00:00:00 2001
From: MichaelDvP <59284019+MichaelDvP@users.noreply.github.com>
Date: Tue, 8 Jun 2021 16:07:20 +0200
Subject: [PATCH 2/2] fix '0 hours' display

---
 interface/src/project/EMSESPDevicesForm.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/project/EMSESPDevicesForm.tsx b/interface/src/project/EMSESPDevicesForm.tsx
index c5495ccdd..bb604151c 100644
--- a/interface/src/project/EMSESPDevicesForm.tsx
+++ b/interface/src/project/EMSESPDevicesForm.tsx
@@ -120,9 +120,9 @@ const pluralize = (count: number, noun: string, suffix = 's') =>
 function formatValue(value: any, uom: number) {
   switch (uom) {
     case DeviceValueUOM.HOURS:
-      return formatDuration(value * 60);
+      return value ? formatDuration(value * 60) : '0 hours';
     case DeviceValueUOM.MINUTES:
-      return formatDuration(value);
+      return value ? formatDuration(value) : '0 minutes';
     case DeviceValueUOM.NONE:
       return value;
     case DeviceValueUOM.NUM: