piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Bsongis/gui refactoring for x7 d (#3701)

Browse Source 
* [X7D] New board added
* Cosmetics
This commit is contained in:
Bertrand Songis
2016-08-18 11:49:16 +02:00
committed by GitHub
parent 282b856309
commit d3ae3c035d
233 changed files with 7472 additions and 4560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/tests/crossfire.cpp
+3 -3
View File
@@ -24,12 +24,12 @@
uint8_t createCrossfireChannelsFrame(uint8_t * frame, int16_t * pulses);
TEST(Crossfire, createCrossfireChannelsFrame)
{
int16_t pulsesStart[NUM_TRAINER];
int16_t pulsesStart[MAX_TRAINER_CHANNELS];
uint8_t crossfire[CROSSFIRE_FRAME_MAXLEN];
memset(crossfire, 0, sizeof(crossfire));
for (int i=0; i<NUM_TRAINER; i++) {
pulsesStart[i] = -1024 + (2048 / NUM_TRAINER) * i;
for (int i=0; i<MAX_TRAINER_CHANNELS; i++) {
pulsesStart[i] = -1024 + (2048 / MAX_TRAINER_CHANNELS) * i;
}
createCrossfireChannelsFrame(crossfire, pulsesStart);
radio/src/tests/gtests.cpp
+2 -2
View File
@@ -22,10 +22,10 @@
#include "gtests.h"
int32_t lastAct = 0;
uint16_t anaInValues[NUM_STICKS+NUM_POTS] = { 0 };
uint16_t anaInValues[NUM_STICKS+NUM_POTS+NUM_SLIDERS] = { 0 };
uint16_t anaIn(uint8_t chan)
{
if (chan < NUM_STICKS+NUM_POTS)
if (chan < NUM_STICKS+NUM_POTS+NUM_SLIDERS)
return anaInValues[chan];
else
return 0;
radio/src/tests/gtests.h
+2 -2
View File
@@ -31,7 +31,7 @@
#define CHANNEL_MAX (1024*256)
extern int32_t lastAct;
extern uint16_t anaInValues[NUM_STICKS+NUM_POTS];
extern uint16_t anaInValues[NUM_STICKS+NUM_POTS+NUM_SLIDERS];
void doMixerCalculations();
@@ -83,7 +83,7 @@ inline void TELEMETRY_RESET()
TELEMETRY_RSSI() = 100;
#endif
#if defined(CPUARM) && defined(TELEMETRY_FRSKY)
for (int i=0; i<MAX_SENSORS; i++) {
for (int i=0; i<MAX_TELEMETRY_SENSORS; i++) {
telemetryItems[i].clear();
}
#endif
radio/src/tests/lcd.cpp
+15 -15
View File
@@ -38,25 +38,25 @@ void doPaint(QPainter & p)
p.eraseRect(0, 0, LCD_W, LCD_H);
if (1) {
#if !defined(PCBTARANIS)
#if LCD_W < 212
rgb = qRgb(0, 0, 0);
p.setPen(rgb);
p.setBrush(QBrush(rgb));
#endif
#if defined(PCBTARANIS)
#if LCD_W >= 212
unsigned int previousDepth = 0xFF;
#endif
for (int y=0; y<LCD_H; y++) {
#if defined(PCBTARANIS)
#if LCD_W >= 212
unsigned int idx = (y/2) * LCD_W;
#else
unsigned int idx = (y/8) * LCD_W;
unsigned int mask = (1 << (y%8));
#endif
for (int x=0; x<LCD_W; x++, idx++) {
#if !defined(PCBTARANIS)
#if LCD_W < 212
if (simuLcdBuf[idx] & mask) {
p.drawPoint(x, y);
}
@@ -93,7 +93,7 @@ bool checkScreenshot(const QString & test)
#if defined(COLORLCD)
// TODO
#else
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(outdezNAtt, test_unsigned)
{
lcdClear();
@@ -268,19 +268,19 @@ TEST(Lcd, Dblsize)
}
#endif
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, DrawSwitch)
{
lcdClear();
putsSwitches(0, 10, SWSRC_SA0, 0);
putsSwitches(30, 10, SWSRC_SA0, SMLSIZE);
// putsSwitches(60, 10, SWSRC_SA0, MIDSIZE); missing arrows in this font
putsSwitches(90, 10, SWSRC_SA0, DBLSIZE);
drawSwitch(0, 10, SWSRC_SA0, 0);
drawSwitch(30, 10, SWSRC_SA0, SMLSIZE);
// drawSwitch(60, 10, SWSRC_SA0, MIDSIZE); missing arrows in this font
drawSwitch(90, 10, SWSRC_SA0, DBLSIZE);
EXPECT_TRUE(checkScreenshot("drawswitch"));
}
#endif
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, BMPWrapping)
{
lcdClear();
@@ -294,7 +294,7 @@ TEST(Lcd, BMPWrapping)
}
#endif
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, lcdDrawHorizontalLine)
{
lcdClear();
@@ -307,7 +307,7 @@ TEST(Lcd, lcdDrawHorizontalLine)
}
#endif
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, lcdDrawVerticalLine)
{
lcdClear();
@@ -347,7 +347,7 @@ public:
};
};
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
{
lcdClear();
@@ -398,7 +398,7 @@ TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
}
#endif
#if defined(PCBTARANIS)
#if defined(PCBTARANIS) && LCD_W >= 212
TEST(Lcd, lcdDrawLine)
{
int start, length, xOffset;
radio/src/tests/mixer.cpp
+20 -13
View File
@@ -19,12 +19,11 @@
*/
#include "gtests.h"
#include "templates.h"
#define CHECK_NO_MOVEMENT(channel, value, duration) \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], (value)); \
GTEST_ASSERT_EQ((value), chans[(channel)]); \
}
#define CHECK_SLOW_MOVEMENT(channel, sign, duration) \
@@ -32,7 +31,7 @@
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
lastAct = lastAct + (sign) * (1<<19)/500; /* 100 on ARM */ \
EXPECT_EQ(chans[(channel)], 256 * (lastAct >> 8)); \
GTEST_ASSERT_EQ(256 * (lastAct >> 8), chans[(channel)]); \
} \
} while (0)
@@ -41,7 +40,7 @@
int32_t value = chans[(channel)]; \
for (int i=1; i<=(duration); i++) { \
evalFlightModeMixes(e_perout_mode_normal, 1); \
EXPECT_EQ(chans[(channel)], value); \
GTEST_ASSERT_EQ(chans[(channel)], value); \
} \
} while (0)
@@ -173,7 +172,7 @@ TEST(Trims, throttleTrimWithZeroWeightOnThrottle)
MODEL_RESET();
modelDefault(0);
g_model.thrTrim = 1;
#if defined(VIRTUALINPUTS)
#if defined(VIRTUAL_INPUTS)
// the input already exists
ExpoData *expo = expoAddress(THR_STICK);
#else
@@ -252,7 +251,7 @@ TEST(Trims, invertedThrottlePlusthrottleTrimWithZeroWeightOnThrottle)
modelDefault(0);
g_model.throttleReversed = 1;
g_model.thrTrim = 1;
#if defined(VIRTUALINPUTS)
#if defined(VIRTUAL_INPUTS)
// the input already exists
ExpoData *expo = expoAddress(THR_STICK);
#else
@@ -325,7 +324,7 @@ TEST(Trims, invertedThrottlePlusthrottleTrimWithZeroWeightOnThrottle)
EXPECT_EQ(channelOutputs[2], 0);
}
#if !defined(VIRTUALINPUTS)
#if !defined(VIRTUAL_INPUTS)
TEST(Trims, greaterTrimLink)
{
MODEL_RESET();
@@ -395,7 +394,7 @@ TEST(Trims, InstantTrim)
EXPECT_EQ(25, getTrimValue(0, AIL_STICK));
}
#if defined(VIRTUALINPUTS)
#if defined(VIRTUAL_INPUTS)
TEST(Trims, InstantTrimNegativeCurve)
{
MODEL_RESET();
@@ -743,7 +742,11 @@ TEST(Mixer, SlowOnSwitchSource)
MIXER_RESET();
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = TR(MIXSRC_THR, MIXSRC_SA);
#if defined(PCBTARANIS) || defined(PCBHORUS)
g_model.mixData[0].srcRaw = MIXSRC_SA;
#else
g_model.mixData[0].srcRaw = MIXSRC_THR;
#endif
g_model.mixData[0].weight = 100;
g_model.mixData[0].speedUp = SLOW_STEP*5;
g_model.mixData[0].speedDown = SLOW_STEP*5;
@@ -784,7 +787,11 @@ TEST(Mixer, DelayOnSwitch)
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
g_model.mixData[0].swtch = TR(SWSRC_THR, SWSRC_SA2);
#if defined(PCBTARANIS)
g_model.mixData[0].swtch = SWSRC_SA2;
#else
g_model.mixData[0].swtch = SWSRC_THR;
#endif
g_model.mixData[0].delayUp = DELAY_STEP*5;
g_model.mixData[0].delayDown = DELAY_STEP*5;
@@ -866,7 +873,7 @@ TEST(Mixer, SlowOnSwitchReplace)
}
#endif
#if !defined(VIRTUALINPUTS)
#if !defined(VIRTUAL_INPUTS)
TEST(Mixer, NoTrimOnInactiveMix)
{
MODEL_RESET();
@@ -919,7 +926,7 @@ TEST(Mixer, SlowOnMultiply)
}
#if defined(HELI) && defined(VIRTUALINPUTS)
#if defined(HELI) && defined(VIRTUAL_INPUTS)
TEST(Heli, BasicTest)
{
MODEL_RESET();
@@ -982,7 +989,7 @@ TEST(Heli, Mode2Test)
}
#endif
#if defined(HELI) && !defined(VIRTUALINPUTS)
#if defined(HELI) && !defined(VIRTUAL_INPUTS)
TEST(Heli, SimpleTest)
{
MODEL_RESET();
radio/src/tests/switches.cpp
+11 -9
View File
@@ -20,7 +20,7 @@
#include "gtests.h"
#if !defined(VIRTUALINPUTS)
#if !defined(VIRTUAL_INPUTS)
TEST(getSwitch, undefCSW)
{
MODEL_RESET();
@@ -45,8 +45,7 @@ TEST(getSwitch, circularCSW)
}
#endif
#if defined(VIRTUALINPUTS)
#if defined(VIRTUAL_INPUTS)
void setLogicalSwitch(int index, uint16_t _func, int16_t _v1, int16_t _v2, int16_t _v3 = 0, uint8_t _delay = 0, uint8_t _duration = 0, int8_t _andsw = 0)
{
g_model.logicalSw[index].func = _func;
@@ -57,7 +56,9 @@ void setLogicalSwitch(int index, uint16_t _func, int16_t _v1, int16_t _v2, int16
g_model.logicalSw[index].duration = _duration;
g_model.logicalSw[index].andsw = _andsw;
}
#endif
#if defined(PCBTARANIS)
TEST(getSwitch, OldTypeStickyCSW)
{
RADIO_RESET();
@@ -89,7 +90,7 @@ TEST(getSwitch, OldTypeStickyCSW)
EXPECT_EQ(getSwitch(SWSRC_SW1), false);
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
}
#endif // #if defined(VIRTUALINPUTS)
#endif
TEST(getSwitch, nullSW)
{
@@ -128,7 +129,7 @@ TEST(getSwitch, recursiveSW)
}
#endif // #if !defined(CPUARM)
#if defined(VIRTUALINPUTS)
#if defined(PCBTARANIS)
TEST(getSwitch, inputWithTrim)
{
MODEL_RESET();
@@ -149,7 +150,7 @@ TEST(getSwitch, inputWithTrim)
}
#endif
#if defined(VIRTUALINPUTS)
#if defined(PCBTARANIS)
TEST(evalLogicalSwitches, playFile)
{
SYSTEM_RESET();
@@ -178,7 +179,9 @@ TEST(evalLogicalSwitches, playFile)
#undef MODELNAME
}
#endif
#if defined(PCBTARANIS) && !defined(PCBX7D)
TEST(getSwitch, edgeInstant)
{
MODEL_RESET();
@@ -186,7 +189,7 @@ TEST(getSwitch, edgeInstant)
// LS1 setup: EDGE SFup (0:instant)
// LS2 setup: (EDGE SFup (0:instant)) AND SAup
setLogicalSwitch(0, LS_FUNC_EDGE, SWSRC_SF2, -129, -1);
setLogicalSwitch(1, LS_FUNC_EDGE, SWSRC_SF2, -129, -1, 0, 0, SWSRC_SA2 );
setLogicalSwitch(1, LS_FUNC_EDGE, SWSRC_SF2, -129, -1, 0, 0, SWSRC_SA2);
simuSetSwitch(0, -1); //SA down
simuSetSwitch(5, 0); //SF down
@@ -354,5 +357,4 @@ TEST(getSwitch, edgeRelease)
EXPECT_EQ(getSwitch(SWSRC_SW2), false);
}
#endif // #if defined(CPUARM)
#endif // defined(PCBTARANIS)
radio/src/tests/timers.cpp
-2
View File
@@ -19,8 +19,6 @@
*/
#include "gtests.h"
#include "opentx.h"
#include "timers.h"
#if !defined(CPUARM)
#undef timerSet