Add version macro #300
Merged
Add version macro #300
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fred-drake
pushed a commit
to fred-drake/Adv360-Keyboard
that referenced
this pull request
Dec 17, 2023
moritzschatz
pushed a commit
to moritzschatz/Adv360-Pro-ZMK
that referenced
this pull request
Jan 3, 2024
moritzschatz
pushed a commit
to moritzschatz/Adv360-Pro-ZMK
that referenced
this pull request
Jan 3, 2024
gshpychka
pushed a commit
to gshpychka/Adv360-Pro-ZMK
that referenced
this pull request
Jan 4, 2024
noseworthy
pushed a commit
to noseworthy/Adv360-Pro-ZMK
that referenced
this pull request
Jan 16, 2024
Coobaha
added a commit
to Coobaha/Adv360-Pro-ZMK
that referenced
this pull request
Jan 17, 2024
# By ReFil (7) and others # Via GitHub * upstream/v3.0: 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) # Conflicts: # Makefile
mdecamposmendes
pushed a commit
to mdecamposmendes/Adv360-Pro-ZMK
that referenced
this pull request
Jan 21, 2024
alok
added a commit
to alok/Adv360-Pro-ZMK
that referenced
this pull request
Feb 6, 2024
* upstream/V3.0: 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)
sanderdrummer
added a commit
to sanderdrummer/Adv360-Pro-ZMK
that referenced
this pull request
Feb 8, 2024
* feat: update keymap * Update bluetooth settings in light of user feedback (KinesisCorporation#289) * Make get_version use bash from $PATH (KinesisCorporation#287) * Make get_version use bash from $PATH * Update CHANGELOG.md --------- Co-authored-by: ReFil <31960031+ReFil@users.noreply.github.com> * Updated keymap * Updated keymap * Revert "Updated keymap" This reverts commit 18e664a. * Revert "Updated keymap" This reverts commit 9fc6c62. * Add pull request template (KinesisCorporation#293) * Add pull request template * Update CHANGELOG.md * Add version macro (KinesisCorporation#300) * Prefer `tr` to ${char^^}, which does not work on older bash versions (KinesisCorporation#303) * Prefer `tr` to ${char^^}, which does not work on older bash versions * Update CHANGELOG.md --------- Co-authored-by: ReFil <31960031+ReFil@users.noreply.github.com> * Base ZMK update (KinesisCorporation#326) * Update Makefile variables (KinesisCorporation#335) * Makefile enhancements to optimize local workflows (KinesisCorporation#363) - Enhance the Makefile to enable firmware building exclusively for the left side. To modify the keymap, flashing only the left side's firmware suffices. This change facilitates the creation of firmware for the left side only, thereby expediting the build process. Usage: make left This update maintains existing functionality. Without specifying the left target, firmware for both halves will be generated. - Add separate make targets to clean firmware and docker image Add targets clean_firmware and clean_image independently while maintaing clean to run both - Ensure files modified by the build process are reset at the end The current build process dynamically generates the content of the version macro in config/version.dtsi to enable users to print out the precise version and commit the firmware was built on via a keybinding on the keymap. This change ensurs that the changes to this macro file are reset at the end of the build process to ensure it isn't shown as modified and added to keymap commit changes. * feat: add f keys --------- Co-authored-by: ReFil <31960031+ReFil@users.noreply.github.com> Co-authored-by: David Whetstone <humblehacker@users.noreply.github.com> Co-authored-by: adv360proapp[bot] <105741512+adv360proapp[bot]@users.noreply.github.com> Co-authored-by: Jim Jowdy <jjowdy@gmail.com> Co-authored-by: Thomas Huber <113915837+huber-th@users.noreply.github.com>
tricktux
pushed a commit
to tricktux/Adv360-Pro-ZMK
that referenced
this pull request
Feb 10, 2024
OAGr
added a commit
to OAGr/Adv360-Pro-ZMK-v1
that referenced
this pull request
Mar 2, 2024
* V3.0: (57 commits) 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) ...
ztomer
pushed a commit
to ztomer/Adv360-Pro-ZMK
that referenced
this pull request
Apr 16, 2024
zemackdaddy
pushed a commit
to zemackdaddy/Adv360-Pro-ZMK
that referenced
this pull request
Jul 7, 2024
jan-l
pushed a commit
to jan-l/Adv360-Pro-ZMK
that referenced
this pull request
Aug 28, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's changed:
Added the version macro back into the keymap.json file after the editor was updated to support it
Why has this change been implemented:
This allows keymaps generated by the keymap editor to use teh same mod+v version macro as manually edited keymaps and factory firmwares
What (if any) actions must a user take after this change:
Nothing aside from fetching upstream