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

Google tests didn't compile with my last commit

Browse Source
This commit is contained in:
bsongis
2014-06-17 11:07:20 +02:00
parent 2094e87da5
commit 6dacd5a914
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gtests.cpp
+7 -7
View File
@@ -46,7 +46,7 @@ void doMixerCalculations();
memset(&g_model, 0, sizeof(g_model)); \
extern uint8_t s_mixer_first_run_done; \
s_mixer_first_run_done = false; \
s_last_phase = 255;
lastFlightMode = 255;
int32_t lastAct = 0;
void MIXER_RESET()
@@ -59,7 +59,7 @@ void MIXER_RESET()
s_last_switch_used = 0;
s_last_switch_value = 0;
#endif
mixerCurrentFlightMode = s_last_phase = 0;
mixerCurrentFlightMode = lastFlightMode = 0;
lastAct = 0;
logicalSwitchesReset();
}
@@ -531,12 +531,12 @@ TEST(Mixer, RecursiveAddChannelAfterInactivePhase)
g_model.mixData[0].destCh = 0;
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_CH2;
g_model.mixData[0].phases = 0b11110;
g_model.mixData[0].flightModes = 0b11110;
g_model.mixData[0].weight = 50;
g_model.mixData[1].destCh = 0;
g_model.mixData[1].mltpx = MLTPX_ADD;
g_model.mixData[1].srcRaw = MIXSRC_MAX;
g_model.mixData[1].phases = 0b11101;
g_model.mixData[1].flightModes = 0b11101;
g_model.mixData[1].weight = 50;
g_model.mixData[2].destCh = 1;
g_model.mixData[2].srcRaw = MIXSRC_MAX;
@@ -639,7 +639,7 @@ TEST(Mixer, SlowOnPhase)
g_model.mixData[0].mltpx = MLTPX_ADD;
g_model.mixData[0].srcRaw = MIXSRC_MAX;
g_model.mixData[0].weight = 100;
g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
g_model.mixData[0].speedUp = SLOW_STEP*5;
g_model.mixData[0].speedDown = SLOW_STEP*5;
@@ -666,9 +666,9 @@ TEST(Mixer, SlowOnSwitchAndPhase)
g_model.mixData[0].weight = 100;
g_model.mixData[0].swtch = TR(SWSRC_THR, SWSRC_SA0);
#if defined(CPUARM)
g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 + 0x20 + 0x40 + 0x80 + 0x100 /*only enabled in phase 0*/;
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 + 0x20 + 0x40 + 0x80 + 0x100 /*only enabled in phase 0*/;
#else
g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
#endif
g_model.mixData[0].speedUp = SLOW_STEP*5;
g_model.mixData[0].speedDown = SLOW_STEP*5;
radio/src/opentx.h
+1 -1
View File
@@ -674,7 +674,7 @@ enum StartupWarningStates {
#endif
extern uint8_t mixerCurrentFlightMode;
extern uint8_t s_last_phase;
extern uint8_t lastFlightMode;
extern uint8_t flightModeTransitionLast;
#if defined(CPUARM)