Commit Graph
117 Commits
Author SHA1 Message Date
ddad99eab1 feat: Add PR number to version string on PR builds (#1887)
* Add PR number to version string

* Testing another way

* Decide according to GitHub ref type how to parse and where to output.
Prioritize EDGETX_VERSION_TAG, if set, else resort to EDGETX_VERSION_SUFFIX, if set.
Adjust also firmware_version and boot_version strings and adjist bootloader title.

* Consider also B/W.

* B&W: omit GIT SHA if tagged, otherwise own line
Omit GIT SHA from version string if a tagged version.
Otherwise, show on own line since is too long for 128x64 B&W displays.

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
2022-04-25 11:42:19 +10:00
Peter Feerick 2a3fc748bb feat: Better indicate release and development versions via version suffix (#1850)
* Add codename to version string and to bootloader title.

* Use EDGETX_VERSION_SUFFIX instead of CODENAME

* use "dev" instead of "merge" and "custom" instead of "SB".
Changed to lower case for "nightly" and "release".

* Show TEST BUILD warning screen for all non release builds.

* Improved logic

* Removed TEST_BUILD_WARNING, reverted to "merge" and changed to "selfbuild".
2022-04-24 14:26:56 +10:00
Peter Feerick 65a016aa7a Add custom targets for simulator and simu 2022-04-23 18:23:25 +10:00
Raphael Coeffic 969c04e815 Cleanup and allow for setting ARM_TOOLCHAIN_DIR via command line 2022-04-01 08:56:25 +02:00
Raphael Coeffic 69b88d7a68 Use make natively to avoid issue with job server 2022-04-01 08:56:25 +02:00
Raphael Coeffic 8a5b4b2473 Pass CMAKE_BUILD_TYPE to sub-cmake 2022-04-01 08:56:25 +02:00
Raphael Coeffic baa4f65d9b Use ExternalPoject_Add() to split by toolchain 2022-04-01 08:56:25 +02:00
Raphael Coeffic 1b87b6acea Bump dev version 2022-03-25 11:35:48 +01:00
Stephen Mose AaskovandGitHub 2593bef711 Make compilation on M1 Macs work (#1383) 2022-01-21 20:02:37 +10:00
Raphael Coeffic e8deb4e03f Bump major version 2021-12-20 11:11:26 +01:00
Peter FeerickandGitHub 8fa1d91e65 SD Card version cleanup + update more OTX references (#1194)
* Remove references to `REQUIRED_SDCARD_VERSION`

* EdgeTX, not OpenTX

* Alignment
2021-12-07 20:48:36 +11:00
Raphael Coeffic b3da777251 Bumped version to 2.6.0-dev 2021-09-21 08:42:21 +02:00
Peter FeerickandGitHub 47dac14b2f Add codename define, update radio version screens and tweak companion (#747)
* Add codename deffine and update all radio version screens

* Move string, make const and formatting

* Missed parentheses around version number

* Add codename to Companion

* Replace edge-tx.org with edgetx.org

* Change EdgeTX website http links to https
Also consistent URL

* Update copyright string
Leave second version for future years
2021-09-18 20:35:31 +10:00
Raphael Coeffic a17a02c541 Compute SDKROOT and use it 2021-09-16 12:05:41 +02:00
Raphael Coeffic 118fc26374 WiP Windows build workflow 2021-09-13 11:13:08 +02:00
Peter Feerick 86cfd14b6e Summarise the main project cmake policy settings 2021-08-06 15:18:58 +10:00
Raphael CoefficandRaphael Coeffic a2b8b4ecba Bump cmake minimum required version to 3.13 2021-08-04 16:23:33 +02:00
Raphael Coeffic 648514dc50 Updated version for next release 2021-07-20 13:42:54 +02:00
Raphael CoefficandRaphael Coeffic a33b114ae4 Shrink fonts 2021-05-21 22:33:01 +02:00
Raphael Coeffic 2f5b522413 Merge branch '2.3' into 2.4 2021-05-16 12:55:21 +02:00
c06b789f5c Multi module config support (#8438)
* Multi module configuration

Co-authored-by: Pascal Langer <pascal_langer@yahoo.fr>
2021-05-05 15:46:29 +02:00
3djc 70d24506da Merge branch '2.3' into 2.4
# Conflicts:
#	radio/src/fonts/480x272/font_dblsize.png
#	radio/src/fonts/480x272/font_xxlsize.png
#	radio/src/gui/128x64/model_setup.cpp
#	radio/src/gui/128x64/radio_setup.cpp
#	radio/src/gui/480x272/model_receiver_options.cpp
#	radio/src/gui/480x272/model_setup.cpp
#	radio/src/gui/480x272/radio_calibration.cpp
#	radio/src/gui/480x272/radio_hardware.cpp
#	radio/src/gui/common/stdlcd/draw_functions.cpp
#	radio/src/gui/gui_common.cpp
#	radio/src/keys.h
#	radio/src/lua/interface.cpp
#	radio/src/pulses/afhds3.h
#	radio/src/rtos.h
#	radio/src/switches.cpp
#	radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
#	radio/src/targets/horus/CMakeLists.txt
#	radio/src/targets/horus/lcd_driver.cpp
#	radio/src/targets/horus/startup_stm32f42_43xxx.s
#	radio/src/targets/taranis/CMakeLists.txt
#	radio/src/telemetry/crossfire.h
#	radio/src/telemetry/multi.cpp
#	radio/src/translations.cpp
#	radio/src/translations/it.h.txt
#	radio/src/translations/untranslated.h
#	radio/util/font2png.py
#	tools/commit-tests.sh
2021-04-08 11:42:28 +02:00
3djc 48907600ef Fix quad wiz and bump SDCard 2021-01-20 08:30:25 +01:00
Bertrand Songis a02bf3aa0c Merge with latest 2.3 2021-01-12 17:16:15 +01:00
3djc 070f81e528 Move nightlies to 2.3.12 2021-01-10 11:20:11 +01:00
3djc d6c64bce46 Update SDCard 2020-12-07 10:19:25 +01:00
Bertrand Songis 42a3198568 Merge with latest 2.3 2020-10-07 21:01:45 +02:00
3djc 6f212c08b9 New nighlies are 2.3.11 2020-10-07 12:11:36 +02:00
3djc 5ec01f90cf Bump SDCard for release 2020-10-04 08:24:26 +02:00
3djc 8a4af2abba Bump SDcard version 2020-10-01 09:26:26 +02:00
3djc 2889f69654 Update multi scripts 2020-09-17 08:38:21 +02:00
3djc f3cdf28d46 Bump SD version in prep for 2.3.10 2020-09-16 13:50:00 +02:00
3djcandGitHub 40a5e2f030 Flexi theme (#7841)
"Flexi" Theme
2020-07-31 16:22:41 +02:00
3djc 6d29faa48b Version increment (we probably forgot it a t 2.3.9 release) 2020-06-22 13:11:54 +02:00
Bertrand Songis 71ec1db9f6 Merge with latest 2.3 2020-06-18 11:14:07 +02:00
Bertrand Songis d4e11966cd Bump to 2.3.9 2020-06-14 18:42:22 +02:00
3djc fb61452671 Fix wrong mix order in quad wizard 2020-06-02 07:57:41 +02:00
Bertrand Songis bddccb9765 Merge with latest 2.3 2020-05-30 11:57:03 +02:00
3djcandGitHub e68662764f Battcheck fixes (#7602)
Battcheck reviewed
2020-05-22 19:55:04 +02:00
3djc 463607e838 Increment SD version 2020-04-24 17:32:46 +02:00
Bertrand Songis bb3dd95acc Bump to 2.3.8 2020-03-28 11:01:33 +01:00
Bertrand Songis 8b080683eb 2.3.7 preparation 2020-03-28 09:36:29 +01:00
Bertrand Songis 6878ae4a9f Merge with latest 2.3 2020-03-05 10:43:01 +01:00
3djc ecb21a3df3 Trigger new Sd card version 2020-01-31 11:15:38 +01:00
3djc 152a702faa Post 2.3.5 2020-01-15 17:40:13 +01:00
3djc 979cd7b719 Move nightlies to 2.3.5 2019-12-24 08:57:51 +01:00
3djc b60300b609 Move nightlies to 2.3.4 2019-12-21 09:36:23 +01:00
Bertrand Songis 6cab260ee6 Merge with latest 2.3 2019-12-13 12:30:02 +01:00
3djc f7f67744e7 Bump SDCard version for Horus Batt widget 2019-12-07 08:43:21 +01:00
Bertrand Songis 4c484017a4 Merge from 2.3 2019-12-05 09:29:11 +01:00