battery error handling

Author: sctanf

src/system/battery.c

@@ -263,7 +263,7 @@ static const struct battery_level_point levels[] = {
 #endif
 };
 
-unsigned int read_batt()
+int read_batt()
 {
 	int rc = battery_measure_enable(true);
 
@@ -274,17 +274,18 @@ unsigned int read_batt()
 
 	int batt_mV = battery_sample();
 
+	battery_measure_enable(false);
+
 	if (batt_mV < 0) {
 		LOG_DBG("Failed to read battery voltage: %d",
 		       batt_mV);
+		return rc;
 	}
 
-	battery_measure_enable(false);
-
 	return battery_level_pptt(batt_mV, levels);
 }
 
-unsigned int read_batt_mV(int *out)
+int read_batt_mV(int *out)
 {
 	int rc = battery_measure_enable(true);
 
@@ -295,13 +296,14 @@ unsigned int read_batt_mV(int *out)
 
 	int batt_mV = battery_sample();
 
+	battery_measure_enable(false);
+
 	if (batt_mV < 0) {
 		LOG_DBG("Failed to read battery voltage: %d",
 		       batt_mV);
+		return rc;
 	}
 
-	battery_measure_enable(false);
-
 	*out = batt_mV;
 	return battery_level_pptt(batt_mV, levels);
 }

src/system/battery.h

@@ -50,8 +50,8 @@ struct battery_level_point {
 unsigned int battery_level_pptt(unsigned int batt_mV,
 				const struct battery_level_point *curve);
 
-unsigned int read_batt(void);
+int read_batt(void);
 
-unsigned int read_batt_mV(int *out);
+int read_batt_mV(int *out);
 
 #endif /* APPLICATION_BATTERY_H_ */

src/system/power.c

@@ -464,6 +464,8 @@ static void power_thread(void)
 
 		int battery_mV;
 		int16_t battery_pptt = read_batt_mV(&battery_mV);
+		if (battery_level_pptt < 0)
+			LOG_ERR("Failed to read battery voltage: %d", battery_pptt);
 		if (samples < BATTERY_SAMPLES)
 			samples++;