Merge master elrs.lua changes

Author: CapnBry

src/lua/elrsV3.lua

@@ -6,10 +6,10 @@
 ---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html               #
 ---- #                                                                       #
 ---- #########################################################################
-local EXITVER = "-- EXIT (Lua r15) --"
+local EXITVER = "-- EXIT (Lua r16) --"
 local deviceId = 0xEE
 local handsetId = 0xEF
-local deviceName = "Loading..."
+local deviceName = nil
 local lineIndex = 1
 local pageOffset = 0
 local edit = nil
@@ -572,7 +572,7 @@ local function refreshNext(skipPush)
   elseif time > fieldTimeout and fields_count ~= 0 then
     if #loadQ > 0 then
       crossfireTelemetryPush(0x2C, { deviceId, handsetId, loadQ[#loadQ], fieldChunk })
-      fieldTimeout = time + 500 -- 5s
+      fieldTimeout = time + (deviceIsELRS_TX and 50 or 500) -- 0.5s for local / 5s for remote devices
     end
   end
 
@@ -895,7 +895,10 @@ local function checkCrsfModule()
   for modIdx = 0, 1 do
     local mod = model.getModule(modIdx)
     if mod and (mod.Type == nil or mod.Type == 5) then
-      -- CRSF found
+      -- CRSF found, put module type in Loading message
+      local modDescrip = (mod.Type == nil) and " awaiting" or (modIdx == 0) and " Internal" or " External"
+      -- Prefix with "Lua rXXX" from between EXITVER parens
+      deviceName = string.match(EXITVER, "%((.*)%)") .. modDescrip .. " TX..."
       checkCrsfModule = nil
       return 0
     end