Skip to content

Commit d088782

Browse files
authored
Merge pull request #45 from ExpressLRS/semver-version
Share one package version across the tools
2 parents a47079c + 4750c4c commit d088782

3 files changed

Lines changed: 11 additions & 2 deletions

File tree

‎src/SCRIPTS/ELRS/version.lua‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---------------------------------------------------------------------------
2+
-- Package Version --
3+
-- "dev" in the source tree; release builds write the semver version --
4+
-- (or a short commit hash) here. --
5+
---------------------------------------------------------------------------
6+
7+
return "dev"

‎src/SCRIPTS/TOOLS/ExpressLRS/main.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
---- # Unified tool for BW and color LCD radios (EdgeTX 2.11.6+/2.12.1+) #
99
---- #########################################################################
1010

11-
local VERSION = "r3"
1211
local useLvgl = (lvgl ~= nil)
1312

1413
---@diagnostic disable-next-line: need-check-nil
1514
local loader = loadScript("/SCRIPTS/ELRS/loader.lua")()
1615

16+
local VERSION = loader("/SCRIPTS/ELRS/version.lua")
17+
1718
local crsf = loader("/SCRIPTS/ELRS/crsf.lua")
1819
local params = loader("/SCRIPTS/ELRS/crsf_params.lua", crsf)
1920
local CRSFSession = loader("/SCRIPTS/ELRS/crsf_session.lua", crsf, params)

‎src/SCRIPTS/TOOLS/ExpressLRSBind/main.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html #
55
---- #########################################################################
66

7-
local VERSION = "r1"
87
local useLvgl = (lvgl ~= nil)
98

109
---@diagnostic disable-next-line: need-check-nil
1110
local loader = loadScript("/SCRIPTS/ELRS/loader.lua")()
1211

12+
local VERSION = loader("/SCRIPTS/ELRS/version.lua")
13+
1314
local crsf = loader("/SCRIPTS/ELRS/crsf.lua")
1415
local msp = loader("/SCRIPTS/ELRS/msp.lua", crsf)
1516
local defer = loader("/SCRIPTS/ELRS/defer.lua")

0 commit comments

Comments
 (0)