Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-23 08:15:30 +03:00
Code Issues Wiki Activity

Update RC Controls so that functions with different modes can be

Browse source 
applied.  The existing modes are 'step'.  A new mode is 'select'.

The other unit tests need fixing up so that appropriate code is compiled
as C and not C++ code.
This commit is contained in:
Dominic Clifton 2014-10-29 20:52:44 +00:00
parent e22b37026c
commit cac814923c
4 changed files with 105 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/test/unit/rc_controls_unittest.cc
View file

@ -17,17 +17,18 @@
#include <stdint.h>
#include <limits.h>
extern "C" {
#include "common/axis.h"
#include "flight/flight.h"
#include "common/axis.h"
#include "flight/flight.h"
#include "rx/rx.h"
#include "io/escservo.h"
#include "io/rc_controls.h"
#include "rx/rx.h"
#include "io/escservo.h"
#include "io/rc_controls.h"
}
#include "unittest_macros.h"
#include "gtest/gtest.h"
extern "C" {
int constrain(int amt, int low, int high)
{
if (amt < low)
@ -37,6 +38,7 @@ int constrain(int amt, int low, int high)
else
return amt;
}
}
TEST(RcControlsTest, updateActivatedModesWithAllInputsAtMidde)
{
@ -168,6 +170,7 @@ static int callCounts[CALL_COUNT_ITEM_COUNT];
#define CALL_COUNTER(item) (callCounts[item])
extern "C" {
void generatePitchRollCurve(controlRateConfig_t *) {
callCounts[COUNTER_GENERATE_PITCH_ROLL_CURVE]++;
}
@ -175,15 +178,19 @@ void generatePitchRollCurve(controlRateConfig_t *) {
void queueConfirmationBeep(uint8_t) {
callCounts[COUNTER_QUEUE_CONFIRMATION_BEEP]++;
}
}
void resetCallCounters(void) {
memset(&callCounts, 0, sizeof(callCounts));
}
uint32_t fixedMillis = 0;
extern "C" {
uint32_t millis(void) {
return fixedMillis;
}
}
#define DEFAULT_MIN_CHECK 1100
#define DEFAULT_MAX_CHECK 1900
@ -191,10 +198,12 @@ uint32_t millis(void) {
rxConfig_t rxConfig;
extern uint8_t adjustmentStateMask;
extern adjustmentState_t adjustmentStates[MAX_SIMULTANEOUS_ADJUSTMENT_COUNT];
static const adjustmentConfig_t rateAdjustmentConfig = {
.adjustmentFunction = ADJUSTMENT_RC_RATE,
.step = 1
.mode = ADJUSTMENT_MODE_STEP,
.data = { 1 }
};
TEST(RcControlsTest, processRcAdjustmentsSticksInMiddle)
@ -215,6 +224,7 @@ TEST(RcControlsTest, processRcAdjustmentsSticksInMiddle)
rxConfig.maxcheck = DEFAULT_MAX_CHECK;
rxConfig.midrc = 1500;
memset(&adjustmentStates, 0, sizeof(adjustmentStates));
configureAdjustment(0, AUX3 - NON_AUX_CHANNEL_COUNT, &rateAdjustmentConfig);
// and
@ -393,6 +403,7 @@ TEST(RcControlsTest, processRcAdjustmentsWithRcRateFunctionSwitchUp)
}
extern "C" {
void saveConfigAndNotify(void) {}
void generateThrottleCurve(controlRateConfig_t *, escAndServoConfig_t *) {}
void changeProfile(uint8_t) {}
@ -410,3 +421,4 @@ int16_t heading;
uint8_t stateFlags = 0;
int16_t rcData[MAX_SUPPORTED_RC_CHANNEL_COUNT];
rxRuntimeConfig_t rxRuntimeConfig;
}