From fc86f776104e4cdb89316ff6ac879f134bc0e3d9 Mon Sep 17 00:00:00 2001 From: rotorman Date: Sat, 15 May 2021 11:40:36 +0200 Subject: [PATCH 1/5] Build environment setup script for Ubuntu 20.04 --- tools/setup_buildenv_ubuntu20.04.sh | 127 ++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 tools/setup_buildenv_ubuntu20.04.sh diff --git a/tools/setup_buildenv_ubuntu20.04.sh b/tools/setup_buildenv_ubuntu20.04.sh new file mode 100644 index 000000000..47f33a974 --- /dev/null +++ b/tools/setup_buildenv_ubuntu20.04.sh @@ -0,0 +1,127 @@ +#! /usr/bin/env bash + +## Bash script to setup EdgeTX v2.4 development environment on Ubuntu 20.04. +## Let it run as normal user and when asked, give sudo credentials + +PAUSEAFTEREACHLINE="false" + +# Parse argument(s) +for arg in "$@" +do + if [[ $arg == "--pause" ]]; then + PAUSEAFTEREACHLINE="true" + fi +done + +if + [[ `lsb_release -rs` != "20.04" ]]; then + echo "ERROR: Not running on Ubuntu 20.04!" + echo "Terminating the script now." + exit 1 +fi + +echo "=== Step 1: Updating Ubuntu package lists. Please provide sudo credentials, when asked ===" +sudo apt-get -y update +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 2: Installing packages ===" +sudo apt-get -y install build-essential cmake gcc git lib32ncurses-dev lib32z1 libfox-1.6-dev libsdl1.2-dev qt5-default qtmultimedia5-dev qttools5-dev qttools5-dev-tools qtcreator libqt5svg5-dev software-properties-common wget zip python-pip-whl python-pil libgtest-dev python3-pip python3-tk python3-setuptools clang-7 python-clang-7 libusb-1.0-0-dev stlink-tools openocd libncurses5:i386 libpython2.7:i386 +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 3: Creating symbolic link for Python ===" +sudo ln -sf /usr/bin/python3 /usr/bin/python +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 4: Installing Python packages ===" +sudo python3 -m pip install filelock pillow clang future lxml +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 5: Fetching GNU Arm Embedded Toolchains ===" +# EdgeTX uses GNU Arm Embedded Toolchain in version 6-2017-q2 +wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 6: Unpacking GNU Arm Embedded Toolchains ===" +tar xjf gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 7: Removing the downloaded archives ===" +rm gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2 +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 8: Moving GNU Arm Embedded Toolchains to /opt ===" +sudo mv gcc-arm-none-eabi-6-2017-q2-update /opt/gcc-arm-none-eabi +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 9: Adding GNU Arm Embedded Toolchain to PATH of current user ===" +echo 'export PATH="/opt/gcc-arm-none-eabi/bin:$PATH"' >> ~/.bashrc +source ~/.bashrc +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 10: Removing modemmanager (conflicts with DFU) ===" +sudo apt-get -y remove modemmanager +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 11: Fetching USB DFU host utility ===" +wget http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 12: Unpacking USB DFU host utility ===" +tar xzvf dfu-util-0.9.tar.gz +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 13: Building and Installing USB DFU host utility ===" +cd dfu-util-0.9/ +./configure +make +sudo make install +cd .. +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." + read +fi + +echo "=== Step 14: Removing the downloaded archive and build folder of USB DFU host utility ===" +rm dfu-util-0.9.tar.gz +rm -rf dfu-util-0.9 +if [[ $PAUSEAFTEREACHLINE == "true" ]]; then + echo "Step finished." +fi + +echo "Finished setting up EdgeTX v2.4 development environment. Please reboot the computer." From 3b7d70cc9ceb833759672753df10d3348f528ba4 Mon Sep 17 00:00:00 2001 From: Risto Date: Sat, 15 May 2021 13:18:29 +0200 Subject: [PATCH 2/5] Pillow fixed to v7.2.0 --- tools/setup_buildenv_ubuntu20.04.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/setup_buildenv_ubuntu20.04.sh b/tools/setup_buildenv_ubuntu20.04.sh index 47f33a974..e014d4aff 100644 --- a/tools/setup_buildenv_ubuntu20.04.sh +++ b/tools/setup_buildenv_ubuntu20.04.sh @@ -42,7 +42,7 @@ if [[ $PAUSEAFTEREACHLINE == "true" ]]; then fi echo "=== Step 4: Installing Python packages ===" -sudo python3 -m pip install filelock pillow clang future lxml +sudo python3 -m pip install filelock pillow==7.2.0 clang future lxml if [[ $PAUSEAFTEREACHLINE == "true" ]]; then echo "Step finished. Please check the output above and press Enter to continue or Ctrl+C to stop." read From a81081c35a59c86077dddfffa9ec0c72b41ce1dd Mon Sep 17 00:00:00 2001 From: Risto Date: Sat, 15 May 2021 16:49:13 +0200 Subject: [PATCH 3/5] Furter -DLUA=OFF bugfix --- radio/src/gui/colorlcd/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/colorlcd/CMakeLists.txt b/radio/src/gui/colorlcd/CMakeLists.txt index d1271bda3..b7000a10e 100644 --- a/radio/src/gui/colorlcd/CMakeLists.txt +++ b/radio/src/gui/colorlcd/CMakeLists.txt @@ -64,7 +64,6 @@ set(GUI_SRC menu_screen.cpp screen_setup.cpp switch_warn_dialog.cpp - standalone_lua.cpp ) macro(add_gui_src src) @@ -74,6 +73,10 @@ macro(add_gui_src src) ) endmacro(add_gui_src) +if(LUA) + add_gui_src(standalone_lua.cpp) +endif() + if(HELI) add_gui_src(model_heli.cpp) endif() From ff0d5f5d75835fb18410ec1508ed6c82f9cadcca Mon Sep 17 00:00:00 2001 From: Risto Date: Mon, 24 May 2021 20:01:42 +0200 Subject: [PATCH 4/5] About logo changed to EdgeTX --- .../horus/THEMES/480_default/mask_edgetx.png | Bin 0 -> 3668 bytes .../sdcard/horus/THEMES/Darkblue/mask_edgetx.png | Bin 0 -> 3668 bytes radio/sdcard/horus/THEMES/Flexi/mask_edgetx.png | Bin 0 -> 3668 bytes .../sdcard/nv14/THEMES/Darkblue/mask_edgetx.png | Bin 0 -> 3668 bytes radio/sdcard/nv14/THEMES/FlySky/mask_edgetx.png | Bin 0 -> 3668 bytes radio/src/gui/colorlcd/themes/480_default.cpp | 2 +- radio/src/gui/colorlcd/themes/flysky.cpp | 2 +- 7 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 radio/sdcard/horus/THEMES/480_default/mask_edgetx.png create mode 100644 radio/sdcard/horus/THEMES/Darkblue/mask_edgetx.png create mode 100644 radio/sdcard/horus/THEMES/Flexi/mask_edgetx.png create mode 100644 radio/sdcard/nv14/THEMES/Darkblue/mask_edgetx.png create mode 100644 radio/sdcard/nv14/THEMES/FlySky/mask_edgetx.png diff --git a/radio/sdcard/horus/THEMES/480_default/mask_edgetx.png b/radio/sdcard/horus/THEMES/480_default/mask_edgetx.png new file mode 100644 index 0000000000000000000000000000000000000000..6331645e1ae354ee665021fb55df0d76c7be9bc7 GIT binary patch literal 3668 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 Date: Mon, 24 May 2021 20:22:25 +0200 Subject: [PATCH 5/5] Transparent PNG and main menu text About changed to EdgeTX as well. --- .../horus/THEMES/480_default/mask_edgetx.png | Bin 3668 -> 3740 bytes .../horus/THEMES/Darkblue/mask_edgetx.png | Bin 3668 -> 3740 bytes .../sdcard/horus/THEMES/Flexi/mask_edgetx.png | Bin 3668 -> 3740 bytes .../nv14/THEMES/Darkblue/mask_edgetx.png | Bin 3668 -> 3740 bytes .../sdcard/nv14/THEMES/FlySky/mask_edgetx.png | Bin 3668 -> 3740 bytes radio/src/gui/colorlcd/view_main_menu.cpp | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/sdcard/horus/THEMES/480_default/mask_edgetx.png b/radio/sdcard/horus/THEMES/480_default/mask_edgetx.png index 6331645e1ae354ee665021fb55df0d76c7be9bc7..84a7d97829e4626824dd1e3a6a46a472a0ec4b55 100644 GIT binary patch delta 1098 zcmV-Q1hxCr9Go4H83+ad008s-lvJ@HO$vVv*8l(w*8xH(n|J^K1Pe(-K~#90wN_au zu3Z#f_{f|gbB5dyE=Yz9DN$S~W5!$vkto~{kqcuXTp&Y~Opzg?+{lnAMUp8)To^)< zp-ksL&(iz$zK;L&|DEqV_4Vzwhxgfgt!J&h6+eEWs;Y`UK0ZhaRaI3gC@7%e;bDK; z+uIZSOiWBDEG&#nO-;qQCnqN~Ffc%8XJ@3Lp+WBM?i3dnM`~(nG&eU#3kwVM6@h_) zq(B4Y@9*!jK`aFM(9jS~Oiake%F4=UW@d&Q931$=k&%(~{QNAAx3#s=%E}5gHa61y z{5*gEE3~z>Kgk93_4Sdbr{^ydf%t#;cuGu6q~hXY+Su5jii!&A?(U}C+*~G3PEMxE z%1WA=nxf|BW>Qg6p`T6_*ZceXQ&(4)XzS|g%E{~N>&eK-h}*8Nu2fW1B#xPxnNdJM z0A*!mQCeCWt*)-p)zua4?(Xtm*YE7?@LB;iH8p>7^2^Ih zdU$x?ww0CDw;sTb0i0IqYCSzY+S=Nph=>TWZ)s^sY-8@}>8WVHyu8TCTU%Sn*Vp%3 zQUStAEiEm{!oq@dbaeQHo12>~w2_e!)`}of0p8x;G&(ve>ywd}l$3~W2Ot~)V`F2q zzP?V&%gby-%}_S9(B9ro85w^W6dN1Mia$6w;5mr90BkNMCPuVFLqp}{h@%v6jez6h zV@@fYHYq8Iva_?fAHsWjdg82TYHH#>XJ=>1&(G(7;k4J+*EBsnEq>3=&hC@^?(UBM z4ak7sK}$=E!`0BxKsPrxq_3~f@fQHmN`)&0lfzZp+uOe-`3eIA1I~W{X>4&)DY1b4 z{e3z*IudPUlDWD0C;8;$BxPo1{x5PbFE1J&AE%U*6godY=RQYAN7e-jh=7ZW3(j$* zCE()XB8FG->u3KvP-1&}dMG$Jn9DOVAtxt?1qh(Xp!f*H*c8ezLM4)igoJR4NKso` zE33(agM*~5t}fa_R-k`I7Zw&$d3ib89UUFK87Lox1Z7wNbm8RWB-%_4<>4nqe}BKs z#$}?Zsrju3Q0r%BXK8V9k?r*KboPW$=>Vi=YHF%%-5OTtu5C8lgnvwq)RNwMrKP3h=jSJz6BQN3_Xgf|Ky`IBS4C*xAJ5B QR{#J207*qoM6N<$f_(WF@Bjb+ delta 1025 zcmV+c1pfP+9n>6<83+OZ004ZS0|T)kO$vVt5&!@T5&_cPe*6Fc1H(x~K~#90tyNhl ztx**I@sl}2=5X>tcpw=vq(t$cj2ZJFW1{eaEAn70ga=m~Q8LRAQC?)olp@L0K|C0e zPNGxB`<;K?yU)3Y?#;P(J@D=Iuk-D_*ZS7l{QLWRU0vPV+Z*@GG&MC#N=nAY#twfE z4{2#(VG$V_X=!Om0cU4tLqkIs7Z*A@I$mC0iHV6?T3U;Xi_6Q)oRWovgz)$W_Se@} z=0zyjM@L7er>B{-s;X*!e%{&H85A)wF*2Eq{GFYh>+9>St*uK-OW;vv*VotQ*3Lqi37b91wqnHhkmr)ODN89A-2tb&7s^YZdCGcz|fHg0Zi4h|0BFDfc}d3iB6 zH^;_UK0ZED{Qmwvf(bV?G$`1wudg2-9sum@>{M=mQ{b;mF!C4~8SU=wMn``~({gon zl>h?H&(8@zJv}MdJ32Z70s^?tjLvIoYina;V_;x_lkV*7pq}I7CdTAC8=wnwo!~pAQdei|db!jI_12Vd>`PR$N@{>gtMnV0n9cJ2y8+ zzZHo@a(1ay`Y{`j(5G3_)6@Gdn2P_KU@A^IJ1)4lxA!TRvYD8eKte3bIJLdKy>h_O z(b37t31JTp4{K{{Is44aOm1%OU)g8`;Dd z9v;@#)+S7f!t^LDEv>Gu1{RCO*eM|)0gZz>L18T|EhsW!IlD+O#y&VW$S{VNuCA`i z4KQ;S78X`kR)DjzvT%P7>R3)tZAL~0i~L$<$S~%hDAeul?(Y8nJ~=s={7z0zXi4Qr zb=YB0OLup7R8$o6Ac45Fv9a-gV2Anp`$MCwR~#H1AQhDuHQ7ld%55l-NHCmLx=c;> zrluy=@!sCvo12@QFb6|JL*wG&{)ru25G7#@VW=B@gck}+JOgdm%+b+NO?HR`WAgd= znGl^4t diff --git a/radio/sdcard/horus/THEMES/Darkblue/mask_edgetx.png b/radio/sdcard/horus/THEMES/Darkblue/mask_edgetx.png index 6331645e1ae354ee665021fb55df0d76c7be9bc7..84a7d97829e4626824dd1e3a6a46a472a0ec4b55 100644 GIT binary patch delta 1098 zcmV-Q1hxCr9Go4H83+ad008s-lvJ@HO$vVv*8l(w*8xH(n|J^K1Pe(-K~#90wN_au zu3Z#f_{f|gbB5dyE=Yz9DN$S~W5!$vkto~{kqcuXTp&Y~Opzg?+{lnAMUp8)To^)< zp-ksL&(iz$zK;L&|DEqV_4Vzwhxgfgt!J&h6+eEWs;Y`UK0ZhaRaI3gC@7%e;bDK; z+uIZSOiWBDEG&#nO-;qQCnqN~Ffc%8XJ@3Lp+WBM?i3dnM`~(nG&eU#3kwVM6@h_) zq(B4Y@9*!jK`aFM(9jS~Oiake%F4=UW@d&Q931$=k&%(~{QNAAx3#s=%E}5gHa61y z{5*gEE3~z>Kgk93_4Sdbr{^ydf%t#;cuGu6q~hXY+Su5jii!&A?(U}C+*~G3PEMxE z%1WA=nxf|BW>Qg6p`T6_*ZceXQ&(4)XzS|g%E{~N>&eK-h}*8Nu2fW1B#xPxnNdJM z0A*!mQCeCWt*)-p)zua4?(Xtm*YE7?@LB;iH8p>7^2^Ih zdU$x?ww0CDw;sTb0i0IqYCSzY+S=Nph=>TWZ)s^sY-8@}>8WVHyu8TCTU%Sn*Vp%3 zQUStAEiEm{!oq@dbaeQHo12>~w2_e!)`}of0p8x;G&(ve>ywd}l$3~W2Ot~)V`F2q zzP?V&%gby-%}_S9(B9ro85w^W6dN1Mia$6w;5mr90BkNMCPuVFLqp}{h@%v6jez6h zV@@fYHYq8Iva_?fAHsWjdg82TYHH#>XJ=>1&(G(7;k4J+*EBsnEq>3=&hC@^?(UBM z4ak7sK}$=E!`0BxKsPrxq_3~f@fQHmN`)&0lfzZp+uOe-`3eIA1I~W{X>4&)DY1b4 z{e3z*IudPUlDWD0C;8;$BxPo1{x5PbFE1J&AE%U*6godY=RQYAN7e-jh=7ZW3(j$* zCE()XB8FG->u3KvP-1&}dMG$Jn9DOVAtxt?1qh(Xp!f*H*c8ezLM4)igoJR4NKso` zE33(agM*~5t}fa_R-k`I7Zw&$d3ib89UUFK87Lox1Z7wNbm8RWB-%_4<>4nqe}BKs z#$}?Zsrju3Q0r%BXK8V9k?r*KboPW$=>Vi=YHF%%-5OTtu5C8lgnvwq)RNwMrKP3h=jSJz6BQN3_Xgf|Ky`IBS4C*xAJ5B QR{#J207*qoM6N<$f_(WF@Bjb+ delta 1025 zcmV+c1pfP+9n>6<83+OZ004ZS0|T)kO$vVt5&!@T5&_cPe*6Fc1H(x~K~#90tyNhl ztx**I@sl}2=5X>tcpw=vq(t$cj2ZJFW1{eaEAn70ga=m~Q8LRAQC?)olp@L0K|C0e zPNGxB`<;K?yU)3Y?#;P(J@D=Iuk-D_*ZS7l{QLWRU0vPV+Z*@GG&MC#N=nAY#twfE z4{2#(VG$V_X=!Om0cU4tLqkIs7Z*A@I$mC0iHV6?T3U;Xi_6Q)oRWovgz)$W_Se@} z=0zyjM@L7er>B{-s;X*!e%{&H85A)wF*2Eq{GFYh>+9>St*uK-OW;vv*VotQ*3Lqi37b91wqnHhkmr)ODN89A-2tb&7s^YZdCGcz|fHg0Zi4h|0BFDfc}d3iB6 zH^;_UK0ZED{Qmwvf(bV?G$`1wudg2-9sum@>{M=mQ{b;mF!C4~8SU=wMn``~({gon zl>h?H&(8@zJv}MdJ32Z70s^?tjLvIoYina;V_;x_lkV*7pq}I7CdTAC8=wnwo!~pAQdei|db!jI_12Vd>`PR$N@{>gtMnV0n9cJ2y8+ zzZHo@a(1ay`Y{`j(5G3_)6@Gdn2P_KU@A^IJ1)4lxA!TRvYD8eKte3bIJLdKy>h_O z(b37t31JTp4{K{{Is44aOm1%OU)g8`;Dd z9v;@#)+S7f!t^LDEv>Gu1{RCO*eM|)0gZz>L18T|EhsW!IlD+O#y&VW$S{VNuCA`i z4KQ;S78X`kR)DjzvT%P7>R3)tZAL~0i~L$<$S~%hDAeul?(Y8nJ~=s={7z0zXi4Qr zb=YB0OLup7R8$o6Ac45Fv9a-gV2Anp`$MCwR~#H1AQhDuHQ7ld%55l-NHCmLx=c;> zrluy=@!sCvo12@QFb6|JL*wG&{)ru25G7#@VW=B@gck}+JOgdm%+b+NO?HR`WAgd= znGl^4t diff --git a/radio/sdcard/horus/THEMES/Flexi/mask_edgetx.png b/radio/sdcard/horus/THEMES/Flexi/mask_edgetx.png index 6331645e1ae354ee665021fb55df0d76c7be9bc7..84a7d97829e4626824dd1e3a6a46a472a0ec4b55 100644 GIT binary patch delta 1098 zcmV-Q1hxCr9Go4H83+ad008s-lvJ@HO$vVv*8l(w*8xH(n|J^K1Pe(-K~#90wN_au zu3Z#f_{f|gbB5dyE=Yz9DN$S~W5!$vkto~{kqcuXTp&Y~Opzg?+{lnAMUp8)To^)< zp-ksL&(iz$zK;L&|DEqV_4Vzwhxgfgt!J&h6+eEWs;Y`UK0ZhaRaI3gC@7%e;bDK; z+uIZSOiWBDEG&#nO-;qQCnqN~Ffc%8XJ@3Lp+WBM?i3dnM`~(nG&eU#3kwVM6@h_) zq(B4Y@9*!jK`aFM(9jS~Oiake%F4=UW@d&Q931$=k&%(~{QNAAx3#s=%E}5gHa61y z{5*gEE3~z>Kgk93_4Sdbr{^ydf%t#;cuGu6q~hXY+Su5jii!&A?(U}C+*~G3PEMxE z%1WA=nxf|BW>Qg6p`T6_*ZceXQ&(4)XzS|g%E{~N>&eK-h}*8Nu2fW1B#xPxnNdJM z0A*!mQCeCWt*)-p)zua4?(Xtm*YE7?@LB;iH8p>7^2^Ih zdU$x?ww0CDw;sTb0i0IqYCSzY+S=Nph=>TWZ)s^sY-8@}>8WVHyu8TCTU%Sn*Vp%3 zQUStAEiEm{!oq@dbaeQHo12>~w2_e!)`}of0p8x;G&(ve>ywd}l$3~W2Ot~)V`F2q zzP?V&%gby-%}_S9(B9ro85w^W6dN1Mia$6w;5mr90BkNMCPuVFLqp}{h@%v6jez6h zV@@fYHYq8Iva_?fAHsWjdg82TYHH#>XJ=>1&(G(7;k4J+*EBsnEq>3=&hC@^?(UBM z4ak7sK}$=E!`0BxKsPrxq_3~f@fQHmN`)&0lfzZp+uOe-`3eIA1I~W{X>4&)DY1b4 z{e3z*IudPUlDWD0C;8;$BxPo1{x5PbFE1J&AE%U*6godY=RQYAN7e-jh=7ZW3(j$* zCE()XB8FG->u3KvP-1&}dMG$Jn9DOVAtxt?1qh(Xp!f*H*c8ezLM4)igoJR4NKso` zE33(agM*~5t}fa_R-k`I7Zw&$d3ib89UUFK87Lox1Z7wNbm8RWB-%_4<>4nqe}BKs z#$}?Zsrju3Q0r%BXK8V9k?r*KboPW$=>Vi=YHF%%-5OTtu5C8lgnvwq)RNwMrKP3h=jSJz6BQN3_Xgf|Ky`IBS4C*xAJ5B QR{#J207*qoM6N<$f_(WF@Bjb+ delta 1025 zcmV+c1pfP+9n>6<83+OZ004ZS0|T)kO$vVt5&!@T5&_cPe*6Fc1H(x~K~#90tyNhl ztx**I@sl}2=5X>tcpw=vq(t$cj2ZJFW1{eaEAn70ga=m~Q8LRAQC?)olp@L0K|C0e zPNGxB`<;K?yU)3Y?#;P(J@D=Iuk-D_*ZS7l{QLWRU0vPV+Z*@GG&MC#N=nAY#twfE z4{2#(VG$V_X=!Om0cU4tLqkIs7Z*A@I$mC0iHV6?T3U;Xi_6Q)oRWovgz)$W_Se@} z=0zyjM@L7er>B{-s;X*!e%{&H85A)wF*2Eq{GFYh>+9>St*uK-OW;vv*VotQ*3Lqi37b91wqnHhkmr)ODN89A-2tb&7s^YZdCGcz|fHg0Zi4h|0BFDfc}d3iB6 zH^;_UK0ZED{Qmwvf(bV?G$`1wudg2-9sum@>{M=mQ{b;mF!C4~8SU=wMn``~({gon zl>h?H&(8@zJv}MdJ32Z70s^?tjLvIoYina;V_;x_lkV*7pq}I7CdTAC8=wnwo!~pAQdei|db!jI_12Vd>`PR$N@{>gtMnV0n9cJ2y8+ zzZHo@a(1ay`Y{`j(5G3_)6@Gdn2P_KU@A^IJ1)4lxA!TRvYD8eKte3bIJLdKy>h_O z(b37t31JTp4{K{{Is44aOm1%OU)g8`;Dd z9v;@#)+S7f!t^LDEv>Gu1{RCO*eM|)0gZz>L18T|EhsW!IlD+O#y&VW$S{VNuCA`i z4KQ;S78X`kR)DjzvT%P7>R3)tZAL~0i~L$<$S~%hDAeul?(Y8nJ~=s={7z0zXi4Qr zb=YB0OLup7R8$o6Ac45Fv9a-gV2Anp`$MCwR~#H1AQhDuHQ7ld%55l-NHCmLx=c;> zrluy=@!sCvo12@QFb6|JL*wG&{)ru25G7#@VW=B@gck}+JOgdm%+b+NO?HR`WAgd= znGl^4t diff --git a/radio/sdcard/nv14/THEMES/Darkblue/mask_edgetx.png b/radio/sdcard/nv14/THEMES/Darkblue/mask_edgetx.png index 6331645e1ae354ee665021fb55df0d76c7be9bc7..84a7d97829e4626824dd1e3a6a46a472a0ec4b55 100644 GIT binary patch delta 1098 zcmV-Q1hxCr9Go4H83+ad008s-lvJ@HO$vVv*8l(w*8xH(n|J^K1Pe(-K~#90wN_au zu3Z#f_{f|gbB5dyE=Yz9DN$S~W5!$vkto~{kqcuXTp&Y~Opzg?+{lnAMUp8)To^)< zp-ksL&(iz$zK;L&|DEqV_4Vzwhxgfgt!J&h6+eEWs;Y`UK0ZhaRaI3gC@7%e;bDK; z+uIZSOiWBDEG&#nO-;qQCnqN~Ffc%8XJ@3Lp+WBM?i3dnM`~(nG&eU#3kwVM6@h_) zq(B4Y@9*!jK`aFM(9jS~Oiake%F4=UW@d&Q931$=k&%(~{QNAAx3#s=%E}5gHa61y z{5*gEE3~z>Kgk93_4Sdbr{^ydf%t#;cuGu6q~hXY+Su5jii!&A?(U}C+*~G3PEMxE z%1WA=nxf|BW>Qg6p`T6_*ZceXQ&(4)XzS|g%E{~N>&eK-h}*8Nu2fW1B#xPxnNdJM z0A*!mQCeCWt*)-p)zua4?(Xtm*YE7?@LB;iH8p>7^2^Ih zdU$x?ww0CDw;sTb0i0IqYCSzY+S=Nph=>TWZ)s^sY-8@}>8WVHyu8TCTU%Sn*Vp%3 zQUStAEiEm{!oq@dbaeQHo12>~w2_e!)`}of0p8x;G&(ve>ywd}l$3~W2Ot~)V`F2q zzP?V&%gby-%}_S9(B9ro85w^W6dN1Mia$6w;5mr90BkNMCPuVFLqp}{h@%v6jez6h zV@@fYHYq8Iva_?fAHsWjdg82TYHH#>XJ=>1&(G(7;k4J+*EBsnEq>3=&hC@^?(UBM z4ak7sK}$=E!`0BxKsPrxq_3~f@fQHmN`)&0lfzZp+uOe-`3eIA1I~W{X>4&)DY1b4 z{e3z*IudPUlDWD0C;8;$BxPo1{x5PbFE1J&AE%U*6godY=RQYAN7e-jh=7ZW3(j$* zCE()XB8FG->u3KvP-1&}dMG$Jn9DOVAtxt?1qh(Xp!f*H*c8ezLM4)igoJR4NKso` zE33(agM*~5t}fa_R-k`I7Zw&$d3ib89UUFK87Lox1Z7wNbm8RWB-%_4<>4nqe}BKs z#$}?Zsrju3Q0r%BXK8V9k?r*KboPW$=>Vi=YHF%%-5OTtu5C8lgnvwq)RNwMrKP3h=jSJz6BQN3_Xgf|Ky`IBS4C*xAJ5B QR{#J207*qoM6N<$f_(WF@Bjb+ delta 1025 zcmV+c1pfP+9n>6<83+OZ004ZS0|T)kO$vVt5&!@T5&_cPe*6Fc1H(x~K~#90tyNhl ztx**I@sl}2=5X>tcpw=vq(t$cj2ZJFW1{eaEAn70ga=m~Q8LRAQC?)olp@L0K|C0e zPNGxB`<;K?yU)3Y?#;P(J@D=Iuk-D_*ZS7l{QLWRU0vPV+Z*@GG&MC#N=nAY#twfE z4{2#(VG$V_X=!Om0cU4tLqkIs7Z*A@I$mC0iHV6?T3U;Xi_6Q)oRWovgz)$W_Se@} z=0zyjM@L7er>B{-s;X*!e%{&H85A)wF*2Eq{GFYh>+9>St*uK-OW;vv*VotQ*3Lqi37b91wqnHhkmr)ODN89A-2tb&7s^YZdCGcz|fHg0Zi4h|0BFDfc}d3iB6 zH^;_UK0ZED{Qmwvf(bV?G$`1wudg2-9sum@>{M=mQ{b;mF!C4~8SU=wMn``~({gon zl>h?H&(8@zJv}MdJ32Z70s^?tjLvIoYina;V_;x_lkV*7pq}I7CdTAC8=wnwo!~pAQdei|db!jI_12Vd>`PR$N@{>gtMnV0n9cJ2y8+ zzZHo@a(1ay`Y{`j(5G3_)6@Gdn2P_KU@A^IJ1)4lxA!TRvYD8eKte3bIJLdKy>h_O z(b37t31JTp4{K{{Is44aOm1%OU)g8`;Dd z9v;@#)+S7f!t^LDEv>Gu1{RCO*eM|)0gZz>L18T|EhsW!IlD+O#y&VW$S{VNuCA`i z4KQ;S78X`kR)DjzvT%P7>R3)tZAL~0i~L$<$S~%hDAeul?(Y8nJ~=s={7z0zXi4Qr zb=YB0OLup7R8$o6Ac45Fv9a-gV2Anp`$MCwR~#H1AQhDuHQ7ld%55l-NHCmLx=c;> zrluy=@!sCvo12@QFb6|JL*wG&{)ru25G7#@VW=B@gck}+JOgdm%+b+NO?HR`WAgd= znGl^4t diff --git a/radio/sdcard/nv14/THEMES/FlySky/mask_edgetx.png b/radio/sdcard/nv14/THEMES/FlySky/mask_edgetx.png index 6331645e1ae354ee665021fb55df0d76c7be9bc7..84a7d97829e4626824dd1e3a6a46a472a0ec4b55 100644 GIT binary patch delta 1098 zcmV-Q1hxCr9Go4H83+ad008s-lvJ@HO$vVv*8l(w*8xH(n|J^K1Pe(-K~#90wN_au zu3Z#f_{f|gbB5dyE=Yz9DN$S~W5!$vkto~{kqcuXTp&Y~Opzg?+{lnAMUp8)To^)< zp-ksL&(iz$zK;L&|DEqV_4Vzwhxgfgt!J&h6+eEWs;Y`UK0ZhaRaI3gC@7%e;bDK; z+uIZSOiWBDEG&#nO-;qQCnqN~Ffc%8XJ@3Lp+WBM?i3dnM`~(nG&eU#3kwVM6@h_) zq(B4Y@9*!jK`aFM(9jS~Oiake%F4=UW@d&Q931$=k&%(~{QNAAx3#s=%E}5gHa61y z{5*gEE3~z>Kgk93_4Sdbr{^ydf%t#;cuGu6q~hXY+Su5jii!&A?(U}C+*~G3PEMxE z%1WA=nxf|BW>Qg6p`T6_*ZceXQ&(4)XzS|g%E{~N>&eK-h}*8Nu2fW1B#xPxnNdJM z0A*!mQCeCWt*)-p)zua4?(Xtm*YE7?@LB;iH8p>7^2^Ih zdU$x?ww0CDw;sTb0i0IqYCSzY+S=Nph=>TWZ)s^sY-8@}>8WVHyu8TCTU%Sn*Vp%3 zQUStAEiEm{!oq@dbaeQHo12>~w2_e!)`}of0p8x;G&(ve>ywd}l$3~W2Ot~)V`F2q zzP?V&%gby-%}_S9(B9ro85w^W6dN1Mia$6w;5mr90BkNMCPuVFLqp}{h@%v6jez6h zV@@fYHYq8Iva_?fAHsWjdg82TYHH#>XJ=>1&(G(7;k4J+*EBsnEq>3=&hC@^?(UBM z4ak7sK}$=E!`0BxKsPrxq_3~f@fQHmN`)&0lfzZp+uOe-`3eIA1I~W{X>4&)DY1b4 z{e3z*IudPUlDWD0C;8;$BxPo1{x5PbFE1J&AE%U*6godY=RQYAN7e-jh=7ZW3(j$* zCE()XB8FG->u3KvP-1&}dMG$Jn9DOVAtxt?1qh(Xp!f*H*c8ezLM4)igoJR4NKso` zE33(agM*~5t}fa_R-k`I7Zw&$d3ib89UUFK87Lox1Z7wNbm8RWB-%_4<>4nqe}BKs z#$}?Zsrju3Q0r%BXK8V9k?r*KboPW$=>Vi=YHF%%-5OTtu5C8lgnvwq)RNwMrKP3h=jSJz6BQN3_Xgf|Ky`IBS4C*xAJ5B QR{#J207*qoM6N<$f_(WF@Bjb+ delta 1025 zcmV+c1pfP+9n>6<83+OZ004ZS0|T)kO$vVt5&!@T5&_cPe*6Fc1H(x~K~#90tyNhl ztx**I@sl}2=5X>tcpw=vq(t$cj2ZJFW1{eaEAn70ga=m~Q8LRAQC?)olp@L0K|C0e zPNGxB`<;K?yU)3Y?#;P(J@D=Iuk-D_*ZS7l{QLWRU0vPV+Z*@GG&MC#N=nAY#twfE z4{2#(VG$V_X=!Om0cU4tLqkIs7Z*A@I$mC0iHV6?T3U;Xi_6Q)oRWovgz)$W_Se@} z=0zyjM@L7er>B{-s;X*!e%{&H85A)wF*2Eq{GFYh>+9>St*uK-OW;vv*VotQ*3Lqi37b91wqnHhkmr)ODN89A-2tb&7s^YZdCGcz|fHg0Zi4h|0BFDfc}d3iB6 zH^;_UK0ZED{Qmwvf(bV?G$`1wudg2-9sum@>{M=mQ{b;mF!C4~8SU=wMn``~({gon zl>h?H&(8@zJv}MdJ32Z70s^?tjLvIoYina;V_;x_lkV*7pq}I7CdTAC8=wnwo!~pAQdei|db!jI_12Vd>`PR$N@{>gtMnV0n9cJ2y8+ zzZHo@a(1ay`Y{`j(5G3_)6@Gdn2P_KU@A^IJ1)4lxA!TRvYD8eKte3bIJLdKy>h_O z(b37t31JTp4{K{{Is44aOm1%OU)g8`;Dd z9v;@#)+S7f!t^LDEv>Gu1{RCO*eM|)0gZz>L18T|EhsW!IlD+O#y&VW$S{VNuCA`i z4KQ;S78X`kR)DjzvT%P7>R3)tZAL~0i~L$<$S~%hDAeul?(Y8nJ~=s={7z0zXi4Qr zb=YB0OLup7R8$o6Ac45Fv9a-gV2Anp`$MCwR~#H1AQhDuHQ7ld%55l-NHCmLx=c;> zrluy=@!sCvo12@QFb6|JL*wG&{)ru25G7#@VW=B@gck}+JOgdm%+b+NO?HR`WAgd= znGl^4t diff --git a/radio/src/gui/colorlcd/view_main_menu.cpp b/radio/src/gui/colorlcd/view_main_menu.cpp index 94caf8507..f848df105 100644 --- a/radio/src/gui/colorlcd/view_main_menu.cpp +++ b/radio/src/gui/colorlcd/view_main_menu.cpp @@ -98,7 +98,7 @@ ViewMainMenu::ViewMainMenu(Window* parent) : return 0; }); - carousel->addButton(ICON_OPENTX, "About\nOpenTx", [=]() -> uint8_t { + carousel->addButton(ICON_OPENTX, "About\nEdgeTX", [=]() -> uint8_t { deleteLater(); //TODO: new AboutUs(); return 0;