Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doctor: Add avrdude/dfu-util/dfu-programmer version printing #8678

Merged
merged 3 commits into from
Apr 5, 2020
Merged

Doctor: Add avrdude/dfu-util/dfu-programmer version printing #8678

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62d3ba7
Doctor: Add avrdude/dfu-util/dfu-programmer version printing
fauxpark Apr 4, 2020
4a6ddb6
Extra newline
fauxpark Apr 4, 2020
8a2e585
Iterate through version checking functions
fauxpark Apr 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 31 additions & 1 deletion lib/python/qmk/cli/doctor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,32 @@ def check_avr_gcc_version():
return False


def check_avrdude_version():
if 'output' in ESSENTIAL_BINARIES['avrdude']:
last_line = ESSENTIAL_BINARIES['avrdude']['output'].split('\n')[-2]
version_number = last_line.split()[2][:-1]
cli.log.info('Found avrdude version %s', version_number)

return True


def check_dfu_util_version():
if 'output' in ESSENTIAL_BINARIES['dfu-util']:
first_line = ESSENTIAL_BINARIES['dfu-util']['output'].split('\n')[0]
version_number = first_line.split()[1]
cli.log.info('Found dfu-util version %s', version_number)

return True


def check_dfu_programmer_version():
if 'output' in ESSENTIAL_BINARIES['dfu-programmer']:
first_line = ESSENTIAL_BINARIES['dfu-programmer']['output'].split('\n')[0]
version_number = first_line.split()[1]
cli.log.info('Found dfu-programmer version %s', version_number)

return True

def check_binaries():
"""Iterates through ESSENTIAL_BINARIES and tests them.
"""
Expand Down Expand Up @@ -156,7 +182,7 @@ def is_executable(command):

# Make sure the command can be executed
version_arg = ESSENTIAL_BINARIES[command].get('version_arg', '--version')
check = subprocess.run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.PIPE, timeout=5, universal_newlines=True)
check = run([command, version_arg], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, timeout=5, universal_newlines=True)

ESSENTIAL_BINARIES[command]['output'] = check.stdout

Expand Down Expand Up @@ -240,6 +266,10 @@ def doctor(cli):
ok = False

# Make sure the tools are at the correct version
check_avrdude_version()
check_dfu_util_version()
check_dfu_programmer_version()

if not check_arm_gcc_version():
ok = False

Expand Down