rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix RX unit test

This commit is contained in:
Dan Nixon 2017-07-30 21:39:19 +01:00
parent 5b31ca2916
commit fa39970cda
1 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/test/unit/rx_rx_unittest.cc
View File

@ -66,24 +66,20 @@ TEST(RxTest, TestValidFlightChannels)
memset(&rcModeActivationMask, 0, sizeof(rcModeActivationMask)); // BOXFAILSAFE must be OFF memset(&rcModeActivationMask, 0, sizeof(rcModeActivationMask)); // BOXFAILSAFE must be OFF
// and // and
rxConfig_t rxConfig; rxConfigMutable()->rx_min_usec = 1000;
modeActivationCondition_t modeActivationConditions[MAX_MODE_ACTIVATION_CONDITION_COUNT]; rxConfigMutable()->rx_max_usec = 2000;
memset(&rxConfig, 0, sizeof(rxConfig)); // and
rxConfig.rx_min_usec = 1000; modeActivationConditionsMutable(0)->auxChannelIndex = 0;
rxConfig.rx_max_usec = 2000; modeActivationConditionsMutable(0)->modeId = BOXARM;
modeActivationConditionsMutable(0)->range.startStep = CHANNEL_VALUE_TO_STEP(CHANNEL_RANGE_MIN);
memset(&modeActivationConditions, 0, sizeof(modeActivationConditions)); modeActivationConditionsMutable(0)->range.endStep = CHANNEL_VALUE_TO_STEP(1600);
modeActivationConditions[0].auxChannelIndex = 0;
modeActivationConditions[0].modeId = BOXARM;
modeActivationConditions[0].range.startStep = CHANNEL_VALUE_TO_STEP(CHANNEL_RANGE_MIN);
modeActivationConditions[0].range.endStep = CHANNEL_VALUE_TO_STEP(1600);
// when // when
rxInit(); rxInit();
// then (ARM channel should be positioned just 1 step above active range to init to OFF) // then (ARM channel should be positioned just 1 step above active range to init to OFF)
//!! EXPECT_EQ(1625, rcData[modeActivationConditions[0].auxChannelIndex + NON_AUX_CHANNEL_COUNT]); EXPECT_EQ(1625, rcData[modeActivationConditions(0)->auxChannelIndex + NON_AUX_CHANNEL_COUNT]);
// given // given
rxResetFlightChannelStatus(); rxResetFlightChannelStatus();
@ -95,7 +91,7 @@ TEST(RxTest, TestValidFlightChannels)
} }
// then // then
//!! EXPECT_TRUE(rxHaveValidFlightChannels()); EXPECT_TRUE(rxHaveValidFlightChannels());
} }
TEST(RxTest, TestInvalidFlightChannels) TEST(RxTest, TestInvalidFlightChannels)
@ -104,18 +100,14 @@ TEST(RxTest, TestInvalidFlightChannels)
memset(&testData, 0, sizeof(testData)); memset(&testData, 0, sizeof(testData));
// and // and
rxConfig_t rxConfig; rxConfigMutable()->rx_min_usec = 1000;
modeActivationCondition_t modeActivationConditions[MAX_MODE_ACTIVATION_CONDITION_COUNT]; rxConfigMutable()->rx_max_usec = 2000;
memset(&rxConfig, 0, sizeof(rxConfig)); // and
rxConfig.rx_min_usec = 1000; modeActivationConditionsMutable(0)->auxChannelIndex = 0;
rxConfig.rx_max_usec = 2000; modeActivationConditionsMutable(0)->modeId = BOXARM;
modeActivationConditionsMutable(0)->range.startStep = CHANNEL_VALUE_TO_STEP(1400);
memset(&modeActivationConditions, 0, sizeof(modeActivationConditions)); modeActivationConditionsMutable(0)->range.endStep = CHANNEL_VALUE_TO_STEP(CHANNEL_RANGE_MAX);
modeActivationConditions[0].auxChannelIndex = 0;
modeActivationConditions[0].modeId = BOXARM;
modeActivationConditions[0].range.startStep = CHANNEL_VALUE_TO_STEP(1400);
modeActivationConditions[0].range.endStep = CHANNEL_VALUE_TO_STEP(CHANNEL_RANGE_MAX);
// and // and
uint16_t channelPulses[MAX_SUPPORTED_RC_CHANNEL_COUNT]; uint16_t channelPulses[MAX_SUPPORTED_RC_CHANNEL_COUNT];
@ -125,18 +117,17 @@ TEST(RxTest, TestInvalidFlightChannels)
rxInit(); rxInit();
// then (ARM channel should be positioned just 1 step below active range to init to OFF) // then (ARM channel should be positioned just 1 step below active range to init to OFF)
//!! EXPECT_EQ(1375, rcData[modeActivationConditions[0].auxChannelIndex + NON_AUX_CHANNEL_COUNT]); EXPECT_EQ(1375, rcData[modeActivationConditions(0)->auxChannelIndex + NON_AUX_CHANNEL_COUNT]);
// and // and
for (uint8_t stickChannelIndex = 0; stickChannelIndex < STICK_CHANNEL_COUNT; stickChannelIndex++) { for (uint8_t stickChannelIndex = 0; stickChannelIndex < STICK_CHANNEL_COUNT; stickChannelIndex++) {
// given // given
rxResetFlightChannelStatus(); rxResetFlightChannelStatus();
for (uint8_t otherStickChannelIndex = 0; otherStickChannelIndex < STICK_CHANNEL_COUNT; otherStickChannelIndex++) { for (uint8_t otherStickChannelIndex = 0; otherStickChannelIndex < STICK_CHANNEL_COUNT; otherStickChannelIndex++) {
channelPulses[otherStickChannelIndex] = rxConfig.rx_min_usec; channelPulses[otherStickChannelIndex] = rxConfig()->rx_min_usec;
} }
channelPulses[stickChannelIndex] = rxConfig.rx_min_usec - 1; channelPulses[stickChannelIndex] = rxConfig()->rx_min_usec - 1;
// when // when
for (uint8_t channelIndex = 0; channelIndex < MAX_SUPPORTED_RC_CHANNEL_COUNT; channelIndex++) { for (uint8_t channelIndex = 0; channelIndex < MAX_SUPPORTED_RC_CHANNEL_COUNT; channelIndex++) {
@ -151,9 +142,9 @@ TEST(RxTest, TestInvalidFlightChannels)
rxResetFlightChannelStatus(); rxResetFlightChannelStatus();
for (uint8_t otherStickChannelIndex = 0; otherStickChannelIndex < STICK_CHANNEL_COUNT; otherStickChannelIndex++) { for (uint8_t otherStickChannelIndex = 0; otherStickChannelIndex < STICK_CHANNEL_COUNT; otherStickChannelIndex++) {
channelPulses[otherStickChannelIndex] = rxConfig.rx_max_usec; channelPulses[otherStickChannelIndex] = rxConfig()->rx_max_usec;
} }
channelPulses[stickChannelIndex] = rxConfig.rx_max_usec + 1; channelPulses[stickChannelIndex] = rxConfig()->rx_max_usec + 1;
// when // when
for (uint8_t channelIndex = 0; channelIndex < MAX_SUPPORTED_RC_CHANNEL_COUNT; channelIndex++) { for (uint8_t channelIndex = 0; channelIndex < MAX_SUPPORTED_RC_CHANNEL_COUNT; channelIndex++) {