mirror of
https://github.com/QIDITECH/klipper.git
synced 2026-02-02 08:58:42 +03:00
plus4的klipper版本
This commit is contained in:
@@ -231,11 +231,7 @@ class Printer:
|
||||
run_result = self.run_result
|
||||
try:
|
||||
if run_result == 'firmware_restart':
|
||||
for n, m in self.lookup_objects(module='mcu'):
|
||||
m.microcontroller_restart()
|
||||
if run_result == 'close_mcu_port':
|
||||
for n, m in self.lookup_objects(module='mcu'):
|
||||
m.microcontroller_close_port()
|
||||
self.send_event("klippy:firmware_restart")
|
||||
self.send_event("klippy:disconnect")
|
||||
except:
|
||||
logging.exception("Unhandled exception during post run")
|
||||
@@ -347,12 +343,35 @@ def main():
|
||||
else:
|
||||
logging.getLogger().setLevel(debuglevel)
|
||||
logging.info("Starting Klippy...")
|
||||
start_args['software_version'] = util.get_git_version()
|
||||
git_info = util.get_git_version()
|
||||
git_vers = git_info["version"]
|
||||
extra_files = [fname for code, fname in git_info["file_status"]
|
||||
if (code in ('??', '!!') and fname.endswith('.py')
|
||||
and (fname.startswith('klippy/kinematics/')
|
||||
or fname.startswith('klippy/extras/')))]
|
||||
modified_files = [fname for code, fname in git_info["file_status"]
|
||||
if code == 'M']
|
||||
extra_git_desc = ""
|
||||
if extra_files:
|
||||
if not git_vers.endswith('-dirty'):
|
||||
git_vers = git_vers + '-dirty'
|
||||
if len(extra_files) > 10:
|
||||
extra_files[10:] = ["(+%d files)" % (len(extra_files) - 10,)]
|
||||
extra_git_desc += "\nUntracked files: %s" % (', '.join(extra_files),)
|
||||
if modified_files:
|
||||
if len(modified_files) > 10:
|
||||
modified_files[10:] = ["(+%d files)" % (len(modified_files) - 10,)]
|
||||
extra_git_desc += "\nModified files: %s" % (', '.join(modified_files),)
|
||||
extra_git_desc += "\nBranch: %s" % (git_info["branch"])
|
||||
extra_git_desc += "\nRemote: %s" % (git_info["remote"])
|
||||
extra_git_desc += "\nTracked URL: %s" % (git_info["url"])
|
||||
start_args['software_version'] = git_vers
|
||||
start_args['cpu_info'] = util.get_cpu_info()
|
||||
if bglogger is not None:
|
||||
versions = "\n".join([
|
||||
"Args: %s" % (sys.argv,),
|
||||
"Git version: %s" % (repr(start_args['software_version']),),
|
||||
"Git version: %s%s" % (repr(start_args['software_version']),
|
||||
extra_git_desc),
|
||||
"CPU: %s" % (start_args['cpu_info'],),
|
||||
"Python: %s" % (repr(sys.version),)])
|
||||
logging.info(versions)
|
||||
|
||||
Reference in New Issue
Block a user