1 files changed, 8 insertions, 17 deletions

diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 9e7320eef6..94f6cc74ea 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -428,27 +428,16 @@ static bool bidir_limit(void)
 }
 #endif
 
+#ifndef SIMULATOR
 /**
  * Menu to set the battery capacity
  */
-static bool battery_capacity(void) {
-    bool retval = false;
-
-    char* names[] = { "1500 mAh ", "1600 mAh ",
-                      "1700 mAh ", "1800 mAh ",
-                      "1900 mAh ", "2000 mAh ",
-                      "2100 mAh ", "2200 mAh "
-    };
-
-    retval = set_option( str(LANG_BATTERY_CAPACITY), 
-                       &global_settings.battery_capacity, names, 8, NULL);
-
-#ifndef SIMULATOR
-    set_battery_capacity(global_settings.battery_capacity);
-#endif /* SIMULATOR */
-
-    return retval;
+static bool battery_capacity(void)
+{
+    return set_int(str(LANG_BATTERY_CAPACITY), " mAh", &global_settings.battery_capacity, 
+                   &set_battery_capacity, 50, 1500, BATTERY_CAPACITY_MAX );
 }
+#endif
 
 #ifdef HAVE_CHARGE_CTRL
 static bool deep_discharge(void)
@@ -742,7 +731,9 @@ static bool system_settings_menu(void)
 #ifdef HAVE_ATA_POWER_OFF
         { str(LANG_POWEROFF),    poweroff        },
 #endif
+#ifndef SIMULATOR
         { str(LANG_BATTERY_CAPACITY), battery_capacity },
+#endif
 #ifdef HAVE_CHARGE_CTRL
         { str(LANG_DISCHARGE),        deep_discharge   },
         { str(LANG_TRICKLE_CHARGE),   trickle_charge   },