From 860fc3e91de9e17d869daaad08ebfcf9b07e270e Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 28 Dec 2016 21:45:29 -0500 Subject: gcode: Add support for M115 command Support querying the firmware type and version. Signed-off-by: Kevin O'Connor --- klippy/util.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'klippy/util.py') diff --git a/klippy/util.py b/klippy/util.py index 9daf75cd..7a61de08 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -36,11 +36,11 @@ def create_pty(ptyname): termios.tcsetattr(mfd, termios.TCSADRAIN, old) return mfd -def report_git_version(): +def get_git_version(): # Obtain version info from "git" program if not os.path.exists('.git'): logging.debug("No '.git' file/directory found") - return + return "?" prog = "git describe --tags --long --dirty" try: process = subprocess.Popen(shlex.split(prog), stdout=subprocess.PIPE) @@ -48,6 +48,5 @@ def report_git_version(): retcode = process.poll() except OSError: logging.debug("Exception on run: %s" % (traceback.format_exc(),)) - return - ver = output.strip() - logging.info("Git version: %s" % (repr(ver),)) + return "?" + return output.strip() -- cgit v1.2.3-70-g09d2