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

Add version macro to keymap.json #269

Merged
merged 2 commits into from
Nov 17, 2023
Merged

Add version macro to keymap.json #269

merged 2 commits into from
Nov 17, 2023

Conversation

ReFil
Copy link
Collaborator

@ReFil ReFil commented Nov 17, 2023 •
edited
Loading

This was overlooked when the versioning system was implemented, should be sorted now

@ReFil ReFil changed the title Keadd version macro to keymap.json Add version macro to keymap.json Nov 17, 2023
@ReFil ReFil merged commit 7adf062 into KinesisCorporation:V3.0 Nov 17, 2023
1 check passed
ReFil added a commit that referenced this pull request Nov 18, 2023
@ReFil
Revert "Add version macro to keymap.json (#269)"
d0ffaf8 
This reverts commit 7adf062.
clayne11 pushed a commit to clayne11/Adv360-Pro-ZMK that referenced this pull request Nov 18, 2023
@ReFil @clayne11
Add version macro to keymap.json (KinesisCorporation#269)
6c606f7 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
clayne11 pushed a commit to clayne11/Adv360-Pro-ZMK that referenced this pull request Nov 18, 2023
@ReFil @clayne11
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
c55a6b4 
This reverts commit 7adf062.
Shamasher pushed a commit to Shamasher/Adv360-Pro-ZMK-fork that referenced this pull request Nov 22, 2023
@ReFil @Shamasher
Add version macro to keymap.json (KinesisCorporation#269)
840e007 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
Shamasher pushed a commit to Shamasher/Adv360-Pro-ZMK-fork that referenced this pull request Nov 22, 2023
@ReFil @Shamasher
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
43b54f0 
This reverts commit 7adf062.
Mike-Burton pushed a commit to Mike-Burton/Adv360-Pro-ZMK that referenced this pull request Nov 24, 2023
@ReFil @Mike-Burton
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
3009d00 
This reverts commit 7adf062.
Mike-Burton pushed a commit to Mike-Burton/Adv360-Pro-ZMK that referenced this pull request Nov 24, 2023
@ReFil @Mike-Burton
Add version macro to keymap.json (KinesisCorporation#269)
e1e4a44 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
Coobaha added a commit to Coobaha/Adv360-Pro-ZMK that referenced this pull request Nov 26, 2023
@Coobaha
Merge remote-tracking branch 'upstream/V3.0' into v3.0
5312c3a 
* 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
FlippingBinary pushed a commit to FlippingBinary/Adv360-Pro-ZMK that referenced this pull request Dec 2, 2023
@ReFil @FlippingBinary
Add version macro to keymap.json (KinesisCorporation#269)
59cc567 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
FlippingBinary pushed a commit to FlippingBinary/Adv360-Pro-ZMK that referenced this pull request Dec 2, 2023
@ReFil @FlippingBinary
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
c19afc3 
This reverts commit 7adf062.
asmodeus812 pushed a commit to asmodeus812/Adv360-Pro that referenced this pull request Dec 6, 2023
@ReFil @asmodeus812
Add version macro to keymap.json (KinesisCorporation#269)
88be27e 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
asmodeus812 pushed a commit to asmodeus812/Adv360-Pro that referenced this pull request Dec 6, 2023
@ReFil @asmodeus812
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
6b1a165 
This reverts commit 7adf062.
alok added a commit to alok/Adv360-Pro-ZMK that referenced this pull request Dec 6, 2023
@alok
Merge remote-tracking branch 'upstream/V3.0'
baf0175 
* 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)
fred-drake pushed a commit to fred-drake/Adv360-Keyboard that referenced this pull request Dec 17, 2023
@ReFil @fred-drake
Add version macro to keymap.json (KinesisCorporation#269)
504a89d 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
fred-drake pushed a commit to fred-drake/Adv360-Keyboard that referenced this pull request Dec 17, 2023
@ReFil @fred-drake
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
60c191d 
This reverts commit 7adf062.
moritzschatz pushed a commit to moritzschatz/Adv360-Pro-ZMK that referenced this pull request Jan 3, 2024
@ReFil @moritzschatz
Add version macro to keymap.json (KinesisCorporation#269)
846b5b4 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
moritzschatz pushed a commit to moritzschatz/Adv360-Pro-ZMK that referenced this pull request Jan 3, 2024
@ReFil @moritzschatz
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
b775f25 
This reverts commit 7adf062.
moritzschatz pushed a commit to moritzschatz/Adv360-Pro-ZMK that referenced this pull request Jan 3, 2024
@ReFil @moritzschatz
Add version macro to keymap.json (KinesisCorporation#269)
12db006 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
moritzschatz pushed a commit to moritzschatz/Adv360-Pro-ZMK that referenced this pull request Jan 3, 2024
@ReFil @moritzschatz
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
0164bab 
This reverts commit 7adf062.
gshpychka pushed a commit to gshpychka/Adv360-Pro-ZMK that referenced this pull request Jan 4, 2024
@ReFil @gshpychka
Add version macro to keymap.json (KinesisCorporation#269)
8992c63 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
gshpychka pushed a commit to gshpychka/Adv360-Pro-ZMK that referenced this pull request Jan 4, 2024
@ReFil @gshpychka
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
56d69ce 
This reverts commit 7adf062.
noseworthy pushed a commit to noseworthy/Adv360-Pro-ZMK that referenced this pull request Jan 16, 2024
@ReFil @noseworthy
Add version macro to keymap.json (KinesisCorporation#269)
dd84ba7 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
noseworthy pushed a commit to noseworthy/Adv360-Pro-ZMK that referenced this pull request Jan 16, 2024
@ReFil @noseworthy
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
9cd7a7b 
This reverts commit 7adf062.
tricktux pushed a commit to tricktux/Adv360-Pro-ZMK that referenced this pull request Feb 10, 2024
@ReFil @tricktux
Add version macro to keymap.json (KinesisCorporation#269)
0e149c4 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
tricktux pushed a commit to tricktux/Adv360-Pro-ZMK that referenced this pull request Feb 10, 2024
@ReFil @tricktux
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
8b430fc 
This reverts commit 7adf062.
OAGr added a commit to OAGr/Adv360-Pro-ZMK-v1 that referenced this pull request Mar 2, 2024
@OAGr
Merge branch 'V3.0' into v3-test
54d0289 
* 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
@ReFil @ztomer
Add version macro to keymap.json (KinesisCorporation#269)
566bd5b 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
ztomer pushed a commit to ztomer/Adv360-Pro-ZMK that referenced this pull request Apr 16, 2024
@ReFil @ztomer
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
f926f5e 
This reverts commit 7adf062.
zemackdaddy pushed a commit to zemackdaddy/Adv360-Pro-ZMK that referenced this pull request Jul 7, 2024
@ReFil
Add version macro to keymap.json (KinesisCorporation#269)
6a17ea8 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
zemackdaddy pushed a commit to zemackdaddy/Adv360-Pro-ZMK that referenced this pull request Jul 7, 2024
@ReFil
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
31321e9 
This reverts commit 7adf062.
jan-l pushed a commit to jan-l/Adv360-Pro-ZMK that referenced this pull request Aug 28, 2024
@ReFil @jan-l
Add version macro to keymap.json (KinesisCorporation#269)
5dfb4c7 
* Update keymap.json to reflect version macro

* Update CHANGELOG.md
jan-l pushed a commit to jan-l/Adv360-Pro-ZMK that referenced this pull request Aug 28, 2024
@ReFil @jan-l
Revert "Add version macro to keymap.json (KinesisCorporation#269)"
602125c 
This reverts commit 7adf062.
martypenner added a commit to martypenner/Adv360-Pro-ZMK that referenced this pull request Nov 6, 2024
@martypenner
Merge branch 'V3.0' into V2.0
9801a4f 
* V3.0: (40 commits)
  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)"
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@ReFil