From 4268ce9eca45759cf55f8f2b10944a20c5dd7c09 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 16 May 2016 21:56:35 -0700 Subject: [PATCH] 3djc/batt check widget (#3498) * Add 1/4th screen widget (in addition to existing 1/8th) * Batt+ filled white * Cosmetics * Review copyright and zone handling --- radio/sdcard/horus/WIDGETS/BattCheck/main.lua | 127 ++++++++++++++---- 1 file changed, 101 insertions(+), 26 deletions(-) diff --git a/radio/sdcard/horus/WIDGETS/BattCheck/main.lua b/radio/sdcard/horus/WIDGETS/BattCheck/main.lua index 02bbfd9f6..b61baf86b 100755 --- a/radio/sdcard/horus/WIDGETS/BattCheck/main.lua +++ b/radio/sdcard/horus/WIDGETS/BattCheck/main.lua @@ -1,18 +1,20 @@ ----- ############################################################### ----- # # ----- # Telemetry widget Script for FrSky Horus # ----- # LI-xx BATTCHECK v1 // Use it with OpenTX 2.2.x # ----- # # ----- # License: Share alike # ----- # Can be used and changed non commercial # ----- # # ----- # Developed for Horus widgets by OpenTx team. # ----- # # ----- # Initial work for Taranis by Heisenberg. # ----- # Initial credits to Kilrah, Dev.Fred, and Sacred100 # ----- # from the french forum frskytaranis.forumactif.org/ # ----- # # ----- ############################################################### +---- ######################################################################### +---- # # +---- # Telemetry Widget script for FrSky Horus # +---- # Copyright (C) OpenTX # +-----# # +---- # License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html # +---- # # +---- # This program is free software; you can redistribute it and/or modify # +---- # it under the terms of the GNU General Public License version 2 as # +---- # published by the Free Software Foundation. # +---- # # +---- # This program is distributed in the hope that it will be useful # +---- # but WITHOUT ANY WARRANTY; without even the implied warranty of # +---- # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +---- # GNU General Public License for more details. # +---- # # +---- ######################################################################### local options = { @@ -59,7 +61,7 @@ end --- This function return the percentage remaining in a single Lipo cel local function getCellPercent(cellValue) - --## Based on Robbe lipo sensor + --## 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}} @@ -91,15 +93,34 @@ end -- This function returns green at 100%, red bellow 30% and graduate in betwwen local function getPercentColor(cpercent) if cpercent < 30 then - return(lcd.RGB(0xff,0,0)) + return lcd.RGB(0xff,0,0) else g = math.floor(0xdf * cpercent / 100) r = 0xdf - g - return (lcd.RGB(r,g,0)) + return lcd.RGB(r,g,0) end end ---- Size is 160x32 +-- This function returns green at gvalue, red at rvalue and graduate in betwwen +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) + 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) + g = 0xdf - r + return lcd.RGB(r,g,0) + end +end + +--- Size is 160x30 local function zoneSmall(zone) local mySensor = getCels(zone.options.Sensor) @@ -117,7 +138,7 @@ local function zoneSmall(zone) lcd.drawRectangle(zone.zone.x+i, zone.zone.y+2, 15, zone.zone.h - 4, SOLID + CUSTOM_COLOR,1) end lcd.drawRectangle(zone.zone.x+2, zone.zone.y+2, 75, zone.zone.h - 4, SOLID + CUSTOM_COLOR,2) - lcd.drawRectangle(zone.zone.x+77, zone.zone.y+8, 6, zone.zone.h - 16, SOLID + CUSTOM_COLOR,2) + lcd.drawFilledRectangle(zone.zone.x+77, zone.zone.y+8, 6, zone.zone.h - 16, SOLID + CUSTOM_COLOR) lcd.setColor(CUSTOM_COLOR, BLACK) lcd.setColor(TEXT_COLOR, BLACK) return @@ -125,24 +146,78 @@ end --- Size is 180x70 local function zoneMedium(zone) + local mySensor = getCels(zone.options.Sensor) + + lcd.setColor(TEXT_COLOR, zone.options.Color) + if type(mySensor) == "table" then + local percent = getCellPercent(getCellAvg(mySensor)) + lcd.drawText(zone.zone.x+102, zone.zone.y, percent.."%", LEFT + DBLSIZE + TEXT_COLOR) + lcd.setColor(CUSTOM_COLOR, getPercentColor(percent)) + lcd.drawGauge(zone.zone.x+2, zone.zone.y+2, 75, 36 - 4,percent,100, CUSTOM_COLOR) + mystring = "" + 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.drawText(zone.zone.x + pos[i].x+10,zone.zone.y + pos[i].y,string.format("%.2f",mySensor[i])) + lcd.drawRectangle(zone.zone.x + pos[i].x,zone.zone.y + pos[i].y,59,20) + end + lcd.drawText(zone.zone.x + 2, zone.zone.y + 40, mystring) + end + lcd.setColor(CUSTOM_COLOR, WHITE) + for i=2,75,15 do + lcd.drawRectangle(zone.zone.x+i, zone.zone.y+2, 15, 32, SOLID + CUSTOM_COLOR,1) + end + lcd.drawRectangle(zone.zone.x+2, zone.zone.y+2, 75, 32, SOLID + CUSTOM_COLOR,2) + lcd.drawFilledRectangle(zone.zone.x+77, zone.zone.y+8, 6, 20, SOLID + CUSTOM_COLOR) + lcd.setColor(CUSTOM_COLOR, BLACK) + lcd.setColor(TEXT_COLOR, BLACK) + + lcd.drawText(zone.zone.x, zone.zone.y+60, "Sensor : "..zone.options.Sensor, LEFT + SMLSIZE + TEXT_COLOR) return end ---- Size is 192x152 +--- Size is 190x150 local function zoneLarge(zone) + local mySensor = getCels(zone.options.Sensor) + + lcd.setColor(TEXT_COLOR, zone.options.Color) + if type(mySensor) == "table" then + local percent = getCellPercent(getCellAvg(mySensor)) + lcd.drawText(zone.zone.x+102, zone.zone.y, percent.."%", LEFT + DBLSIZE + TEXT_COLOR) + lcd.setColor(CUSTOM_COLOR, getPercentColor(percent)) + lcd.drawGauge(zone.zone.x+2, zone.zone.y+2, 75, 36 - 4,percent,100, CUSTOM_COLOR) + mystring = "" + 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.drawText(zone.zone.x + pos[i].x+10,zone.zone.y + pos[i].y,string.format("%.2f",mySensor[i])) + lcd.drawRectangle(zone.zone.x + pos[i].x,zone.zone.y + pos[i].y,59,20) + end + lcd.drawText(zone.zone.x + 2, zone.zone.y + 40, mystring) + end + lcd.setColor(CUSTOM_COLOR, WHITE) + for i=2,75,15 do + lcd.drawRectangle(zone.zone.x+i, zone.zone.y+2, 15, 32, SOLID + CUSTOM_COLOR,1) + end + lcd.drawRectangle(zone.zone.x+2, zone.zone.y+2, 75, 32, SOLID + CUSTOM_COLOR,2) + lcd.drawFilledRectangle(zone.zone.x+77, zone.zone.y+8, 6, 20, SOLID + CUSTOM_COLOR) + lcd.setColor(CUSTOM_COLOR, BLACK) + lcd.setColor(TEXT_COLOR, BLACK) return end ---- Size is 390x172 +--- Size is 390x170 local function zoneXLarge(zone) return end function refresh(myZone) - if myZone.zone.w == 160 then zoneSmall(myZone) - elseif myZone.zone.w == 180 then zoneMedium(myZone) - elseif myZone.zone.w == 192 then zoneLarge(myZone) - elseif myZone.zone.w == 390 then zoneXLarge(myZone) + if myZone.zone.w > 380 and myZone.zone.h > 165 then zoneXLarge(myZone) + elseif myZone.zone.w > 180 and myZone.zone.h > 145 then zoneLarge(myZone) + elseif myZone.zone.w > 170 and myZone.zone.h > 65 then zoneMedium(myZone) + elseif myZone.zone.w > 150 and myZone.zone.h > 28 then zoneSmall(myZone) end end