diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2016-12-28 21:45:29 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2016-12-28 22:38:29 -0500 |
commit | 860fc3e91de9e17d869daaad08ebfcf9b07e270e (patch) | |
tree | 73b92f90a61ab6e31d12a24abab0e4bcc241d81c /klippy/util.py | |
parent | 2e03d84755f466adaad64ae0054eb461869d0529 (diff) | |
download | kutter-860fc3e91de9e17d869daaad08ebfcf9b07e270e.tar.gz kutter-860fc3e91de9e17d869daaad08ebfcf9b07e270e.tar.xz kutter-860fc3e91de9e17d869daaad08ebfcf9b07e270e.zip |
gcode: Add support for M115 command
Support querying the firmware type and version.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/util.py')
-rw-r--r-- | klippy/util.py | 9 |
1 files changed, 4 insertions, 5 deletions
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() |