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

BastardKB: upstream dilemma/4x6_4 #23816

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

BastardKB: upstream dilemma/4x6_4 #23816

wants to merge 6 commits into from
+86 −11

Conversation

finrod09
Copy link
Contributor

@finrod09 finrod09 commented May 28, 2024 •
edited
Loading

Description

This change aims to upstream several changes accumulated in the BastardKB fork. It is submitted alondside several companion PRs, which divide the very similar set of changes by board. Changes requested during review of the initial draft have been appied here as well, where applicable.

The full set of related PRs is:

Description from the inital PR repeated for convenience:

The most extensive of these changes is dropping support for all controllers and shields other than v2/splinky_3, which has been flattened into the main keyboard. Older variants have not been sold in kits or prebuilts nor been recommended to self-source for a long time.

The dates GH shows on these commits is misleading as some rewriting of the history was necessary to separate commits by keyboard; The functional changes by @0xcharly have been shipping with kits and prebuilts for months and are well-tested. Changes up to and including 3799cd5 are live downstream.

Care has been taken to not lose changes introduced by #23622 and #23627.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

finrod09 and others added 5 commits May 28, 2024 12:14
@finrod09 @casuanoob
@zvecr @drashna @ykz89
Add dilemma max layer indicator (qmk#47)
2203858 
* tentatively add dilemma 4x6_4 WIP untested

* Add dilemma 4x6_4 WIP

set max brightness to 128 pending testing
migrate rgbmatrix layout macro to info.json
migrate other settings to info.json
add default keymap and readme
add via keymap readme

* 4x6_4 Remove files that shouldn't be in main

KLE and Via JSONs should not be included in qmk_firmware

* 4x6_4 Add RGBMATRIX coordinates in info.json WIP

Still pending testing to validate coordinates
Add copyright lines

* 4x6_4 Change RGB matrix centre

* 4x6_4 update rgb flags for outer columns

* 4x6_4 add swap_hands config from Drashna

* 4x6_4 explicitly set some defaults

some things were only working because "processor: RP2040" defaults to
GENERIC_PROMICRO_RP2040.
explicitly set "board": "GENERIC_RP_RP2040" instead.
correctly enable SPI0 and SPID0 instead of SPI1

* Update dilemma/readme.md

* 4x6_4 migrate more items to info.json

Forgot to move rgb matrix animations to info.json
Didn't realise RGB_MATRIX_CENTER had an info.json mapping
Missed migrating some rules.mk options to info.json

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

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

* Update keyboards/bastardkb/dilemma/4x6_4/rules.mk

per requested changes

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

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/config.h

per requested changes

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

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/via/keymap.c

per requested changes

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

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

per requested changes

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

* 4x6_4/config.h formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* 4x6_4/info.json formatting change per review request

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Add layer indicators

* Use predefined rgb colors for layers

* Refactor layer indicators from keymap to keyboard

* swap encoder volume directions for CW=volup

* Revert wrong conflict solutions following review

* Update keyboards/bastardkb/dilemma/4x6_4/info.json

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Update keyboards/bastardkb/dilemma/4x6_4/keymaps/default/readme.md

* Update keyboards/bastardkb/dilemma/4x6_4/config.h

* Apply suggested changes from code review

* Apply suggested changes from code review

* Break the brightness interval out into defines for configurability from keymap

* Formatting

* Add documentation for indicator brightness boosts

* narrow scope of kb-internal function

* fix type of counting variable

* remove unneccessary condition

* Remove shutdown_user

Instead of rewriting for breaking change, simply removed akin to new 3x5_3 on qmk:develop

* Formatting

---------

Co-authored-by: casuanoob <gms.rulz@hotmail.com>
Co-authored-by: casuanoob <96005765+casuanoob@users.noreply.github.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ying Kun Zhan <yingkun@zhan.co.nl>
@ankostis @finrod09
dilemma/4x6_4: fix(chrdb.doc) typo in the snip-toggle keycode
4011485
@finrod09
dilemma/4x6_4: rp2040 workaround: reduce soft serial speed
949620b
@0xcharly @finrod09
Revert 4x6_4 layout change introduced in the latest rebase onto `upst…
6dbdbbd 
…ream/master`
@finrod09
dilemma/4x6_4: fix double definition of split transport (info.json vs…
250ca34 
… config.h)
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels May 28, 2024
This was referenced May 28, 2024
Open
Open
Open
Open
Open
Open
Open
Open
@finrod09 finrod09 marked this pull request as ready for review May 28, 2024 13:33
@drashna drashna requested a review from a team June 9, 2024 17:53
@drashna drashna requested a review from a team June 12, 2024 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@finrod09 @drashna @ankostis @0xcharly