Mirror/edgetx
1
0
Fork 0
mirror of https://github.com/EdgeTX/edgetx.git synced 2025-07-24 00:35:14 +03:00
Code Activity

Housekeeping start

Browse source
This commit is contained in:
3djc 2019-11-12 18:10:56 +01:00
parent 1ae3f14dab
commit 810cdc366f
6 changed files with 0 additions and 305 deletions
Download patch file Download diff file Expand all files Collapse all files

27
radio/util/Dockerfile
View file

@ -1,27 +0,0 @@
# An Debian image for compiling OpenTX 2.2
FROM debian:stretch
RUN DEBIAN_FRONTEND=noninteractive apt-get -y update
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install build-essential cmake gcc git lib32ncurses5 lib32z1 libfox-1.6-dev libsdl1.2-dev \
qt5-default qtmultimedia5-dev qttools5-dev qttools5-dev-tools libqt5svg5-dev \
software-properties-common wget zip python-pip python-pil libgtest-dev
RUN python -m pip install filelock
RUN wget -q https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \
tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2 && \
mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi
#RUN wget -q http://ftp.de.debian.org/debian/pool/main/m/mpclib/libmpc2_0.9-4_amd64.deb && \
# dpkg -i libmpc2_0.9-4_amd64.deb
VOLUME ["/opentx"]
ENV PATH $PATH:/opt/gcc-arm-none-eabi/bin:/opentx/code/radio/util
ARG OPENTX_VERSION_SUFFIX=
ENV OPENTX_VERSION_SUFFIX ${OPENTX_VERSION_SUFFIX}
WORKDIR /build

74
radio/util/lua/lua_old_event_check.lua
View file

@ -1,74 +0,0 @@
local toolName = "TNS|LUA event tests|TNE"
---- #########################################################################
---- # #
---- # Copyright (C) OpenTX #
-----# #
---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html #
---- # #
---- # This program is free software; you can redistribute it and/or modify #
---- # it under the terms of the GNU General Public License version 2 as #
---- # published by the Free Software Foundation. #
---- # #
---- # This program is distributed in the hope that it will be useful #
---- # but WITHOUT ANY WARRANTY; without even the implied warranty of #
---- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
---- # GNU General Public License for more details. #
---- # #
---- #########################################################################
local virtual_next = 0
local virtual_previous = 0
local virtual_next_rept = 0
local virtual_previous_rept = 0
local virtual_page_next = 0
local virtual_page_previous = 0
local virtual_enter = 0
local virtual_enter_long = 0
local virtual_menu = 0
local virtual_menu_long = 0
-- Init
local function init()
end
-- Main
local function run(event)
if event == nil then
error("Cannot be run as a model script!")
return 2
elseif event == EVT_VIRTUAL_EXIT then
return 2
elseif event == EVT_PLUS_FIRST then
virtual_next = virtual_next + 1
elseif event == EVT_MINUS_FIRST then
virtual_previous = virtual_previous + 1
elseif event == EVT_PLUS_REPT then
virtual_next_rept = virtual_next_rept + 1
elseif event == EVT_MINUS_REPT then
virtual_previous_rept = virtual_previous_rept + 1
elseif event == EVT_PAGE_BREAK then
virtual_page_next = virtual_page_next +1
elseif event == EVT_PAGE_LONG then
virtual_page_previous = virtual_page_previous + 1
killEvents(event);
elseif event == EVT_ENTER_BREAK then
virtual_enter = virtual_enter + 1
elseif event == EVT_MENU_BREAK then
virtual_menu = virtual_menu + 1
end
lcd.clear()
lcd.drawScreenTitle("LUA EVENT TEST", 0, 0)
lcd.drawText(1, 10, "PLUS: "..virtual_next)
lcd.drawText(1, 20, "MINUS: "..virtual_previous)
lcd.drawText(1, 40, "PLUS_REPT: "..virtual_next_rept)
lcd.drawText(1, 50, "MINUS_REPT: "..virtual_previous_rept)
lcd.drawText(LCD_W/2, 10, "ENTER: "..virtual_enter)
lcd.drawText(LCD_W/2, 20, "MENU: "..virtual_menu)
lcd.drawText(LCD_W/2, 40, "NEXT_PAGE: "..virtual_page_next)
lcd.drawText(LCD_W/2, 50, "PREVIOUS_PAGE: "..virtual_page_previous)
return 0
end
return { init=init, run=run }

0
radio/util/add-issue-links.py → tools/add-issue-links.py
View file

79
tools/nightly23/build-nightly.sh
View file

@ -1,79 +0,0 @@
#!/bin/bash
set -e
branch=2.3.0
docker=nightly23
workdir=/home/opentx/nightly23
output=/var/www/html/2.3/nightlies
version=2.3.0
echo "Increment nightly index"
index=`cat index.txt`
index=`expr $index + 1`
suffix="N$index"
cd ${workdir}
echo "Create on-demand build environment"
cp code/radio/util/Dockerfile .
docker build -t new-${docker} --build-arg OPENTX_VERSION_SUFFIX=${suffix} .
docker rmi -f ${docker} || true
docker tag new-${docker} ${docker}
docker rmi -f new-${docker}
echo "Call sdcard generation"
code/tools/nightly23/build-sdcard.sh
echo "Delete companion container in case of previous failed atempt"
if [ "$(docker ps -aq -f name=companion)" ]; then
docker rm --force companion
fi
echo "Build firmware stamps"
docker run -dit --name companion -v /home/opentx/${docker}:/opentx ${docker}
docker exec companion sh -c "mkdir -p build && cd build && cmake /opentx/code && cp radio/src/stamp.h /opentx/binaries/stamp-opentx.txt"
cp -f ${workdir}/binaries/stamp-opentx.txt ${output}/firmware
# These radios are currently not enabled
# echo "#define BLOCK \"x10,x12s\"" >> ${output}/firmware/stamp-opentx.txt
echo "#define ERROR \"MOVE_TO_RELEASE\"" >> ${output}/firmware/stamp-opentx.txt
docker exec companion rm -rf build
echo "Check if Linux companion is needed"
if [ ! -f ${output}/companion/linux/companion23_${version}${suffix}_amd64.deb ]; then
echo "Build Linux companion"
docker exec companion /opentx/code/tools/build-companion-nightly.sh /opentx/code /opentx/binaries/ ${suffix}
cp -f binaries/*.deb ${output}/companion/linux/companion23_${version}${suffix}_amd64.deb
fi
docker stop companion
docker rm companion
echo "Check if Windows companion is needed"
if [ ! -f ${output}/companion/windows/companion-windows-${version}${suffix}.exe ]; then
echo "Build Windows companion"
cd ${output}/companion/windows
wget --tries=1 --read-timeout=6000 -O- http://winbox.open-tx.org/companion-builds/compile23.php?branch=$branch\&suffix=${suffix}
wget -O companion-windows-${version}${suffix}.exe http://winbox.open-tx.org/companion-builds/companion-windows-${version}${suffix}.exe
chmod -Rf g+w companion-windows-${version}${suffix}.exe
fi
echo "Check if Macosc companion is needed"
if [ ! -f ${output}/companion/macosx/opentx-companion-${version}${suffix}.dmg ]; then
echo "Build Macosx companion"
cd ${output}/companion/macosx
wget --tries=1 -qO- http://opentx.blinkt.de:8080/~opentx/build-opentx.py?branch=${branch}\&suffix=${suffix}
wget -O opentx-companion-${version}${suffix}.dmg http://opentx.blinkt.de:8080/~opentx/builds/opentx-companion-${version}${suffix}.dmg
chmod -Rf g+w opentx-companion-${version}${suffix}.dmg
fi
echo "Update Companion stamps"
echo "#define VERSION \"${version}${suffix}\"" > ${output}/companion/companion-windows.stamp
cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-linux.stamp
cp -f ${output}/companion/companion-windows.stamp ${output}/companion/companion-macosx.stamp
echo "Clean binaries It will be hosting built on demand firmware"
rm -rf ${workdir}/binaries/*
rm -rf ${workdir}/binaries/.lock
echo "Release $index successfully completed"
echo $index > ${workdir}/index.txt

77
tools/nightly23/build-sdcard.sh
View file

@ -1,77 +0,0 @@
#!/bin/bash
set -e
set -x
workdir=/home/opentx/nightly23
output=/var/www/html/2.3/nightlies
# 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/nightly23/tts.py en csv files
fi
if [[ ! -d /tmp/SOUNDS/es ]];then
${workdir}/code/tools/nightly23/tts.py fr csv files
fi
if [[ ! -d /tmp/SOUNDS/it ]];then
${workdir}/code/tools/nightly23/tts.py es csv files
fi
if [[ ! -d /tmp/SOUNDS/de ]];then
${workdir}/code/tools/nightly23/tts.py it csv files
fi
if [[ ! -d /tmp/SOUNDS/cz ]];then
${workdir}/code/tools/nightly23/tts.py de csv files
fi
if [[ ! -d /tmp/SOUNDS/pl ]];then
${workdir}/code/tools/nightly23/tts.py cz csv files
fi
if [[ ! -d /tmp/SOUNDS/ru ]];then
${workdir}/code/tools/nightly23/tts.py pt csv files
fi
${workdir}/code/tools/nightly23/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
ln -s ${output}/sdcard/sdcard-horus-${sdcard_version}.zip ${output}/sdcard/sdcard-jumper-t16-${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

48
tools/nightly23/build-sdcard.sh.winbox
View file

@ -1,48 +0,0 @@
#!/bin/bash
set -e
branch=2.3
workdir=/home/opentx/nightly23
output=/var/www/html/2.3/nightly
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
wget -qO- http://winbox.open-tx.org/voice-builds/compile23.php?branch=${branch}
# Get sounds
cd sdcard
wget http://winbox.open-tx.org/voice-builds/english-irish-taranis.zip
wget http://winbox.open-tx.org/voice-builds/english-scottish-taranis.zip
wget http://winbox.open-tx.org/voice-builds/english-american-taranis.zip
wget http://winbox.open-tx.org/voice-builds/english-australian-taranis.zip
wget http://winbox.open-tx.org/voice-builds/french-taranis.zip
# Prepare the sdcard zip files for Horus
unzip english-irish-taranis.zip -d ${workdir}/sdcard/horus
mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/horus/SOUNDS/en-irish
unzip english-scottish-taranis.zip -d ${workdir}/sdcard/horus
mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/horus/SOUNDS/en-scottish
unzip english-australian-taranis.zip -d ${workdir}/sdcard/horus
mv ${workdir}/sdcard/horus/SOUNDS/en ${workdir}/sdcard/horus/SOUNDS/en-australian
unzip english-american-taranis -d ${workdir}/sdcard/horus
unzip french-taranis.zip -d ${workdir}/sdcard/horus
wget -O ${workdir}/sdcard/horus/SOUNDS/en/english.csv http://winbox.open-tx.org/voice-builds/english-american-taranis.csv
wget -O ${workdir}/sdcard/horus/SOUNDS/fr/french.csv http://winbox.open-tx.org/voice-builds/french-taranis.csv
# Duplicate for Taranis and create sdcards.zip
mkdir ${workdir}/sdcard/taranis/SOUNDS
cp -r ${workdir}/sdcard/horus/SOUNDS ${workdir}/sdcard/taranis/
rm -f ${workdir}/sdcard/*.zip
cd ${workdir}/sdcard/taranis && zip -r ${output}/sdcard/sdcard-taranis.zip *
cd ${workdir}/sdcard/horus && zip -r ${output}/sdcard/sdcard-horus.zip *
rm -Rf ${workdir}/sdcard