Bastard Keyboards: Add support for Dilemma v2 (3x5+3) #22185
Merged
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
github-actions
bot
added
keyboard
keymap
via
drashna
requested changes
Oct 4, 2023
|
This should be updated (and subsequent merge conflicts fixed). |
Remove rgb matrix layout macro from 3x5_3.c Remove defines from config.h and rules.mk that are now in info.json Refactor default keymap to use core tri-layer subsystem Added default keymap readme
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
mirror the changes requested by reviewers in the Dilemma Max PR move rgb animation enabling to info.json remove redefinitions of default rgbmatrix values move rules.mk <feature>_enable to info.json
Change RGB Matrix flags to Indicator on the pinky columns. Add per-layer underglow colours for each layer. Add caps lock indication on the pinky columns. Add full red RGB on bootloader entry.
Convert values from HSV to respect brightness settings
Co-authored-by: Drashna Jaelre <[email protected]>
- wrapper macros removed to conform with pristine keymap requirement - readded miryoku inspired ESC_MEDIA layer
- use *_kb function to keep via keymap pristine - allows user to override default behaviour easily from keymap level
- accidentally put the wrong keycode name in, which broke the layers
- move shutdown function to 3x5_3.c
casuanoob
force-pushed
the
bk_dilemma_3x5_3
branch
from
766d67d
to
a2e758b
Compare
PR qmk#21060 added the new shutdown_kb callback to dilemma.c, so can be removed from 3x5_3.c
drashna
reviewed
Dec 1, 2023
Per Drashna's suggestion, no need to redefine existing minmax macro
keyboard-magpie
approved these changes
Dec 6, 2023
fauxpark
requested changes
Dec 6, 2023
`[2]` is deprecated for `[NUM_DIRECTIONS]`, missed it when updating Co-authored-by: Ryan <[email protected]>
|
I have tested these changes on the appropriate hardware and everything works as expected. Thanks, casua! |
drashna
approved these changes
Dec 12, 2023
|
Thanks everyone!! 🥳🥳 |
itsjonny96
pushed a commit
to itsjonny96/qmk_firmware
that referenced
this pull request
Jan 7, 2024
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Charly Delay <[email protected]>
mechlovin
pushed a commit
to mechlovin/qmk_firmware
that referenced
this pull request
Jan 17, 2024
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Charly Delay <[email protected]>
mechlovin
pushed a commit
to mechlovin/qmk_firmware
that referenced
this pull request
Jan 19, 2024
Co-authored-by: Drashna Jaelre <[email protected]> Co-authored-by: Ryan <[email protected]> Co-authored-by: Charly Delay <[email protected]>
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.
Description
This PR adds support for @bstiq's Dilemma v2 keyboard, which is the 3x5+3 entry in the Dilemma range of keyboards.
Please note that the existing
dilemma/3x5_3configs in the upstream qmk repo which were merged in @0xcharly's PR #18903 actually reflect a never-released prototype version of the Dilemma v2, so there are no users who would be affected by replacing them.defaultkeymap.viakeymap.bastardkb/dilemma/3x5_3/readme.mdTypes of Changes
Issues Fixed or Closed by This PR
Checklist