imported by:
urllib3.connection
+ •
urllib3.connectionpool
•
urllib3.poolmanager
•
urllib3.response
@@ -19056,6 +19057,7 @@ imports:
•
socket
•
sys
•
urllib3
+ •
urllib3._collections
•
urllib3.connection
•
urllib3.exceptions
•
urllib3.packages.ssl_match_hostname
diff --git a/dist/mqtt_srv b/dist/mqtt_srv
index e5a6e37..0e050f3 100755
Binary files a/dist/mqtt_srv and b/dist/mqtt_srv differ
diff --git a/mqtt_srv.py b/mqtt_srv.py
index 43211cd..b16d453 100755
--- a/mqtt_srv.py
+++ b/mqtt_srv.py
@@ -19,7 +19,7 @@ import random
import requests
#import psutil
stats = {}
-VERSION = "1.0.25"
+VERSION = "1.0.26"
curos = platform.system()
host = platform.node().lower()
print(host)
@@ -789,11 +789,13 @@ def on_message(client, userdata, msg):
mon3 = "DVI-I-2-1"
mon4 = "eDP-1-1"
'''
- left = ["HDMI-A-0", "1920x1080"]
- mid = ["DisplayPort-0", "2560x1440"]
- right = ["DisplayPort-1", "3440x1440"]
-
+ right = ["HDMI-A-0", "1920x1080"]
+ tleft = ["HDMI-A-0", "1920x1080"]
+ tright = ["DVI-I-1-1", "1920x1080"]
+ left = ["DisplayPort-0", "2560x1440"]
+ mid = ["DisplayPort-1", "3440x1440"]
+ #xrandr --output DisplayPort-1 --primary --auto --mode 3440x1440 --output HDMI-A-0 --auto --left-of DVI-I-1-1 --mode 1920x1080 --output DisplayPort-0 --auto --left-of DisplayPort-1 --mode 2560x1440 --output DVI-I-1-1 --above DisplayPort-1 --mode 1920x1080
if myObj["target"] == "mid":
myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --off"
elif myObj["target"] == "left":
@@ -805,8 +807,9 @@ def on_message(client, userdata, msg):
elif myObj["target"] == "right":
myCmd = f"xrandr --output {right[0]} --primary --auto --mode {right[1]} --output {mid[0]} --off --output {left[0]} --off"
- elif myObj["target"] == "all":
- myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
+ elif myObj["target"] == "all":
+ myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {tleft[0]}--auto --left-of {tright[0]} --mode {tright[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]} --output {tright[0]} --above {mid[0]} --mode {tright[1]}"
+ #myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midleft":
myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --off --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "midtop":
@@ -819,6 +822,8 @@ def on_message(client, userdata, msg):
myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "build":
myCmd = f"xrandr --output {mid[0]} --off --output {right[0]} --off --output {left[0]} --off"
+ elif myObj["target"] == "leftright":
+ myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {right[0]} --auto --right-of {left[0]} --mode {right[1]}"
else:
pass
@@ -1108,7 +1113,7 @@ else:
#print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"]))
#print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_input"]))
#client.publish("sectorq/monitor/" + host.lower(), payload="{\"mb_temp\":0,\"mem_usage\":0,\"cpu_temp\":0,\"cpu_usage\":0,\"gpu_temp\":0,\"gpu_usage\":0}", qos=0, retain=False)
- client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+ client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","TCPU":"NA", "MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True)
elif host.lower() == "openmediavault" or host.lower() == "omv":
#print(psutil.sensors_temperatures())
diff --git a/mqtt_srv.pyw b/mqtt_srv.pyw
index 43211cd..f392d46 100755
--- a/mqtt_srv.pyw
+++ b/mqtt_srv.pyw
@@ -19,7 +19,7 @@ import random
import requests
#import psutil
stats = {}
-VERSION = "1.0.25"
+VERSION = "1.0.26"
curos = platform.system()
host = platform.node().lower()
print(host)
@@ -789,9 +789,9 @@ def on_message(client, userdata, msg):
mon3 = "DVI-I-2-1"
mon4 = "eDP-1-1"
'''
- left = ["HDMI-A-0", "1920x1080"]
- mid = ["DisplayPort-0", "2560x1440"]
- right = ["DisplayPort-1", "3440x1440"]
+ right = ["HDMI-A-0", "1920x1080"]
+ left = ["DisplayPort-0", "2560x1440"]
+ mid = ["DisplayPort-1", "3440x1440"]
if myObj["target"] == "mid":
@@ -819,6 +819,8 @@ def on_message(client, userdata, msg):
myCmd = f"xrandr --output {mid[0]} --primary --auto --mode {mid[1]} --output {right[0]} --auto --right-of {mid[0]} --mode {right[1]} --output {left[0]} --auto --left-of {mid[0]} --mode {left[1]}"
elif myObj["target"] == "build":
myCmd = f"xrandr --output {mid[0]} --off --output {right[0]} --off --output {left[0]} --off"
+ elif myObj["target"] == "leftright":
+ myCmd = f"xrandr --output {left[0]} --primary --auto --mode {left[1]} --output {mid[0]} --off --output {right[0]} --auto --right-of {left[0]} --mode {right[1]}"
else:
pass
@@ -1108,7 +1110,7 @@ else:
#print(str(jn1["coretemp-isa-0000"]["Package id 0"]["temp1_input"]))
#print(str(jn1["asus-isa-0000"]["cpu_fan"]["fan1_input"]))
#client.publish("sectorq/monitor/" + host.lower(), payload="{\"mb_temp\":0,\"mem_usage\":0,\"cpu_temp\":0,\"cpu_usage\":0,\"gpu_temp\":0,\"gpu_usage\":0}", qos=0, retain=False)
- client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
+ client.publish("home-assistant/" + host + "/hwstats", payload='{"status":"on", "version":"' + VERSION + '","TCPU":"NA", "MB_TEMP":' + str(mb_data.current) + ', "MEM_UTIL":' + str(mem_data.percent) + ', "CPU_TEMP":' + str(cpu_data.current) + ', "GPU_TEMP":0, "GPU_UTIL":0, "FAN_CPU":"' + str(fan_data) + '", "VMEM_UTIL":' + str(swap_data.percent) + ', "CPU_UTIL":' + str(cpu_usage) + '}', qos=0, retain=False)
client.publish("sectorq/systems/" + host.lower() + "/stat", payload="on", qos=0, retain=True)
elif host.lower() == "openmediavault" or host.lower() == "omv":
#print(psutil.sensors_temperatures())