diff --git a/klippy/klippy.py b/klippy/klippy.py index 316343cbd..df86f49fa 100644 --- a/klippy/klippy.py +++ b/klippy/klippy.py @@ -327,12 +327,14 @@ def main(): extra_git_desc += "\nTracked URL: %s" % (git_info["url"]) start_args['software_version'] = git_vers start_args['cpu_info'] = util.get_cpu_info() + start_args['device'] = util.get_device_info() if bglogger is not None: versions = "\n".join([ "Args: %s" % (sys.argv,), "Git version: %s%s" % (repr(start_args['software_version']), extra_git_desc), "CPU: %s" % (start_args['cpu_info'],), + "Device: %s" % (start_args['device']), "Python: %s" % (repr(sys.version),)]) logging.info(versions) elif not options.debugoutput: diff --git a/klippy/util.py b/klippy/util.py index 6a8baee7f..9b64ed8f2 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -125,6 +125,17 @@ def get_cpu_info(): model_name = dict(lines).get("model name", "?") return "%d core %s" % (core_count, model_name) +def get_device_info(): + try: + f = open('/proc/device-tree/model', 'r') + data = f.read() + f.close() + except (IOError, OSError) as e: + logging.debug("Exception on read /proc/device-tree/model: %s", + traceback.format_exc()) + return "?" + return data.rstrip(' \0') + def get_version_from_file(klippy_src): try: with open(os.path.join(klippy_src, '.version')) as h: