Skip to content

Memory Profiles Added #18

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

Open
BigBangPro wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Memory Profiles Added #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6de1d19
Memory Profiles Added
BigBangPro Jul 3, 2017
4421fe9
Update KissProtocolCF.lua
BigBangPro Jul 3, 2017
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
6 changes: 5 additions & 1 deletion src/Horus/KISS/alarms.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,9 @@ return {
-- Alarms
{ t = "VBat", x = 100, y = 96, sp = 60, i=1, min=0, max=26000, prec=1 },
{ t = "mAH", x = 250, y = 96, sp = 60, i=2, min=0, max=26000, inc=10 }
}
},
wrName = {},
dL = 10,
data = {},
defValues = "Default___14400 1000"
}
6 changes: 5 additions & 1 deletion src/Horus/KISS/filters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,5 +52,9 @@ return {
{ x = 289, y = 124, i=6, min=0, max=490 },
{ x = 129, y = 158, i=7, min=1, max=7, table = { "Off", "High", "Med. High", "Medium", "Med. Low", "Low", "Very Low" } },
{ x = 129, y = 186, i=8, min=0, max=97},
}
},
wrName = {},
dL = 40,
data = {},
defValues = "Default___ 1 200 100 1 200 100 1 35"
}
20 changes: 20 additions & 0 deletions src/Horus/KISS/memory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
return {
title = " Names",
text = {
{ t = "1:", x = 40, y = 43 },
{ t = "2:", x = 40, y = 63 },
{ t = "3:", x = 40, y = 83 },
{ t = "4:", x = 40, y = 103 },
{ t = "5:", x = 40, y = 123 }
},
fields = {
-- model data
{t="1", d="", x = 60, y = 43, sp = 12, i=1, min=1, max=500 },
{t="2", d="", x = 60, y = 63, sp = 12, i=2, min=1, max=500 },
{t="3", d="", x = 60, y = 83, sp = 12, i=3, min=0, max=600 },
{t="4", d="", x = 60, y = 103, sp = 12, i=4, min=0, max=600 },
{t="5", d="", x = 60, y = 123, sp = 12, i=5, min=0, max=600 }
},
read = select_model_load,
write = select_model_save
}
6 changes: 5 additions & 1 deletion src/Horus/KISS/pids.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,9 @@ return {
{ x = 289, y = 96, i=3, max=65000, prec=2 },
{ x = 289, y = 124, i=6, max=65000, prec=2 },
{ x = 289, y = 152, i=9, max=65000, prec=2 }
}
},
wrName = {},
dL = 45,
data = {},
defValues = "Default___ 3000 3510000 3000 3510000 8000 50 0"
}
6 changes: 5 additions & 1 deletion src/Horus/KISS/rates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,9 @@ return {
{ x = 129, y = 152, i=7, max=65000, prec=2 },
{ x = 209, y = 152, i=8, max=65000, prec=2 },
{ x = 289, y = 152, i=9, max=65000, prec=2 }
}
},
wrName = {},
dL = 45,
data = {},
defValues= "Default___ 70 70 40 70 70 40 70 70 40"
}
6 changes: 5 additions & 1 deletion src/Horus/KISS/tpa.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@ return {
{ x = 190, y = 190, i=8, max=100},
{ x = 240, y = 190, i=9, max=100},
{ x = 289, y = 190, i=10,max=100},
}
},
wrName = {},
dL = 50,
data = {},
defValues = "Default___ 40 20 40 1 30 50 30 0 0 100"
}
59 changes: 57 additions & 2 deletions src/Horus/Kiss.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,19 @@ local drawScreenTitle = function(title, currentPage, totalPages)
lcd.drawText(1, 5, title, MENU_TITLE_COLOR)
end

local drawScreenTitle = function(title, cPage, tPages)
local str
if cPage == #(AllPages) then
str = "Mem: "..CP.title
cPage = 0
tPages = 0
else
str = "Kiss Setup: "
end
lcd.drawFilledRectangle(0, 0, LCD_W, 30, TITLE_BGCOLOR)
lcd.drawText(1,5,str..title,MENU_TITLE_COLOR)
end

local drawTelemetry = function()
lcd.drawText(192,LCD_H - 28,"No telemetry",TEXT_COLOR + INVERS + BLINK)
end
Expand All @@ -18,27 +31,69 @@ local drawSaving = function()
end

local function drawMenu(menuList, menuActive)
local vTx
if ActivePage.title== "VTX" then vTx = 2 else vTx = #(menuList) end

local x = 120
local y = 100
local w = 200
local w = 240
local x_offset = 68
local h_line = 20
local h_offset = 6
local h = #(menuList) * h_line + h_offset*2
local h = vTx * h_line + h_offset*2

lcd.drawFilledRectangle(x-2,y-2,w+4,h+4,ERASE)
lcd.drawRectangle(x-2,y-2,w+3,h+3,SOLID)
lcd.drawRectangle(x,y,w-1,h-1,SOLID)
lcd.drawText(x+4,y+3,"Menu: ", INVERS)

lcd.drawFilledRectangle(x,y,w,h,TEXT_BGCOLOR)
lcd.drawRectangle(x,y,w-1,h-1,LINE_COLOR)
lcd.drawText(x+h_line/2,y+h_offset,"Menu:", TEXT_COLOR)

for i,e in ipairs(menuList) do
local text_options = TEXT_COLOR
if vTx == 2 and i == 3 then break end
if menuActive == i then
text_options = text_options + INVERS
end
lcd.drawText(x+x_offset,y+(i-1)*h_line+h_offset,e.t,text_options)
end
end

local function getFieldFlags(p)
local flg = 0
if activeField==p then
flg=INVERS
if editMode then
flg=INVERS+BLINK
end
end
return flg
end

local function drawEditMenu()
currentLine = 1
local x = 30
local y = 60
local w = 240
local h = 120

lcd.drawFilledRectangle(x,y,w,h,TEXT_BGCOLOR)
lcd.drawRectangle(x,y,w,h,LINE_COLOR)
lcd.drawRectangle(x+1,y+1,w-2,h-3,LINE_COLOR)

lcd.drawText(x+5,y+3,CP.title.." Set: ",TEXT_COLOR)
lcd.drawText(x + w - 30, y+3, currentLine, TEXT_COLOR)
lcd.drawText(x+4,y+32,"Name: ")
for i = 0,9 do
lcd.drawText ( x+80+i*15,y+32,CPvN[i+1],getFieldFlags(i))
end
lcd.drawText(x+6, y+80, "[SAVE NAME]", getFieldFlags(10))
lcd.drawText(x+w-90, y+80, "[..LOAD..]", getFieldFlags(11))

end

local function getDefaultTextOptions()
return TEXT_COLOR
end
Expand Down
6 changes: 5 additions & 1 deletion src/X7/KISS/alarms.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ return {
fields = {
{ t = "VBat", x = 15, y = 27, sp = 70, i=1, min=0, max=26000, prec=1 },
{ t = "mAH", x = 15, y = 40, sp = 70, i=2, min=0, max=26000, inc=10 }
}
},
wrName = {},
dL = 10,
data = {},
defValues = "Default___14400 1000"
}
6 changes: 5 additions & 1 deletion src/X7/KISS/filters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,9 @@ return {
{ x = 80, y = 38, i=6, min=0, max=490 },
{ x = 15, y = 52, i=7, min=1, max=7, table = { "Off", "High", "MedHi", "Med", "MedLo", "Low", "VerLo" } },
{ x = 80, y = 52, i=8, min=0, max=97},
}
},
wrName = {},
dL = 40,
data = {},
defValues = "Default___ 1 200 100 1 200 100 1 35"
}
20 changes: 20 additions & 0 deletions src/X7/KISS/memory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
return {
title = " Names",
text = {
{ t = "1:", x = 10, y = 13 },
{ t = "2", x = 10, y = 23 },
{ t = "3:", x = 10, y = 33 },
{ t = "4:", x = 10, y = 43 },
{ t = "5:", x = 10, y = 53 }
},
fields = {
-- model data
{t="1", d="", x = 20, y = 13, sp = 12, i=1, min=1, max=500 },
{t="2", d="", x = 20, y = 23, sp = 12, i=2, min=1, max=500 },
{t="3", d="", x = 20, y = 33, sp = 12, i=3, min=0, max=600 },
{t="4", d="", x = 20, y = 43, sp = 12, i=4, min=0, max=600 },
{t="5", d="", x = 20, y = 53, sp = 12, i=5, min=0, max=600 }
},
read = select_model_load,
write = select_model_save
}
4 changes: 4 additions & 0 deletions src/X7/KISS/pids.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ return {
{ x = 48, y = 50, i=8, max=65000, prec=3 },
{ x = 80, y = 50, i=9, max=65000, prec=2 }
},
wrName = {},
dL = 45,
data = {},
defValues = "Default___ 3000 3510000 3000 3510000 8000 50 0"
}
6 changes: 5 additions & 1 deletion src/X7/KISS/rates.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,9 @@ return {
{ x = 16, y = 50, i=7, max=65000, prec=2 },
{ x = 48, y = 50, i=8, max=65000, prec=2 },
{ x = 80, y = 50, i=9, max=65000, prec=2 }
}
},
wrName = {},
dL = 45,
data = {},
defValues= "Default___ 70 70 40 70 70 40 70 70 40"
}
6 changes: 5 additions & 1 deletion src/X7/KISS/tpa.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@ return {
{ x = 38, y = 53, i=8, max=100},
{ x = 61, y = 53, i=9, max=100},
{ x = 85, y = 53, i=10,max=100},
}
},
wrName = {},
dL = 50,
data = {},
defValues = "Default___ 40 20 40 1 30 50 30 0 0 100"
}
62 changes: 54 additions & 8 deletions src/X7/Kiss.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,16 @@

local RADIO = "X7"

local drawScreenTitle = function(title, currentPage, totalPages)
lcd.drawScreenTitle('Kiss Setup: '..title, currentPage, totalPages)
local drawScreenTitle = function(title, cPage, tPages)
local str
if cPage == #(AllPages) then
str = "Mem: "..CP.title
cPage = 0
tPages = 0
else
str = "Kiss Setup: "
end
lcd.drawScreenTitle(str..title, cPage, tPages)
end

local drawTelemetry = function()
Expand All @@ -17,23 +25,61 @@ local drawSaving = function()
end

local function drawMenu(menuList, menuActive)
local x = 6
local vTx
if ActivePage.title== "VTX" then vTx = 2 else vTx = #(menuList) end

local x = 4
local y = 12
local w = 120
local h = #(menuList) * 8 + 6
lcd.drawFilledRectangle(x,y,w,h,ERASE)
local h = vTx * 8 + 6
lcd.drawFilledRectangle(x-2,y-2,w+4,h+4,ERASE)
lcd.drawRectangle(x-2,y-2,w+3,h+3,SOLID)
lcd.drawRectangle(x,y,w-1,h-1,SOLID)
lcd.drawText(x+4,y+3,"Menu:")
lcd.drawText(x+2,y+3,"Menu:")

for i,e in ipairs(menuList) do
if vTx == 2 and i == 3 then break end
if menuActive == i then
lcd.drawText(x+36,y+(i-1)*8+3,e.t,INVERS)
if vTx == 2 and i == 3 then break end
lcd.drawText(x+33,y+(i-1)*8+3,e.t,INVERS)
else
lcd.drawText(x+36,y+(i-1)*8+3,e.t)
lcd.drawText(x+33,y+(i-1)*8+3,e.t)
end
end
end

local function getFieldFlags(p)
local flg = 0
if activeField==p then
flg=INVERS
if editMode then
flg=INVERS+BLINK
end
end
return flg
end

local function drawEditMenu()
currentLine = 1
local x = 6
local y = 12
local w = 120
local h = 38
lcd.drawFilledRectangle(x-2,y-2,w+4,h+4,ERASE)
lcd.drawRectangle(x-2,y-2,w+3,h+3,SOLID)
lcd.drawRectangle(x,y,w-1,h-1,SOLID)
lcd.drawFilledRectangle(x+2,y+2,w-5,10, SOLID)
lcd.drawText(x+5,y+3,CP.title.." Set: ",INVERS)
lcd.drawText(lcd.getLastPos() + 20, y+3, currentLine, INVERS)
lcd.drawText(x+4,y+16,"Name: ")
for i = 0,9 do
lcd.drawText ( x+36+i*6,y+16,CPvN[i+1],getFieldFlags(i))
end
lcd.drawText(x+5, y+26, "[SAVE NAME]", getFieldFlags(10))
lcd.drawText(x+75, y+26, "[..LOAD..]", getFieldFlags(11))

end

local function getDefaultTextOptions()
return 0
end
Expand Down
6 changes: 5 additions & 1 deletion src/X9/KISS/alarms.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,9 @@ return {
fields = {
{ t = "VBat", x = 15, y = 25, sp = 30, i=1, min=0, max=26000, prec=1 },
{ t = "mAH", x = 120, y = 25, sp = 30, i=2, min=0, max=26000, inc=10 }
}
},
wrName = {},
dL = 10,
data = {},
defValues = "Default___14400 1000"
}
6 changes: 5 additions & 1 deletion src/X9/KISS/filters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,9 @@ return {
{ x = 145, y = 38, i=6, min=0, max=490 },
{ x = 35, y = 52, i=7, min=1, max=7, table = { "Off", "High", "Med. High", "Medium", "Med. Low", "Low", "Very Low" } },
{ x = 145, y = 52, i=8, min=0, max=97},
}
},
wrName = {},
dL = 40,
data = {},
defValues = "Default___ 1 200 100 1 200 100 1 35"
}
20 changes: 20 additions & 0 deletions src/X9/KISS/memory.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
return {
title = " Names",
text = {
{ t = "1:", x = 10, y = 13 },
{ t = "2:", x = 10, y = 23 },
{ t = "3:", x = 10, y = 33 },
{ t = "4:", x = 10, y = 43 },
{ t = "5:", x = 10, y = 53 }
},
fields = {
-- model data
{t="1", d="", x = 20, y = 13, sp = 12, i=1, min=1, max=500 },
{t="2", d="", x = 20, y = 23, sp = 12, i=2, min=1, max=500 },
{t="3", d="", x = 20, y = 33, sp = 12, i=3, min=0, max=600 },
{t="4", d="", x = 20, y = 43, sp = 12, i=4, min=0, max=600 },
{t="5", d="", x = 20, y = 53, sp = 12, i=5, min=0, max=600 }
},
read = select_model_load,
write = select_model_save
}
6 changes: 5 additions & 1 deletion src/X9/KISS/pids.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,9 @@ return {
{ x = 35, y = 50, i=7, max=65000, prec=2 },
{ x = 90, y = 50, i=8, max=65000, prec=3 },
{ x = 145, y = 50, i=9, max=65000, prec=2 }
}
},
wrName = {},
dL = 45,
data = {},
defValues = "Default___ 3000 3510000 3000 3510000 8000 50 0"
}
Loading