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.

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

Minor ZMK update #248

Merged
merged 1 commit into from
Oct 20, 2023
Merged

Minor ZMK update #248

merged 1 commit into from
Oct 20, 2023

Conversation

ReFil
Copy link
Collaborator

@ReFil ReFil commented Oct 20, 2023

Tweaks to point to new ZMK branch, changes to support this.

@ReFil
Copy link
Collaborator Author

ReFil commented Oct 20, 2023

Please note this update will require a settings-reset on both halves

Tweaks to point to new ZMK branch, changes to support this.
@ReFil ReFil merged commit 71a5ba1 into KinesisCorporation:V3.0 Oct 20, 2023
1 check passed
DDRBoxman added a commit to DDRBoxman/Adv360-Pro-ZMK that referenced this pull request Oct 22, 2023
martinarrieta added a commit to martinarrieta/Adv360-Pro-ZMK that referenced this pull request Oct 26, 2023
db-hua added a commit to db-hua/Adv360-Pro-ZMK that referenced this pull request Oct 28, 2023
clayne11 pushed a commit to clayne11/Adv360-Pro-ZMK that referenced this pull request Nov 18, 2023
Tweaks to point to new ZMK branch, changes to support this.
Shamasher pushed a commit to Shamasher/Adv360-Pro-ZMK-fork that referenced this pull request Nov 22, 2023
Tweaks to point to new ZMK branch, changes to support this.
Coobaha added a commit to Coobaha/Adv360-Pro-ZMK that referenced this pull request Nov 26, 2023
* upstream/V3.0:
  Revert "Add version macro to keymap.json (KinesisCorporation#269)"
  Add version macro to keymap.json (KinesisCorporation#269)
  Changelog new base ZMK update (KinesisCorporation#268)
  Version compiled FW with automatic macro (KinesisCorporation#267)
  Document new NKRO settings (KinesisCorporation#264)
  Improve documentation based on feedback (KinesisCorporation#260)
  Update reset file
  Update ZMK (KinesisCorporation#248)
  Further documentation work (KinesisCorporation#241)
  Fix shell check warnings (KinesisCorporation#242)
  Readme rewrite (KinesisCorporation#222)
  Add CHANGELOG (KinesisCorporation#221)

# Conflicts:
#	Makefile
#	config/adv360.keymap
asmodeus812 pushed a commit to asmodeus812/Adv360-Pro that referenced this pull request Dec 6, 2023
Tweaks to point to new ZMK branch, changes to support this.
alok added a commit to alok/Adv360-Pro-ZMK that referenced this pull request Dec 6, 2023
* upstream/V3.0:
  Update bluetooth settings in light of user feedback (KinesisCorporation#289)
  Revert "Add version macro to keymap.json (KinesisCorporation#269)"
  Add version macro to keymap.json (KinesisCorporation#269)
  Changelog new base ZMK update (KinesisCorporation#268)
  Version compiled FW with automatic macro (KinesisCorporation#267)
  Document new NKRO settings (KinesisCorporation#264)
  Improve documentation based on feedback (KinesisCorporation#260)
  Update reset file
  Update ZMK (KinesisCorporation#248)
  Further documentation work (KinesisCorporation#241)
  Fix shell check warnings (KinesisCorporation#242)
  Readme rewrite (KinesisCorporation#222)
  Add CHANGELOG (KinesisCorporation#221)
noseworthy pushed a commit to noseworthy/Adv360-Pro-ZMK that referenced this pull request Jan 16, 2024
Tweaks to point to new ZMK branch, changes to support this.
zemackdaddy pushed a commit to zemackdaddy/Adv360-Pro-ZMK that referenced this pull request Jan 22, 2024
Tweaks to point to new ZMK branch, changes to support this.
tricktux pushed a commit to tricktux/Adv360-Pro-ZMK that referenced this pull request Feb 10, 2024
Tweaks to point to new ZMK branch, changes to support this.
ztomer pushed a commit to ztomer/Adv360-Pro-ZMK that referenced this pull request Apr 16, 2024
Tweaks to point to new ZMK branch, changes to support this.
zemackdaddy pushed a commit to zemackdaddy/Adv360-Pro-ZMK that referenced this pull request Jul 7, 2024
Tweaks to point to new ZMK branch, changes to support this.
jan-l pushed a commit to jan-l/Adv360-Pro-ZMK that referenced this pull request Aug 28, 2024
Tweaks to point to new ZMK branch, changes to support this.
therealcisse added a commit to therealcisse/Adv360-Pro-ZMK that referenced this pull request Dec 30, 2024
* KinesisCorporation-V3.0:
  Version 3.x
  Updated keymap
  crap
  crap
  crap
  Updated keymap
  Updated keymap
  Updated keymap
  Changelog update (KinesisCorporation#448)
  Minor docs update (KinesisCorporation#445)
  Document new layer colors and modifier color configuration option (KinesisCorporation#431)
  Zephyr 3.5 Update (KinesisCorporation#426)
  Fix Makefile errors that prevent builds on macOS (KinesisCorporation#409)
  Fix version.dtsi is reset after local firmware build (KinesisCorporation#385)
  Update build workflows (KinesisCorporation#376)
  Makefile enhancements to optimize local workflows (KinesisCorporation#363)
  Update Makefile variables (KinesisCorporation#335)
  Base ZMK update (KinesisCorporation#326)
  Prefer `tr` to ${char^^}, which does not work on older bash versions (KinesisCorporation#303)
  Add version macro (KinesisCorporation#300)
  Add pull request template (KinesisCorporation#293)
  Revert "Updated keymap"
  Revert "Updated keymap"
  Updated keymap
  Updated keymap
  Make get_version use bash from $PATH (KinesisCorporation#287)
  Update bluetooth settings in light of user feedback (KinesisCorporation#289)
  Revert "Add version macro to keymap.json (KinesisCorporation#269)"
  Add version macro to keymap.json (KinesisCorporation#269)
  Changelog new base ZMK update (KinesisCorporation#268)
  Version compiled FW with automatic macro (KinesisCorporation#267)
  Document new NKRO settings (KinesisCorporation#264)
  Improve documentation based on feedback (KinesisCorporation#260)
  Update reset file
  Update ZMK (KinesisCorporation#248)
  Further documentation work (KinesisCorporation#241)
  Fix shell check warnings (KinesisCorporation#242)
  Readme rewrite (KinesisCorporation#222)
  Add CHANGELOG (KinesisCorporation#221)
  Add instructions for upgrading from V2 to V3 in README (KinesisCorporation#197)
  V3.0 Update
  Refactor(boards): cleanup pins and keys
  Refine wording of steps in firmware flashing.
  Provide flashing instructions, point at GUI editor, and format support links.
  Remove unnecessary keys from GUI
  Fix json files
  Add additional pedal keys
  Disable logging
  use $(strip to remove whitespace
  Fix alignment of space thumb key
  Correct column alignment for generated keymaps
  Disable SELinux support on OS X
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant