From ccb93068fef2d01c6666c8ba0d849540aa5a8e46 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Tue, 25 Apr 2017 11:15:15 -0400 Subject: msgproto: Rework dump() so it also works with params Always call the regular .parse() method for each message type during dump() - add a new .format_params() method for dumping a verbose representation of the parsed message. This allows the new format_params() to also be used with data already parsed. Signed-off-by: Kevin O'Connor --- klippy/console.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'klippy/console.py') diff --git a/klippy/console.py b/klippy/console.py index b3ac9c19..4d68b8de 100755 --- a/klippy/console.py +++ b/klippy/console.py @@ -25,6 +25,7 @@ class KeyboardReader: self.eval_globals = {} def connect(self, eventtime): self.ser.connect() + self.ser.handle_default = self.handle_default self.mcu_freq = self.ser.msgparser.get_constant_float('CLOCK_FREQ') mcu = self.ser.msgparser.get_constant('MCU') self.pins = pins.get_pin_map(mcu) @@ -33,6 +34,8 @@ class KeyboardReader: def output(self, msg): sys.stdout.write("%s\n" % (msg,)) sys.stdout.flush() + def handle_default(self, params): + self.output(self.ser.msgparser.format_params(params)) def update_evals(self, eventtime): self.eval_globals['freq'] = self.mcu_freq self.eval_globals['clock'] = self.ser.get_clock(eventtime) -- cgit v1.2.3-70-g09d2