scifijunkie/pwnagotchi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request from andrewbeard/master

Browse Source 
Fix for issue
This commit is contained in:
evilsocket 2019-11-16 10:09:49 +01:00 committed by GitHub
commit d8d6d52eda
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 12 deletions

30
pwnagotchi/plugins/default/memtemp.py

@ -51,26 +51,32 @@ class MemTemp(plugins.Plugin):
h_pos = (155, 76) h_pos = (155, 76)
v_pos = (180, 61) v_pos = (180, 61)
if self.options['orientation'] == "horizontal": if self.options['orientation'] == "vertical":
ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - - -',
position=h_pos,
label_font=fonts.Small, text_font=fonts.Small))
elif self.options['orientation'] == "vertical":
ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-', ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value=' mem:-\n cpu:-\ntemp:-',
position=v_pos, position=v_pos,
label_font=fonts.Small, text_font=fonts.Small)) label_font=fonts.Small, text_font=fonts.Small))
else:
# default to horizontal
ui.add_element('memtemp', LabeledValue(color=BLACK, label='', value='mem cpu temp\n - - -',
position=h_pos,
label_font=fonts.Small, text_font=fonts.Small))
def on_ui_update(self, ui): def on_ui_update(self, ui):
if self.options['scale'] == "fahrenheit": if self.options['scale'] == "fahrenheit":
temp = (pwnagotchi.temperature() * 9 / 5) + 32 temp = (pwnagotchi.temperature() * 9 / 5) + 32
elif self.options['scale'] == "celsius": symbol = "f"
temp = pwnagotchi.temperature()
elif self.options['scale'] == "kelvin": elif self.options['scale'] == "kelvin":
temp = pwnagotchi.temperature() + 273.15 temp = pwnagotchi.temperature() + 273.15
if self.options['orientation'] == "horizontal": symbol = "k"
ui.set('memtemp', else:
" mem cpu temp\n %s%% %s%% %sc" % (self.mem_usage(), self.cpu_load(), temp)) # default to celsius
temp = pwnagotchi.temperature()
symbol = "c"
elif self.options['orientation'] == "vertical": if self.options['orientation'] == "vertical":
ui.set('memtemp', ui.set('memtemp',
" mem:%s%%\n cpu:%s%%\ntemp:%sc" % (self.mem_usage(), self.cpu_load(), temp)) " mem:%s%%\n cpu:%s%%\ntemp:%s%s" % (self.mem_usage(), self.cpu_load(), temp, symbol))
else:
# default to horizontal
ui.set('memtemp',
" mem cpu temp\n %s%% %s%% %s%s" % (self.mem_usage(), self.cpu_load(), temp, symbol))