l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #276 from eknoes/master

Browse source 
[modules/sensors] Prefer sensors command if available, solves #275
This commit is contained in:
tobi-wan-kenobi 2018-07-30 20:11:42 +02:00 committed by GitHub
commit b2bf7c7aaa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
bumblebee/modules/sensors.py
View file

@ -29,6 +29,16 @@ class Module(bumblebee.engine.Module):
self._match_number = int(self.parameter("match_number", "-1")) self._match_number = int(self.parameter("match_number", "-1"))
self._pattern = re.compile(r"^\s*{}:\s*([\d.]+)$".format(self.parameter("match", "temp1_input")), re.MULTILINE) self._pattern = re.compile(r"^\s*{}:\s*([\d.]+)$".format(self.parameter("match", "temp1_input")), re.MULTILINE)
engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, cmd="xsensors") engine.input.register_callback(self, button=bumblebee.input.LEFT_MOUSE, cmd="xsensors")
self.determine_method()
def determine_method(self):
try:
output = bumblebee.util.execute("sensors -u")
self.use_sensors = True
log.debug("Sensors command available")
except FileNotFoundError as e:
log.info("Sensors command not available, using /sys/class/thermal/thermal_zone*/")
self.use_sensors = False
def _get_temp_from_sensors(self): def _get_temp_from_sensors(self):
output = bumblebee.util.execute("sensors -u") output = bumblebee.util.execute("sensors -u")
@ -38,12 +48,20 @@ class Module(bumblebee.engine.Module):
return "unknown" return "unknown"
def get_temp(self): def get_temp(self):
if self.use_sensors:
temperature = self._get_temp_from_sensors()
log.debug("Retrieve temperature from sensors -u")
else:
try: try:
temperature = open(self.parameter("path", "/sys/class/thermal/thermal_zone0/temp")).read()[:2] temperature = open(self.parameter("path", "/sys/class/thermal/thermal_zone0/temp")).read()[:2]
log.debug("retrieved temperature from /sys/class/") log.debug("retrieved temperature from /sys/class/")
# TODO: Iterate through all thermal zones to determine the correct one and use its value
# https://unix.stackexchange.com/questions/304845/discrepancy-between-number-of-cores-and-thermal-zones-in-sys-class-thermal
except IOError: except IOError:
temperature = self._get_temp_from_sensors() temperature = "unknown"
log.debug("retrieved temperature from 'sensors -u'") log.info("Can not determine temperature, please install lm-sensors")
return temperature return temperature
def get_mhz(self): def get_mhz(self):