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

Update for 0.26 #67

Merged
merged 945 commits into from
Sep 19, 2024
Merged

Update for 0.26 #67

merged 945 commits into from
Sep 19, 2024

Conversation

drashna
Copy link

@drashna drashna commented Sep 14, 2024

No description provided.

fauxpark and others added 30 commits July 8, 2024 15:57
`kakunpc/rabbit_capture_plan`: update keymap layout names
* initial unsplit keyboard

* move shared code

* unsplit: fix underglow led x,y & remove unecessary code

* unsplit: remove split code & tidy readme

* unsplit: limit brightness & community layout

* rename keyboard

* the_q: tidy keymap & readme

* lulu: remove accidental build target

* rename file
Co-authored-by: jack <jack@pngu.org>
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
fauxpark and others added 15 commits September 2, 2024 09:13
)

Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.6.3 to 4.6.4.
- [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases)
- [Commits](JamesIves/github-pages-deploy-action@v4.6.3...v4.6.4)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6 to 7.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v6...v7)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jack <0x6a73@protonmail.com>
* [Keyboard] Add PHDesign PH-AC Rhythm Game Contoller

Co-authored by alt-0191

* Detail Improvement

* Update keyboard.json

* Update readme.md

* Update readme.md

* Created Encoder Matrix

* Posted Images

* Suggested Changes

* Update keyboard.json

* Update readme.md

* Update keyboard.json

* Update readme.md
* Workaround for broken ChibiOS startup (qmk#23822)

* Add personal keymap JSON

* Delete viktus_styrka_nopunin10did_20240529.json

* Add custom Styrka Atmel firmware

* Styrka Atmel fixes to compile and readme

* Remove VIA keymap

* Remove user keymap and edit readme

---------

Co-authored-by: Joel Challis <git@zvecr.com>
Copy link
Collaborator

@burkfers burkfers left a comment

Choose a reason for hiding this comment

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

Looks flawless to me, thanks drashna!

@burkfers burkfers requested a review from 0xcharly September 19, 2024 07:33
@0xcharly
Copy link
Collaborator

It's hard to review a massive merge like that. It seems that files in bkb have just been renamed (though they have not all been correctly marked as such). As far as I can tell, LGTM.

@burkfers
Copy link
Collaborator

The info.json at the revision level have been renamed to keyboard.json; That's an upstream change. The most specific json that "completes" a board's definitions is now to be named keyboard instead of info.
The massive list of changes apart from that one are all in qmk core and non-bk boards, both of which shouldn't have had any conflicts.
I have verified that all BK boards (with userspace) compile without errors or warnings.

@burkfers burkfers merged commit 19e1958 into Bastardkb:bkb-master Sep 19, 2024
4 of 5 checks passed
@drashna drashna deleted the bkb-master branch September 19, 2024 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.