minor refactoring

This commit is contained in:
Simone Margaritelli 2019-10-20 14:28:34 +02:00
parent c10f25140c
commit 6d88cb17f3

View File

@ -24,12 +24,10 @@ __name__ = 'memtemp'
__license__ = 'GPL3' __license__ = 'GPL3'
__description__ = 'A plugin that will display memory/cpu usage and temperature' __description__ = 'A plugin that will display memory/cpu usage and temperature'
from pwnagotchi.ui.components import LabeledValue from pwnagotchi.ui.components import LabeledValue
from pwnagotchi.ui.view import BLACK from pwnagotchi.ui.view import BLACK
import pwnagotchi.ui.fonts as fonts import pwnagotchi.ui.fonts as fonts
import pwnagotchi import pwnagotchi
import subprocess
import logging import logging
OPTIONS = dict() OPTIONS = dict()
@ -42,19 +40,22 @@ def on_loaded():
def mem_usage(): def mem_usage():
return int(pwnagotchi.mem_usage() * 100) return int(pwnagotchi.mem_usage() * 100)
def cpu_load(): def cpu_load():
return int(pwnagotchi.cpu_load() * 100) return int(pwnagotchi.cpu_load() * 100)
def on_ui_setup(ui): def on_ui_setup(ui):
if OPTIONS['orientation'] == "horizontal": if OPTIONS['orientation'] == "horizontal":
ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - - -', position=(ui.width() / 2 + 30, ui.height() /2 + 15), ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - - -',
position=(ui.width() / 2 + 30, ui.height() / 2 + 15),
label_font=fonts.Small, text_font=fonts.Small)) label_font=fonts.Small, text_font=fonts.Small))
elif OPTIONS['orientation'] == "vertical": elif OPTIONS['orientation'] == "vertical":
ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-', position=(ui.width() / 2 + 55, ui.height() /2), ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-',
position=(ui.width() / 2 + 55, ui.height() / 2),
label_font=fonts.Small, text_font=fonts.Small)) label_font=fonts.Small, text_font=fonts.Small))
def on_ui_update(ui): def on_ui_update(ui):
if OPTIONS['orientation'] == "horizontal": if OPTIONS['orientation'] == "horizontal":
ui.set('memtemp', " mem cpu temp\n %s%% %s%% %sc" % (mem_usage(), cpu_load(), pwnagotchi.temperature())) ui.set('memtemp', " mem cpu temp\n %s%% %s%% %sc" % (mem_usage(), cpu_load(), pwnagotchi.temperature()))