Use new OpenTX Tools screen / Add Menu / Use Virtual Events

.gitignore

@@ -45,3 +45,4 @@ luac.out
 #directories
 tmp
 obj
+.vscode

src/SCRIPTS/FUNCTIONS/pids.lua

@@ -1,4 +1,4 @@
-SCRIPT_HOME = "/SCRIPTS/BF"
+SCRIPT_HOME = "/SCRIPTS/TOOLS/BF"
 
 assert(loadScript(SCRIPT_HOME.."/MSP/messages.lua"))()
 

src/SCRIPTS/TELEMETRY/bf.lua

@@ -1,4 +1,4 @@
-SCRIPT_HOME = "/SCRIPTS/BF"
+SCRIPT_HOME = "/SCRIPTS/TOOLS/BF"
 
 apiVersion = 0
 

src/SCRIPTS/TOOLS/BF/HORUS/horuspre.lua

@@ -0,0 +1,17 @@
+PageFiles =
+{
+    { title = "PIDs 1", script = "pids1.lua"},
+    { title = "PIDs 2", script = "pids2.lua"},
+    { title = "Rates", script = "rates.lua"},
+    { title = "Advanced PIDs", script = "pid_advanced.lua"},
+    { title = "Filters", script = "filters.lua"},
+    { title = "vTX Settings", script = "vtx.lua"},
+    { title = "Gyro / Motor", script = "pwm.lua"},
+    { title = "Rx", script = "rx.lua"},
+    { title = "GPS Rescue", script = "rescue.lua", requiredVersion = 1.041},
+    { title = "GPS PIDs", script = "gpspids.lua", requiredVersion = 1.041},
+}
+
+MenuBox = { x=120, y=100, w=200, x_offset=68, h_line=20, h_offset=6 }
+SaveBox = { x=120, y=100, w=180, x_offset=12, h=60, h_offset=12 }
+NoTelem = {   192,   LCD_H - 28, "No Telemetry", TEXT_COLOR + INVERS + BLINK }

src/SCRIPTS/BF/MSP/messages.lua → src/SCRIPTS/TOOLS/BF/MSP/messages.lua

@@ -1,85 +1,85 @@
-MSP_PID_FORMAT = {
-   read           = 112, -- MSP_PID
-   write          = 202, -- MSP_SET_PID
-   minBytes       = 8,
-   fields = {
-      -- P
-      { vals = { 1 } },
-      { vals = { 4 } },
-      { vals = { 7 } },
-      -- I
-      { vals = { 2 } },
-      { vals = { 5 } },
-      { vals = { 8 } },
-      -- D
-      { vals = { 3 } },
-      { vals = { 6 } },
-   },
-}
-
-MSP_PID_ADVANCED_FORMAT = {
-   read           = 94, -- MSP_PID_ADVANCED
-   write          = 95, -- MSP_SET_PID_ADVANCED
-   minBytes       = 23,
-   fields = {
-	  -- weight
-      { vals = { 10 }, scale = 100 },
-	  -- transition
-      { vals = { 9 }, scale = 100 },
-   },
-}
-
-local INTRO_DELAY = 1600
-local READOUT_DELAY = 500
-
-function extractMspValues(cmd, rx_buf, msgFormat, msgValues)
-    if cmd == nil or rx_buf == nil then
-        return
-    end
-    if cmd ~= msgFormat.read then
-        return
-    end
-    if #(rx_buf) > 0 then
-        msgValues.raw = {}
-        for i=1,#(rx_buf) do
-            msgValues.raw[i] = rx_buf[i]
-        end
-
-		msgValues.values = {}
-        for i=1,#(msgFormat.fields) do
-            if (#(msgValues.raw) or 0) >= msgFormat.minBytes then
-               local f = msgFormat.fields[i]
-               if f.vals then
-                  local value = 0;
-                  for idx=1, #(f.vals) do
-                     local raw_val = msgValues.raw[f.vals[idx]]
-                     raw_val = bit32.lshift(raw_val, (idx-1)*8)
-                     value = bit32.bor(value, raw_val)
-                  end
-                  msgValues.values[i] = value/(f.scale or 1)
-               end
-            end
-        end
-    end
-end
-
-function readoutMsp(msgFormat, msg)
-    local t = getTime()
-    if msg.lastTrigger == nil or msg.lastTrigger + INTRO_DELAY <= t then
-        playFile(msg.intro)
-        msg.lastTrigger = t
-    elseif msg.reqTS == nil or msg.reqTS + READOUT_DELAY <= t then
-        protocol.mspRead(msgFormat.read)
-        msg.reqTS = t
-    else
-        local cmd, rx_buf = mspPollReply()
-        extractMspValues(cmd, rx_buf, msgFormat, msg)
-        if msg.raw then
-            for i=1,#(msg.readoutValues) do
-                playNumber(msg.values[msg.readoutValues[i]], 0)
-            end
-            msg.raw = nil
-        end
-    end
-    mspProcessTxQ()
-end
+MSP_PID_FORMAT = {
+   read           = 112, -- MSP_PID
+   write          = 202, -- MSP_SET_PID
+   minBytes       = 8,
+   fields = {
+      -- P
+      { vals = { 1 } },
+      { vals = { 4 } },
+      { vals = { 7 } },
+      -- I
+      { vals = { 2 } },
+      { vals = { 5 } },
+      { vals = { 8 } },
+      -- D
+      { vals = { 3 } },
+      { vals = { 6 } },
+   },
+}
+
+MSP_PID_ADVANCED_FORMAT = {
+   read           = 94, -- MSP_PID_ADVANCED
+   write          = 95, -- MSP_SET_PID_ADVANCED
+   minBytes       = 23,
+   fields = {
+	  -- weight
+      { vals = { 10 }, scale = 100 },
+	  -- transition
+      { vals = { 9 }, scale = 100 },
+   },
+}
+
+local INTRO_DELAY = 1600
+local READOUT_DELAY = 500
+
+function extractMspValues(cmd, rx_buf, msgFormat, msgValues)
+    if cmd == nil or rx_buf == nil then
+        return
+    end
+    if cmd ~= msgFormat.read then
+        return
+    end
+    if #(rx_buf) > 0 then
+        msgValues.raw = {}
+        for i=1,#(rx_buf) do
+            msgValues.raw[i] = rx_buf[i]
+        end
+
+		msgValues.values = {}
+        for i=1,#(msgFormat.fields) do
+            if (#(msgValues.raw) or 0) >= msgFormat.minBytes then
+               local f = msgFormat.fields[i]
+               if f.vals then
+                  local value = 0;
+                  for idx=1, #(f.vals) do
+                     local raw_val = msgValues.raw[f.vals[idx]]
+                     raw_val = bit32.lshift(raw_val, (idx-1)*8)
+                     value = bit32.bor(value, raw_val)
+                  end
+                  msgValues.values[i] = value/(f.scale or 1)
+               end
+            end
+        end
+    end
+end
+
+function readoutMsp(msgFormat, msg)
+    local t = getTime()
+    if msg.lastTrigger == nil or msg.lastTrigger + INTRO_DELAY <= t then
+        playFile(msg.intro)
+        msg.lastTrigger = t
+    elseif msg.reqTS == nil or msg.reqTS + READOUT_DELAY <= t then
+        protocol.mspRead(msgFormat.read)
+        msg.reqTS = t
+    else
+        local cmd, rx_buf = mspPollReply()
+        extractMspValues(cmd, rx_buf, msgFormat, msg)
+        if msg.raw then
+            for i=1,#(msg.readoutValues) do
+                playNumber(msg.values[msg.readoutValues[i]], 0)
+            end
+            msg.raw = nil
+        end
+    end
+    mspProcessTxQ()
+end

src/SCRIPTS/TOOLS/BF/NV14/nv14pre.lua

@@ -0,0 +1,17 @@
+PageFiles =
+{
+    { title = "PIDs 1", script = "pids1.lua"},
+    { title = "PIDs 2", script = "pids2.lua"},
+    { title = "Rates", script = "rates.lua"},
+    { title = "Advanced PIDs", script = "pid_advanced.lua"},
+    { title = "Filters", script = "filters.lua"},
+    { title = "vTX Settings", script = "vtx.lua"},
+    { title = "Gyro / Motor", script = "pwm.lua"},
+    { title = "Rx", script = "rx.lua"},
+    { title = "GPS Rescue", script = "rescue.lua", requiredVersion = 1.041},
+    { title = "GPS PIDs", script = "gpspids.lua", requiredVersion = 1.041},
+}
+
+MenuBox = { x= (LCD_W -200)/2, y=LCD_H/2, w=200, x_offset=68, h_line=20, h_offset=6 }
+SaveBox = { x= (LCD_W -200)/2, y=LCD_H/2, w=180, x_offset=12, h=60, h_offset=12 }
+NoTelem = { LCD_W/2 - 50, LCD_H - 28, "No Telemetry", TEXT_COLOR + INVERS + BLINK }

src/SCRIPTS/TOOLS/BF/X7/x7pre.lua

@@ -0,0 +1,16 @@
+PageFiles = 
+{
+    { title = "vTX Settings", script = "vtx.lua"},
+    { title = "Gyro / Motor", script = "pwm.lua"},
+    { title = "PIDs 1", script = "pids1.lua"},
+    { title = "PIDs 2", script = "pids2.lua"},
+    { title = "Rates", script = "rates.lua"},
+    { title = "Advanced PIDs", script = "pid_advanced.lua"},
+    { title = "Filters", script = "filters.lua"},
+    { title = "GPS Rescue", script = "rescue.lua", requiredVersion = 1.041},
+    { title = "GPS PIDs", script = "gpspids.lua", requiredVersion = 1.041},
+}
+
+MenuBox = { x=15, y=12, w=100, x_offset=36, h_line=8, h_offset=3 }
+SaveBox = { x=15, y=12, w=100, x_offset=4,  h=30, h_offset=5 }
+NoTelem = { 30, 55, "No Telemetry", BLINK }

src/SCRIPTS/TOOLS/BF/X9/x9pre.lua

@@ -0,0 +1,17 @@
+PageFiles = 
+{
+    { title = "PIDs 1", script = "pids1.lua"},
+    { title = "PIDs 2", script = "pids2.lua"},
+    { title = "Rates", script = "rates.lua"},
+    { title = "Advanced PIDs", script = "pid_advanced.lua"},
+    { title = "Filters", script = "filters.lua"},
+    { title = "vTX Settings", script = "vtx.lua"},
+    { title = "Gyro / Motor", script = "pwm.lua"},
+    { title = "Rx", script = "rx.lua"},
+    { title = "GPS Rescue", script = "rescue.lua", requiredVersion = 1.041},
+    { title = "GPS PIDs", script = "gpspids.lua", requiredVersion = 1.041},
+}
+
+MenuBox = { x=40, y=12, w=120, x_offset=36, h_line=8, h_offset=3 }
+SaveBox = { x=40, y=12, w=120, x_offset=4,  h=30, h_offset=5 }
+NoTelem = { 70, 55, "No Telemetry", BLINK }

src/SCRIPTS/BF/radios.lua → src/SCRIPTS/TOOLS/BF/radios.lua

@@ -36,15 +36,18 @@ local supportedRadios =
     ["x3"] = supportedPlatforms.x7,
     ["x7"] = supportedPlatforms.x7,
     ["x7s"] = supportedPlatforms.x7,
+    ["x7-simu"] = supportedPlatforms.x7,
     ["t12"] = supportedPlatforms.x7,
     ["xlite"] = supportedPlatforms.x7,
     ["xlites"] = supportedPlatforms.x7,
     ["x9lite"] = supportedPlatforms.x7,
     ["x9d"] = supportedPlatforms.x9,
     ["x9d+"] = supportedPlatforms.x9,
+    ["x9d+-simu"] = supportedPlatforms.x9,
     ["x9d+2019"] = supportedPlatforms.x9,
     ["x9e"] = supportedPlatforms.x9,
     ["x10"] = supportedPlatforms.horus,
+    ["x10-simu"] = supportedPlatforms.horus,
     ["x10express"] = supportedPlatforms.horus,
     ["x12s"] = supportedPlatforms.horus,
     ["NV14"] = supportedPlatforms.nv14,