friso/rpi-mqtt-monitor
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

option to enable display control during installation and some bugfixes (#119)

Browse Source
This commit is contained in:
Masoko
2024-05-24 19:27:11 +03:00
committed by GitHub
parent ad6b240c14
commit 360a980732
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install.sh
View File

@@ -132,6 +132,12 @@ update_config(){
fi fi
sed -i "s/rpi-MQTT-monitor/${TOPIC}/" src/config.py sed -i "s/rpi-MQTT-monitor/${TOPIC}/" src/config.py
printf "Do you need to control your monitors? (default is No): "
read CONTROL
if [[ "$CONTROL" =~ ^([yY][eE][sS]|[yY])$ ]]; then
sed -i "s/display_control = False/display_control = True/g" src/config.py
fi
print_green "+ config.py is updated with provided settings" print_green "+ config.py is updated with provided settings"
# Get the local version # Get the local version

19
src/rpi-cpu2mqtt.py
View File

@@ -52,9 +52,12 @@ def check_used_space(path):
def check_cpu_load(): def check_cpu_load():
p = subprocess.Popen("uptime", shell=True, stdout=subprocess.PIPE).communicate()[0] p = subprocess.Popen("uptime", shell=True, stdout=subprocess.PIPE).communicate()[0]
cores = subprocess.Popen("nproc", shell=True, stdout=subprocess.PIPE).communicate()[0] cores = subprocess.Popen("nproc", shell=True, stdout=subprocess.PIPE).communicate()[0]
cpu_load = str(p).split("average:")[1].split(", ")[0].replace(' ', '').replace(',', '.') try:
cpu_load = float(cpu_load) / int(cores) * 100 cpu_load = str(p).split("average:")[1].split(", ")[0].replace(' ', '').replace(',', '.')
cpu_load = round(float(cpu_load), 1) cpu_load = float(cpu_load) / int(cores) * 100
cpu_load = round(float(cpu_load), 1)
except Exception:
cpu_load = 0
return cpu_load return cpu_load
@@ -118,7 +121,10 @@ def check_model_name():
if model_name == '': if model_name == '':
full_cmd = "cat /proc/cpuinfo | grep 'name'| uniq" full_cmd = "cat /proc/cpuinfo | grep 'name'| uniq"
model_name = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8") model_name = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8")
model_name = model_name.split(':')[1].replace('\n', '') try:
model_name = model_name.split(':')[1].replace('\n', '')
except Exception:
model_name = 'Unknown'
return model_name return model_name
@@ -133,7 +139,10 @@ def check_rpi5_fan_speed():
def get_os(): def get_os():
full_cmd = 'cat /etc/os-release | grep -i pretty_name' full_cmd = 'cat /etc/os-release | grep -i pretty_name'
pretty_name = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8") pretty_name = subprocess.Popen(full_cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0].decode("utf-8")
pretty_name = pretty_name.split('=')[1].replace('"', '').replace('\n', '') try:
pretty_name = pretty_name.split('=')[1].replace('"', '').replace('\n', '')
except Exception:
pretty_name = 'Unknown'
return(pretty_name) return(pretty_name)