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

Jump to bottom

qmk_gui: Select correct device #21

Merged
merged 4 commits into from
Aug 9, 2023
Merged

qmk_gui: Select correct device #21

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d403cc1
qmk_gui: Select correct device
JohnAZoidberg Aug 9, 2023
6f5e683
qmk_gui: Condense design
JohnAZoidberg Aug 9, 2023
a7072a3
qmk_gui: Skip false positives on Linux
JohnAZoidberg Aug 9, 2023
c56526c
qmk_gui: Update to v0.1.10
JohnAZoidberg Aug 9, 2023
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
30 changes: 21 additions & 9 deletions qmk_gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# - Get current values
# - Set sliders to current values

PROGRAM_VERSION = "0.1.9"
PROGRAM_VERSION = "0.1.10"
FWK_VID = 0x32AC

DEBUG_PRINT = False
Expand Down Expand Up @@ -201,10 +201,17 @@ def main(devices):
[sg.Button("Send Numlock Toggle", k='-NUMLOCK-TOGGLE-', disabled=True)],

[sg.HorizontalSeparator()],
[sg.Text("BIOS Mode")],
[sg.Button("Enable", k='-BIOS-MODE-ENABLE-'), sg.Button("Disable", k='-BIOS-MODE-DISABLE-')],
[sg.Text("Factory Mode")],
[sg.Button("Enable", k='-FACTORY-MODE-ENABLE-'), sg.Button("Disable", k='-FACTORY-MODE-DISABLE-')],
[
sg.Column([
[sg.Text("BIOS Mode")],
[sg.Button("Enable", k='-BIOS-MODE-ENABLE-'), sg.Button("Disable", k='-BIOS-MODE-DISABLE-')],
]),
sg.VSeperator(),
sg.Column([
[sg.Text("Factory Mode")],
[sg.Button("Enable", k='-FACTORY-MODE-ENABLE-'), sg.Button("Disable", k='-FACTORY-MODE-DISABLE-')],
])
],

[sg.HorizontalSeparator()],
[sg.Text("Save Settings")],
Expand Down Expand Up @@ -249,9 +256,6 @@ def main(devices):
# print("Selected {} devices".format(len(selected_devices)))

# Updating firmware
if event == "-FLASH-" and len(selected_devices) != 1:
sg.Popup('To flash select exactly 1 device.')
continue
if event == "-VERSION-":
# After selecting a version, we can list the types of firmware available for this version
types = list(releases[values['-VERSION-']])
Expand All @@ -260,9 +264,12 @@ def main(devices):
# Once the user has selected a type, the exact firmware file is known and can be flashed
window['-FLASH-'].update(disabled=False)
if event == "-FLASH-":
if len(selected_devices) != 1:
sg.Popup('To flash select exactly 1 device.')
continue
dev = selected_devices[0]
ver = values['-VERSION-']
t = values['-TYPE-']
# print("Flashing", releases[ver][t])
flash_firmware(dev, releases[ver][t])
restart_hint()
window['-CHECKBOX-{}-'.format(dev['path'])].update(False, disabled=True)
Expand Down Expand Up @@ -452,6 +459,11 @@ def find_devs(show, verbose):
if verbose:
print("Usage Page not matching")
continue
# Lots of false positives, so at least skip Framework false positives
if vid == FWK_VID and pid not in [0x12, 0x13, 0x14, 0x18, 0x19]:
if verbose:
print("False positive, device is not allowed")
continue

fw_ver = device_dict["release_number"]

Expand Down
Loading