Merge with latest 2.3

This commit is contained in:
Bertrand Songis
2019-11-07 15:04:45 +01:00
286 changed files with 9956 additions and 10363 deletions
+22
View File
@@ -40,45 +40,67 @@ cd build
cmake ${COMMON_OPTIONS} -DPCB=AR9X ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=SKY9X ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=9XRPRO ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X7 -DPCBREV=T12 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9D+ -DPCBREV=2019 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITE ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=XLITES ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X9E ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=T16 ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X10 -DPCBREV=EXPRESS ${SRCDIR}
make -j${JOBS} libsimulator
rm CMakeCache.txt
cmake ${COMMON_OPTIONS} -DPCB=X12S ${SRCDIR}
make -j${JOBS} libsimulator
+3
View File
@@ -50,6 +50,9 @@ make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X9LITE ${SRCDIR}
make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X9LITES ${SRCDIR}
make -j${JOBS} libsimulator
cmake ${COMMON_OPTIONS} -DPCB=X7 ${SRCDIR}
make -j${JOBS} libsimulator
+15
View File
@@ -61,6 +61,21 @@ boards = {
"SBUS": "NO",
"DEFAULT_MODE": "2",
},
"X9LITES": {
"PCB": "X9LITES",
"LUA": "NO_MODEL_SCRIPTS",
"GVARS": "YES",
"AUTOUPDATE": "YES",
"PXX1": "YES",
"XJT": "NO",
"MODULE_SIZE_STD": "NO",
"PPM": "NO",
"DSM2": "NO",
"MULTIMODULE": "NO",
"CROSSFIRE": "NO",
"SBUS": "NO",
"DEFAULT_MODE": "2",
},
"X9D+": {
"PCB": "X9D+",
"PCBREV": "2019",
+78
View File
@@ -0,0 +1,78 @@
#!/usr/bin/python3
import argparse
import datetime
import os
from builtins import NotADirectoryError
import shutil
import tempfile
boards = {
"T12": {
"PCB": "X7",
"PCBREV": "T12",
"DEFAULT_MODE": "2",
},
"T16": {
"PCB": "X10",
"PCBREV": "T16",
"INTERNAL_MODULE_MULTI": "YES",
"DEFAULT_MODE": "2",
}
}
translations = [
"EN",
]
def timestamp():
return datetime.datetime.now().strftime("%y%m%d")
def build(board, translation, srcdir):
cmake_options = " ".join(["-D%s=%s" % (key, value) for key, value in boards[board].items()])
cwd = os.getcwd()
if not os.path.exists("output"):
os.mkdir("output")
path = tempfile.mkdtemp()
os.chdir(path)
command = "cmake %s -DTRANSLATIONS=%s -DJUMPER_RELEASE=YES %s" % (cmake_options, translation, srcdir)
print(command)
os.system(command)
os.system("make firmware -j6")
os.chdir(cwd)
index = 0
while 1:
suffix = "" if index == 0 else "_%d" % index
filename = "output/firmware_%s_%s_%s%s.bin" % (board.lower(), translation.lower(), timestamp(), suffix)
if not os.path.exists(filename):
shutil.copy("%s/firmware.bin" % path, filename)
break
index += 1
shutil.rmtree(path)
def dir_path(string):
if os.path.isdir(string):
return string
else:
raise NotADirectoryError(string)
def main():
parser = argparse.ArgumentParser(description="Build JumperRC firmware")
parser.add_argument("-b", "--boards", action="append", help="Destination boards", required=True)
parser.add_argument("-t", "--translations", action="append", help="Translations", required=True)
parser.add_argument("srcdir", type=dir_path)
args = parser.parse_args()
for board in (boards.keys() if "ALL" in args.boards else args.boards):
for translation in (translations if "ALL" in args.translations else args.translations):
build(board, translation, args.srcdir)
if __name__ == "__main__":
main()
+23 -13
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,6 +91,15 @@ 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-radio
fi
if [[ " X9LITES ALL " =~ " ${FLAVOR} " ]] ; then
# OpenTX on X9LITES
rm -rf *
cmake ${COMMON_OPTIONS} -DPCB=X9LITES -DHELI=YES -DGVARS=YES ${SRCDIR}
make -j${CORES} ${FIRMARE_TARGET}
make -j${CORES} libsimulator
make -j${CORES} tests
fi
@@ -100,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
@@ -109,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
@@ -118,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
@@ -127,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
@@ -136,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
@@ -145,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
@@ -154,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
@@ -163,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
@@ -172,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
@@ -181,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
@@ -189,4 +198,5 @@ if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
rm -rf *
cmake ${COMMON_OPTIONS} ${SRCDIR}
make -j${CORES}
make -j${CORES} tests
fi
+77
View File
@@ -0,0 +1,77 @@
#!/bin/bash
set -e
set -x
workdir=/home/opentx/release23
output=/var/www/html/2.3/release
# Handle opentx.sdcard.version
sdcard_version="2.3V"$(grep 'set(SDCARD_REVISION' ${workdir}/code/CMakeLists.txt | grep -o '".*"' | sed 's/"//g')
echo ${sdcard_version} > ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version
echo ${sdcard_version} > ${workdir}/code/radio/sdcard/taranis-x9/opentx.sdcard.version
echo ${sdcard_version} > ${workdir}/code/radio/sdcard/taranis-x7/opentx.sdcard.version
if cmp --silent ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}/opentx.sdcard.version
then
exit
else
cd ${workdir}
# Copy git sdcard data
rm -Rf ${workdir}/sdcard
cp -r ${workdir}/code/radio/sdcard .
# Get images for Horus
mkdir -p ${workdir}/sdcard/horus/IMAGES
cp /home/opentx/horus-bitmaps/* ${workdir}/sdcard/horus/IMAGES/
# Request sound pack generation
if [[ ! -d /tmp/SOUNDS/fr ]];then
${workdir}/code/tools/release23/tts.py en csv files
fi
if [[ ! -d /tmp/SOUNDS/es ]];then
${workdir}/code/tools/release23/tts.py fr csv files
fi
if [[ ! -d /tmp/SOUNDS/it ]];then
${workdir}/code/tools/release23/tts.py es csv files
fi
if [[ ! -d /tmp/SOUNDS/de ]];then
${workdir}/code/tools/release23/tts.py it csv files
fi
if [[ ! -d /tmp/SOUNDS/cz ]];then
${workdir}/code/tools/release23/tts.py de csv files
fi
if [[ ! -d /tmp/SOUNDS/pl ]];then
${workdir}/code/tools/release23/tts.py cz csv files
fi
if [[ ! -d /tmp/SOUNDS/ru ]];then
${workdir}/code/tools/release23/tts.py pt csv files
fi
${workdir}/code/tools/release23/tts.py ru csv psv files
# Create sdcards.zips for supported platforms
mv /tmp/SOUNDS ${workdir}/sdcard/horus/
mkdir ${workdir}/sdcard/taranis-x9/SOUNDS
mkdir ${workdir}/sdcard/taranis-x7/SOUNDS
cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x9/
cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis-x7/
cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/sdcard-horus-${sdcard_version}.zip *
cd ${workdir}/sdcard/taranis-x9 && zip -r ${output}/sdcard/sdcard-taranis-x9-${sdcard_version}.zip *
cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip *
# Create symlinks for other radios
ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-taranis-xlite-${sdcard_version}.zip
ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-taranis-x9lite-${sdcard_version}.zip
ln -s ${output}/sdcard/sdcard-taranis-x7-${sdcard_version}.zip ${output}/sdcard/sdcard-jumper-t12-${sdcard_version}.zip
# remove LUA stuff for 9x platform
rm -Rf ${workdir}/sdcard/taranis-x7/SCRIPTS
rm -Rf ${workdir}/sdcard/taranis-x7/FrSky-utilities
cd ${workdir}/sdcard/taranis-x7 && zip -r ${output}/sdcard/sdcard-9xarm-${sdcard_version}.zip *
rm -Rf ${workdir}/sdcard
cp -r ${workdir}/code/radio/sdcard/horus/opentx.sdcard.version ${workdir}
fi
+152
View File
@@ -0,0 +1,152 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This script is a modified version to support Linux TTS fiel genration using PicoTTS
# Sound pack maintainers (incomplete list) by language alphabetical order
# Czech : Martin Hotar
# French : Bertrand Songis & André Bernet
# English : Rob Thompson & Martin Hotar
# German : Romolo Manfredini (Some corrections by Peer)
# Italian : Romolo Manfredini
# Portuguese : Romolo Manfredini
# Spanish : Romolo Manfredini (With the help of Jose Moreno)
# from __future__ import print_function
import os
import sys
import subprocess
import zipfile
from gtts import gTTS
from tts_common import *
board = "taranis"
reload(sys)
sys.setdefaultencoding('utf8')
SOURCE_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
lib_path = os.path.abspath(os.path.join(SOURCE_DIRECTORY, '..', '..', 'radio', 'util'))
sys.path.append(lib_path)
def generate(str, filename):
if 0:
output = "output.wav"
command = 'pico2wave -l=%s -w=%s "%s"' % (voice, output, str)
os.system(command.encode('utf-8'))
command = "sox %s -r 32000 %s reverse silence 1 0.1 0.1%% reverse" % (output, filename)
os.system(command.encode('utf-8'))
else:
output = u"output.mp3"
tts = gTTS(text=str, lang=voice[:2])
tts.save(output)
command = "sox --norm %s -r 32000 %s tempo 1.2" % (output, filename)
os.system(command.encode('utf-8'))
command = "rm -f output.mp3"
os.system(command.encode('utf-8'))
################################################################
if __name__ == "__main__":
if "en" in sys.argv:
from tts_en import systemSounds, sounds
directory = "en"
voice = "en-US"
elif "fr" in sys.argv:
from tts_fr import systemSounds, sounds
directory = "fr"
voice = "fr-FR"
elif "it" in sys.argv:
from tts_it import systemSounds, sounds
directory = "it"
voice = "it-IT"
elif "de" in sys.argv:
from tts_de import systemSounds, sounds
directory = "de"
voice = "de-DE"
elif "es" in sys.argv:
from tts_es import systemSounds, sounds
directory = "es"
voice = "es-ES"
elif "cz" in sys.argv:
from tts_cz import systemSounds, sounds
directory = "cz"
voice = "cs-CZ"
elif "ru" in sys.argv:
from tts_ru import systemSounds, sounds
directory = "ru"
voice = "ru-RU"
elif "pt" in sys.argv:
from tts_pt import systemSounds, sounds
directory = "pt"
voice = "pt-PT"
else:
print("which language?")
exit()
if "csv" in sys.argv:
path = "/tmp/SOUNDS/" + directory + "/SYSTEM/"
if not os.path.exists(path):
os.makedirs(path)
os.chdir(path)
with open("%s-%s.csv" % (voice, board), "wb") as csvFile:
for s, f in systemSounds:
if s and f:
l = u""
if board in ("sky9x", "taranis"):
l += u"SOUNDS/%s/SYSTEM;" % directory
l += f + u";" + s + u"\n"
csvFile.write(l.encode("utf-8"))
for s, f in sounds:
if s and f:
l = u""
if board in ("sky9x", "taranis"):
l += u"SOUNDS/%s;" % directory
l += f + u";" + s + u"\n"
csvFile.write(l.encode("utf-8"))
if "psv" in sys.argv:
path = "/tmp/SOUNDS/" + directory + "/"
if not os.path.exists(path):
os.makedirs(path)
os.chdir(path)
with open("%s-%s.psv" % (voice, board), "wb") as csvFile:
for s, f in systemSounds:
if s and f:
l = u"SYSTEM|" + f.replace(".wav", "") + u"|" + s + u"\r\n"
csvFile.write(l.encode("windows-1251"))
for s, f in sounds:
if s and f:
l = u"|" + f.replace(".wav", "") + u"|" + s + u"\r\n"
csvFile.write(l.encode("windows-1251"))
if "files" in sys.argv:
path = "/tmp/SOUNDS/" + directory + "/SYSTEM/"
if not os.path.exists(path):
os.makedirs(path)
os.chdir(path)
for s, f in systemSounds:
if s and f:
generate(s, f)
os.chdir("..")
for s, f in sounds:
if s and f:
generate(s, f)
+14
View File
@@ -0,0 +1,14 @@
NO_ALTERNATE = 1024
PROMPT_CUSTOM_BASE = 256
PROMPT_SYSTEM_BASE = 0
board = "taranis"
import sys
def filename(idx, alternate=0):
ext = ".wav"
if isinstance(idx, int):
result = "%04d%s" % (idx, ext)
elif board in ('sky9x', 'taranis'):
result = idx + ext
return result