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

console: Use stdout.write() instead of print 

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-04-25 11:16:02 -04:00
parent 56d4422d31
commit fe11c3e348
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
klippy/console.py
View File

@ -1,7 +1,7 @@
#!/usr/bin/env python #!/usr/bin/env python
# Script to implement a test console with firmware over serial port # Script to implement a test console with firmware over serial port
# #
# Copyright (C) 2016 Kevin O'Connor <kevin@koconnor.net> # Copyright (C) 2016,2017 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, os, re, logging import sys, optparse, os, re, logging
@ -30,6 +30,9 @@ class KeyboardReader:
self.pins = pins.get_pin_map(mcu) self.pins = pins.get_pin_map(mcu)
self.reactor.unregister_timer(self.connect_timer) self.reactor.unregister_timer(self.connect_timer)
return self.reactor.NEVER return self.reactor.NEVER
def output(self, msg):
sys.stdout.write("%s\n" % (msg,))
sys.stdout.flush()
def update_evals(self, eventtime): def update_evals(self, eventtime):
self.eval_globals['freq'] = self.mcu_freq self.eval_globals['freq'] = self.mcu_freq
self.eval_globals['clock'] = int(self.ser.get_clock(eventtime)) self.eval_globals['clock'] = int(self.ser.get_clock(eventtime))
@ -54,16 +57,16 @@ class KeyboardReader:
for i in range(1, len(evalparts), 2): for i in range(1, len(evalparts), 2):
evalparts[i] = str(eval(evalparts[i], self.eval_globals)) evalparts[i] = str(eval(evalparts[i], self.eval_globals))
except: except:
print "Unable to evaluate: ", line self.output("Unable to evaluate: %s" % (line,))
return None return None
line = ''.join(evalparts) line = ''.join(evalparts)
print "Eval:", line self.output("Eval: %s" % (line,))
if self.pins is not None: if self.pins is not None:
try: try:
line = pins.update_command( line = pins.update_command(
line, self.mcu_freq, self.pins).strip() line, self.mcu_freq, self.pins).strip()
except: except:
print "Unable to map pin: ", line self.output("Unable to map pin: %s" % (line,))
return None return None
if line: if line:
parts = line.split() parts = line.split()
@ -73,7 +76,7 @@ class KeyboardReader:
try: try:
msg = self.ser.msgparser.create_command(line) msg = self.ser.msgparser.create_command(line)
except msgproto.error, e: except msgproto.error, e:
print "Error:", e self.output("Error: %s" % (str(e),))
return None return None
return msg return msg
def process_kbd(self, eventtime): def process_kbd(self, eventtime):