From bdfb1aa51f3901fa49e18c9f54ce50f2b58858de Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 11 Jul 2023 09:39:12 +0800 Subject: [PATCH 1/2] qmk_gui: Fix on non-pyinstaller version Signed-off-by: Daniel Schaefer --- qmk_gui.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qmk_gui.py b/qmk_gui.py index 69e7f5e..f6db902 100755 --- a/qmk_gui.py +++ b/qmk_gui.py @@ -125,11 +125,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])], From a6a48aa1ed1cb0d6fc2bbf0aed81744c823f5e7b Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 11 Jul 2023 09:39:02 +0800 Subject: [PATCH 2/2] Release v0.1.7 Signed-off-by: Daniel Schaefer --- Cargo.lock | 2 +- Cargo.toml | 2 +- qmk_gui.py | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5773c7f..9ce349f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -214,7 +214,7 @@ dependencies = [ [[package]] name = "qmk_hid" -version = "0.1.6" +version = "0.1.7" dependencies = [ "clap", "hidapi", diff --git a/Cargo.toml b/Cargo.toml index 6e4f906..efaee06 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" diff --git a/qmk_gui.py b/qmk_gui.py index f6db902..b3f0d8c 100755 --- a/qmk_gui.py +++ b/qmk_gui.py @@ -16,6 +16,7 @@ # - Show connected devices # - Get firmware version +PROGRAM_VERSION = "0.1.7" FWK_VID = 0x32AC QMK_INTERFACE = 0x01 @@ -180,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)