Merge branch '2.3' into 3djc/2.3-synced

# Conflicts:
#	radio/src/pulses/pulses.cpp
This commit is contained in:
3djc
2021-01-26 11:22:58 +01:00
88 changed files with 1164 additions and 141 deletions
+6 -1
View File
@@ -9,6 +9,11 @@ import tempfile
boards = {
"TLITE": {
"PCB": "X7",
"PCBREV": "TLITE",
"DEFAULT_MODE": "2",
},
"T12": {
"PCB": "X7",
"PCBREV": "T12",
@@ -53,7 +58,7 @@ def build(board, translation, srcdir):
command = "cmake %s -DTRANSLATIONS=%s -DJUMPER_RELEASE=YES %s" % (cmake_options, translation, srcdir)
print(command)
os.system(command)
os.system("make firmware -j6")
os.system("make firmware -j16")
os.chdir(cwd)
index = 0
while 1:
+18
View File
@@ -148,6 +148,24 @@ if [[ " T8 X7 ALL " =~ \ ${FLAVOR}\ ]] ; then
make -j"${CORES}" tests-radio
fi
if [[ " TLITE X7 ALL " =~ \ ${FLAVOR}\ ]] ; then
# OpenTX on TLITE
rm -rf ./*
cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=TLITE -DHELI=YES -DGVARS=YES "${SRCDIR}"
make -j"${CORES}" ${FIRMARE_TARGET}
make -j"${CORES}" libsimulator
make -j"${CORES}" tests-radio
fi
if [[ " TX12 X7 ALL " =~ \ ${FLAVOR}\ ]] ; then
# OpenTX on TX12
rm -rf ./*
cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=TX12 -DHELI=YES -DGVARS=YES "${SRCDIR}"
make -j"${CORES}" ${FIRMARE_TARGET}
make -j"${CORES}" libsimulator
make -j"${CORES}" tests-radio
fi
if [[ " XLITE ALL " =~ \ ${FLAVOR}\ ]] ; then
# OpenTX on X-Lite
rm -rf ./*