Merge pull request #605 from ledvinap/fix-batterytest-merge

Fix incorrect merge in battery_unittest
cleanflight · Mar 11, 2015 · 2c79d77 · 2c79d77
2 parents 4746b33 + f1a0972
commit 2c79d77
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/src/test/unit/battery_unittest.cc b/src/test/unit/battery_unittest.cc
@@ -37,10 +37,9 @@ typedef struct batteryAdcToVoltageExpectation_s {
 
 TEST(BatteryTest, BatteryADCToVoltage)
 {
-    // given
-
+    // batteryInit() reads a bunch of fields including vbatscale, so set up the config with useful initial values:
     batteryConfig_t batteryConfig = {
-        .vbatscale = 110,
+        .vbatscale = VBAT_SCALE_DEFAULT,
         .vbatmaxcellvoltage = 43,
         .vbatmincellvoltage = 33,
         .vbatwarningcellvoltage = 35,
@@ -51,14 +50,6 @@ TEST(BatteryTest, BatteryADCToVoltage)
         .batteryCapacity = 2200,
     };
 
-    // 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[] = {