Merge from 2.3
This commit is contained in:
Executable
+47
@@ -0,0 +1,47 @@
|
||||
#!/usr/bin/env python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
import re
|
||||
|
||||
|
||||
if len(sys.argv) > 1:
|
||||
inputFile = sys.argv[1]
|
||||
inp = open(inputFile, "r")
|
||||
else:
|
||||
inp = sys.stdin
|
||||
|
||||
pattern = re.compile("#\d+")
|
||||
while True:
|
||||
skip = False
|
||||
line = inp.readline()
|
||||
if len(line) == 0:
|
||||
break
|
||||
line = line.strip('\r\n')
|
||||
|
||||
if len(line) == 0:
|
||||
skip = True
|
||||
if line.startswith("<"):
|
||||
skip = True
|
||||
if line.startswith("["):
|
||||
skip = True
|
||||
|
||||
if not skip:
|
||||
# line = line.strip()
|
||||
# print("line: %s" % line)
|
||||
found = re.findall(pattern, line)
|
||||
if len(found) > 0:
|
||||
for issue in found:
|
||||
line = line.replace(issue, '')
|
||||
# add issues
|
||||
issue_links = ["<a href=https://github.com/opentx/opentx/issues/%d>#%d</a>" % (int(issue[1:]), int(issue[1:])) for issue in found]
|
||||
links = "(" + ", ".join(issue_links) + ")"
|
||||
line = "<li>" + line + " " + links + "</li>"
|
||||
|
||||
print(line)
|
||||
|
||||
|
||||
inp.close()
|
||||
sys.exit(0)
|
||||
@@ -14,6 +14,12 @@ boards = {
|
||||
"PCBREV": "T12",
|
||||
"DEFAULT_MODE": "2",
|
||||
},
|
||||
"T12PRO": {
|
||||
"PCB": "X7",
|
||||
"PCBREV": "T12",
|
||||
"INTERNAL_MODULE_MULTI": "YES",
|
||||
"DEFAULT_MODE": "2",
|
||||
},
|
||||
"T16": {
|
||||
"PCB": "X10",
|
||||
"PCBREV": "T16",
|
||||
|
||||
+124
-124
@@ -5,12 +5,12 @@ set -e
|
||||
set -x
|
||||
|
||||
# Allow variable core usage, default uses all cpu cores, to set 8 cores for example : commit-tests.sh -j8
|
||||
num_cpus=`grep 'physical id' /proc/cpuinfo | sort -u | wc -l`
|
||||
: ${CORES:=$num_cpus}
|
||||
num_cpus=$(grep 'physical id' /proc/cpuinfo | sort -u | wc -l)
|
||||
: "${CORES:=$num_cpus}"
|
||||
# Default build treats warnings as errors, set -Wno-error to override, e.g.: commit-tests.sh -Wno-error
|
||||
: ${WERROR:=1}
|
||||
: "${WERROR:=1}"
|
||||
# A board name to build for, or ALL
|
||||
: ${FLAVOR:=ALL}
|
||||
: "${FLAVOR:=ALL}"
|
||||
|
||||
for i in "$@"
|
||||
do
|
||||
@@ -40,7 +40,7 @@ else
|
||||
SCRIPT=$(readlink -f "$0")
|
||||
fi
|
||||
|
||||
if [[ ! -z ${GCC_ARM} ]] ; then
|
||||
if [[ -n ${GCC_ARM} ]] ; then
|
||||
export PATH=${GCC_ARM}:$PATH
|
||||
fi
|
||||
|
||||
@@ -58,145 +58,145 @@ COMMON_OPTIONS+=${EXTRA_OPTIONS}
|
||||
mkdir build || true
|
||||
cd build
|
||||
|
||||
if [[ " SKY9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " SKY9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on Sky9x
|
||||
rm -rf *
|
||||
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-radio
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " AR9X ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " AR9X ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on AR9X
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=AR9X -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=AR9X -DHELI=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " 9XRPRO ARM9X ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " 9XRPRO ARM9X ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on Sky9x
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=9XRPRO -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=9XRPRO -DHELI=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " X9LITE ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " X9LITE ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X9LITE
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X9LITE -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
rm -rf ./*
|
||||
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
|
||||
if [[ " X9LITES X9LITE 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
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X7 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " X7 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X7
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=X7 -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=X7 -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 *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=XLITE -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
fi
|
||||
|
||||
if [[ " XLITES ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on X-Lites
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} -DPCB=XLITES -DHELI=YES -DGVARS=YES ${SRCDIR}
|
||||
make -j${CORES} ${FIRMARE_TARGET}
|
||||
make -j${CORES} libsimulator
|
||||
make -j${CORES} tests-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D X9 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on X9D
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D+ X9 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on X9D+
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D+2019 X9 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on X9D+ 2019
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9E X9 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on Taranis X9E
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X10 HORUS ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on X10 boards
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X12S HORUS ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
# OpenTX on Horus
|
||||
rm -rf *
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " T12 ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " T12 X7 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on T12
|
||||
rm -rf *
|
||||
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-radio
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " DEFAULT ALL " =~ " ${FLAVOR} " ]] ; then
|
||||
if [[ " XLITE ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X-Lite
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=XLITE -DHELI=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " XLITES XLITE ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X-Lites
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" -DPCB=XLITES -DHELI=YES -DGVARS=YES "${SRCDIR}"
|
||||
make -j"${CORES}" ${FIRMARE_TARGET}
|
||||
make -j"${CORES}" libsimulator
|
||||
make -j"${CORES}" tests-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D X9 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X9D
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D+ X9 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X9D+
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9D+2019 X9 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X9D+ 2019
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X9E X9 ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on Taranis X9E
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X10 COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X10 boards
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " X12S COLORLCD ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# OpenTX on X12S
|
||||
rm -rf ./*
|
||||
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-radio
|
||||
fi
|
||||
|
||||
if [[ " COMPANION ALL " =~ \ ${FLAVOR}\ ]] ; then
|
||||
# Companion
|
||||
rm -rf *
|
||||
cmake ${COMMON_OPTIONS} ${SRCDIR}
|
||||
make -j${CORES}
|
||||
make -j${CORES} tests
|
||||
rm -rf ./*
|
||||
cmake "${COMMON_OPTIONS}" "${SRCDIR}"
|
||||
make -j"${CORES}" companion23 simulator23
|
||||
make -j"${CORES}" tests-companion
|
||||
fi
|
||||
|
||||
@@ -1,77 +0,0 @@
|
||||
#!/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
|
||||
@@ -1,152 +0,0 @@
|
||||
#!/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)
|
||||
@@ -1,14 +0,0 @@
|
||||
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
|
||||
Reference in New Issue
Block a user