Skip to content

Commit fc0dd3d

Browse files
raphaelcoefficraphaelcoeffic
authored
Merge pull request #69 from raphaelcoeffic/horus-layout
fixed horus layout
2 parents a6bf4ba + 0e0070d commit fc0dd3d

File tree

8 files changed

+90
-84
lines changed

8 files changed

+90
-84
lines changed

‎src/SCRIPTS/BF/HORUS/filters.lua

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,39 +7,38 @@ return {
77
title = "Filters",
88
minBytes = 18,
99
text= {
10-
{ t = "LPF", x = 38, y = 68 },
11-
{ t = "Gyro", x = 12, y = 110 },
12-
{ t = "DTerm", x = 12, y = 155 },
13-
{ t = "Yaw", x = 12, y = 200 },
10+
-- Column headers
11+
{ t = "Gy LP", x = 60, y = 68, to = SMLSIZE },
12+
{ t = "Gy NF1", x = 125, y = 68, to = SMLSIZE },
13+
{ t = "Gy NF2", x = 190, y = 68, to = SMLSIZE },
14+
{ t = "DT LP", x = 255, y = 68, to = SMLSIZE },
15+
{ t = "DT NF", x = 315, y = 68, to = SMLSIZE },
16+
{ t = "Yaw LP", x = 385, y = 68, to = SMLSIZE },
17+
18+
-- Line titles
19+
{ t = "Hz", x = 48, y = 110, to = SMLSIZE + RIGHT },
20+
{ t = "COff", x = 48, y = 155, to = SMLSIZE + RIGHT },
1421

15-
{ t = "Gyro 1", x = 138, y = 68 },
16-
{ t = "Hz", x = 132, y = 110 },
17-
{ t = "CO", x = 132, y = 155 },
18-
19-
{ t = "Gyro 2", x = 244, y = 68 },
20-
{ t = "Hz", x = 238, y = 110 },
21-
{ t = "CO", x = 238, y = 155 },
22-
23-
{ t = "DTerm", x = 344, y = 68 },
24-
{ t = "Hz", x = 338, y = 110 },
25-
{ t = "CO", x = 338, y = 155 },
26-
27-
{ t = "DTerm LP Type", x = 148, y = 200 },
22+
{ t = "DTerm LP Type", x = 60, y = 208 },
2823
},
2924
fields = {
30-
{ x = 80, y = 110, min = 0, max = 255, vals = { 1 } },
31-
{ x = 80, y = 155, min = 0, max = 16000, vals = { 2, 3 } },
32-
{ x = 80, y = 200, min = 0, max = 500, vals = { 4, 5 } },
25+
{ x = 60, y = 110, min = 0, max = 255, vals = { 1 }, to = MIDSIZE },
26+
27+
{ x = 125, y = 110, min = 0, max = 16000, vals = { 6, 7 }, to = MIDSIZE },
28+
{ x = 125, y = 155, min = 0, max = 16000, vals = { 8, 9 }, to = MIDSIZE },
29+
30+
{ x = 190, y = 110, min = 0, max = 16000, vals = { 14, 15 }, to = MIDSIZE },
31+
{ x = 190, y = 155, min = 0, max = 16000, vals = { 16, 17 }, to = MIDSIZE },
3332

34-
{ x = 172, y = 110, min = 0, max = 16000, vals = { 6, 7 } },
35-
{ x = 172, y = 155, min = 0, max = 16000, vals = { 8, 9 } },
33+
{ x = 255, y = 110, min = 0, max = 16000, vals = { 2, 3 }, to = MIDSIZE },
3634

37-
{ x = 278, y = 110, min = 0, max = 16000, vals = { 14, 15 } },
38-
{ x = 278, y = 155, min = 0, max = 16000, vals = { 16, 17 } },
35+
{ x = 315, y = 110, min = 0, max = 16000, vals = { 10, 11 }, to = MIDSIZE },
36+
{ x = 315, y = 155, min = 0, max = 16000, vals = { 12, 13 }, to = MIDSIZE },
3937

40-
{ x = 378, y = 110, min = 0, max = 16000, vals = { 10, 11 } },
41-
{ x = 378, y = 155, min = 0, max = 16000, vals = { 12, 13 } },
38+
{ x = 391, y = 110, min = 0, max = 500, vals = { 4, 5 }, to = MIDSIZE },
4239

43-
{ x = 288, y = 200, min = 0, max = 2, vals = { 18 }, table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" } },
40+
{ x = 208, y = 208, min = 0, max = 2, vals = { 18 }, to = MIDSIZE,
41+
table = { [0] = "PT1", [1] = "BIQUAD", [2] = "FIR" }
42+
},
4443
}
4544
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ backgroundFill = TEXT_BGCOLOR
1313
foregroundColor = LINE_COLOR
1414
globalTextOptions = TEXT_COLOR
1515

16-
MenuBox = { x=120, y=90, w=210, x_offset=40, h_line=30, h_offset=20 }
17-
SaveBox = { x=120, y=100, w=210, x_offset=12, h=150, h_offset=12 }
16+
MenuBox = { x=120, y=100, w=200, x_offset=68, h_line=20, h_offset=6 }
17+
SaveBox = { x=120, y=100, w=180, x_offset=12, h=60, h_offset=12 }
1818
NoTelem = { 192, LCD_H - 28, "No Telemetry", TEXT_COLOR + INVERS + BLINK }

‎src/SCRIPTS/BF/HORUS/pids.lua

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@ return {
1616
},
1717
fields = {
1818
-- P
19-
{ x = 140, y = 100, min = 0, max = 200, vals = { 1 } },
20-
{ x = 140, y = 150, min = 0, max = 200, vals = { 4 } },
21-
{ x = 140, y = 200, min = 0, max = 200, vals = { 7 } },
19+
{ x = 140, y = 100, min = 0, max = 200, vals = { 1 }, to = MIDSIZE },
20+
{ x = 140, y = 150, min = 0, max = 200, vals = { 4 }, to = MIDSIZE },
21+
{ x = 140, y = 200, min = 0, max = 200, vals = { 7 }, to = MIDSIZE },
2222
-- I
23-
{ x = 240, y = 100, min = 0, max = 200, vals = { 2 } },
24-
{ x = 240, y = 150, min = 0, max = 200, vals = { 5 } },
25-
{ x = 240, y = 200, min = 0, max = 200, vals = { 8 } },
23+
{ x = 240, y = 100, min = 0, max = 200, vals = { 2 }, to = MIDSIZE },
24+
{ x = 240, y = 150, min = 0, max = 200, vals = { 5 }, to = MIDSIZE },
25+
{ x = 240, y = 200, min = 0, max = 200, vals = { 8 }, to = MIDSIZE },
2626
-- D
27-
{ x = 340, y = 100, min = 0, max = 200, vals = { 3 } },
28-
{ x = 340, y = 150, min = 0, max = 200, vals = { 6 } },
27+
{ x = 340, y = 100, min = 0, max = 200, vals = { 3 }, to = MIDSIZE },
28+
{ x = 340, y = 150, min = 0, max = 200, vals = { 6 }, to = MIDSIZE },
2929
},
3030
}

‎src/SCRIPTS/BF/HORUS/pwm.lua

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@ return {
1515
{ t = "Idle Offset", x = 232, y = 200 }
1616
},
1717
fields = {
18-
{ x = 130, y = 68, vals = { 4 }, min = 0, max = 9,
18+
{ x = 130, y = 68, vals = { 4 }, min = 0, max = 9, to = MIDSIZE,
1919
table = { [0] = "OFF", "ONESHOT125", "ONESHOT42",
2020
"MULTISHOT","BRUSHED",
2121
"DSHOT150", "DSHOT300", "DSHOT600","DSHOT1200",
2222
"PROSHOT1000" }
2323
},
24-
{ x = 130, y = 110, vals = { 9 }, min = 0, max = 1,
24+
{ x = 130, y = 110, vals = { 9 }, min = 0, max = 1, to = MIDSIZE,
2525
table = { [0] = "OFF", "ON" },
2626
upd = function(self) self.updateRateTables(self) end
2727
},
28-
{ x = 130, y = 155, vals = { 1 }, min = 1, max = 32,
28+
{ x = 130, y = 155, vals = { 1 }, min = 1, max = 32, to = MIDSIZE,
2929
upd = function(self) self.updatePidRateTable(self) end
3030
},
31-
{ x = 130, y = 200, vals = { 2 }, min = 1, max = 16 },
32-
{ x = 350, y = 110, vals = { 3 }, min = 0, max = 1,
31+
{ x = 130, y = 200, vals = { 2 }, min = 1, max = 16, to = MIDSIZE },
32+
{ x = 350, y = 110, vals = { 3 }, min = 0, max = 1, to = MIDSIZE,
3333
table = { [0] = "OFF", "ON" } },
34-
{ x = 350, y = 155, vals = { 5, 6 }, min = 200, max = 32000 },
35-
{ x = 350, y = 200, vals = { 7, 8 }, min = 0, max = 2000, scale = 100 },
34+
{ x = 350, y = 155, vals = { 5, 6 }, min = 200, max = 32000, to = MIDSIZE },
35+
{ x = 350, y = 200, vals = { 7, 8 }, min = 0, max = 2000, scale = 100, to = MIDSIZE },
3636
},
3737
calculateGyroRates = function(self, baseRate)
3838
self.gyroRates = {}

‎src/SCRIPTS/BF/HORUS/rates1.lua

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ return {
2424
},
2525
fields = {
2626
-- RC Rates
27-
{ x = 102, y = 125, vals = { 1 }, min = 0, max = 255, scale = 100 },
28-
{ x = 102, y = 200, vals = { 12 }, min = 0, max = 255, scale = 100 },
27+
{ x = 102, y = 125, vals = { 1 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
28+
{ x = 102, y = 200, vals = { 12 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
2929
-- Super Rates
30-
{ x = 158, y = 100, vals = { 3 }, min = 0, max = 100, scale = 100 },
31-
{ x = 158, y = 150, vals = { 4 }, min = 0, max = 100, scale = 100 },
32-
{ x = 158, y = 200, vals = { 5 }, min = 0, max = 255, scale = 100 },
30+
{ x = 158, y = 100, vals = { 3 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
31+
{ x = 158, y = 150, vals = { 4 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
32+
{ x = 158, y = 200, vals = { 5 }, min = 0, max = 255, scale = 100, to=MIDSIZE },
3333
-- RC Expo
34-
{ x = 216, y = 125, vals = { 2 }, min = 0, max = 100, scale = 100 },
35-
{ x = 216, y = 200, vals = { 11 }, min = 0, max = 100, scale = 100 },
34+
{ x = 216, y = 125, vals = { 2 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
35+
{ x = 216, y = 200, vals = { 11 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
3636
-- Throttle
37-
{ x = 330, y = 100, vals = { 7 }, min = 0, max = 100, scale = 100 },
38-
{ x = 330, y = 150, vals = { 8 }, min = 0, max = 100, scale = 100 },
37+
{ x = 330, y = 100, vals = { 7 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
38+
{ x = 330, y = 150, vals = { 8 }, min = 0, max = 100, scale = 100, to=MIDSIZE },
3939
-- TPA
40-
{ x = 416, y = 100, vals = { 6 } , min = 0, max = 100, scale = 100 },
41-
{ x = 416, y = 150, vals = { 9, 10 }, min = 1000, max = 2000 }
40+
{ x = 416, y = 100, vals = { 6 } , min = 0, max = 100, scale = 100, to=MIDSIZE },
41+
{ x = 416, y = 150, vals = { 9, 10 }, min = 1000, max = 2000, to=MIDSIZE }
4242
},
4343
}

‎src/SCRIPTS/BF/HORUS/rates2.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ return {
1717
},
1818
fields = {
1919
-- GAIN
20-
{ x = 144, y = 100, min = 1000, max = 30000, vals = { 22, 23 }, scale = 1000, mult = 1000 },
20+
{ x = 144, y = 100, min = 1000, max = 30000, vals = { 22, 23 }, to = MIDSIZE, scale = 1000, mult = 1000 },
2121
-- THRESHOLD
22-
{ x = 144, y = 142, min = 20, max = 1000, vals = { 20, 21 } },
22+
{ x = 144, y = 142, min = 20, max = 1000, vals = { 20, 21 }, to = MIDSIZE },
2323
-- WEIGHT
24-
{ x = 348, y = 100, min = 0, max = 254, vals = { 10 }, scale = 100 },
24+
{ x = 348, y = 100, min = 0, max = 254, vals = { 10 }, to = MIDSIZE, scale = 100 },
2525
-- TRANSITION
26-
{ x = 348, y = 142, min = 0, max = 100, vals = { 9 }, scale = 100 },
26+
{ x = 348, y = 142, min = 0, max = 100, vals = { 9 }, to = MIDSIZE, scale = 100 },
2727
-- VBAT COMPENSATION
28-
{ x = 236, y = 200, min = 0, max = 1, vals = { 8 }, table = { [0]="OFF", "ON" } },
28+
{ x = 236, y = 200, min = 0, max = 1, vals = { 8 }, to = MIDSIZE, table = { [0]="OFF", "ON" } },
2929
}
3030
}

‎src/SCRIPTS/BF/HORUS/rx.lua

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ return {
66
eepromWrite = true,
77
minBytes = 23,
88
text= {
9-
{ t = "Stick Min", x = 50, y = 68 },
10-
{ t = "Stick Mid", x = 50, y = 110 },
11-
{ t = "Stick Max", x = 50, y = 155 },
12-
{ t = "Cam Angle", x = 240, y = 68 },
13-
{ t = "Interp", x = 240, y = 110 },
14-
{ t = "Interp Int", x = 240, y = 155 }
9+
{ t = "Stick Min", x = 36, y = 68 },
10+
{ t = "Stick Mid", x = 36, y = 110 },
11+
{ t = "Stick Max", x = 36, y = 155 },
12+
{ t = "Cam Angle", x = 232, y = 68 },
13+
{ t = "Interp", x = 232, y = 110 },
14+
{ t = "Interp Int", x = 232, y = 155 }
1515
},
1616
fields = {
17-
{ x = 152, y = 68, min = 1000, max = 2000, vals = { 6, 7 } },
18-
{ x = 152, y = 110, min = 1000, max = 2000, vals = { 4, 5 } },
19-
{ x = 152, y = 155, min = 1000, max = 2000, vals = { 2, 3 } },
20-
{ x = 362, y = 68, min = 0, max = 50, vals = { 23 } },
21-
{ x = 362, y = 110, min = 0, max = 3, vals = { 13 },
17+
{ x = 130, y = 68, min = 1000, max = 2000, vals = { 6, 7 }, to = MIDSIZE },
18+
{ x = 130, y = 110, min = 1000, max = 2000, vals = { 4, 5 }, to = MIDSIZE },
19+
{ x = 130, y = 155, min = 1000, max = 2000, vals = { 2, 3 }, to = MIDSIZE },
20+
{ x = 350, y = 68, min = 0, max = 50, vals = { 23 }, to = MIDSIZE },
21+
{ x = 350, y = 110, min = 0, max = 3, vals = { 13 }, to = MIDSIZE,
2222
table={ [0]="Off", "Preset", "Auto", "Manual"} },
23-
{ x = 362, y = 155, min = 1, max = 50, vals = { 14 } }
23+
{ x = 350, y = 155, min = 1, max = 50, vals = { 14 }, to = MIDSIZE }
2424
},
2525
}

‎src/SCRIPTS/BF/HORUS/vtx.lua

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,33 @@ return {
99
title = "VTX",
1010
minBytes = 5,
1111
text= {
12-
{ t = "Band", x = 50, y = 50 },
13-
{ t = "Channel", x = 50, y = 100 },
14-
{ t = "Power", x = 50, y = 150 },
15-
{ t = "Pit", x = 50, y = 200 },
16-
{ t = "Proto", x = 240, y = 50 },
17-
{ t = "Freq", x = 240, y = 100 },
12+
{ t = "Band", x = 36, y = 110 },
13+
{ t = "Channel", x = 36, y = 155 },
14+
{ t = "Power", x = 232, y = 110 },
15+
{ t = "Pit", x = 232, y = 155 },
16+
{ t = "Proto", x = 36, y = 68 },
17+
{ t = "Freq", x = 232, y = 68 },
1818
},
1919
fields = {
20-
{ x = 152, y = 50, min=1, max=5, vals = { 2 },
20+
-- Band
21+
{ x = 130, y = 110, min=1, max=5, vals = { 2 }, to = MIDSIZE,
2122
table = { "A", "B", "E", "F", "R" },
2223
upd = function(self) self.updateVTXFreq(self) end },
23-
{ x = 152, y = 100, min=1, max=8, vals = { 3 },
24+
-- Channel
25+
{ x = 130, y = 155, min=1, max=8, vals = { 3 }, to = MIDSIZE,
2426
upd = function(self) self.updateVTXFreq(self) end },
25-
{ x = 152, y = 150, min=1, vals = { 4 },
27+
-- Power
28+
{ x = 350, y = 110, min=1, vals = { 4 }, to = MIDSIZE,
2629
upd = function(self) self.updatePowerTable(self) end },
27-
{ x = 152, y = 200, min=0, max=1, vals = { 5 },
30+
-- Pit mode
31+
{ x = 350, y = 155, min=0, max=1, vals = { 5 }, to = MIDSIZE,
2832
table = { [0]="OFF", "ON" } },
29-
{ x = 332, y = 50, write = false, ro = true, vals = { 1 },
33+
-- Proto
34+
{ x = 130, y = 68, vals = { 1 }, to = MIDSIZE,
35+
write = false, ro = true,
3036
table = {[3]="SmartAudio",[4]="Tramp",[255]="None"} },
31-
{ x = 332, y = 100, min=5000, max=6000, ro=true },
37+
-- Freq
38+
{ x = 350, y = 68, min=5000, max=6000, ro=true, to = MIDSIZE },
3239
},
3340
freqLookup = {
3441
{ 5865, 5845, 5825, 5805, 5785, 5765, 5745, 5725 }, -- Boscam A

0 commit comments

Comments
 (0)