From e42d74926a398cbe23c23bac2bb5c7df0779e1e3 Mon Sep 17 00:00:00 2001 From: Anders Hoglund Date: Mon, 11 Dec 2017 01:19:00 +0100 Subject: [PATCH] Fixed unittest compile warnings caused by inconsistant data types. --- src/test/unit/blackbox_unittest.cc | 2 +- src/test/unit/flight_imu_unittest.cc | 2 +- src/test/unit/ledstrip_unittest.cc | 2 +- src/test/unit/rx_ranges_unittest.cc | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/test/unit/blackbox_unittest.cc b/src/test/unit/blackbox_unittest.cc index 5e39e4fd04..a85c52eae2 100644 --- a/src/test/unit/blackbox_unittest.cc +++ b/src/test/unit/blackbox_unittest.cc @@ -371,7 +371,7 @@ struct pidProfile_s; struct pidProfile_s *currentPidProfile; uint32_t targetPidLooptime; -uint32_t rcModeActivationMask; +boxBitmask_t rcModeActivationMask; void mspSerialAllocatePorts(void) {} uint32_t getArmingBeepTimeMicros(void) {return 0;} diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc index 80b11af562..401f52fb3e 100644 --- a/src/test/unit/flight_imu_unittest.cc +++ b/src/test/unit/flight_imu_unittest.cc @@ -198,7 +198,7 @@ TEST(FlightImuTest, TestSmallAngle) // STUBS extern "C" { -uint32_t rcModeActivationMask; +boxBitmask_t rcModeActivationMask; float rcCommand[4]; int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc index 44abc37372..5fc1e91f91 100644 --- a/src/test/unit/ledstrip_unittest.cc +++ b/src/test/unit/ledstrip_unittest.cc @@ -297,7 +297,7 @@ uint8_t stateFlags = 0; uint16_t flightModeFlags = 0; float rcCommand[4]; int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; -uint32_t rcModeActivationMask; +boxBitmask_t rcModeActivationMask; gpsSolutionData_t gpsSol; batteryState_e getBatteryState(void) { diff --git a/src/test/unit/rx_ranges_unittest.cc b/src/test/unit/rx_ranges_unittest.cc index 45712a71aa..a93b8e8a34 100644 --- a/src/test/unit/rx_ranges_unittest.cc +++ b/src/test/unit/rx_ranges_unittest.cc @@ -34,10 +34,8 @@ extern "C" { #include "unittest_macros.h" #include "gtest/gtest.h" -#define DE_ACTIVATE_ALL_BOXES 0 - extern "C" { -uint32_t rcModeActivationMask; +boxBitmask_t rcModeActivationMask; extern uint16_t applyRxChannelRangeConfiguraton(int sample, const rxChannelRangeConfig_t *range); } @@ -46,7 +44,7 @@ extern uint16_t applyRxChannelRangeConfiguraton(int sample, const rxChannelRange TEST(RxChannelRangeTest, TestRxChannelRanges) { - rcModeActivationMask = DE_ACTIVATE_ALL_BOXES; // BOXFAILSAFE must be OFF + memset(&rcModeActivationMask, 0, sizeof(rcModeActivationMask)); // BOXFAILSAFE must be OFF // No signal, special condition EXPECT_EQ(0, applyRxChannelRangeConfiguraton(0, RANGE_CONFIGURATION(1000, 2000)));