2 files changed, 4 insertions, 3 deletions

diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 7dcecb1e68..febcb78a5a 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -73,9 +73,9 @@ int battery_capacity = 1500;                 /* only a default value */
 
 void set_battery_capacity(int capacity)
 {
-    int values[8] = {1500, 1600, 1700, 1800, 1900, 2000, 2100, 2200};
-    
-    battery_capacity = values[capacity];
+    battery_capacity = capacity;
+    if ((battery_capacity > BATTERY_CAPACITY_MAX) || (battery_capacity < 1500))
+        battery_capacity = 1500;
 }
 
 #ifdef HAVE_CHARGE_CTRL
diff --git a/firmware/powermgmt.h b/firmware/powermgmt.h
index b7f8b01978..ea6319c02e 100644
--- a/firmware/powermgmt.h
+++ b/firmware/powermgmt.h
@@ -27,6 +27,7 @@
 #define BATTERY_LEVEL_FULL       585 /* 5.85V */
 
 #define BATTERY_RANGE (BATTERY_LEVEL_FULL - BATTERY_LEVEL_EMPTY)
+#define BATTERY_CAPACITY_MAX 2400 /* max. capacity that can be selected in settings menu, min. is always 1500 */
 
 #define POWER_HISTORY_LEN 2*60   /* 2 hours of samples, one per minute */
 #define POWER_AVG_N       4      /* how many samples to take for each measurement */