From 3177cb3ec07b6ffd4c32d4c3638450f0047fb4f9 Mon Sep 17 00:00:00 2001 From: Hans Christian Olaussen <41271048+klutvott123@users.noreply.github.com> Date: Sun, 18 Apr 2021 21:26:56 +0200 Subject: [PATCH] Update unit tests --- src/test/unit/arming_prevention_unittest.cc | 2 +- src/test/unit/flight_failsafe_unittest.cc | 2 +- src/test/unit/flight_imu_unittest.cc | 2 +- src/test/unit/ledstrip_unittest.cc | 2 +- src/test/unit/link_quality_unittest.cc | 2 +- src/test/unit/osd_unittest.cc | 2 +- src/test/unit/rc_controls_unittest.cc | 2 +- src/test/unit/rcdevice_unittest.cc | 2 +- src/test/unit/rx_crsf_unittest.cc | 10 +++++----- src/test/unit/rx_ranges_unittest.cc | 2 +- src/test/unit/vtx_unittest.cc | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/test/unit/arming_prevention_unittest.cc b/src/test/unit/arming_prevention_unittest.cc index cdd574b70..b6d343808 100644 --- a/src/test/unit/arming_prevention_unittest.cc +++ b/src/test/unit/arming_prevention_unittest.cc @@ -59,7 +59,7 @@ extern "C" { PG_REGISTER(motorConfig_t, motorConfig, PG_MOTOR_CONFIG, 0); float rcCommand[4]; - int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; + float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; uint16_t averageSystemLoadPercent = 0; uint8_t cliMode = 0; uint8_t debugMode = 0; diff --git a/src/test/unit/flight_failsafe_unittest.cc b/src/test/unit/flight_failsafe_unittest.cc index 2fbdcba8b..c5b006961 100644 --- a/src/test/unit/flight_failsafe_unittest.cc +++ b/src/test/unit/flight_failsafe_unittest.cc @@ -543,7 +543,7 @@ TEST(FlightFailsafeTest, TestFailsafeNotActivatedWhenDisarmedAndRXLossIsDetected // STUBS extern "C" { -int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; +float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; float rcCommand[4]; int16_t debug[DEBUG16_VALUE_COUNT]; bool isUsingSticksToArm = true; diff --git a/src/test/unit/flight_imu_unittest.cc b/src/test/unit/flight_imu_unittest.cc index a1648095a..55b177e04 100644 --- a/src/test/unit/flight_imu_unittest.cc +++ b/src/test/unit/flight_imu_unittest.cc @@ -204,7 +204,7 @@ TEST(FlightImuTest, TestSmallAngle) extern "C" { boxBitmask_t rcModeActivationMask; float rcCommand[4]; -int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; +float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; gyro_t gyro; acc_t acc; diff --git a/src/test/unit/ledstrip_unittest.cc b/src/test/unit/ledstrip_unittest.cc index 0a0e445ab..3abeed55b 100644 --- a/src/test/unit/ledstrip_unittest.cc +++ b/src/test/unit/ledstrip_unittest.cc @@ -299,7 +299,7 @@ uint8_t armingFlags = 0; uint8_t stateFlags = 0; uint16_t flightModeFlags = 0; float rcCommand[4]; -int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; +float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; boxBitmask_t rcModeActivationMask; gpsSolutionData_t gpsSol; diff --git a/src/test/unit/link_quality_unittest.cc b/src/test/unit/link_quality_unittest.cc index ee4320230..26441c40b 100644 --- a/src/test/unit/link_quality_unittest.cc +++ b/src/test/unit/link_quality_unittest.cc @@ -69,7 +69,7 @@ extern "C" { float rMat[3][3]; pidProfile_t *currentPidProfile; - int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; + float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; uint8_t GPS_numSat; uint16_t GPS_distanceToHome; int16_t GPS_directionToHome; diff --git a/src/test/unit/osd_unittest.cc b/src/test/unit/osd_unittest.cc index 8969837c1..66b78bc34 100644 --- a/src/test/unit/osd_unittest.cc +++ b/src/test/unit/osd_unittest.cc @@ -73,7 +73,7 @@ extern "C" { pidProfile_t *currentPidProfile; int16_t debug[DEBUG16_VALUE_COUNT]; - int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; + float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; uint8_t GPS_numSat; uint16_t GPS_distanceToHome; int16_t GPS_directionToHome; diff --git a/src/test/unit/rc_controls_unittest.cc b/src/test/unit/rc_controls_unittest.cc index 8d5c107b2..0f1fab75f 100644 --- a/src/test/unit/rc_controls_unittest.cc +++ b/src/test/unit/rc_controls_unittest.cc @@ -640,7 +640,7 @@ uint8_t armingFlags = 0; uint16_t flightModeFlags = 0; int16_t heading; uint8_t stateFlags = 0; -int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; +float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; pidProfile_t *currentPidProfile; rxRuntimeState_t rxRuntimeState; PG_REGISTER(blackboxConfig_t, blackboxConfig, PG_BLACKBOX_CONFIG, 0); diff --git a/src/test/unit/rcdevice_unittest.cc b/src/test/unit/rcdevice_unittest.cc index 4566674ef..1ddd46219 100644 --- a/src/test/unit/rcdevice_unittest.cc +++ b/src/test/unit/rcdevice_unittest.cc @@ -53,7 +53,7 @@ extern "C" { #include "rx/rx.h" - int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2000] + float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; // interval [1000;2000] extern rcdeviceSwitchState_t switchStates[BOXCAMERA3 - BOXCAMERA1 + 1]; extern runcamDevice_t *camDevice; diff --git a/src/test/unit/rx_crsf_unittest.cc b/src/test/unit/rx_crsf_unittest.cc index fa1cbdb41..f477a9d95 100644 --- a/src/test/unit/rx_crsf_unittest.cc +++ b/src/test/unit/rx_crsf_unittest.cc @@ -46,7 +46,7 @@ extern "C" { void crsfDataReceive(uint16_t c); uint8_t crsfFrameCRC(void); uint8_t crsfFrameStatus(void); - uint16_t crsfReadRawRC(const rxRuntimeState_t *rxRuntimeState, uint8_t chan); + float crsfReadRawRC(const rxRuntimeState_t *rxRuntimeState, uint8_t chan); extern bool crsfFrameDone; extern crsfFrame_t crsfFrame; @@ -239,10 +239,10 @@ TEST(CrossFireTest, TestCapturedData) EXPECT_EQ(983, crsfChannelData[3]); uint8_t crc = crsfFrameCRC(); EXPECT_EQ(crc, crsfFrame.frame.payload[CRSF_FRAME_RC_CHANNELS_PAYLOAD_SIZE]); - EXPECT_EQ(999, crsfReadRawRC(NULL, 0)); - EXPECT_EQ(1501, crsfReadRawRC(NULL, 1)); - EXPECT_EQ(1492, crsfReadRawRC(NULL, 2)); - EXPECT_EQ(1495, crsfReadRawRC(NULL, 3)); + EXPECT_EQ(999, (uint16_t)crsfReadRawRC(NULL, 0)); + EXPECT_EQ(1501, (uint16_t)crsfReadRawRC(NULL, 1)); + EXPECT_EQ(1492, (uint16_t)crsfReadRawRC(NULL, 2)); + EXPECT_EQ(1495, (uint16_t)crsfReadRawRC(NULL, 3)); ++framePtr; crsfFrame = *(const crsfFrame_t*)framePtr; diff --git a/src/test/unit/rx_ranges_unittest.cc b/src/test/unit/rx_ranges_unittest.cc index 636178def..0aa95e44c 100644 --- a/src/test/unit/rx_ranges_unittest.cc +++ b/src/test/unit/rx_ranges_unittest.cc @@ -44,7 +44,7 @@ boxBitmask_t rcModeActivationMask; int16_t debug[DEBUG16_VALUE_COUNT]; uint8_t debugMode = 0; -extern uint16_t applyRxChannelRangeConfiguraton(int sample, const rxChannelRangeConfig_t *range); +extern float applyRxChannelRangeConfiguraton(float sample, const rxChannelRangeConfig_t *range); } #define RANGE_CONFIGURATION(min, max) new (rxChannelRangeConfig_t) {min, max} diff --git a/src/test/unit/vtx_unittest.cc b/src/test/unit/vtx_unittest.cc index abea4e1fe..e7897e010 100644 --- a/src/test/unit/vtx_unittest.cc +++ b/src/test/unit/vtx_unittest.cc @@ -62,7 +62,7 @@ extern "C" { PG_REGISTER(motorConfig_t, motorConfig, PG_MOTOR_CONFIG, 0); float rcCommand[4]; - int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; + float rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT]; uint16_t averageSystemLoadPercent = 0; uint8_t cliMode = 0; uint8_t debugMode = 0;