Merge pull request #516 from sherlockflight/master

Avoid reading uninitialised memory during battery unit tests
2015-02-20 13:17:48 +00:00 · 2015-02-20 13:17:48 +00:00 · 6d9d2e14bb
parent 242a7e65a8 092b4fe62b
commit 6d9d2e14bb
1 changed files with 8 additions and 0 deletions
--- a/src/test/unit/battery_unittest.cc
+++ b/src/test/unit/battery_unittest.cc
@ -39,6 +39,14 @@ TEST(BatteryTest, BatteryADCToVoltage)

    batteryConfig_t batteryConfig;

+    // batteryInit() reads a bunch of fields including vbatscale, so set up the config with useful initial values:
+    memset(&batteryConfig, 0, sizeof(batteryConfig));
+
+    batteryConfig.vbatmaxcellvoltage = 43;
+    batteryConfig.vbatmincellvoltage = 33;
+    batteryConfig.vbatwarningcellvoltage = 35;
+    batteryConfig.vbatscale = VBAT_SCALE_DEFAULT;
+
    batteryInit(&batteryConfig);

    batteryAdcToVoltageExpectation_t batteryAdcToVoltageExpectations[] = {