Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 01:05:27 +03:00
Code Issues Wiki Activity

Fixed unittest compile warnings caused by inconsistant data types.

Browse source
This commit is contained in:
Anders Hoglund 2017-12-11 01:19:00 +01:00
parent e992221848
commit e42d74926a
4 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/test/unit/blackbox_unittest.cc
View file

@ -371,7 +371,7 @@ struct pidProfile_s;
struct pidProfile_s *currentPidProfile; struct pidProfile_s *currentPidProfile;
uint32_t targetPidLooptime; uint32_t targetPidLooptime;
uint32_t rcModeActivationMask; boxBitmask_t rcModeActivationMask;
void mspSerialAllocatePorts(void) {} void mspSerialAllocatePorts(void) {}
uint32_t getArmingBeepTimeMicros(void) {return 0;} uint32_t getArmingBeepTimeMicros(void) {return 0;}

2
src/test/unit/flight_imu_unittest.cc
View file

@ -198,7 +198,7 @@ TEST(FlightImuTest, TestSmallAngle)
// STUBS // STUBS
extern "C" { extern "C" {
uint32_t rcModeActivationMask; boxBitmask_t rcModeActivationMask;
float rcCommand[4]; float rcCommand[4];
int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT];

2
src/test/unit/ledstrip_unittest.cc
View file

@ -297,7 +297,7 @@ uint8_t stateFlags = 0;
uint16_t flightModeFlags = 0; uint16_t flightModeFlags = 0;
float rcCommand[4]; float rcCommand[4];
int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT];
uint32_t rcModeActivationMask; boxBitmask_t rcModeActivationMask;
gpsSolutionData_t gpsSol; gpsSolutionData_t gpsSol;
batteryState_e getBatteryState(void) { batteryState_e getBatteryState(void) {

6
src/test/unit/rx_ranges_unittest.cc
View file

@ -34,10 +34,8 @@ extern "C" {
#include "unittest_macros.h" #include "unittest_macros.h"
#include "gtest/gtest.h" #include "gtest/gtest.h"
#define DE_ACTIVATE_ALL_BOXES 0
extern "C" { extern "C" {
uint32_t rcModeActivationMask; boxBitmask_t rcModeActivationMask;
extern uint16_t applyRxChannelRangeConfiguraton(int sample, const rxChannelRangeConfig_t *range); 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) 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 // No signal, special condition
EXPECT_EQ(0, applyRxChannelRangeConfiguraton(0, RANGE_CONFIGURATION(1000, 2000))); EXPECT_EQ(0, applyRxChannelRangeConfiguraton(0, RANGE_CONFIGURATION(1000, 2000)));