Skip to content

Commit 4cf0cc2

Browse files
authored
Merge pull request #451 from klutvott123/fix-api-version
Fix api version calculation
2 parents cdd9ec2 + 67e7afa commit 4cf0cc2

19 files changed

+107
-107
lines changed

src/SCRIPTS/BF/PAGES/failsafe.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ local fields = {}
1313

1414
local procedure = { [0] = "Land", "Drop" }
1515

16-
if apiVersion >= 1.039 then
16+
if apiVersion >= 1.39 then
1717
procedure[#procedure + 1] = "Rescue"
1818
end
1919

20-
if apiVersion >= 1.039 then
20+
if apiVersion >= 1.39 then
2121
labels[#labels + 1] = { t = "Failsafe Switch", x = x, y = inc.y(lineSpacing) }
2222
fields[#fields + 1] = { t = "Action", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2, vals = { 5 }, table = { [0] = "Stage 1", "Kill", "Stage 2" } }
2323
else

src/SCRIPTS/BF/PAGES/filters1.lua

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,84 +13,84 @@ local fields = {}
1313

1414
local gyroFilterType = { [0] = "PT1", "BIQUAD" }
1515

16-
if apiVersion >= 1.044 then
16+
if apiVersion >= 1.44 then
1717
gyroFilterType[#gyroFilterType + 1] = "PT2"
1818
gyroFilterType[#gyroFilterType + 1] = "PT3"
1919
end
2020

2121
local dtermFilterType = gyroFilterType
2222

23-
if apiVersion >= 1.036 and apiVersion <= 1.038 then
23+
if apiVersion >= 1.36 and apiVersion <= 1.38 then
2424
dtermFilterType = { [0] = "PT1", "BIQUAD", "FIR" }
2525
end
2626

2727
local dtermFilterType2 = gyroFilterType
2828

29-
if apiVersion >= 1.041 then
29+
if apiVersion >= 1.41 then
3030
labels[#labels + 1] = { t = "Gyro Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) }
3131
fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 30, 31 } }
3232
fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 32, 33 } }
3333
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #gyroFilterType, vals = { 25 }, table = gyroFilterType }
3434
end
3535

36-
if apiVersion >= 1.016 then
36+
if apiVersion >= 1.16 then
3737
labels[#labels + 1] = { t = "Gyro Lowpass 1", x = x, y = inc.y(lineSpacing) }
38-
if apiVersion >= 1.039 then
38+
if apiVersion >= 1.39 then
3939
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 21, 22 } }
4040
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #gyroFilterType, vals = { 25 }, table = gyroFilterType }
4141
else
4242
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 255, vals = { 1 } }
4343
end
4444
end
4545

46-
if apiVersion >= 1.039 then
46+
if apiVersion >= 1.39 then
4747
labels[#labels + 1] = { t = "Gyro Lowpass 2", x = x, y = inc.y(lineSpacing) }
4848
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 23, 24 } }
4949
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #gyroFilterType, vals = { 26 }, table = gyroFilterType }
5050
end
5151

52-
if apiVersion >= 1.020 then
52+
if apiVersion >= 1.20 then
5353
labels[#labels + 1] = { t = "Gyro Notch 1", x = x, y = inc.y(lineSpacing) }
5454
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 6, 7 } }
5555
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 8, 9 } }
5656
end
5757

58-
if apiVersion >= 1.021 then
58+
if apiVersion >= 1.21 then
5959
labels[#labels + 1] = { t = "Gyro Notch 2", x = x, y = inc.y(lineSpacing) }
6060
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 14, 15 } }
6161
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 16, 17 } }
6262
end
6363

64-
if apiVersion >= 1.041 then
64+
if apiVersion >= 1.41 then
6565
labels[#labels + 1] = { t = "D Term Lowpass 1 Dynamic", x = x, y = inc.y(lineSpacing) }
6666
fields[#fields + 1] = { t = "Min Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 34, 35 } }
6767
fields[#fields + 1] = { t = "Max Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1000, vals = { 36, 37 } }
6868
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #dtermFilterType, vals = { 18 }, table = dtermFilterType }
6969
end
7070

71-
if apiVersion >= 1.016 then
71+
if apiVersion >= 1.16 then
7272
labels[#labels + 1] = { t = "D Term Lowpass 1", x = x, y = inc.y(lineSpacing) }
7373
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 2, 3 } }
74-
if apiVersion >= 1.036 then
74+
if apiVersion >= 1.36 then
7575
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #dtermFilterType, vals = { 18 }, table = dtermFilterType }
7676
end
7777
end
7878

79-
if apiVersion >= 1.039 then
79+
if apiVersion >= 1.39 then
8080
labels[#labels + 1] = { t = "D Term Lowpass 2", x = x, y = inc.y(lineSpacing) }
8181
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 27, 28 } }
82-
if apiVersion >= 1.041 then
82+
if apiVersion >= 1.41 then
8383
fields[#fields + 1] = { t = "Filter Type", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #dtermFilterType2, vals = { 29 }, table = dtermFilterType2 }
8484
end
8585
end
8686

87-
if apiVersion >= 1.020 then
87+
if apiVersion >= 1.20 then
8888
labels[#labels + 1] = { t = "D Term Notch", x = x, y = inc.y(lineSpacing) }
8989
fields[#fields + 1] = { t = "Center", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 10, 11 } }
9090
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 16000, vals = { 12, 13 } }
9191
end
9292

93-
if apiVersion >= 1.016 then
93+
if apiVersion >= 1.16 then
9494
labels[#labels + 1] = { t = "Yaw Lowpass", x = x, y = inc.y(lineSpacing) }
9595
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 500, vals = { 4, 5 } }
9696
end

src/SCRIPTS/BF/PAGES/filters2.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@ local inc = { x = function(val) x = x + val return x end, y = function(val) y =
1111
local labels = {}
1212
local fields = {}
1313

14-
if apiVersion >= 1.042 then
14+
if apiVersion >= 1.42 then
1515
labels[#labels + 1] = { t = "Gyro RPM Filter", x = x, y = inc.y(lineSpacing) }
1616
fields[#fields + 1] = { t = "Harmonics", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 44 } }
1717
fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 50, max = 200, vals = { 45 } }
1818
labels[#labels + 1] = { t = "Dynamic Notch Filter", x = x, y = inc.y(lineSpacing) }
19-
if apiVersion < 1.043 then
19+
if apiVersion < 1.43 then
2020
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" } }
2121
end
22-
if apiVersion >= 1.044 then
22+
if apiVersion >= 1.44 then
2323
fields[#fields + 1] = { t = "Count", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 5, vals = { 49 } }
2424
else
2525
fields[#fields + 1] = { t = "Width %", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 39 } }
2626
end
2727
fields[#fields + 1] = { t = "Q", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 1000, vals = { 40, 41 } }
28-
if apiVersion >= 1.043 then
28+
if apiVersion >= 1.43 then
2929
fields[#fields + 1] = { t = "Min Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 60, max = 250, vals = { 42, 43 } }
3030
fields[#fields + 1] = { t = "Max Frequency", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 200, max = 1000, vals = { 46, 47 } }
3131
else
@@ -46,7 +46,7 @@ return {
4646
self.rpmHarmonics = self.values[44]
4747
end,
4848
preSave = function(self)
49-
self.reboot = self.values[44] == 0 and self.rpmHarmonics ~= 0 and apiVersion <= 1.043
49+
self.reboot = self.values[44] == 0 and self.rpmHarmonics ~= 0 and apiVersion <= 1.43
5050
return self.values
5151
end,
5252
}

src/SCRIPTS/BF/PAGES/gpspids.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ local inc = { x = function(val) x = x + val return x end, y = function(val) y =
1111
local labels = {}
1212
local fields = {}
1313

14-
if apiVersion >= 1.041 then
14+
if apiVersion >= 1.41 then
1515
x = margin
1616
y = yMinLim - tableSpacing.header
1717
labels[#labels + 1] = { t = "", x = x, y = inc.y(tableSpacing.header) }

src/SCRIPTS/BF/PAGES/pid_advanced.lua

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,53 +11,53 @@ local inc = { x = function(val) x = x + val return x end, y = function(val) y =
1111
local labels = {}
1212
local fields = {}
1313

14-
if apiVersion >= 1.040 then
14+
if apiVersion >= 1.40 then
1515
labels[#labels + 1] = { t = "Acro Trainer", x = x, y = inc.y(lineSpacing) }
1616
fields[#fields + 1] = { t = "Angle Limit", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 20, max = 80, vals = { 32 } }
1717
fields[#fields + 1] = { t = "Throttle Boost", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 31 } }
1818
fields[#fields + 1] = { t = "Absolute Control", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 30 } }
1919
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" } }
2020
end
2121

22-
if apiVersion >= 1.043 then
22+
if apiVersion >= 1.43 then
2323
fields[#fields + 1] = { t = "Motor Output Limit",x = x, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 100, vals = { 48 } }
2424
fields[#fields + 1] = { t = "Dynamic Idle", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 50 } }
2525
end
2626

27-
if apiVersion >= 1.016 and apiVersion <= 1.043 then
27+
if apiVersion >= 1.16 and apiVersion <= 1.43 then
2828
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" } }
2929
end
3030

31-
if apiVersion >= 1.044 then
31+
if apiVersion >= 1.44 then
3232
fields[#fields + 1] = { t = "Vbat Sag Comp", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 150, vals = { 56 } }
3333
fields[#fields + 1] = { t = "Thrust Linear", x = x, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 150, vals = { 57 } }
3434
end
3535

36-
if apiVersion >= 1.040 and apiVersion <= 1.041 then
36+
if apiVersion >= 1.40 and apiVersion <= 1.41 then
3737
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" } }
3838
end
3939

40-
if apiVersion >= 1.041 then
40+
if apiVersion >= 1.41 then
4141
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" } }
4242
end
4343

44-
if apiVersion >= 1.040 then
44+
if apiVersion >= 1.40 then
4545
labels[#labels + 1] = { t = "I Term Relax", x = x, y = inc.y(lineSpacing) }
4646
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)" } }
4747
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" } }
48-
if apiVersion >= 1.043 then
48+
if apiVersion >= 1.43 then
4949
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 50, vals = { 47 } }
50-
elseif apiVersion >= 1.042 then
50+
elseif apiVersion >= 1.42 then
5151
fields[#fields + 1] = { t = "Cutoff", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 100, vals = { 47 } }
5252
end
5353
end
5454

55-
if apiVersion >= 1.036 then
55+
if apiVersion >= 1.36 then
5656
labels[#labels + 1] = { t = "Anti Gravity", x = x, y = inc.y(lineSpacing) }
57-
if apiVersion >= 1.040 then
57+
if apiVersion >= 1.40 then
5858
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" } }
5959
end
60-
if apiVersion >= 1.044 then
60+
if apiVersion >= 1.44 then
6161
fields[#fields + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 100 }
6262
else
6363
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 }
@@ -78,7 +78,7 @@ return {
7878
self.dynamicIdle = self.values[50]
7979
end,
8080
preSave = function(self)
81-
self.reboot = self.values[50] ~= self.dynamicIdle and apiVersion <= 1.043
81+
self.reboot = self.values[50] ~= self.dynamicIdle and apiVersion <= 1.43
8282
return self.values
8383
end,
8484
}

src/SCRIPTS/BF/PAGES/pids1.lua

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ local fields = {}
1414
local pidMax = 200
1515
local dLabel = "D"
1616

17-
if apiVersion >= 1.044 then
17+
if apiVersion >= 1.44 then
1818
pidMax = 250
1919
dLabel = "D Max"
2020
end
2121

22-
if apiVersion >= 1.016 then
22+
if apiVersion >= 1.16 then
2323
x = margin
2424
y = yMinLim - tableSpacing.header
2525

@@ -50,7 +50,7 @@ if apiVersion >= 1.016 then
5050
labels[#labels + 1] = { t = dLabel, x = x, y = inc.y(tableSpacing.header) }
5151
fields[#fields + 1] = { x = x, y = inc.y(tableSpacing.row), min = 0, max = pidMax, vals = { 3 } }
5252
fields[#fields + 1] = { x = x, y = inc.y(tableSpacing.row), min = 0, max = pidMax, vals = { 6 } }
53-
if apiVersion >= 1.041 then
53+
if apiVersion >= 1.41 then
5454
fields[#fields + 1] = { x = x, y = inc.y(tableSpacing.row), min = 0, max = pidMax, vals = { 9 } }
5555
end
5656
end

src/SCRIPTS/BF/PAGES/pids2.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ local fields = {}
1313

1414
local dMinMax = 100
1515

16-
if apiVersion >= 1.044 then
16+
if apiVersion >= 1.44 then
1717
dMinMax = 250
1818
end
1919

20-
if apiVersion >= 1.040 then
20+
if apiVersion >= 1.40 then
2121
x = margin
2222
y = yMinLim - tableSpacing.header
2323

@@ -34,7 +34,7 @@ if apiVersion >= 1.040 then
3434
fields[#fields + 1] = { x = x, y = inc.y(tableSpacing.row), min = 0, max = 2000, vals = { 35, 36 } }
3535
fields[#fields + 1] = { x = x, y = inc.y(tableSpacing.row), min = 0, max = 2000, vals = { 37, 38 } }
3636

37-
if apiVersion >= 1.041 then
37+
if apiVersion >= 1.41 then
3838
x = x + tableSpacing.col
3939
y = yMinLim - tableSpacing.header
4040

@@ -48,9 +48,9 @@ if apiVersion >= 1.040 then
4848
y = inc.y(lineSpacing*0.4)
4949
end
5050

51-
if apiVersion >= 1.040 then
51+
if apiVersion >= 1.40 then
5252
labels[#labels + 1] = { t = "Feedforward", x = x, y = inc.y(lineSpacing) }
53-
if apiVersion >= 1.044 then
53+
if apiVersion >= 1.44 then
5454
fields[#fields + 1] = { t = "Jitter Reduction", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 20, vals = { 55 } }
5555
fields[#fields + 1] = { t = "Smoothness", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 75, vals = { 52 } }
5656
fields[#fields + 1] = { t = "Averaging", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 3, vals = { 51 }, table = { [0] = "OFF", "2_POINT", "3_POINT", "4_POINT" } }
@@ -60,15 +60,15 @@ if apiVersion >= 1.040 then
6060
fields[#fields + 1] = { t = "Transition", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 9 }, scale = 100 }
6161
end
6262

63-
if apiVersion >= 1.041 then
63+
if apiVersion >= 1.41 then
6464
labels[#labels + 1] = { t = "D Min", x = x, y = inc.y(lineSpacing) }
6565
fields[#fields + 1] = { t = "Gain", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 100, vals = { 43 } }
6666
fields[#fields + 1] = { t = "Advance", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 200, vals = { 44 } }
6767
end
6868

69-
if apiVersion >= 1.021 and apiVersion <= 1.039 then
69+
if apiVersion >= 1.21 and apiVersion <= 1.39 then
7070
labels[#labels + 1] = { t = "Dterm Setpoint", x = x, y = inc.y(lineSpacing) }
71-
if apiVersion >= 1.021 and apiVersion <= 1.038 then
71+
if apiVersion >= 1.21 and apiVersion <= 1.38 then
7272
fields[#fields + 1] = { t = "Weight", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 254, vals = { 10 }, scale = 100 }
7373
else
7474
fields[#fields + 1] = { t = "Weight", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 254, vals = { 25 }, scale = 100 }

src/SCRIPTS/BF/PAGES/pwm.lua

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,47 +13,47 @@ local fields = {}
1313

1414
local gyroSampleRateKhz
1515

16-
if apiVersion >= 1.044 then
16+
if apiVersion >= 1.44 then
1717
gyroSampleRateKhz = assert(loadScript("BOARD_INFO/"..mcuId..".lua"))().gyroSampleRateHz / 1000
1818
end
1919

2020
local escProtocols = { [0] = "PWM", "OS125", "OS42", "MSHOT" }
2121

22-
if apiVersion >= 1.020 then
22+
if apiVersion >= 1.20 then
2323
escProtocols[#escProtocols + 1] = "BRSH"
2424
end
25-
if apiVersion >= 1.031 then
25+
if apiVersion >= 1.31 then
2626
escProtocols[#escProtocols + 1] = "DS150"
2727
escProtocols[#escProtocols + 1] = "DS300"
2828
escProtocols[#escProtocols + 1] = "DS600"
29-
if apiVersion < 1.042 then
29+
if apiVersion < 1.42 then
3030
escProtocols[#escProtocols + 1] = "DS1200"
3131
end
32-
if apiVersion >= 1.036 then
32+
if apiVersion >= 1.36 then
3333
escProtocols[#escProtocols + 1] = "PS1000"
3434
end
3535
end
3636

37-
if apiVersion >= 1.043 then
37+
if apiVersion >= 1.43 then
3838
escProtocols[#escProtocols + 1] = "DISABLED"
3939
end
4040

4141
labels[#labels + 1] = { t = "System Config", x = x, y = inc.y(lineSpacing) }
42-
if apiVersion >= 1.031 and apiVersion <= 1.040 then
42+
if apiVersion >= 1.31 and apiVersion <= 1.40 then
4343
fields[#fields + 1] = { t = "32kHz Sampling", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 9 }, table = { [0] = "OFF", "ON" }, upd = function(self) self.updateRateTables(self) end }
4444
end
45-
if apiVersion >= 1.044 then
45+
if apiVersion >= 1.44 then
4646
fields[#fields + 1] = { t = "Gyro Update", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 32, vals = { 1 }, table = {}, upd = function(self) self.updatePidRateTable(self) end, mult = -1, ro = true }
47-
elseif apiVersion <= 1.042 then
47+
elseif apiVersion <= 1.42 then
4848
fields[#fields + 1] = { t = "Gyro Update", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 32, vals = { 1 }, table = {}, upd = function(self) self.updatePidRateTable(self) end, mult = -1 }
4949
end
50-
if apiVersion <= 1.042 or apiVersion >= 1.044 then
50+
if apiVersion <= 1.42 or apiVersion >= 1.44 then
5151
fields[#fields + 1] = { t = "PID Loop", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 1, max = 16, vals = { 2 }, table = {}, mult = -1 }
5252
end
5353

5454
labels[#labels + 1] = { t = "ESC/Motor", x = x, y = inc.y(lineSpacing) }
5555
fields[#fields + 1] = { t = "Protocol", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = #escProtocols, vals = { 4 }, table = escProtocols }
56-
if apiVersion >= 1.031 then
56+
if apiVersion >= 1.31 then
5757
fields[#fields + 1] = { t = "Idle Throttle %", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 2000, vals = { 7, 8 }, scale = 100 }
5858
end
5959
fields[#fields + 1] = { t = "Unsynced PWM", x = x + indent, y = inc.y(lineSpacing), sp = x + sp, min = 0, max = 1, vals = { 3 }, table = { [0] = "OFF", "ON" } }

0 commit comments

Comments
 (0)