Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

klippy: Rename internal functions so that they are prefaced with "_" 

Preface the internal functions to make it more clear which functions
are interfaces to external code.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-08-26 00:13:36 -04:00
parent a42cb4fecf
commit d8c75fc608
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
klippy/klippy.py
View File

@ -131,9 +131,9 @@ class Printer:
self.reactor = reactor.Reactor() self.reactor = reactor.Reactor()
self.objects = {} self.objects = {}
self.gcode = gcode.GCodeParser(self, input_fd) self.gcode = gcode.GCodeParser(self, input_fd)
self.stats_timer = self.reactor.register_timer(self.stats) self.stats_timer = self.reactor.register_timer(self._stats)
self.connect_timer = self.reactor.register_timer( self.connect_timer = self.reactor.register_timer(
self.connect, self.reactor.NOW) self._connect, self.reactor.NOW)
self.all_config_options = {} self.all_config_options = {}
self.need_dump_debug = False self.need_dump_debug = False
self.state_message = message_startup self.state_message = message_startup
@ -142,7 +142,7 @@ class Printer:
self.mcu = None self.mcu = None
def get_start_args(self): def get_start_args(self):
return self.start_args return self.start_args
def stats(self, eventtime, force_output=False): def _stats(self, eventtime, force_output=False):
if self.need_dump_debug: if self.need_dump_debug:
# Call dump_debug here so it is executed in the main thread # Call dump_debug here so it is executed in the main thread
self.gcode.dump_debug() self.gcode.dump_debug()
@ -161,7 +161,7 @@ class Printer:
return eventtime + 1. return eventtime + 1.
def add_object(self, name, obj): def add_object(self, name, obj):
self.objects[name] = obj self.objects[name] = obj
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']
res = self.fileconfig.read(config_file) res = self.fileconfig.read(config_file)
@ -188,9 +188,9 @@ class Printer:
raise ConfigParser.Error( raise ConfigParser.Error(
"Unknown option '%s' in section '%s'" % ( "Unknown option '%s' in section '%s'" % (
option, section)) option, section))
def connect(self, eventtime): def _connect(self, eventtime):
try: try:
self.load_config() self._load_config()
if self.start_args.get('debugoutput') is None: if self.start_args.get('debugoutput') is None:
self.reactor.update_timer(self.stats_timer, self.reactor.NOW) self.reactor.update_timer(self.stats_timer, self.reactor.NOW)
self.mcu.connect() self.mcu.connect()
@ -241,14 +241,14 @@ class Printer:
def disconnect(self): def disconnect(self):
try: try:
if self.mcu is not None: if self.mcu is not None:
self.stats(self.reactor.monotonic(), force_output=True) self._stats(self.reactor.monotonic(), force_output=True)
self.mcu.disconnect() self.mcu.disconnect()
except: except:
logging.exception("Unhandled exception during disconnect") logging.exception("Unhandled exception during disconnect")
def firmware_restart(self): def firmware_restart(self):
try: try:
if self.mcu is not None: if self.mcu is not None:
self.stats(self.reactor.monotonic(), force_output=True) self._stats(self.reactor.monotonic(), force_output=True)
self.mcu.microcontroller_restart() self.mcu.microcontroller_restart()
self.mcu.disconnect() self.mcu.disconnect()
except: except: