2 files changed, 17 insertions, 2 deletions

diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
index c6b3549afb..6986a0605d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
@@ -467,8 +467,13 @@ static bool charging_ok(void)
          * come back into safe range. */
         static const signed char temp_ranges[2][2] =
         {
-            { 0, 45 }, /* Temperature range before beginning charging */
-            { 5, 40 }, /* Temperature range after out-of-range detected */
+            /* Temperature range before beginning charging */
+            { BATTERY_CHARGE_MIN,
+              BATTERY_CHARGE_MAX },
+            /* Temperature range after out-of-range detected -
+               charging will self-resume */
+            { BATTERY_CHARGE_RESTART_MIN,
+              BATTERY_CHARGE_RESTART_MAX },
         };
 
         int temp = battery_adc_temp();
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
index c157dc2fbf..86278bce73 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-target.h
@@ -61,6 +61,16 @@
                                              read below 2400mV. */
 #define CHARGER_TOTAL_TIMER          300 /* minutes */
 
+/* Temperature readings - w/hysteresis */
+
+/* Temperature range before beginning charging */
+#define BATTERY_CHARGE_MIN          0
+#define BATTERY_CHARGE_MAX          50
+/* Temperature range after out-of-range detected - charging will
+ * self-resume */
+#define BATTERY_CHARGE_RESTART_MIN  5
+#define BATTERY_CHARGE_RESTART_MAX  45
+
 /* .316 ohms is closest standard value as measured in 1% tolerance - adjust
  * relative to .100 ohm which is what the PMIC is "tuned" for. */
 #define ILEVEL_ADJUST_IN(I)         (100*(I) / 316)