mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-21 23:35:34 +03:00
Fixed unittest compile warnings caused by inconsistant data types.
This commit is contained in:
parent
e992221848
commit
e42d74926a
4 changed files with 5 additions and 7 deletions
|
@ -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;}
|
||||
|
|
|
@ -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];
|
||||
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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)));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue