Skip to content

Layout fixes #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 27, 2019
Merged

Layout fixes #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/SCRIPTS/BF/LAYOUT/128x64/gpspids.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
return {
labels = {
{ t = "P", x = 55, y = 14, },
{ t = "I", x = 83, y = 14, },
{ t = "D", x = 111, y = 14, },
{ t = "Throttle", x = 5, y = 26, },
{ t = "Velocity", x = 5, y = 36, },
{ t = "Yaw" , x = 5, y = 46, },
{ t = "P", x = 55, y = 14, },
{ t = "I", x = 83, y = 14, },
{ t = "D", x = 111, y = 14, },
{ t = "Throttle", x = 5, y = 26, },
{ t = "Velocity", x = 5, y = 36, },
{ t = "Yaw" , x = 5, y = 46, },
},
fieldLayout = {
{ x = 51, y = 26, },
Expand Down
28 changes: 14 additions & 14 deletions src/SCRIPTS/BF/LAYOUT/128x64/pids2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
return {
labels = {
{ t = "Feed", x = 45, y = 11, },
{ t = "forward", x = 37, y = 18, },
{ t = "D", x = 85, y = 11, },
{ t = "Min", x = 80, y = 18, },
{ t = "ROLL", x = 10, y = 26, },
{ t = "PITCH", x = 10, y = 36, },
{ t = "YAW", x = 10, y = 46, },
{ t = "Feed", x = 45, y = 12, },
{ t = "forward", x = 37, y = 20, },
{ t = "D", x = 85, y = 12, },
{ t = "Min", x = 80, y = 20, },
{ t = "ROLL", x = 10, y = 28, },
{ t = "PITCH", x = 10, y = 38, },
{ t = "YAW", x = 10, y = 48, },
{ t = "Feedforward", x = 10, y = 60, },
{ t = "Transition", x = 20, y = 68, },
{ t = "D Min", x = 10, y = 76, },
{ t = "Gain", x = 20, y = 84, },
{ t = "Advance", x = 20, y = 92, },
},
fieldLayout = {
{ x = 48, y = 26, },
{ x = 48, y = 36, },
{ x = 48, y = 46, },
{ x = 80, y = 26, },
{ x = 80, y = 36, },
{ x = 80, y = 46, },
{ x = 48, y = 28, },
{ x = 48, y = 38, },
{ x = 48, y = 48, },
{ x = 80, y = 28, },
{ x = 80, y = 38, },
{ x = 80, y = 48, },
{ x = 80, y = 68, },
{ x = 80, y = 84, },
{ x = 80, y = 92, },
},
}
}
12 changes: 6 additions & 6 deletions src/SCRIPTS/BF/LAYOUT/128x64/pwm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
return {
labels = {
{ t = "32K", x = 10, y = 14, },
{ t = "Gyro", x = 10, y = 24, },
{ t = "PID", x = 10, y = 34, },
{ t = "Prot", x = 58, y = 14, },
{ t = "32K", x = 10, y = 14, },
{ t = "Gyro", x = 10, y = 24, },
{ t = "PID", x = 10, y = 34, },
{ t = "Prot", x = 58, y = 14, },
{ t = "Unsync", x = 58, y = 24, },
{ t = "PWM", x = 58, y = 34, },
{ t = "Idle", x = 58, y = 44, }
{ t = "PWM", x = 58, y = 34, },
{ t = "Idle", x = 58, y = 44, }
},
fieldLayout = {
{ x = 32, y = 14, },
Expand Down
36 changes: 18 additions & 18 deletions src/SCRIPTS/BF/LAYOUT/128x64/rates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
return {
labels = {
{ t = "RC", x = 43, y = 11, },
{ t = "Rate", x = 38, y = 18, },
{ t = "Super", x = 63, y = 11, },
{ t = "Rate", x = 66, y = 18, },
{ t = "RC", x = 99, y = 11, },
{ t = "Expo", x = 94, y = 18, },
{ t = "ROLL", x = 10, y = 26, },
{ t = "PITCH", x = 10, y = 36, },
{ t = "YAW", x = 10, y = 46, },
{ t = "RC", x = 43, y = 12, },
{ t = "Rate", x = 38, y = 20, },
{ t = "Super", x = 63, y = 12, },
{ t = "Rate", x = 66, y = 20, },
{ t = "RC", x = 99, y = 12, },
{ t = "Expo", x = 94, y = 20, },
{ t = "ROLL", x = 10, y = 28, },
{ t = "PITCH", x = 10, y = 38, },
{ t = "YAW", x = 10, y = 48, },
{ t = "Throttle", x = 10, y = 60, },
{ t = "Mid", x = 20, y = 68, },
{ t = "Expo", x = 20, y = 76, },
Expand All @@ -19,15 +19,15 @@ return {
{ t = "Breakpoint", x = 20, y = 116, },
},
fieldLayout = {
{ x = 39, y = 26, },
{ x = 39, y = 36, },
{ x = 39, y = 46, },
{ x = 66, y = 26, },
{ x = 66, y = 36, },
{ x = 66, y = 46, },
{ x = 94, y = 26, },
{ x = 94, y = 36, },
{ x = 94, y = 46, },
{ x = 39, y = 28, },
{ x = 39, y = 38, },
{ x = 39, y = 48, },
{ x = 66, y = 28, },
{ x = 66, y = 38, },
{ x = 66, y = 48, },
{ x = 94, y = 28, },
{ x = 94, y = 38, },
{ x = 94, y = 48, },
{ x = 70, y = 68, },
{ x = 70, y = 76, },
{ x = 70, y = 84, },
Expand Down
24 changes: 12 additions & 12 deletions src/SCRIPTS/BF/LAYOUT/128x64/rx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
return {
labels = {
{ t = "Stick Min", x = 10, y = 20 },
{ t = "Stick Mid", x = 10, y = 30 },
{ t = "Stick Max", x = 10, y = 40 },
{ t = "Cam Angle", x = 10, y = 50 },
{ t = "Interp", x = 10, y = 60 },
{ t = "Interp Int", x = 10, y = 70 },
{ t = "Stick Min", x = 10, y = 12 },
{ t = "Stick Mid", x = 10, y = 22 },
{ t = "Stick Max", x = 10, y = 32 },
{ t = "Cam Angle", x = 10, y = 42 },
{ t = "Interp", x = 10, y = 52 },
{ t = "Interp Int", x = 10, y = 62 },
},
fieldLayout = {
{ x = 70, y = 20, },
{ x = 70, y = 30, },
{ x = 70, y = 40, },
{ x = 70, y = 50, },
{ x = 70, y = 60, },
{ x = 70, y = 70, }
{ x = 70, y = 12, },
{ x = 70, y = 22, },
{ x = 70, y = 32, },
{ x = 70, y = 42, },
{ x = 70, y = 52, },
{ x = 70, y = 62, }
},
}
12 changes: 6 additions & 6 deletions src/SCRIPTS/BF/LAYOUT/128x64/vtx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
return {
labels = {
{ t = "Band", x = 10, y = 14 },
{ t = "Channel", x = 10, y = 24 },
{ t = "Power", x = 10, y = 34 },
{ t = "Pit", x = 10, y = 44 },
{ t = "Proto", x = 70, y = 14 },
{ t = "Freq", x = 70, y = 24 },
{ t = "Band", x = 10, y = 14 },
{ t = "Chan", x = 10, y = 24 },
{ t = "Power", x = 10, y = 34 },
{ t = "Pit", x = 10, y = 44 },
{ t = "Proto", x = 70, y = 14 },
{ t = "Freq", x = 70, y = 24 },
},
fieldLayout = {
{ x = 40, y = 14, },
Expand Down
30 changes: 15 additions & 15 deletions src/SCRIPTS/BF/LAYOUT/212x64/pids2.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
return {
labels = {
{ t = "Feed", x = 46, y = 11, },
{ t = "forward", x = 38, y = 18, },
{ t = "D", x = 86, y = 11, },
{ t = "Min", x = 81, y = 18, },
{ t = "ROLL", x = 8, y = 26, },
{ t = "PITCH", x = 8, y = 36, },
{ t = "YAW", x = 8, y = 46, },
{ t = "Feed", x = 46, y = 12, },
{ t = "forward", x = 38, y = 20, },
{ t = "D", x = 86, y = 12, },
{ t = "Min", x = 81, y = 20, },
{ t = "ROLL", x = 8, y = 28, },
{ t = "PITCH", x = 8, y = 38, },
{ t = "YAW", x = 8, y = 48, },
{ t = "Feedforward", x = 110, y = 14, },
{ t = "Transition", x = 120, y = 22, },
{ t = "D Min", x = 110, y = 30, },
{ t = "Gain", x = 120, y = 38, },
{ t = "Advance", x = 120, y = 46, },
{ t = "Advance", x = 120, y = 48, },
},
fieldLayout = {
{ x = 49, y = 26, },
{ x = 49, y = 36, },
{ x = 49, y = 46, },
{ x = 81, y = 26, },
{ x = 81, y = 36, },
{ x = 81, y = 46, },
{ x = 49, y = 28, },
{ x = 49, y = 38, },
{ x = 49, y = 48, },
{ x = 81, y = 28, },
{ x = 81, y = 38, },
{ x = 81, y = 48, },
{ x = 180, y = 22, },
{ x = 180, y = 38, },
{ x = 180, y = 46, },
{ x = 180, y = 48, },
},
}
6 changes: 3 additions & 3 deletions src/SCRIPTS/BF/LAYOUT/212x64/pwm.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ return {
{ t = "Idle Offset", x = 94, y = 44, }
},
fieldLayout = {
{ x = 65, y = 14, },
{ x = 65, y = 24, },
{ x = 65, y = 34, },
{ x = 65, y = 14, },
{ x = 65, y = 24, },
{ x = 65, y = 34, },
{ x = 148, y = 14, },
{ x = 148, y = 24, },
{ x = 148, y = 34, },
Expand Down
36 changes: 18 additions & 18 deletions src/SCRIPTS/BF/LAYOUT/212x64/rates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
return {
labels = {
{ t = "RC", x = 43, y = 11, },
{ t = "Rate", x = 38, y = 18, },
{ t = "Super", x = 63, y = 11, },
{ t = "Rate", x = 66, y = 18, },
{ t = "RC", x = 99, y = 11, },
{ t = "Expo", x = 94, y = 18, },
{ t = "ROLL", x = 8, y = 26, },
{ t = "PITCH", x = 8, y = 36, },
{ t = "YAW", x = 8, y = 46, },
{ t = "RC", x = 43, y = 12, },
{ t = "Rate", x = 38, y = 20, },
{ t = "Super", x = 63, y = 12, },
{ t = "Rate", x = 66, y = 20, },
{ t = "RC", x = 99, y = 12, },
{ t = "Expo", x = 94, y = 20, },
{ t = "ROLL", x = 8, y = 28, },
{ t = "PITCH", x = 8, y = 38, },
{ t = "YAW", x = 8, y = 48, },
{ t = "Throttle", x = 120, y = 12, },
{ t = "Mid", x = 130, y = 20, },
{ t = "Expo", x = 130, y = 28, },
Expand All @@ -19,15 +19,15 @@ return {
{ t = "Breakpoint", x = 130, y = 68, },
},
fieldLayout = {
{ x = 39, y = 26, },
{ x = 39, y = 36, },
{ x = 39, y = 46, },
{ x = 66, y = 26, },
{ x = 66, y = 36, },
{ x = 66, y = 46, },
{ x = 94, y = 26, },
{ x = 94, y = 36, },
{ x = 94, y = 46, },
{ x = 39, y = 28, },
{ x = 39, y = 38, },
{ x = 39, y = 48, },
{ x = 66, y = 28, },
{ x = 66, y = 38, },
{ x = 66, y = 48, },
{ x = 94, y = 28, },
{ x = 94, y = 38, },
{ x = 94, y = 48, },
{ x = 180, y = 20, },
{ x = 180, y = 28, },
{ x = 180, y = 36, },
Expand Down
12 changes: 6 additions & 6 deletions src/SCRIPTS/BF/LAYOUT/212x64/rescue.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ return {
{ t = "Max", x = 128, y = 52, },
},
fieldLayout = {
{ x = 75, y = 12, },
{ x = 75, y = 22, },
{ x = 75, y = 32, },
{ x = 75, y = 42, },
{ x = 75, y = 52, },
{ x = 75, y = 62, },
{ x = 75, y = 12, },
{ x = 75, y = 22, },
{ x = 75, y = 32, },
{ x = 75, y = 42, },
{ x = 75, y = 52, },
{ x = 75, y = 62, },
{ x = 180, y = 12, },
{ x = 150, y = 32, },
{ x = 150, y = 42, },
Expand Down
24 changes: 12 additions & 12 deletions src/SCRIPTS/BF/LAYOUT/212x64/rx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
return {
labels = {
{ t = "Stick Min", x = 30, y = 20 },
{ t = "Stick Mid", x = 30, y = 30 },
{ t = "Stick Max", x = 30, y = 40 },
{ t = "Cam Angle", x = 110, y = 20 },
{ t = "Interp", x = 110, y = 30 },
{ t = "Interp Int", x = 110, y = 40 },
{ t = "Stick Min", x = 30, y = 12 },
{ t = "Stick Mid", x = 30, y = 22 },
{ t = "Stick Max", x = 30, y = 32 },
{ t = "Cam Angle", x = 110, y = 12 },
{ t = "Interp", x = 110, y = 22 },
{ t = "Interp Int", x = 110, y = 32 },
},
fieldLayout = {
{ x = 80, y = 20, },
{ x = 80, y = 30, },
{ x = 80, y = 40, },
{ x = 160, y = 20, },
{ x = 160, y = 30, },
{ x = 160, y = 40, }
{ x = 80, y = 12, },
{ x = 80, y = 22, },
{ x = 80, y = 32, },
{ x = 160, y = 12, },
{ x = 160, y = 22, },
{ x = 160, y = 32, }
},
}
12 changes: 6 additions & 6 deletions src/SCRIPTS/BF/LAYOUT/212x64/vtx.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ return {
{ t = "Freq", x = 100, y = 24 },
},
fieldLayout = {
{ x = 75, y = 155, },
{ x = 75, y = 200, },
{ x = 75, y = 242, },
{ x = 75, y = 284, },
{ x = 150, y = 68, },
{ x = 150, y = 110, },
{ x = 75, y = 14, },
{ x = 75, y = 24, },
{ x = 75, y = 34, },
{ x = 75, y = 44, },
{ x = 150, y = 14, },
{ x = 150, y = 24, },
},
}
4 changes: 2 additions & 2 deletions src/SCRIPTS/BF/radios.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ local supportedRadios =
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", BLINK },
textSize = MIDSIZE,
textSize = 0,
yMinLimit = 35,
yMaxLimit = 215,
},
Expand All @@ -46,7 +46,7 @@ local supportedRadios =
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", BLINK },
textSize = MIDSIZE,
textSize = 0,
yMinLimit = 35,
yMaxLimit = 215,
},
Expand Down