From 5fff82b637269de0021df72b108ad66c3634ca28 Mon Sep 17 00:00:00 2001 From: Hans Christian Olaussen <41271048+klutvott123@users.noreply.github.com> Date: Tue, 3 Dec 2019 21:44:38 +0100 Subject: [PATCH] Allow text for fields --- src/SCRIPTS/BF/PAGES/filters1.lua | 69 +++++++++------------------ src/SCRIPTS/BF/PAGES/filters2.lua | 18 +++---- src/SCRIPTS/BF/PAGES/pid_advanced.lua | 39 +++++---------- src/SCRIPTS/BF/PAGES/pids2.lua | 23 ++++----- src/SCRIPTS/BF/PAGES/pwm.lua | 21 +++----- src/SCRIPTS/BF/PAGES/rates.lua | 18 +++---- src/SCRIPTS/BF/PAGES/rescue.lua | 30 ++++-------- src/SCRIPTS/BF/PAGES/rx.lua | 18 +++---- src/SCRIPTS/BF/PAGES/vtx.lua | 18 +++---- src/SCRIPTS/BF/ui.lua | 5 +- 10 files changed, 90 insertions(+), 169 deletions(-) diff --git a/src/SCRIPTS/BF/PAGES/filters1.lua b/src/SCRIPTS/BF/PAGES/filters1.lua index 8b8a9adc..d7eb5937 100644 --- a/src/SCRIPTS/BF/PAGES/filters1.lua +++ b/src/SCRIPTS/BF/PAGES/filters1.lua @@ -18,96 +18,73 @@ local fields = {} if apiVersion >= 1.041 then labels[#labels + 1] = { t = "Gyro Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 30, 31 } } - labels[#labels + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 32, 33 } } - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 30, 31 } } + fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 32, 33 } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } } end if apiVersion >= 1.016 then labels[#labels + 1] = { t = "Gyro Lowpass 1", x = x, y = inc.y(lineSpacing) } if apiVersion >= 1.039 then - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 21, 22 } } - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 21, 22 } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 25 }, table = { [0] = "PT1", [1] = "BIQUAD" } } else - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 255, vals = { 1 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 1 } } end end if apiVersion >= 1.039 then labels[#labels + 1] = { t = "Gyro Lowpass 2", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 23, 24 } } - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 23, 24 } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 26 }, table = { [0] = "PT1", [1] = "BIQUAD" } } end if apiVersion >= 1.020 then labels[#labels + 1] = { t = "Gyro Notch 1", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 6, 7 } } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 8, 9 } } + fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 6, 7 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 8, 9 } } end if apiVersion >= 1.021 then labels[#labels + 1] = { t = "Gyro Notch 2", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 14, 15 } } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 16, 17 } } + fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 14, 15 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 16, 17 } } end if apiVersion >= 1.041 then labels[#labels + 1] = { t = "D Term Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 34, 35 } } - labels[#labels + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1000, vals = { 36, 37 } } - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 34, 35 } } + fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 36, 37 } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } } end if apiVersion >= 1.016 then labels[#labels + 1] = { t = "D Term Lowpass 1", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 2, 3 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 2, 3 } } if apiVersion >= 1.036 and apiVersion <= 1.038 then - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 2, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } } elseif apiVersion >= 1.039 then - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD" } } end end if apiVersion >= 1.039 then labels[#labels + 1] = { t = "D Term Lowpass 2", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 27, 28 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 27, 28 } } if apiVersion >= 1.041 then - labels[#labels + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } } + fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 29 }, table = { [0] = "PT1", [1] = "BIQUAD" } } end end if apiVersion >= 1.020 then labels[#labels + 1] = { t = "D Term Notch", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 10, 11 } } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 16000, vals = { 12, 13 } } + fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 10, 11 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 12, 13 } } end if apiVersion >= 1.016 then labels[#labels + 1] = { t = "Yaw Lowpass", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 500, vals = { 4, 5 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 500, vals = { 4, 5 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/filters2.lua b/src/SCRIPTS/BF/PAGES/filters2.lua index bc67b75a..20042605 100644 --- a/src/SCRIPTS/BF/PAGES/filters2.lua +++ b/src/SCRIPTS/BF/PAGES/filters2.lua @@ -18,19 +18,13 @@ local fields = {} if apiVersion >= 1.042 then labels[#labels + 1] = { t = "Gyro RPM Filter", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Harmonics", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 3, vals = { 44 } } - labels[#labels + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 50, max = 200, vals = { 45 } } + fields[#fields + 1] = { t = "Harmonics", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 44 } } + fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 50, max = 200, vals = { 45 } } labels[#labels + 1] = { t = "Dynamic Notch Filter", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Range", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 3, vals = { 38 }, table = { [0]="HIGH", "MEDIUM", "LOW", "AUTO" } } - labels[#labels + 1] = { t = "Width %", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 20, vals = { 39 } } - labels[#labels + 1] = { t = "Q", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 1000, vals = { 40, 41 } } - labels[#labels + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 60, max = 1000, vals = { 42, 43 } } + fields[#fields + 1] = { t = "Range", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 38 }, table = { [0]="HIGH", "MEDIUM", "LOW", "AUTO" } } + fields[#fields + 1] = { t = "Width %", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 39 } } + fields[#fields + 1] = { t = "Q", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 1000, vals = { 40, 41 } } + fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 60, max = 1000, vals = { 42, 43 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/pid_advanced.lua b/src/SCRIPTS/BF/PAGES/pid_advanced.lua index 471062ba..0bc820eb 100644 --- a/src/SCRIPTS/BF/PAGES/pid_advanced.lua +++ b/src/SCRIPTS/BF/PAGES/pid_advanced.lua @@ -18,53 +18,40 @@ local fields = {} if apiVersion >= 1.040 then labels[#labels + 1] = { t = "Acro Trainer", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Angle Limit", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 20, max = 80, vals = { 32 } } - labels[#labels + 1] = { t = "Throttle Boost", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 31 } } - labels[#labels + 1] = { t = "Absolute Control", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 20, vals = { 30 } } - labels[#labels + 1] = { t = "I Term Rotation", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 26 }, table = { [0]="OFF", "ON" } } + fields[#fields + 1] = { t = "Angle Limit", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 20, max = 80, vals = { 32 } } + fields[#fields + 1] = { t = "Throttle Boost", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 31 } } + fields[#fields + 1] = { t = "Absolute Control", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 30 } } + fields[#fields + 1] = { t = "I Term Rotation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 26 }, table = { [0]="OFF", "ON" } } end if apiVersion >= 1.016 then - labels[#labels + 1] = { t = "VBAT Compensation", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } } + fields[#fields + 1] = { t = "VBAT Compensation", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } } end if apiVersion >= 1.040 and apiVersion <= 1.041 then - labels[#labels + 1] = { t = "Smart Feedforward", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 27 }, table = { [0] = "OFF", "ON" } } + fields[#fields + 1] = { t = "Smart Feedforward", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 27 }, table = { [0] = "OFF", "ON" } } end if apiVersion >= 1.040 then labels[#labels + 1] = { t = "I Term Relax", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Axes", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 4, vals = { 28 }, table = { [0]="NONE", "RP", "RPY", "RP (inc)", "RPY (inc)" } } - labels[#labels + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 29 }, table = { [0]="Gyro", "Setpoint" } } + fields[#fields + 1] = { t = "Axes", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 4, vals = { 28 }, table = { [0]="NONE", "RP", "RPY", "RP (inc)", "RPY (inc)" } } + fields[#fields + 1] = { t = "Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 29 }, table = { [0]="Gyro", "Setpoint" } } if apiVersion >= 1.042 then - labels[#labels + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 100, vals = { 47 } } + fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 100, vals = { 47 } } end end if apiVersion >= 1.041 then - labels[#labels + 1] = { t = "Integrated Yaw", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 45 }, table = { [0]="OFF", "ON" } } + fields[#fields + 1] = { t = "Integrated Yaw", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 45 }, table = { [0]="OFF", "ON" } } end if apiVersion >= 1.036 then labels[#labels + 1] = { t = "Anti Gravity", x = x, y = inc.y(lineSpacing) } if apiVersion >= 1.040 then - labels[#labels + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 39 }, table = { [0]="Smooth", "Step" } } + fields[#fields + 1] = { t = "Mode", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 39 }, table = { [0]="Smooth", "Step" } } end - labels[#labels + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 100 } - labels[#labels + 1] = { t = "Threshold", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 20,max = 1000, vals = { 20, 21 } } + fields[#fields + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 100 } + fields[#fields + 1] = { t = "Threshold", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 20,max = 1000, vals = { 20, 21 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/pids2.lua b/src/SCRIPTS/BF/PAGES/pids2.lua index 46cf7e2b..b4c3a68d 100644 --- a/src/SCRIPTS/BF/PAGES/pids2.lua +++ b/src/SCRIPTS/BF/PAGES/pids2.lua @@ -50,29 +50,24 @@ end if apiVersion >= 1.040 then - labels[#labels + 1] = { t = "Feedforward", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Transition", x = indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 9 }, scale = 100 } + labels[#labels + 1] = { t = "Feedforward", x = x, y = inc.y(lineSpacing) } + fields[#fields + 1] = { t = "Transition", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 9 }, scale = 100 } end if apiVersion >= 1.041 then - labels[#labels + 1] = { t = "D Min", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Gain", x = indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 43 } } - labels[#labels + 1] = { t = "Advance", x = indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 200, vals = { 44 } } + labels[#labels + 1] = { t = "D Min", x = x, y = inc.y(lineSpacing) } + fields[#fields + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 43 } } + fields[#fields + 1] = { t = "Advance", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 200, vals = { 44 } } end if apiVersion >= 1.021 and apiVersion <= 1.039 then - labels[#labels + 1] = { t = "Dterm Setpoint", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Weight", x = indent, y = inc.y(lineSpacing) } + labels[#labels + 1] = { t = "Dterm Setpoint", x = x, y = inc.y(lineSpacing) } if apiVersion >= 1.021 and apiVersion <= 1.038 then - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 254, vals = { 10 }, scale = 100 } + fields[#fields + 1] = { t = "Weight", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 254, vals = { 10 }, scale = 100 } else - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 254, vals = { 25 }, scale = 100 } + fields[#fields + 1] = { t = "Weight", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 254, vals = { 25 }, scale = 100 } end - labels[#labels + 1] = { t = "Transition", x = indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 9 }, scale = 100 } + fields[#fields + 1] = { t = "Transition", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 9 }, scale = 100 } end return { diff --git a/src/SCRIPTS/BF/PAGES/pwm.lua b/src/SCRIPTS/BF/PAGES/pwm.lua index 3a025fb0..b3ee5c67 100644 --- a/src/SCRIPTS/BF/PAGES/pwm.lua +++ b/src/SCRIPTS/BF/PAGES/pwm.lua @@ -17,26 +17,19 @@ local labels = {} local fields = {} if apiVersion >= 1.031 and apiVersion <= 1.040 then - labels[#labels + 1] = { t = "32kHz Sampling", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 9 }, table = { [0] = "OFF", "ON" }, upd = function(self) self.updateRateTables(self) end } + fields[#fields + 1] = { t = "32kHz Sampling", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 9 }, table = { [0] = "OFF", "ON" }, upd = function(self) self.updateRateTables(self) end } end if apiVersion >= 1.016 then - labels[#labels + 1] = { t = "Gyro Update", x = x, y = inc.y(lineSpacing)} - fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 32, vals = { 1 }, table = {}, upd = function(self) self.updatePidRateTable(self) end } - labels[#labels + 1] = { t = "PID Loop", x = x, y = inc.y(lineSpacing)} - fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 16, vals = { 2 }, table = {} } - labels[#labels + 1] = { t = "Protocol", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 9, vals = { 4 }, table = { [0] = "OFF", "OS125", "OS42", "MSHOT","BRSH", "DS150", "DS300", "DS600","DS1200", "PS1000" } } - labels[#labels + 1] = { t = "Unsynced PWM", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 3 }, table = { [0] = "OFF", "ON" } } - labels[#labels + 1] = { t = "PWM Frequency", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 200, max = 32000, vals = { 5, 6 }, } + fields[#fields + 1] = { t = "Gyro Update", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 32, vals = { 1 }, table = {}, upd = function(self) self.updatePidRateTable(self) end } + fields[#fields + 1] = { t = "PID Loop", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 16, vals = { 2 }, table = {} } + fields[#fields + 1] = { t = "Protocol", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 9, vals = { 4 }, table = { [0] = "OFF", "OS125", "OS42", "MSHOT","BRSH", "DS150", "DS300", "DS600","DS1200", "PS1000" } } + fields[#fields + 1] = { t = "Unsynced PWM", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 3 }, table = { [0] = "OFF", "ON" } } + fields[#fields + 1] = { t = "PWM Frequency", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 200, max = 32000, vals = { 5, 6 }, } end if apiVersion >= 1.031 then - labels[#labels + 1] = { t = "Idle Throttle %", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 2000, vals = { 7, 8 }, scale = 100 } + fields[#fields + 1] = { t = "Idle Throttle %", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2000, vals = { 7, 8 }, scale = 100 } end return { diff --git a/src/SCRIPTS/BF/PAGES/rates.lua b/src/SCRIPTS/BF/PAGES/rates.lua index 8d0f600d..6f348e6b 100644 --- a/src/SCRIPTS/BF/PAGES/rates.lua +++ b/src/SCRIPTS/BF/PAGES/rates.lua @@ -68,24 +68,18 @@ end if apiVersion >= 1.016 then labels[#labels + 1] = { t = "Throttle", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Mid", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 7 }, scale = 100 } - labels[#labels + 1] = { t = "Expo", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 8 }, scale = 100 } + fields[#fields + 1] = { t = "Mid", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 7 }, scale = 100 } + fields[#fields + 1] = { t = "Expo", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 8 }, scale = 100 } if apiVersion >= 1.041 then - labels[#labels + 1] = { t = "Limit Type", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 2, vals = { 15 }, table = { [0] = "OFF", "SCALE", "CLIP" } } - labels[#labels + 1] = { t = "Limit %", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 25, max = 100, vals = { 16 } } + fields[#fields + 1] = { t = "Limit Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2, vals = { 15 }, table = { [0] = "OFF", "SCALE", "CLIP" } } + fields[#fields + 1] = { t = "Limit %", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 25, max = 100, vals = { 16 } } end end if apiVersion >= 1.016 then labels[#labels + 1] = { t = "TPA", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Rate", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 100, vals = { 6 } , scale = 100 } - labels[#labels + 1] = { t = "Breakpoint", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 9, 10 } } + fields[#fields + 1] = { t = "Rate", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 6 } , scale = 100 } + fields[#fields + 1] = { t = "Breakpoint", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 9, 10 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/rescue.lua b/src/SCRIPTS/BF/PAGES/rescue.lua index 718c83ac..ecc9785a 100644 --- a/src/SCRIPTS/BF/PAGES/rescue.lua +++ b/src/SCRIPTS/BF/PAGES/rescue.lua @@ -17,31 +17,21 @@ local labels = {} local fields = {} if apiVersion >= 1.041 then - labels[#labels + 1] = { t = "Min Sats.", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 50, vals = { 16 } } - labels[#labels + 1] = { t = "Angle", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 200, vals = { 1, 2 } } - labels[#labels + 1] = { t = "Initial Altitude", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 20, max = 100, vals = { 3, 4 } } - labels[#labels + 1] = { t = "Descent Distance", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 30, max = 500, vals = { 5, 6 } } - labels[#labels + 1] = { t = "Ground Speed", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 30, max = 3000, vals = { 7, 8 } } + fields[#fields + 1] = { t = "Min Sats.", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 50, vals = { 16 } } + fields[#fields + 1] = { t = "Angle", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 200, vals = { 1, 2 } } + fields[#fields + 1] = { t = "Initial Altitude", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 20, max = 100, vals = { 3, 4 } } + fields[#fields + 1] = { t = "Descent Distance", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 30, max = 500, vals = { 5, 6 } } + fields[#fields + 1] = { t = "Ground Speed", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 30, max = 3000, vals = { 7, 8 } } if apiVersion >= 1.043 then - labels[#labels + 1] = { t = "Arm w/o fix", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 1, vals = { 21 }, table = { [0]="OFF","ON"} } + fields[#fields + 1] = { t = "Arm w/o fix", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 21 }, table = { [0]="OFF","ON"} } end - labels[#labels + 1] = { t = "Sanity Check", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 2, vals = { 15 }, table = { [0]="OFF","ON","FS_ONLY"} } + fields[#fields + 1] = { t = "Sanity Check", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2, vals = { 15 }, table = { [0]="OFF","ON","FS_ONLY"} } labels[#labels + 1] = { t = "Throttle", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Min", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 9, 10 } } - labels[#labels + 1] = { t = "Hover", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 13, 14 } } - labels[#labels + 1] = { t = "Max", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 11, 12 } } + fields[#fields + 1] = { t = "Min", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 9, 10 } } + fields[#fields + 1] = { t = "Hover", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 13, 14 } } + fields[#fields + 1] = { t = "Max", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 11, 12 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/rx.lua b/src/SCRIPTS/BF/PAGES/rx.lua index 75286661..f9939b5e 100644 --- a/src/SCRIPTS/BF/PAGES/rx.lua +++ b/src/SCRIPTS/BF/PAGES/rx.lua @@ -18,24 +18,18 @@ local fields = {} if apiVersion >= 1.016 then labels[#labels + 1] = { t = "Stick", x = x, y = inc.y(lineSpacing) } - labels[#labels + 1] = { t = "Low", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 6, 7 } } - labels[#labels + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 4, 5 } } - labels[#labels + 1] = { t = "High", x = x + indent, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1000, max = 2000, vals = { 2, 3 } } + fields[#fields + 1] = { t = "Low", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 6, 7 } } + fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 4, 5 } } + fields[#fields + 1] = { t = "High", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1000, max = 2000, vals = { 2, 3 } } end if apiVersion >= 1.020 then - labels[#labels + 1] = { t = "Interp", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 3, vals = { 13 }, table={ [0]="Off", "Preset", "Auto", "Manual"} } - labels[#labels + 1] = { t = "Interp Int", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 1, max = 50, vals = { 14 } } + fields[#fields + 1] = { t = "Interp", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 13 }, table={ [0]="Off", "Preset", "Auto", "Manual"} } + fields[#fields + 1] = { t = "Interp Int", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 14 } } end if apiVersion >= 1.031 then - labels[#labels + 1] = { t = "Cam Angle", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 0, max = 90, vals = { 23 } } + fields[#fields + 1] = { t = "Cam Angle", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 90, vals = { 23 } } end return { diff --git a/src/SCRIPTS/BF/PAGES/vtx.lua b/src/SCRIPTS/BF/PAGES/vtx.lua index 1f2d8da0..bccdedab 100644 --- a/src/SCRIPTS/BF/PAGES/vtx.lua +++ b/src/SCRIPTS/BF/PAGES/vtx.lua @@ -26,21 +26,15 @@ local labels = {} local fields = {} if apiVersion >= 1.036 then - labels[#labels + 1] = { t = "Band", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min=0, max=#(vtx_tables.bandTable), vals = { 2 }, table = vtx_tables.bandTable, upd = function(self) self.handleBandChanUpdate(self) end } - labels[#labels + 1] = { t = "Channel", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min=1, max=vtx_tables.frequenciesPerBand, vals = { 3 }, upd = function(self) self.handleBandChanUpdate(self) end } - labels[#labels + 1] = { t = "Power", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min=1, vals = { 4 }, upd = function(self) self.updatePowerTable(self) end } - labels[#labels + 1] = { t = "Pit Mode", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min=0, max=#(pitModeTable), vals = { 5 }, table = pitModeTable } - labels[#labels + 1] = { t = "Protocol", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, vals = { 1 }, write = false, ro = true, table = deviceTable } + fields[#fields + 1] = { t = "Band", x = x, y = inc.y(lineSpacing), sp = x + sp, min=0, max=#(vtx_tables.bandTable), vals = { 2 }, table = vtx_tables.bandTable, upd = function(self) self.handleBandChanUpdate(self) end } + fields[#fields + 1] = { t = "Channel", x = x, y = inc.y(lineSpacing), sp = x + sp, min=1, max=vtx_tables.frequenciesPerBand, vals = { 3 }, upd = function(self) self.handleBandChanUpdate(self) end } + fields[#fields + 1] = { t = "Power", x = x, y = inc.y(lineSpacing), sp = x + sp, min=1, vals = { 4 }, upd = function(self) self.updatePowerTable(self) end } + fields[#fields + 1] = { t = "Pit Mode", x = x, y = inc.y(lineSpacing), sp = x + sp, min=0, max=#(pitModeTable), vals = { 5 }, table = pitModeTable } + fields[#fields + 1] = { t = "Protocol", x = x, y = inc.y(lineSpacing), sp = x + sp, vals = { 1 }, write = false, ro = true, table = deviceTable } end if apiVersion >= 1.037 then - labels[#labels + 1] = { t = "Frequency", x = x, y = inc.y(lineSpacing) } - fields[#fields + 1] = { x = x + sp, y = y, min = 5000, max = 5999, vals = { 6 }, upd = function(self) self.handleFreqValUpdate(self) end } + fields[#fields + 1] = { t = "Frequency", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 5000, max = 5999, vals = { 6 }, upd = function(self) self.handleFreqValUpdate(self) end } end -- Vals Fields diff --git a/src/SCRIPTS/BF/ui.lua b/src/SCRIPTS/BF/ui.lua index 0567af01..0cdc3d9c 100644 --- a/src/SCRIPTS/BF/ui.lua +++ b/src/SCRIPTS/BF/ui.lua @@ -228,7 +228,10 @@ local function drawScreen() end end if (f.y - pageScrollY) >= yMinLim and (f.y - pageScrollY) <= yMaxLim then - lcd.drawText(f.x, f.y - pageScrollY, val, valueOptions) + if f.t then + lcd.drawText(f.x, f.y - pageScrollY, f.t, textOptions) + end + lcd.drawText(f.sp or f.x, f.y - pageScrollY, val, valueOptions) end end end