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

Added support of WB32 DFU for MacOs. #320

Merged
merged 21 commits into from
May 20, 2022
Merged

Added support of WB32 DFU for MacOs. #320

merged 21 commits into from
May 20, 2022

Conversation

itarze
Copy link
Contributor

@itarze itarze commented Dec 7, 2021 •
edited
Loading

Added support of WB32 DFU for MacOs.

Description

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Documentation

Issues Fixed or Closed by This PR

@fauxpark
Copy link
Member

fauxpark commented Dec 7, 2021

Package should be submitted to Homebrew and binary taken from there.
https://github.com/homebrew/homebrew-core

See #292

fauxpark
fauxpark requested changes Apr 17, 2022
View reviewed changes
macos/QMK Toolbox/USB/Bootloader/BootloaderType.h Outdated Show resolved Hide resolved
macos/QMK Toolbox/USB/USBListener.m Outdated Show resolved Hide resolved
macos/QMK Toolbox/USB/USBListener.m Outdated Show resolved Hide resolved
macos/QMK Toolbox/USB/USBListener.m Outdated Show resolved Hide resolved
macos/QMK Toolbox/USB/Bootloader/WB32DFUDevice.m Outdated Show resolved Hide resolved
macos/QMK Toolbox.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
macos/QMK Toolbox.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
macos/QMK Toolbox.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
@itarze
Copy link
Contributor Author

itarze commented Apr 17, 2022

The format has been adjusted.

@itarze itarze requested a review from fauxpark April 17, 2022 09:45
@fauxpark fauxpark added enhancement macos waiting-brew Waiting on Homebrew PR merge labels Apr 18, 2022
@fauxpark
Copy link
Member

Waiting for Homebrew/homebrew-core#98739

fauxpark
fauxpark requested changes Apr 21, 2022
View reviewed changes
macos/QMK Toolbox/AppDelegate.m Outdated Show resolved Hide resolved
@itarze itarze requested a review from fauxpark April 30, 2022 03:57
@itarze
Copy link
Contributor Author

itarze commented Apr 30, 2022

Waiting for Homebrew/homebrew-core#98739

Has been merged.

@itarze itarze requested a review from fauxpark April 30, 2022 05:30
@zvecr
Copy link
Member

zvecr commented Apr 30, 2022

You still need to pull down the "official" binary from homebrew and update the PR.

@itarze
Copy link
Contributor Author

itarze commented Apr 30, 2022 •
edited
Loading

You still need to pull down the "official" binary from homebrew and update the PR.

I've already done that.
image

@zvecr
Copy link
Member

zvecr commented Apr 30, 2022 •
edited
Loading

Ignore me, for whatever reason the sha256 didnt match. Just retried by steps and they do indeed match.

You have uploaded the monterey bottle artifact, rather than the catalina ones.

executable should be 5becb921ab4cb3b1cce87418720fb3e8b5cc650eea0f0934815b2d291af2950a but is eca41b6ce4e88ff2c25eb8932adde0823a8e98c43426a3e8a859e3aa073da7b1.

@itarze
Copy link
Contributor Author

itarze commented Apr 30, 2022

Ignore me, for whatever reason the sha256 didnt match. Just retried by steps and they do indeed match.

You have uploaded the monterey bottle artifact, rather than the catalina ones.

executable should be 5becb921ab4cb3b1cce87418720fb3e8b5cc650eea0f0934815b2d291af2950a but is eca41b6ce4e88ff2c25eb8932adde0823a8e98c43426a3e8a859e3aa073da7b1.

It's been re-uploaded.

@fauxpark
Copy link
Member

Still wrong - the Homebrew placeholder needs to be changed.
This PR:

fauxpark@marissa:downloads$ otool -L wb32-dfu-updater_cli  
wb32-dfu-updater_cli:
	@@HOMEBREW_PREFIX@@/opt/libusb/lib/libusb-1.0.0.dylib (compatibility version 4.0.0, current version 4.0.0)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1281.100.1)
fauxpark@marissa:downloads$ shasum -a256 wb32-dfu-updater_cli
5becb921ab4cb3b1cce87418720fb3e8b5cc650eea0f0934815b2d291af2950a  wb32-dfu-updater_cli

What it should be:

fauxpark@marissa:bin$ otool -L wb32-dfu-updater_cli  
wb32-dfu-updater_cli:
	@executable_path/../Frameworks/libusb-1.0.0.dylib (compatibility version 4.0.0, current version 4.0.0)
	/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1281.100.1)
fauxpark@marissa:bin$ shasum -a256 wb32-dfu-updater_cli
7bfd47724864c8042fb169aa6b6dd5ceef03ca477d29f9badd345d2503d7064a  wb32-dfu-updater_cli

See #342

@itarze
Copy link
Contributor Author

itarze commented Apr 30, 2022

Okay, the placeholder have been changed. That should be all right.

@fauxpark fauxpark removed the waiting-brew Waiting on Homebrew PR merge label May 15, 2022
fauxpark
fauxpark requested changes May 15, 2022
View reviewed changes
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One last thing.

macos/QMK Toolbox.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
macos/QMK Toolbox.xcodeproj/project.pbxproj Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team May 15, 2022 09:29
@fauxpark fauxpark merged commit d7f9c0f into qmk:master May 20, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

Assignees
No one assigned
Labels
enhancement macos
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@itarze @fauxpark @zvecr @proceee