3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

power: remove has_gpio check 

This prevents loading the gpio module unless a gpio
device is configured.  Resolves #283.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-11-25 17:14:43 -05:00
parent ccb86ea039
commit 2a0be55a8d
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
moonraker/components/power.py
View File

@ -37,7 +37,6 @@ if TYPE_CHECKING:
class PrinterPower: class PrinterPower:
def __init__(self, config: ConfigHelper) -> None: def __init__(self, config: ConfigHelper) -> None:
self.server = config.get_server() self.server = config.get_server()
has_gpio = self.server.load_component(config, 'gpio', None) is not None
self.devices: Dict[str, PowerDevice] = {} self.devices: Dict[str, PowerDevice] = {}
prefix_sections = config.get_prefix_sections("power") prefix_sections = config.get_prefix_sections("power")
logging.info(f"Power component loading devices: {prefix_sections}") logging.info(f"Power component loading devices: {prefix_sections}")
@ -59,12 +58,12 @@ class PrinterPower:
dev_class = dev_types.get(dev_type) dev_class = dev_types.get(dev_type)
if dev_class is None: if dev_class is None:
raise config.error(f"Unsupported Device Type: {dev_type}") raise config.error(f"Unsupported Device Type: {dev_type}")
if issubclass(dev_class, GpioDevice) and not has_gpio: try:
self.server.add_warning(
f"Unable to load power device [{cfg.get_name()}], "
"gpio component not available")
continue
dev = dev_class(cfg) dev = dev_class(cfg)
except Exception as e:
msg = f"Failed to load power device [{cfg.get_name()}]\n{e}"
self.server.add_warning(msg)
continue
self.devices[dev.get_name()] = dev self.devices[dev.get_name()] = dev
self.server.register_endpoint( self.server.register_endpoint(