13
13
import psutil
14
14
import pytz
15
15
import yaml
16
+ import csv
16
17
from pytz import timezone
17
18
18
19
try :
24
25
UTC = pytz .utc
25
26
DEFAULT_TIME_ZONE = None
26
27
28
+ # Get OS information
29
+ OS_DATA = {}
30
+ with open ("/etc/os-release" ) as f :
31
+ reader = csv .reader (f , delimiter = "=" )
32
+ for row in reader :
33
+ if row :
34
+ OS_DATA [row [0 ]] = row [1 ]
35
+
27
36
mqttClient = None
28
37
SYSFILE = "/sys/devices/platform/soc/soc:firmware/get_throttled"
29
38
WAIT_TIME_SECONDS = 60
@@ -130,10 +139,16 @@ def get_updates():
130
139
return str (cache .get_changes ().__len__ ())
131
140
132
141
142
+ # Temperature method depending on system distro
133
143
def get_temp ():
134
- temp = check_output (["vcgencmd" , "measure_temp" ]).decode ("UTF-8" )
135
- return str (findall ("\d+\.\d+" , temp )[0 ])
136
-
144
+ temp = "" ;
145
+ if "rasp" in OS_DATA ["ID" ]:
146
+ reading = check_output (["vcgencmd" , "measure_temp" ]).decode ("UTF-8" )
147
+ temp = str (findall ("\d+\.\d+" , reading )[0 ])
148
+ else :
149
+ reading = check_output (["cat" , "/sys/class/thermal/thermal_zone0/temp" ]).decode ("UTF-8" )
150
+ temp = str (reading [0 ] + reading [1 ] + "." + reading [2 ])
151
+ return temp
137
152
138
153
def get_disk_usage (path ):
139
154
return str (psutil .disk_usage (path ).percent )
@@ -152,17 +167,16 @@ def get_swap_usage():
152
167
153
168
154
169
def get_wifi_strength (): # check_output(["/proc/net/wireless", "grep wlan0"])
155
- return (
156
- check_output (
157
- [
158
- "bash" ,
159
- "-c" ,
160
- "cat /proc/net/wireless | grep wlan0: | awk '{print int($4)}'" ,
161
- ]
162
- )
163
- .decode ("utf-8" )
164
- .rstrip ()
165
- )
170
+ wifi_strength_value = check_output (
171
+ [
172
+ "bash" ,
173
+ "-c" ,
174
+ "cat /proc/net/wireless | grep wlan0: | awk '{print int($4)}'" ,
175
+ ]
176
+ ).decode ("utf-8" ).rstrip ()
177
+ if not wifi_strength_value :
178
+ wifi_strength_value = "0"
179
+ return (wifi_strength_value )
166
180
167
181
168
182
def get_rpi_power_status ():
0 commit comments