Skip to content

Commit

Permalink
Merge pull request #13 from FrameworkComputer/release-0.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
JohnAZoidberg committed Jul 11, 2023
2 parents 8735ced + a6a48aa commit 4e1da6d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "qmk_hid"
version = "0.1.6"
version = "0.1.7"
edition = "2021"
license = "BSD-3-Clause"
description = "Commandline tool to interact with QMK devices via their raw HID interface"
Expand Down
8 changes: 6 additions & 2 deletions qmk_gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
# - Show connected devices
# - Get firmware version

PROGRAM_VERSION = "0.1.7"
FWK_VID = 0x32AC

QMK_INTERFACE = 0x01
Expand Down Expand Up @@ -125,11 +126,13 @@ def main(devices):
checkbox = sg.Checkbox(device_info, default=True, key='-CHECKBOX-{}-'.format(dev['path']), enable_events=True)
device_checkboxes.append([checkbox])

releases = find_releases()
versions = sorted(list(releases.keys()), reverse=True)


# Only in the pyinstaller bundle are the FW update binaries included
if is_pyinstaller():
releases = find_releases()
versions = sorted(list(releases.keys()), reverse=True)

bundled_update = [
[sg.Text("Update Version")],
[sg.Text("Version"), sg.Push(), sg.Combo(versions, k='-VERSION-', enable_events=True, default_value=versions[0])],
Expand Down Expand Up @@ -178,6 +181,7 @@ def main(devices):
[sg.HorizontalSeparator()],
[sg.Text("Save Settings")],
[sg.Button("Save", k='-SAVE-'), sg.Button("Clear EEPROM", k='-CLEAR-EEPROM-')],
[sg.Text(f"Program Version: {PROGRAM_VERSION}")],
]
window = sg.Window("QMK Keyboard Control", layout)

Expand Down

0 comments on commit 4e1da6d

Please sign in to comment.