Merge with latest 2.3
This commit is contained in:
@@ -98,6 +98,10 @@ cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRC
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
@@ -98,6 +98,10 @@ cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 -DINTERNAL_MODULE_MULTI=YES ${SRC
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=TX16S ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR}
|
||||
make -j${JOBS} libsimulator
|
||||
rm CMakeCache.txt
|
||||
|
||||
@@ -184,6 +184,24 @@ if [[ " X10 COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " T16 COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on T16 boards
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=X10 -DPCBREV=T16 -DHELI=YES -DLUA=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " TX16S COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on TX16S boards
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=X10 -DPCBREV=TX16S -DHELI=YES -DLUA=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " X12S COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X12S
|
||||
rm -rf ./*
|
||||
|
||||
Reference in New Issue
Block a user