Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-13 11:29:51 +03:00
Code Issues Wiki Activity

Merge branch '2.3.1' into 2.3

Browse source 
# Conflicts:
#	CREDITS.txt
#	radio/src/gui/480x272/radio_hardware.cpp
This commit is contained in:
Kilrah 2019-10-05 11:41:48 +02:00
commit b40dfdf12b
72 changed files with 544 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/commit-tests.sh
View file

@ -64,7 +64,7 @@ if [[ " SKY9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=SKY9X -DHELI=YES DLUA=YES -DTELEMETRY=FRSKY -DPPM_LIMITS_SYMETRICAL=YES -DVARIO=YES -DAUTOSWITCH=YES -DAUTOSOURCE=YES -DAUDIO=YES -DGPS=YES -DPPM_CENTER_ADJUSTABLE=YES -DFLIGHT_MODES=YES -DOVERRIDE_CHANNEL_FUNCTION=YES -DFRSKY_STICKS=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " AR9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
@ -73,7 +73,7 @@ if [[ " AR9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " 9XRPRO ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
@ -82,7 +82,7 @@ if [[ " 9XRPRO ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=9XRPRO -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9LITE ALL " =~ " ${FLAVOR} " ]] ; then
@ -91,7 +91,7 @@ if [[ " X9LITE ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X9LITE -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9LITES ALL " =~ " ${FLAVOR} " ]] ; then
@ -109,7 +109,7 @@ if [[ " X7 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X7 -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " XLITE ALL " =~ " ${FLAVOR} " ]] ; then
@ -118,7 +118,7 @@ if [[ " XLITE ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=XLITE -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " XLITES ALL " =~ " ${FLAVOR} " ]] ; then
@ -127,7 +127,7 @@ if [[ " XLITES ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=XLITES -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9D X9 ALL " =~ " ${FLAVOR} " ]] ; then
@ -136,7 +136,7 @@ if [[ " X9D X9 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X9D -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9D+ X9 ALL " =~ " ${FLAVOR} " ]] ; then
@ -145,7 +145,7 @@ if [[ " X9D+ X9 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9D+2019 X9 ALL " =~ " ${FLAVOR} " ]] ; then
@ -154,7 +154,7 @@ if [[ " X9D+2019 X9 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X9E X9 ALL " =~ " ${FLAVOR} " ]] ; then
@ -163,7 +163,7 @@ if [[ " X9E X9 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X9E -DHELI=YES -DLUA=YES -DGVARS=YES -DPPM_UNIT=PERCENT_PREC1 ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
@ -172,7 +172,7 @@ if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X10 -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
@ -181,7 +181,7 @@ if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X12S -DHELI=YES -DLUA=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " T12 ALL " =~ " ${FLAVOR} " ]] ; then
@ -190,7 +190,7 @@ if [[ " T12 ALL " =~ " ${FLAVOR} " ]] ; then
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
make -j${CORES} tests-radio
fi
if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
@ -198,4 +198,5 @@ if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
rm -rf *
cmake ${COMMON_OPTIONS} ${SRCDIR}
make -j${CORES}
make -j${CORES} tests
fi