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

klippy: Add support for dynamic loading of python modules 

Check if a config section matches a python filename in the
klippy/extras/ directory.  If it does, load that python code to handle
the config section.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2018-01-19 21:25:58 -05:00
parent d3665699f1
commit 9399911490
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
klippy/extras/__init__.py Normal file
View File

@ -0,0 +1,5 @@
# Package definition for the extras directory
#
# Copyright (C) 2018 Kevin O'Connor <kevin@koconnor.net>
#
# This file may be distributed under the terms of the GNU GPLv3 license.

20
klippy/klippy.py
View File

@ -4,7 +4,7 @@
# Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2016-2018 Kevin O'Connor <kevin@koconnor.net>
# #
# This file may be distributed under the terms of the GNU GPLv3 license. # This file may be distributed under the terms of the GNU GPLv3 license.
import sys, optparse, logging, time, threading import sys, os, optparse, logging, time, threading
import collections, ConfigParser, importlib import collections, ConfigParser, importlib
import util, reactor, queuelogger, msgproto import util, reactor, queuelogger, msgproto
import gcode, pins, mcu, chipmisc, toolhead, extruder, heater, fan import gcode, pins, mcu, chipmisc, toolhead, extruder, heater, fan
@ -184,6 +184,16 @@ class Printer:
stats = [cb(eventtime) for cb in self.stats_cb] stats = [cb(eventtime) for cb in self.stats_cb]
logging.info("Stats %.1f: %s", eventtime, ' '.join(stats)) logging.info("Stats %.1f: %s", eventtime, ' '.join(stats))
return eventtime + 1. return eventtime + 1.
def _try_load_module(self, config, section):
if section in self.objects:
return
module_name = section.split()[0]
py_name = os.path.join(os.path.dirname(__file__),
'extras', module_name + '.py')
if not os.path.exists(py_name):
return
mod = importlib.import_module('extras.' + module_name)
self.objects[section] = mod.load_config(config.getsection(section))
def _load_config(self): def _load_config(self):
self.fileconfig = ConfigParser.RawConfigParser() self.fileconfig = ConfigParser.RawConfigParser()
config_file = self.start_args['config_file'] config_file = self.start_args['config_file']
@ -195,13 +205,17 @@ class Printer:
ConfigLogger(self.fileconfig, self.bglogger) ConfigLogger(self.fileconfig, self.bglogger)
# Create printer components # Create printer components
config = ConfigWrapper(self, 'printer') config = ConfigWrapper(self, 'printer')
for m in [pins, mcu, chipmisc, toolhead, extruder, heater, fan]: for m in [pins, mcu]:
m.add_printer_objects(self, config)
for section in self.fileconfig.sections():
self._try_load_module(config, section)
for m in [chipmisc, toolhead, extruder, heater, fan]:
m.add_printer_objects(self, config) m.add_printer_objects(self, config)
# Validate that there are no undefined parameters in the config file # Validate that there are no undefined parameters in the config file
valid_sections = { s: 1 for s, o in self.all_config_options } valid_sections = { s: 1 for s, o in self.all_config_options }
for section in self.fileconfig.sections(): for section in self.fileconfig.sections():
section = section.lower() section = section.lower()
if section not in valid_sections: if section not in valid_sections and section not in self.objects:
raise self.config_error("Unknown config file section '%s'" % ( raise self.config_error("Unknown config file section '%s'" % (
section,)) section,))
for option in self.fileconfig.options(section): for option in self.fileconfig.options(section):