Horus widget batt check updates (#6412)
* Gyro added, dead code removed * CZ translations continued * Missing translation * Translations again * Assert added * Segfault removed * Compilation fix * Cosmetics * More work for X-Lite S/PRO * GyrX / GyrY eeprom support on X-Lite S/PRO * [X3] Only 5 switches * Renaming PXX / ACCESS modules constants * ACCESS started in Companion * Remove obsolete option * As X3 is X9LITE PCBX9 should be defined * Compilation fix * Logical issue: X9DP is NOT an X9D. Will be fixed better when we introduce radio family definitions * New bunch of translations * [X3] missing MIXSRC line (+ an assert to avoid it happens again) * Compilation fix * [X7] Bootloader fix * rename x3 to x9lite * rename x3 to x9lite * Compilation fix * Logical issue: X9DP is NOT an X9D. Will be fixed better when we introduce radio family definitions * cosmetics * cosmetics * Renaming continued * [X9 Lite] Simulator keys fixed * [X7] Simulator keys fixed * Update CREDITS.txt * VC++ compilation * 3djc/x7 additional switches (#6422) X7, add two additional switches * Remaining X3 in code * Bug with [EXIT Long] in TX / RX Options screen * Compilation fix * Cosmetics * Cosmetics * Cosmetics * [X10] Freeze issue fixed * Cosmetics * Allow CROSSFIRE serial telemetry mirror * HORUS fixes * CZ next round of translations * HORUS fixes * Horusgets 60 sensors, not 64 * Build simu for new radios * Compilation options updated * Compilation options updated * Compilation options updated * Cosmetics * Verbose nighlies * Compilation fix * Fix macosx compile * Fix macosx compile * Fix macosx compile * Compilation options updated * Windows compilation fight * Allow accst protocols on xlites * Windows compilation fight * Revert "Allow accst protocols on xlites" This reverts commit5040e518* Revert "Compilation options updated" This reverts commit68a9edc8* Windows compilation fight * Windows compilation fight * Should work if we compile with -DWIN_DO_FULL_INSTALL=YES -DSIMU_TARGET=NO * License.txt to ISO-8859-1 * Windows compilation fight * Windows compilation fight * Windows compilation fight clean * Windows compilation fight next round * Windows compilation fight next round * Windows compilation fight next round * Windows compilation fight next round clean * External module list depends on compilation options - option PPM=NO is added for radios which don't support PPM anymore - option SBUS=NO - option DSM2=NO * Fixes in channels order in the Multi wizard * Options for building FrSky release firmware updated * Translations fix * Translations fix * Quel talent ! * Update firmware stamps asap * small companion fixes * Fix #•6425 * cosmetics * Fix eeprom load multiples warnings * Untranslated strings splitted from others * cosmetics * ACCST protocol support added * Strings big cleaning session (#6426) Strings cleaning session * Companion new error detected on flash (when no device found) * Compilation fix * X10 extra switches sticks (#6423) [X10] 2 extra sticks switches + 2 extra pots * String change * String change * String change * String change * Compilation fix * FourCC missing for new boards in Companion * Will raise a warning next time we forget a FourCC or an EEPROM size * Compilation fix * Compilation fix * Compilation fix * Compilation fix again (no possible to avoid it with VC++ ???) * VC++ warnings fixes * Update gui_common.cpp Added: - BAYANG DHD_D4 - MJXQ PHOENIX and Freq tuning for E010 - E01X E016H - GD00X V1 and V2 - BUGSMINI BUGS3H * ACCST on ACCESS (#6430) ACCST on ACCESS * updated japanese translation. (#6429) * Fix ALT displayed in TopBar in FAI mode (2.3 version) (#6367) * Some german translations added or corrected (#6344) Some german translations added or corrected * Wrong search & replace * Fix ported from #6331 * #6331 * Prevent dist calculation overflow * Improve nightly outputs * Fix GPS overflow * Make nightlies process more robust * Make nightlies process more robust * [companion] Fix Bluetooth fields availability, add ownerId and gyro * Make nightlies process more robust * Reserve gyro data for Horus * Compilation fix * Multi compile fix * 日本語オプションを追加 * Add japaneese translation file * Temporary fix for Sky9X compilation issue * Use the Force, Luke * SKY9X-REVA removed as it doesn't even build since 2.2 * Compilation fix * Unused file removed * Removing PPM support also removed Trainer / Trainee feature * CROSSFIRE is no more a default, but firmware option (saves RAM) * CROSSFIRE module availability is based on sport sharing * Companion enhancements for checklist editor, model print and compare (2 3 branch) (#6434) * Model print and compare include GFs enhancement * Model print and compare include checklist contents * Add missing brackets and code tidy up * Print message if cannot open or read checklist file * Missing GV label translation Move some checklist code to helpers * Refactor to use helpers and add cursor position * Move improved version of removeAccents to helpers and apply to checklist * Force fixed width font for edit window * Fixes #6439 * [ACCESS] More bits for the RF protocol enum * Taranis X9D REV4a support removed (didn't compile since 2.2) * Problem in Failsafe HOLD / NONE strings * Allow PXX1 only * Fix wrong BT password Thix fixes #6440 * REvert previous fix and do it differently * Fixes missing or invalid SD path (#6441) * XLite EEPROM 218 import fix * Improve massively splash screen ! Thx MHotar !!! * Fix fiel permissions * CMake options printed when building a firmware * Companion import fix * O9X FourCC support removed * Fix companion import This fixes #6443 * Fix for negative gvars precision - inspired by #6446 thanks @ elecpower * Add mouseover tool tips to label fields with context menus (#6448) * Aie * Fix X10 analogs * Merge bitfield macros * Fix PPMUS * Add Jumper t12 support by 3djc (#6451) * Jumper T12 - companion part * more work * Add definitions * fix libsimulator key handling * Fix simu keys handling * Cosmetics * Continued * Fix wrong regplace * Fix wrong regplace * Please travis * Please travis * Add T12 to Travis Switch naming and display * Cosmetics * Work on modules * Work on modules * typo * Fix navigation * Cosmetics * Introduce NAVIGATION_type * Fix * Make NAVIGATION_type more future proof * Lots of cleanups and improvements * Cosmetics * Fix internal module menu * Cosmetics * Fix screen reversed * Small fixes * Fix navigation issue * Please travis * Fix LCD contrast * Fix T12 switch layout * Fix T12 keys screen and all radios keys translations * Complete rework of SWITCHES screen for all radios * comsetics * VC++ compilation * Prep for switch refactoring * Typo * Fix missing * Switch refactoring continued * Fix duplicate * Too long string on 128x64 screens * Properly disable BT when module not present (cherry picked from commit 2bc9a00f32a29a085e4764042ffc7d61019944f1) * X12S has Gimbal switchs handling as well * Bsongis/power control chip (#6445) FRSK files support added * Now module / receiver / sensor firmware update from .frsk files should be OK * Compilation fix * Fix X7 switches on main view * Switches refactoring (#6454) Switches refactoring * CZ translations * Bsongis/accst support over pxx2 (#6455) ACCST support over PXX2 * Refactoring * Cosmetics * Compilation fix * Compilation fix * Unused code removal * Compilation fix * X9 Lite powering issue * warning removed * R9M ACCESS / ACCST refactoring * Update build options * Introduce AUX_SERIAL (#6456) * [XLiteS / X9 Lite] Will only propose "ACCESS / ACCST D16 / ACCST LR12" (no ISRM) * Initial version * Module names constants / strings changed again * Updated Companion French translation for OpenTX 2.3 * R9M bugfix * R9M improvements * Clean outdated and unused pxx2 code (#6458) Remove outdated PXX2 code from X10 / X12S * Bsongis/menus refactoring (#6463) Menus refactoring * Update CREDITS.txt * R9M warning (#6464) R9M warning + refactoring * String change * Multi protocol updates to MPM version 1.2.1.51 (#6466) * Travis build error fix for PR #6466 Update MPM for 2.3 * Remove non working Theme * Update CREDITS.txt * Negative test inversion. Internal module mode displayed wrongly on X9 Lite * ACCST D16 / ACCESS mode removed until it is ready * Same shutdown animation on all boards * ACCST D16 is OK on ACCESS modules now * Fixes #6459 * Switches position was not optimal in Main view [Switches] * Xlite has no trainer port * Fixes 5602 Special Functions Inc/Dec Gvar (#6442) Fixes #5602 (2.3) * Cosmetics * Add vario sensor to CRSF telemetry * T12 to use 9x navigation + navigation refactoring (#6474) * Move T12 to more suited 9x navigation * Navigation refactoring * Navigation refactoring continued * Channels count in ACCESS mode fix (24 channels max) * Cosmetics * Radio / Version: FCC / EU variant displayed * BIND in ACCST mode didn't take care of 8CH / 16CH * Cosmetics * Remove 1ms for mixer to pulse XJT (now 2ms) * Refactoring around trainer * ACCESS module type added to Companion * Compilation fix * Compilation fix * Cosmetics * Fix critical issue when flashing 2.2.x firm from 2.3 bootloader (making 2.3 BL init wrong interupt not handled by 2.2 firm) * Cosmetics * Rename serial2 to aux_serial * Compilation fix * Compilation fix * ACCESS support started in Companion * Renaming "Power control chip" to "Power management unit" * Fix switch warning for X9 Lite * Always use 230400bauds for PXX2 on external module * Improve switch layout display * Companion T12 support (#6480) * Introduce T12 own variant, radio side * T12 Companion support continued * Remove warnings * Cosmetics * Please Travis * Cosmetics * Fix an issue in statistics display * Cosmetics * Update CREDITS.txt * R9M subtype selection fix * Switches fix (because we have more than 256 switches today) * CZ translations * X7 didn't have the S.PORT connector enabled * Fix nightlies compilation and add multi to Travis (it is mainstream after all) * S.PORT Flash fix * Lua warning popups could not be canceled! * Bsongis/radio tools (#6484) Lua tools now displayed in RADIO / TOOLS Add a function to write CENTERED text with lcdDrawText * PXX synchro using Hearbeat (#6482) * [PXX] Latency using heartbeat sync optimized for X7 (stable @ 12ms) * [PXX] Latency using heartbeat sync optimized for XLite Pro (stable @ 9ms) * Add RX numbers to CPN models list (2.3) (#6447) Add RX numbers to models list (#5088) * Typo * cleaner look (optimize additional info) * fix index-out-of-bound when trying to use it on top bar * cleaner code * Keep historical info of lowest cells * BattCheck, update view in top-bar
This commit is contained in:
committed by
Bertrand Songis
parent
fdc154c5ae
commit
13cee8786c
@@ -16,37 +16,59 @@
|
||||
---- # #
|
||||
---- #########################################################################
|
||||
|
||||
local shadowed = 0
|
||||
|
||||
local options = {
|
||||
local _options = {
|
||||
{ "Sensor", SOURCE, 0 },
|
||||
{ "Color", COLOR, WHITE },
|
||||
{ "Shadow", BOOL, 0 },
|
||||
{ "LowestCell", BOOL, 0 }
|
||||
{ "LowestCell", BOOL, 1 }
|
||||
}
|
||||
|
||||
-- This function is runned once at the creation of the widget
|
||||
-- This function is run once at the creation of the widget
|
||||
local function create(zone, options)
|
||||
local myZone = { zone=zone, options=options, counter=0 }
|
||||
histCellData = {}
|
||||
local wgt = {
|
||||
zone = zone,
|
||||
options = options,
|
||||
counter = 0,
|
||||
|
||||
-- use default if user did not set, So widget is operational when selecting the widget
|
||||
if myZone.options.Sensor == 0 then
|
||||
myZone.options.Sensor = "Cels"
|
||||
shadowed = 0,
|
||||
no_telem_blink = 0,
|
||||
isDataAvailable = 0,
|
||||
cellDataLive = {0,0,0,0,0,0},
|
||||
cellDataHistoryLowest = {0,0,0,0,0,0},
|
||||
cellDataHistoryCellLowest = 5,
|
||||
cellMax = 0,
|
||||
cellMin = 0,
|
||||
cellAvg = 0,
|
||||
cellPercent = 0,
|
||||
cellCount = 0,
|
||||
cellSum = 0,
|
||||
mainValue = 0,
|
||||
secondaryValue = 0
|
||||
}
|
||||
|
||||
-- use default if user did not set, So widget is operational on "select widget"
|
||||
if wgt.options.Sensor == 0 then
|
||||
wgt.options.Sensor = "Cels"
|
||||
end
|
||||
|
||||
return myZone
|
||||
wgt.options.LowestCell = wgt.options.LowestCell % 2 -- modulo due to bug that cause the value to be other than 0|1
|
||||
|
||||
return wgt
|
||||
end
|
||||
|
||||
-- This function allow updates when you change widgets settings
|
||||
local function update(myZone, options)
|
||||
myZone.options = options
|
||||
local function update(wgt, options)
|
||||
if (wgt == nil) then return end
|
||||
|
||||
-- use default if user did not set, So widget is operational when selecting the widget
|
||||
if myZone.options.Sensor == 0 then
|
||||
myZone.options.Sensor = "Cels"
|
||||
wgt.options = options
|
||||
|
||||
-- use default if user did not set, So widget is operational on "select widget"
|
||||
if wgt.options.Sensor == 0 then
|
||||
wgt.options.Sensor = "Cels"
|
||||
end
|
||||
|
||||
wgt.options.LowestCell = wgt.options.LowestCell % 2 -- modulo due to bug that cause the value to be other than 0|1
|
||||
|
||||
end
|
||||
|
||||
-- A quick and dirty check for empty table
|
||||
@@ -57,345 +79,373 @@ local function isEmpty(self)
|
||||
return true
|
||||
end
|
||||
|
||||
--- This function returns a table with cels values
|
||||
local function getCels(sensor)
|
||||
liveCellData = getValue(sensor)
|
||||
if type(liveCellData) == "table" then
|
||||
-- initialize historical table if not done yet
|
||||
if isEmpty(histCellData) then
|
||||
for k, v in pairs(liveCellData) do
|
||||
histCellData[k] = v
|
||||
end
|
||||
end
|
||||
-- this is necessary for simu where cellcount can change
|
||||
if #histCellData ~= #liveCellData then
|
||||
for k, v in pairs(liveCellData) do
|
||||
histCellData[k] = v
|
||||
end
|
||||
end
|
||||
-- stores the lowest cell values in historical table
|
||||
for k, v in pairs(liveCellData) do
|
||||
if v < histCellData[k] then histCellData[k] = v end
|
||||
end
|
||||
else
|
||||
-- erase low cell memory when you change lipo
|
||||
histCellData = {}
|
||||
end
|
||||
return liveCellData
|
||||
end
|
||||
|
||||
--- This function returns the number of cels
|
||||
local function getCellCount(cellData)
|
||||
return #cellData
|
||||
end
|
||||
|
||||
--- This function returns the value of the highest of all cels
|
||||
local function getCellMax(cellData)
|
||||
cellMax = 0
|
||||
if type(cellData) == "table" then
|
||||
for k, v in pairs(cellData) do
|
||||
if v > cellMax then cellMax = v end
|
||||
end
|
||||
end
|
||||
return cellMax
|
||||
end
|
||||
|
||||
--- This function returns the value of the lowest of all cels
|
||||
local function getCellMin(cellData)
|
||||
cellMin = 5
|
||||
if type(cellData) == "table" then
|
||||
for k, v in pairs(cellData) do
|
||||
if v < cellMin then cellMin = v end
|
||||
end
|
||||
end
|
||||
return cellMin
|
||||
end
|
||||
|
||||
--- This function return the percentage remaining in a single Lipo cel
|
||||
local function getCellPercent(cellValue)
|
||||
if cellValue == nil then
|
||||
return 0
|
||||
end
|
||||
--## Data gathered from commercial lipo sensors
|
||||
local myArrayPercentList =
|
||||
{{3, 0}, {3.093, 1}, {3.196, 2}, {3.301, 3}, {3.401, 4}, {3.477, 5}, {3.544, 6}, {3.601, 7}, {3.637, 8}, {3.664, 9}, {3.679, 10}, {3.683, 11}, {3.689, 12}, {3.692, 13}, {3.705, 14}, {3.71, 15}, {3.713, 16}, {3.715, 17}, {3.72, 18}, {3.731, 19}, {3.735, 20}, {3.744, 21}, {3.753, 22}, {3.756, 23}, {3.758, 24}, {3.762, 25}, {3.767, 26}, {3.774, 27}, {3.78, 28}, {3.783, 29}, {3.786, 30}, {3.789, 31}, {3.794, 32}, {3.797, 33}, {3.8, 34}, {3.802, 35}, {3.805, 36}, {3.808, 37}, {3.811, 38}, {3.815, 39}, {3.818, 40}, {3.822, 41}, {3.825, 42}, {3.829, 43}, {3.833, 44}, {3.836, 45}, {3.84, 46}, {3.843, 47}, {3.847, 48}, {3.85, 49}, {3.854, 50}, {3.857, 51}, {3.86, 52}, {3.863, 53}, {3.866, 54}, {3.87, 55}, {3.874, 56}, {3.879, 57}, {3.888, 58}, {3.893, 59}, {3.897, 60}, {3.902, 61}, {3.906, 62}, {3.911, 63}, {3.918, 64}, {3.923, 65}, {3.928, 66}, {3.939, 67}, {3.943, 68}, {3.949, 69}, {3.955, 70}, {3.961, 71}, {3.968, 72}, {3.974, 73}, {3.981, 74}, {3.987, 75}, {3.994, 76}, {4.001, 77}, {4.007, 78}, {4.014, 79}, {4.021, 80}, {4.029, 81}, {4.036, 82}, {4.044, 83}, {4.052, 84}, {4.062, 85}, {4.074, 86}, {4.085, 87}, {4.095, 88}, {4.105, 89}, {4.111, 90}, {4.116, 91}, {4.12, 92}, {4.125, 93}, {4.129, 94}, {4.135, 95}, {4.145, 96}, {4.176, 97}, {4.179, 98}, {4.193, 99}, {4.2, 100}}
|
||||
|
||||
for i, v in ipairs( myArrayPercentList ) do
|
||||
if v[ 1 ] >= cellValue then
|
||||
result = v[ 2 ]
|
||||
-- in case somehow voltage is higher, don't return nil
|
||||
if (cellValue > 4.2) then
|
||||
return 100
|
||||
end
|
||||
|
||||
-- Data gathered from commercial lipo sensors
|
||||
local myArrayPercentList = { {3,0},{3.093,1},{3.196,2},{3.301,3},{3.401,4},{3.477,5},{3.544,6},{3.601,7},{3.637,8},{3.664,9},{3.679,10},{3.683,11},{3.689,12},{3.692,13},{3.705,14},{3.71,15},{3.713,16},{3.715,17},{3.72,18},{3.731,19},{3.735,20},{3.744,21},{3.753,22},{3.756,23},{3.758,24},{3.762,25},{3.767,26},{3.774,27},{3.78,28},{3.783,29},{3.786,30},{3.789,31},{3.794,32},{3.797,33},{3.8,34},{3.802,35},{3.805,36},{3.808,37},{3.811,38},{3.815,39},{3.818,40},{3.822,41},{3.825,42},{3.829,43},{3.833,44},{3.836,45},{3.84,46},{3.843,47},{3.847,48},{3.85,49},{3.854,50},{3.857,51},{3.86,52},{3.863,53},{3.866,54},{3.87,55},{3.874,56},{3.879,57},{3.888,58},{3.893,59},{3.897,60},{3.902,61},{3.906,62},{3.911,63},{3.918,64},{3.923,65},{3.928,66},{3.939,67},{3.943,68},{3.949,69},{3.955,70},{3.961,71},{3.968,72},{3.974,73},{3.981,74},{3.987,75},{3.994,76},{4.001,77},{4.007,78},{4.014,79},{4.021,80},{4.029,81},{4.036,82},{4.044,83},{4.052,84},{4.062,85},{4.074,86},{4.085,87},{4.095,88},{4.105,89},{4.111,90},{4.116,91},{4.12,92},{4.125,93},{4.129,94},{4.135,95},{4.145,96},{4.176,97},{4.179,98},{4.193,99},{4.2,100} }
|
||||
|
||||
for i, v in ipairs(myArrayPercentList) do
|
||||
if v[1] >= cellValue then
|
||||
result = v[2]
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
--- This function parse each individual cell and return the sum of all cels
|
||||
local function getCellSum(cellData)
|
||||
cellSum = 0
|
||||
if type(cellData) == "table" then
|
||||
for k, v in pairs(cellData) do cellSum = cellSum + v end
|
||||
--- This function returns a table with cels values
|
||||
local function calculateBatteryData(wgt)
|
||||
|
||||
local newCellData = getValue(wgt.options.Sensor)
|
||||
|
||||
if type(newCellData) ~= "table" then
|
||||
wgt.isDataAvailable = false
|
||||
return
|
||||
end
|
||||
return cellSum
|
||||
|
||||
|
||||
-- this is necessary for simu where cell-count can change
|
||||
if #wgt.cellDataHistoryLowest ~= #newCellData then
|
||||
wgt.cellDataHistoryLowest = {}
|
||||
for k, v in pairs(newCellData) do
|
||||
wgt.cellDataHistoryLowest[k] = v
|
||||
end
|
||||
end
|
||||
-- stores the lowest cell values in historical table
|
||||
for k, v in pairs(newCellData) do
|
||||
if v < wgt.cellDataHistoryLowest[k] then
|
||||
wgt.cellDataHistoryLowest[k] = v
|
||||
end
|
||||
end
|
||||
|
||||
--- calc highest of all cels
|
||||
local cellMax = 0
|
||||
for k, v in pairs(newCellData) do
|
||||
if v > cellMax then
|
||||
cellMax = v
|
||||
end
|
||||
end
|
||||
wgt.cellMax = cellMax
|
||||
|
||||
--- calc lowest of all cels
|
||||
local cellMin = 5
|
||||
for k, v in pairs(newCellData) do
|
||||
if v < cellMin and v > 1 then -- >1 to ignore invalid values
|
||||
cellMin = v
|
||||
end
|
||||
end
|
||||
wgt.cellMin = cellMin
|
||||
|
||||
--- calc history lowest of all cells
|
||||
if cellMin < wgt.cellDataHistoryCellLowest and cellMin > 1 then -- >1 to ignore invalid values
|
||||
wgt.cellDataHistoryCellLowest = cellMin
|
||||
end
|
||||
|
||||
wgt.cellCount = #newCellData
|
||||
|
||||
--- sum of all cells
|
||||
local cellSum = 0
|
||||
for k, v in pairs(newCellData) do
|
||||
cellSum = cellSum + v
|
||||
end
|
||||
wgt.cellSum = cellSum
|
||||
|
||||
--- average of all cells
|
||||
wgt.cellAvg = wgt.cellSum / wgt.cellCount
|
||||
wgt.cellPercent = getCellPercent(wgt.cellMin)
|
||||
|
||||
wgt.cellDataLive = newCellData
|
||||
|
||||
-- mainValue
|
||||
if wgt.options.LowestCell == 1 then
|
||||
wgt.mainValue = wgt.cellMin
|
||||
elseif wgt.options.LowestCell == 0 then
|
||||
wgt.mainValue = wgt.cellSum
|
||||
else
|
||||
wgt.mainValue = "-1"
|
||||
end
|
||||
|
||||
-- secondaryValue
|
||||
if wgt.options.LowestCell == 1 then
|
||||
wgt.secondaryValue = wgt.cellSum
|
||||
elseif wgt.options.LowestCell == 0 then
|
||||
wgt.secondaryValue = wgt.cellMin
|
||||
else
|
||||
wgt.secondaryValue = "-2"
|
||||
end
|
||||
|
||||
|
||||
wgt.isDataAvailable = true
|
||||
|
||||
|
||||
end
|
||||
|
||||
--- This function returns the average of all cels
|
||||
local function getCellAvg(cellData)
|
||||
if type(cellData) == "table" then
|
||||
return getCellSum(cellData)/getCellCount(cellData)
|
||||
end
|
||||
end
|
||||
|
||||
-- This function returns green at 100%, red bellow 30% and graduate in between
|
||||
-- color for battery
|
||||
local function getPercentColor(cpercent)
|
||||
if cpercent < 30 then
|
||||
-- This function returns green at 100%, red bellow 30% and graduate in between
|
||||
local function getPercentColor(percent)
|
||||
if percent < 30 then
|
||||
return lcd.RGB(0xff, 0, 0)
|
||||
else
|
||||
g = math.floor(0xdf * cpercent / 100)
|
||||
g = math.floor(0xdf * percent / 100)
|
||||
r = 0xdf - g
|
||||
return lcd.RGB(r, g, 0)
|
||||
end
|
||||
end
|
||||
|
||||
-- This function returns green at gvalue, red at rvalue and graduate in between
|
||||
-- color for cell
|
||||
local function getRangeColor(value, gvalue, rvalue)
|
||||
if gvalue > rvalue and not range==0 then
|
||||
range = gvalue - rvalue
|
||||
if value > gvalue then return lcd.RGB(0, 0xdf, 0) end
|
||||
if value < rvalue then return lcd.RGB(0xdf, 0, 0) end
|
||||
g = math.floor(0xdf * (value-rvalue) / range)
|
||||
-- This function returns green at gvalue, red at rvalue and graduate in between
|
||||
local function getRangeColor(value, green_value, red_value)
|
||||
local range = math.abs(green_value - red_value)
|
||||
if range==0 then return lcd.RGB(0, 0xdf, 0) end
|
||||
|
||||
if green_value > red_value then
|
||||
if value > green_value then return lcd.RGB(0, 0xdf, 0) end
|
||||
if value < red_value then return lcd.RGB(0xdf, 0, 0) end
|
||||
g = math.floor(0xdf * (value - red_value) / range)
|
||||
r = 0xdf - g
|
||||
return lcd.RGB(r, g, 0)
|
||||
else
|
||||
range = rvalue - gvalue
|
||||
if value > gvalue then return lcd.RGB(0, 0xdf, 0) end
|
||||
if value < rvalue then return lcd.RGB(0xdf, 0, 0) end
|
||||
r = math.floor(0xdf * (value-gvalue) / range)
|
||||
if value > green_value then return lcd.RGB(0, 0xdf, 0) end
|
||||
if value < red_value then return lcd.RGB(0xdf, 0, 0) end
|
||||
r = math.floor(0xdf * (value - green_value) / range)
|
||||
g = 0xdf - r
|
||||
return lcd.RGB(r, g, 0)
|
||||
end
|
||||
end
|
||||
|
||||
local function getMainValue(mySensor, options)
|
||||
if options.LowestCell == 1 then
|
||||
return getCellMin(mySensor)
|
||||
else
|
||||
return getCellSum(mySensor)
|
||||
end
|
||||
|
||||
--- Zone size: 70x39 1/8th top bar
|
||||
local function refreshZoneTiny(wgt)
|
||||
local myString = string.format("%2.1fV", wgt.mainValue)
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w -25, wgt.zone.y + 5, wgt.cellPercent .. "%", RIGHT + SMLSIZE + CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w -25, wgt.zone.y + 20, myString, RIGHT + SMLSIZE + CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
-- draw batt
|
||||
lcd.drawRectangle(wgt.zone.x + 50, wgt.zone.y + 9, 16, 25, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(wgt.zone.x +50 + 4, wgt.zone.y + 7, 6, 3, CUSTOM_COLOR)
|
||||
local rect_h = math.floor(25 * wgt.cellPercent / 100)
|
||||
lcd.drawFilledRectangle(wgt.zone.x +50, wgt.zone.y + 9 + 25 - rect_h, 16, rect_h, CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
end
|
||||
|
||||
local function getSecondaryValue(mySensor, options)
|
||||
if options.LowestCell == 1 then
|
||||
return getCellSum(mySensor)
|
||||
else
|
||||
return getCellMin(mySensor)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- This size is for top bar widgets
|
||||
local function refreshZoneTiny(zone)
|
||||
local mySensor = getCels(zone.options.Sensor)
|
||||
local isHaveData = (type(mySensor) == "table")
|
||||
if isHaveData then
|
||||
local myString = string.format("%2.1fV", getMainValue(mySensor, zone.options))
|
||||
local percent = getCellPercent(getCellAvg(mySensor))
|
||||
lcd.drawText(zone.zone.x + zone.zone.w, zone.zone.y, percent.."%", RIGHT + SMLSIZE + CUSTOM_COLOR)
|
||||
lcd.drawText(zone.zone.x + zone.zone.w, zone.zone.y + 15, myString, RIGHT + SMLSIZE + CUSTOM_COLOR)
|
||||
-- draw batt
|
||||
lcd.drawRectangle(zone.zone.x, zone.zone.y + 6, 16, 25, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(zone.zone.x + 4, zone.zone.y + 4, 6, 3, CUSTOM_COLOR)
|
||||
local rect_h = math.floor(25 * percent / 100)
|
||||
lcd.drawFilledRectangle(zone.zone.x, zone.zone.y + 6 + 25 - rect_h , 16, rect_h, CUSTOM_COLOR)
|
||||
end
|
||||
end
|
||||
|
||||
--- Size is 160x32 1/8th
|
||||
local function refreshZoneSmall(zone)
|
||||
local myBatt = {["x"]=0, ["y"]=0, ["w"]=155, ["h"]=35, ["segments_w"]=25, ["color"]=WHITE, ["cath_w"]=6, ["cath_h"]=20}
|
||||
local mySensor = getCels(zone.options.Sensor)
|
||||
local isDataAvailable = (type(mySensor) == "table")
|
||||
|
||||
local percent = getCellPercent(getCellAvg(mySensor))
|
||||
--- Zone size: 160x32 1/8th
|
||||
local function refreshZoneSmall(wgt)
|
||||
local myBatt = { ["x"] = 0, ["y"] = 0, ["w"] = 155, ["h"] = 35, ["segments_w"] = 25, ["color"] = WHITE, ["cath_w"] = 6, ["cath_h"] = 20 }
|
||||
|
||||
-- draws bat
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x + myBatt.w, zone.zone.y + myBatt.h/2 - myBatt.cath_h/2, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
|
||||
-- fill batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(wgt.cellPercent))
|
||||
lcd.drawGauge(wgt.zone.x + 2, wgt.zone.y + 2, myBatt.w - 4, wgt.zone.h, wgt.cellPercent, 100, CUSTOM_COLOR)
|
||||
|
||||
-- fils batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(percent))
|
||||
lcd.drawGauge(zone.zone.x+2, zone.zone.y+2, myBatt.w-4, zone.zone.h, percent, 100, CUSTOM_COLOR)
|
||||
-- write text
|
||||
if isDataAvailable then
|
||||
lcd.setColor(CUSTOM_COLOR, zone.options.Color)
|
||||
local topLine = string.format("%2.1fV %2.0f%%", getMainValue(mySensor, zone.options), percent)
|
||||
lcd.drawText(zone.zone.x + 20, zone.zone.y +2, topLine , MIDSIZE + CUSTOM_COLOR + shadowed)
|
||||
if wgt.isDataAvailable then
|
||||
lcd.setColor(CUSTOM_COLOR, wgt.options.Color)
|
||||
else
|
||||
lcd.drawText(zone.zone.x + 10, zone.zone.y+10, "No Cells Data", LEFT + SMLSIZE + INVERS + CUSTOM_COLOR + shadowed)
|
||||
lcd.setColor(CUSTOM_COLOR, GREY)
|
||||
end
|
||||
local topLine = string.format("%2.1fV %2.0f%%", wgt.mainValue, wgt.cellPercent)
|
||||
lcd.drawText(wgt.zone.x + 20, wgt.zone.y + 2, topLine, MIDSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
|
||||
|
||||
return
|
||||
end
|
||||
|
||||
--- Size is 225x98 1/4th (no sliders/trim)
|
||||
local function refreshZoneMedium(zone)
|
||||
local myBatt = {["x"]=0, ["y"]=0, ["w"]=85, ["h"]=35, ["segments_w"]=15, ["color"]=WHITE, ["cath_w"]=6, ["cath_h"]=20}
|
||||
local mySensor = getCels(zone.options.Sensor)
|
||||
local isDataAvailable = (type(mySensor) == "table")
|
||||
--- Zone size: 180x70 1/4th (with sliders/trim)
|
||||
--- Zone size: 225x98 1/4th (no sliders/trim)
|
||||
local function refreshZoneMedium(wgt)
|
||||
local myBatt = { ["x"] = 0, ["y"] = 0, ["w"] = 85, ["h"] = 35, ["segments_w"] = 15, ["color"] = WHITE, ["cath_w"] = 6, ["cath_h"] = 20 }
|
||||
|
||||
lcd.setColor(CUSTOM_COLOR, zone.options.Color)
|
||||
if isDataAvailable then
|
||||
-- draw values
|
||||
local percent = getCellPercent(getCellAvg(mySensor))
|
||||
lcd.drawText(zone.zone.x + zone.zone.w, zone.zone.y, string.format("%2.1fV", getMainValue(mySensor, zone.options)) , DBLSIZE + CUSTOM_COLOR + RIGHT+ shadowed)
|
||||
|
||||
-- fils batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(percent))
|
||||
lcd.drawGauge(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y, myBatt.w, myBatt.h, percent, 100, CUSTOM_COLOR)
|
||||
-- draw cells
|
||||
local pos = {{x=2, y=38}, {x=60, y=38}, {x=118, y=38}, {x=2, y=57}, {x=60, y=57}, {x=118, y=57}}
|
||||
for i=1, getCellCount(mySensor), 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(mySensor[i], getCellMax(mySensor), getCellMax(mySensor) - 0.2))
|
||||
lcd.drawFilledRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 58, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText(zone.zone.x + pos[i].x+10, zone.zone.y + pos[i].y, string.format("%.2f", mySensor[i]), CUSTOM_COLOR + shadowed)
|
||||
lcd.drawRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 59, 20, CUSTOM_COLOR,1)
|
||||
end
|
||||
if wgt.isDataAvailable then
|
||||
lcd.setColor(CUSTOM_COLOR, wgt.options.Color)
|
||||
else
|
||||
lcd.drawText(zone.zone.x, zone.zone.y+35, "No Cells Data", LEFT + SMLSIZE + INVERS + CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, GREY)
|
||||
end
|
||||
|
||||
-- draw values
|
||||
lcd.drawText(wgt.zone.x, wgt.zone.y + 35, string.format("%2.1fV", wgt.mainValue), DBLSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
|
||||
-- more info if 1/4 is high enough (without trim & slider)
|
||||
if wgt.zone.h > 80 then
|
||||
lcd.drawText(wgt.zone.x , wgt.zone.y + 70, string.format("%2.2fV" , wgt.secondaryValue), SMLSIZE + CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
lcd.drawText(wgt.zone.x + 50, wgt.zone.y + 70, string.format("dV %2.2fV", wgt.cellMax - wgt.cellMin), SMLSIZE + CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
lcd.drawText(wgt.zone.x , wgt.zone.y + 84, string.format("Min %2.2fV", wgt.cellDataHistoryCellLowest), SMLSIZE + CUSTOM_COLOR + wgt.no_telem_blink)
|
||||
end
|
||||
|
||||
-- fill batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(wgt.cellPercent))
|
||||
lcd.drawGauge(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y, myBatt.w, myBatt.h, wgt.cellPercent, 100, CUSTOM_COLOR)
|
||||
|
||||
-- draw cells
|
||||
local cellH = wgt.zone.h / wgt.cellCount
|
||||
if cellH > 20 then cellH =20 end
|
||||
local cellX = 118
|
||||
local cellW = 58
|
||||
for i = 1, wgt.cellCount, 1 do
|
||||
local cellY = wgt.zone.y + (i-1)* (cellH -1)
|
||||
|
||||
-- fill current value
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(wgt.cellDataLive[i], wgt.cellMax, wgt.cellMax - 0.2))
|
||||
--lcd.drawFilledRectangle(wgt.zone.x + cellX , cellY, 58, cellH, CUSTOM_COLOR)
|
||||
local percentCurrent = getCellPercent(wgt.cellDataLive[i])
|
||||
local percentMin = getCellPercent(wgt.cellDataHistoryLowest[i])
|
||||
|
||||
lcd.drawFilledRectangle(wgt.zone.x + cellX , cellY, cellW * percentCurrent / 100, cellH, CUSTOM_COLOR)
|
||||
-- fill min
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(wgt.cellDataHistoryLowest[i], wgt.cellMax, wgt.cellMax - 0.2))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + cellX + ((percentCurrent - percentMin) / 100) , cellY, cellW - (cellW * (percentCurrent - percentMin) / 100), cellH, CUSTOM_COLOR)
|
||||
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText (wgt.zone.x + cellX + 10, cellY, string.format("%.2f", wgt.cellDataLive[i]), SMLSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
lcd.drawRectangle (wgt.zone.x + cellX , cellY, 59, cellH, CUSTOM_COLOR , 1)
|
||||
end
|
||||
|
||||
-- draws bat
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x , zone.zone.y + myBatt.y, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x + myBatt.w, zone.zone.y + myBatt.h/2 - myBatt.cath_h/2, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
lcd.drawText(zone.zone.x + myBatt.x + 20 , zone.zone.y + myBatt.y + 5, string.format("%2.0f%%", getCellPercent(getCellAvg(mySensor))), LEFT + MIDSIZE + CUSTOM_COLOR + shadowed)
|
||||
--for i=1, myBatt.w - myBatt.segments_w, myBatt.segments_w do
|
||||
-- lcd.drawRectangle(zone.zone.x + myBatt.x + i, zone.zone.y + myBatt.y, myBatt.segments_w, myBatt.h, CUSTOM_COLOR, 1)
|
||||
--end
|
||||
return
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(wgt.zone.x + myBatt.x + myBatt.w, wgt.zone.y + myBatt.h / 2 - myBatt.cath_h / 2, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
lcd.drawText(wgt.zone.x + myBatt.x + 20, wgt.zone.y + myBatt.y + 5, string.format("%2.0f%%", wgt.cellPercent), LEFT + MIDSIZE + CUSTOM_COLOR + wgt.shadowed)
|
||||
|
||||
end
|
||||
|
||||
--- Size is 192x152 1/2
|
||||
local function refreshZoneLarge(zone)
|
||||
local myBatt = {["x"]=0, ["y"]=18, ["w"]=76, ["h"]=121, ["segments_h"]=30, ["color"]=WHITE, ["cath_w"]=30, ["cath_h"]=10}
|
||||
local mySensor = getCels(zone.options.Sensor)
|
||||
local isDataAvailable = (type(mySensor) == "table")
|
||||
--- Zone size: 192x152 1/2
|
||||
local function refreshZoneLarge(wgt)
|
||||
local myBatt = { ["x"] = 0, ["y"] = 18, ["w"] = 76, ["h"] = 121, ["segments_h"] = 30, ["color"] = WHITE, ["cath_w"] = 30, ["cath_h"] = 10 }
|
||||
|
||||
lcd.setColor(CUSTOM_COLOR, zone.options.Color)
|
||||
if isDataAvailable then
|
||||
local percent = getCellPercent(getCellAvg(mySensor))
|
||||
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y, percent.."%", RIGHT + DBLSIZE + CUSTOM_COLOR + shadowed)
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y+30, string.format("%2.1fV", getMainValue(mySensor, zone.options)), RIGHT + DBLSIZE + CUSTOM_COLOR + shadowed)
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y+70, string.format("%2.1fV %2.1fS", getSecondaryValue(mySensor, options), getCellCount(mySensor)), RIGHT + SMLSIZE + CUSTOM_COLOR + shadowed)
|
||||
-- fils batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(percent))
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.h + myBatt.cath_h - math.floor(percent/100 * myBatt.h), myBatt.w, math.floor(percent/100 * myBatt.h), CUSTOM_COLOR)
|
||||
-- draw cells
|
||||
local pos = {{x=80, y=90}, {x=138, y=90}, {x=80, y=109}, {x=138, y=109}, {x=80, y=128}, {x=138, y=128}}
|
||||
for i=1, getCellCount(mySensor), 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(mySensor[i], getCellMax(mySensor), getCellMax(mySensor) - 0.2))
|
||||
lcd.drawFilledRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 58, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText(zone.zone.x + pos[i].x+10, zone.zone.y + pos[i].y, string.format("%.2f", mySensor[i]), CUSTOM_COLOR + shadowed)
|
||||
lcd.drawRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 59, 20, CUSTOM_COLOR, 1)
|
||||
end
|
||||
if wgt.isDataAvailable then
|
||||
lcd.setColor(CUSTOM_COLOR, wgt.options.Color)
|
||||
else
|
||||
lcd.drawText(zone.zone.x+5, zone.zone.y, "No Cells Data", LEFT + SMLSIZE + INVERS + CUSTOM_COLOR + shadowed)
|
||||
lcd.setColor(CUSTOM_COLOR, GREY)
|
||||
end
|
||||
-- draws bat
|
||||
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y, wgt.cellPercent .. "%", RIGHT + DBLSIZE + CUSTOM_COLOR + wgt.shadowed)
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y + 30, string.format("%2.1fV", wgt.mainValue), RIGHT + DBLSIZE + CUSTOM_COLOR + wgt.shadowed)
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y + 70, string.format("%2.1fV %2.1fS", wgt.secondaryValue, wgt.cellCount), RIGHT + SMLSIZE + CUSTOM_COLOR + wgt.shadowed)
|
||||
-- fill batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(wgt.cellPercent))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.h + myBatt.cath_h - math.floor(wgt.cellPercent / 100 * myBatt.h), myBatt.w, math.floor(wgt.cellPercent / 100 * myBatt.h), CUSTOM_COLOR)
|
||||
-- draw cells
|
||||
local pos = { { x = 80, y = 90 }, { x = 138, y = 90 }, { x = 80, y = 109 }, { x = 138, y = 109 }, { x = 80, y = 128 }, { x = 138, y = 128 } }
|
||||
for i = 1, wgt.cellCount, 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(wgt.cellDataLive[i], wgt.cellMax, wgt.cellMax - 0.2))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 58, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText(wgt.zone.x + pos[i].x + 10, wgt.zone.y + pos[i].y, string.format("%.2f", wgt.cellDataLive[i]), CUSTOM_COLOR + wgt.shadowed)
|
||||
lcd.drawRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 59, 20, CUSTOM_COLOR, 1)
|
||||
end
|
||||
|
||||
-- draw bat
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.cath_h , myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x + myBatt.w/2 - myBatt.cath_w/2, zone.zone.y + myBatt.y, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
for i=1, myBatt.h - myBatt.segments_h, myBatt.segments_h do
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.cath_h + i, myBatt.w, myBatt.segments_h, CUSTOM_COLOR, 1)
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.cath_h, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(wgt.zone.x + myBatt.x + myBatt.w / 2 - myBatt.cath_w / 2, wgt.zone.y + myBatt.y, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
for i = 1, myBatt.h - myBatt.segments_h, myBatt.segments_h do
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.cath_h + i, myBatt.w, myBatt.segments_h, CUSTOM_COLOR, 1)
|
||||
end
|
||||
return
|
||||
|
||||
end
|
||||
|
||||
--- Size is 390x172 1/1
|
||||
--- Size is 460x252 1/1 (no sliders/trim/topbar)
|
||||
local function refreshZoneXLarge(zone)
|
||||
local myBatt = {["x"]=10, ["y"]=20, ["w"]=80, ["h"]=121, ["segments_h"]=30, ["color"]=WHITE, ["cath_w"]=30, ["cath_h"]=10}
|
||||
local mySensor = getCels(zone.options.Sensor)
|
||||
local isDataAvailable = (type(mySensor) == "table")
|
||||
--- Zone size: 390x172 1/1
|
||||
--- Zone size: 460x252 1/1 (no sliders/trim/topbar)
|
||||
local function refreshZoneXLarge(wgt)
|
||||
local myBatt = { ["x"] = 10, ["y"] = 20, ["w"] = 80, ["h"] = 121, ["segments_h"] = 30, ["color"] = WHITE, ["cath_w"] = 30, ["cath_h"] = 10 }
|
||||
|
||||
lcd.setColor(CUSTOM_COLOR, zone.options.Color)
|
||||
if isDataAvailable then
|
||||
local percent = getCellPercent(getCellAvg(mySensor))
|
||||
-- fils batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(percent))
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.h + myBatt.cath_h - math.floor(percent/100 * myBatt.h), myBatt.w, math.floor(percent/100 * myBatt.h), CUSTOM_COLOR)
|
||||
-- draw right text section
|
||||
lcd.setColor(CUSTOM_COLOR, zone.options.Color)
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y + myBatt.y, percent.."%", RIGHT + DBLSIZE + CUSTOM_COLOR + shadowed)
|
||||
lcd.setColor(CUSTOM_COLOR, wgt.options.Color)
|
||||
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y + myBatt.y + 30, string.format("%2.1fV", getMainValue(mySensor, zone.options)), RIGHT + DBLSIZE + CUSTOM_COLOR + shadowed)
|
||||
lcd.drawText(zone.zone.x+zone.zone.w, zone.zone.y + myBatt.y + 105, string.format("%2.1fV %2.1fS", getSecondaryValue(mySensor, zone.options), getCellCount(mySensor)) , RIGHT + SMLSIZE + CUSTOM_COLOR + shadowed)
|
||||
-- fill batt
|
||||
lcd.setColor(CUSTOM_COLOR, getPercentColor(wgt.cellPercent))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.h + myBatt.cath_h - math.floor(wgt.cellPercent / 100 * myBatt.h), myBatt.w, math.floor(wgt.cellPercent / 100 * myBatt.h), CUSTOM_COLOR)
|
||||
|
||||
-- draw cells
|
||||
local pos = {{x=111, y=38}, {x=164, y=38}, {x=217, y=38}, {x=111, y=57}, {x=164, y=57}, {x=217, y=57}}
|
||||
for i=1, getCellCount(mySensor), 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(mySensor[i], getCellMax(mySensor), getCellMax(mySensor) - 0.2))
|
||||
lcd.drawFilledRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 53, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText(zone.zone.x + pos[i].x+10, zone.zone.y + pos[i].y, string.format("%.2f", mySensor[i]), CUSTOM_COLOR + shadowed)
|
||||
lcd.drawRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 54, 20, CUSTOM_COLOR, 1)
|
||||
end
|
||||
-- draw cells for lowest cells
|
||||
local pos = {{x=111, y=110}, {x=164, y=110}, {x=217, y=110}, {x=111, y=129}, {x=164, y=129}, {x=217, y=129}}
|
||||
for i=1, getCellCount(mySensor), 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(histCellData[i], mySensor[i], mySensor[i] - 0.3))
|
||||
lcd.drawFilledRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 53, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(zone.zone.x + pos[i].x, zone.zone.y + pos[i].y, 54, 20, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(zone.zone.x + pos[i].x+10, zone.zone.y + pos[i].y, string.format("%.2f", histCellData[i]), CUSTOM_COLOR + shadowed)
|
||||
end
|
||||
-- draw right text section
|
||||
if wgt.isDataAvailable then
|
||||
lcd.setColor(CUSTOM_COLOR, wgt.options.Color)
|
||||
else
|
||||
lcd.drawText(zone.zone.x+5, zone.zone.y, "No Cells Data", LEFT + SMLSIZE + INVERS + CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, GREY)
|
||||
end
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y + myBatt.y, wgt.cellPercent .. "%", RIGHT + DBLSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y + myBatt.y + 30, string.format("%2.1fV", wgt.mainValue), RIGHT + DBLSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
lcd.drawText(wgt.zone.x + wgt.zone.w, wgt.zone.y + myBatt.y + 105, string.format("%2.1fV %2.1fS", wgt.secondaryValue, wgt.cellCount), RIGHT + SMLSIZE + CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
|
||||
-- draw cells
|
||||
local pos = { { x = 111, y = 38 }, { x = 164, y = 38 }, { x = 217, y = 38 }, { x = 111, y = 57 }, { x = 164, y = 57 }, { x = 217, y = 57 } }
|
||||
for i = 1, wgt.cellCount, 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(wgt.cellDataLive[i], wgt.cellMax, wgt.cellMax - 0.2))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 53, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawText(wgt.zone.x + pos[i].x + 10, wgt.zone.y + pos[i].y, string.format("%.2f", wgt.cellDataLive[i]), CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
lcd.drawRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 54, 20, CUSTOM_COLOR, 1)
|
||||
end
|
||||
-- draw cells for lowest cells
|
||||
local pos = { { x = 111, y = 110 }, { x = 164, y = 110 }, { x = 217, y = 110 }, { x = 111, y = 129 }, { x = 164, y = 129 }, { x = 217, y = 129 } }
|
||||
for i = 1, wgt.cellCount, 1 do
|
||||
lcd.setColor(CUSTOM_COLOR, getRangeColor(wgt.cellDataHistoryLowest[i], wgt.cellDataLive[i], wgt.cellDataLive[i] - 0.3))
|
||||
lcd.drawFilledRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 53, 20, CUSTOM_COLOR)
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(wgt.zone.x + pos[i].x, wgt.zone.y + pos[i].y, 54, 20, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(wgt.zone.x + pos[i].x + 10, wgt.zone.y + pos[i].y, string.format("%.2f", wgt.cellDataHistoryLowest[i]), CUSTOM_COLOR + wgt.shadowed + wgt.no_telem_blink)
|
||||
end
|
||||
|
||||
-- draws bat
|
||||
lcd.setColor(CUSTOM_COLOR, WHITE)
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.cath_h , myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(zone.zone.x + myBatt.x + myBatt.w/2 - myBatt.cath_w/2, zone.zone.y + myBatt.y, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
for i=1, myBatt.h - myBatt.segments_h, myBatt.segments_h do
|
||||
lcd.drawRectangle(zone.zone.x + myBatt.x, zone.zone.y + myBatt.y + myBatt.cath_h + i, myBatt.w, myBatt.segments_h, CUSTOM_COLOR, 1)
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.cath_h, myBatt.w, myBatt.h, CUSTOM_COLOR, 2)
|
||||
lcd.drawFilledRectangle(wgt.zone.x + myBatt.x + myBatt.w / 2 - myBatt.cath_w / 2, wgt.zone.y + myBatt.y, myBatt.cath_w, myBatt.cath_h, CUSTOM_COLOR)
|
||||
for i = 1, myBatt.h - myBatt.segments_h, myBatt.segments_h do
|
||||
lcd.drawRectangle(wgt.zone.x + myBatt.x, wgt.zone.y + myBatt.y + myBatt.cath_h + i, myBatt.w, myBatt.segments_h, CUSTOM_COLOR, 1)
|
||||
end
|
||||
-- draw middle rectangles
|
||||
lcd.drawRectangle(zone.zone.x + 110, zone.zone.y + 38, 161, 40, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(zone.zone.x + 220, zone.zone.y + 21, "Live data", RIGHT + SMLSIZE + INVERS + CUSTOM_COLOR + shadowed)
|
||||
lcd.drawRectangle(zone.zone.x + 110, zone.zone.y + 110, 161, 40, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(zone.zone.x + 230, zone.zone.y + 93, "Lowest data", RIGHT + SMLSIZE + INVERS + CUSTOM_COLOR + shadowed)
|
||||
lcd.drawRectangle(wgt.zone.x + 110, wgt.zone.y + 38, 161, 40, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(wgt.zone.x + 220, wgt.zone.y + 21, "Live data", RIGHT + SMLSIZE + INVERS + CUSTOM_COLOR + wgt.shadowed)
|
||||
lcd.drawRectangle(wgt.zone.x + 110, wgt.zone.y + 110, 161, 40, CUSTOM_COLOR, 1)
|
||||
lcd.drawText(wgt.zone.x + 230, wgt.zone.y + 93, "Lowest data", RIGHT + SMLSIZE + INVERS + CUSTOM_COLOR + wgt.shadowed)
|
||||
return
|
||||
end
|
||||
|
||||
-- This function allow recording of lowest cells when widget is not active
|
||||
local function background(myZone)
|
||||
getCels(myZone.options.Sensor)
|
||||
return
|
||||
-- This function allow recording of lowest cells when widget is in background
|
||||
local function background(wgt)
|
||||
if (wgt == nil) then return end
|
||||
|
||||
calculateBatteryData(wgt)
|
||||
|
||||
end
|
||||
|
||||
function refresh(myZone)
|
||||
if myZone.options.Shadow == 1 then
|
||||
shadowed = SHADOWED
|
||||
local function refresh(wgt)
|
||||
|
||||
if (wgt == nil) then return end
|
||||
if (wgt.options == nil) then return end
|
||||
if (wgt.zone == nil) then return end
|
||||
if (wgt.options.LowestCell == nil) then return end
|
||||
|
||||
if wgt.options.Shadow == 1 then
|
||||
wgt.shadowed = SHADOWED
|
||||
else
|
||||
shadowed = 0
|
||||
wgt.shadowed = 0
|
||||
end
|
||||
|
||||
--if myZone.options.Sensor == 1 then
|
||||
-- lcd.drawText(myZone.zone.x+2, myZone.zone.y+2, "Not configured", LEFT + SMLSIZE + CUSTOM_COLOR)
|
||||
-- lcd.drawText(myZone.zone.x+2, myZone.zone.y+20, "Requires setting a Voltage Sensor", LEFT + SMLSIZE + INVERS + CUSTOM_COLOR)
|
||||
-- return
|
||||
--end
|
||||
if myZone.zone.w > 380 and myZone.zone.h > 165 then refreshZoneXLarge(myZone)
|
||||
elseif myZone.zone.w > 180 and myZone.zone.h > 145 then refreshZoneLarge(myZone)
|
||||
elseif myZone.zone.w > 170 and myZone.zone.h > 65 then refreshZoneMedium(myZone)
|
||||
elseif myZone.zone.w > 150 and myZone.zone.h > 28 then refreshZoneSmall(myZone)
|
||||
elseif myZone.zone.w > 65 and myZone.zone.h > 35 then refreshZoneTiny(myZone)
|
||||
|
||||
calculateBatteryData(wgt)
|
||||
|
||||
if wgt.isDataAvailable then
|
||||
wgt.no_telem_blink = 0
|
||||
else
|
||||
wgt.no_telem_blink = INVERS + BLINK
|
||||
end
|
||||
|
||||
|
||||
if wgt.zone.w > 380 and wgt.zone.h > 165 then refreshZoneXLarge(wgt)
|
||||
elseif wgt.zone.w > 180 and wgt.zone.h > 145 then refreshZoneLarge(wgt)
|
||||
elseif wgt.zone.w > 170 and wgt.zone.h > 65 then refreshZoneMedium(wgt)
|
||||
elseif wgt.zone.w > 150 and wgt.zone.h > 28 then refreshZoneSmall(wgt)
|
||||
elseif wgt.zone.w > 65 and wgt.zone.h > 35 then refreshZoneTiny(wgt)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
return { name="BattCheck", options=options, create=create, update=update, background=background, refresh=refresh }
|
||||
return { name="BattCheck", options=_options, create=create, update=update, background=background, refresh=refresh }
|
||||
|
||||
Reference in New Issue
Block a user