2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Modify sensor_data in place

Browse source
This commit is contained in:
2Shirt 2018-12-05 20:47:40 -07:00
parent 2eccc236a9
commit 328d6eb294
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.bin/Scripts/functions/sensors.py
View file

@ -23,7 +23,6 @@ def clear_temps(sensor_data):
for _adapter, _sources in _adapters.items(): for _adapter, _sources in _adapters.items():
for _source, _data in _sources.items(): for _source, _data in _sources.items():
_data['Temps'] = [] _data['Temps'] = []
return sensor_data
def fix_sensor_str(s): def fix_sensor_str(s):
"""Cleanup string and return str.""" """Cleanup string and return str."""
@ -57,7 +56,6 @@ def generate_report(sensor_data, *temp_labels, colors=True):
_line += ', '.join(_temps) _line += ', '.join(_temps)
report.append(_line) report.append(_line)
report.append(' ') report.append(' ')
return sensor_data
def get_colored_temp_str(temp): def get_colored_temp_str(temp):
"""Get colored string based on temp, returns str.""" """Get colored string based on temp, returns str."""
@ -139,7 +137,7 @@ def save_average_temp(sensor_data, temp_label, seconds=10):
# Get temps # Get temps
for i in range(seconds): for i in range(seconds):
sensor_data = update_sensor_data(sensor_data) update_sensor_data(sensor_data)
sleep(1) sleep(1)
# Calculate averages # Calculate averages
@ -148,9 +146,6 @@ def save_average_temp(sensor_data, temp_label, seconds=10):
for _source, _data in _sources.items(): for _source, _data in _sources.items():
_data[temp_label] = sum(_data['Temps']) / len(_data['Temps']) _data[temp_label] = sum(_data['Temps']) / len(_data['Temps'])
# Done
return sensor_data
def update_sensor_data(sensor_data): def update_sensor_data(sensor_data):
"""Read sensors and update existing sensor_data, returns dict.""" """Read sensors and update existing sensor_data, returns dict."""
json_data = get_raw_sensor_data() json_data = get_raw_sensor_data()
@ -162,7 +157,6 @@ def update_sensor_data(sensor_data):
_data['Current'] = _temp _data['Current'] = _temp
_data['Max'] = max(_temp, _data['Max']) _data['Max'] = max(_temp, _data['Max'])
_data['Temps'].append(_temp) _data['Temps'].append(_temp)
return sensor_data
def join_columns(column1, column2, width=55): def join_columns(column1, column2, width=55):
return '{:<{}}{}'.format( return '{:<{}}{}'.format(