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

Bastard Keyboards: Add support for Dilemma v2 (3x5+3) #22185

Merged
merged 22 commits into from
Dec 12, 2023
Merged

Bastard Keyboards: Add support for Dilemma v2 (3x5+3) #22185

merged 22 commits into from
Dec 12, 2023

Conversation

casuanoob
Copy link
Contributor

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_3 configs 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.

  • Add implementation for the dilemma_3x5_3 keyboard.
  • Update default keymap.
  • Add via keymap.
  • Update bastardkb/dilemma/3x5_3/readme.md

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).

@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels Oct 2, 2023
@casuanoob casuanoob requested a review from drashna November 15, 2023 14:26
@drashna
Copy link
Member

drashna commented Nov 29, 2023

This should be updated (and subsequent merge conflicts fixed).

0xcharly and others added 18 commits December 1, 2023 15:34
@0xcharly @casuanoob
Update Dilemma 3x5+3 config ahead of upcoming release
d93b2e0
@0xcharly @casuanoob
Fix Dilemma 3x5+3 RGB pin definition
3cc1788
@casuanoob
migrate dilemma 3x5_3 RGB layout to info.json
9353250
@casuanoob
Migrate Dilemma 3x5_3 to info.json
701b073 
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
@casuanoob
3x5_3 remove unused settings
c67956e
@casuanoob
3x5_3 explicitly set some defaults
7661fa1 
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
@casuanoob
3x5_3 Apply changes for data-driven update
cb9ede0 
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
@casuanoob
3x5_3 Add RGB indicators to via keymap
e49b98c 
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.
@casuanoob
3x5_3 via keymap indicators data sync
845b1da
@casuanoob
3x5_3 fix RGB Matrix indicators
cb9ac02 
Convert values from HSV to respect brightness settings
@casuanoob
fix bstiq build failure
8631ab4
@casuanoob
limit rgb/hsv values to 255 or under
ec3e89b
@casuanoob @drashna
Apply suggestions from code review
83ed1b0 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@casuanoob
3x5_3 remove layout wrapper from via keymap
1ab771e 
- wrapper macros removed to conform with pristine keymap requirement
- readded miryoku inspired ESC_MEDIA layer
@casuanoob
3x5_3 migrate RGB indicator code to kb level
1d81e54 
- use *_kb function to keep via keymap pristine
- allows user to override default behaviour easily from keymap level
@casuanoob
3x5_3 fix typo in default keymap
58dd4bf 
- accidentally put the wrong keycode name in, which broke the layers
@casuanoob
3x5_3 make via keymap pristine
1359d26 
- move shutdown function to 3x5_3.c
@casuanoob
3x5_3 rearrange some keycodes
a2e758b
@casuanoob
3x5_3 rebase and fix compile
75b977f 
PR qmk#21060 added the new shutdown_kb callback to dilemma.c, so can be
removed from 3x5_3.c
casuanoob and others added 2 commits December 2, 2023 02:19
@casuanoob
3x5_3 use MIN from util.h
a6d0807 
Per Drashna's suggestion, no need to redefine existing minmax macro
@casuanoob
Merge branch 'develop' into bk_dilemma_3x5_3
8533d74
@casuanoob casuanoob requested a review from drashna December 3, 2023 06:25
@keyboard-magpie keyboard-magpie requested a review from a team December 6, 2023 08:13
@casuanoob @fauxpark
Fix outdated encoder_map impl
806339a 
`[2]` is deprecated for `[NUM_DIRECTIONS]`, missed it when updating

Co-authored-by: Ryan <fauxpark@gmail.com>
@casuanoob casuanoob requested a review from fauxpark December 8, 2023 06:39
@burkfers
Copy link
Contributor

I have tested these changes on the appropriate hardware and everything works as expected. Thanks, casua!

@drashna drashna merged commit 06b9925 into qmk:develop Dec 12, 2023
3 checks passed
@bstiq
Copy link
Contributor

bstiq commented Dec 12, 2023

Thanks everyone!! 🥳🥳

@casuanoob casuanoob deleted the bk_dilemma_3x5_3 branch December 24, 2023 14:27
itsjonny96 pushed a commit to itsjonny96/qmk_firmware that referenced this pull request Jan 7, 2024
@casuanoob @drashna
@fauxpark @0xcharly @itsjonny96
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) (qmk#22185)
6ae3853 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Jan 17, 2024
@casuanoob @drashna
@fauxpark @0xcharly @mechlovin
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) (qmk#22185)
8a01990 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
mechlovin pushed a commit to mechlovin/qmk_firmware that referenced this pull request Jan 19, 2024
@casuanoob @drashna
@fauxpark @0xcharly @mechlovin
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) (qmk#22185)
9289df3 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
nuess0r pushed a commit to nuess0r/qmk_firmware that referenced this pull request Sep 8, 2024
@casuanoob @drashna
@fauxpark @0xcharly @nuess0r
Bastard Keyboards: Add support for Dilemma v2 (3x5+3) (qmk#22185)
58f0b25 
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Charly Delay <charly@delay.gg>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xcharly 0xcharly 0xcharly left review comments

@tzarc tzarc tzarc left review comments

@keyboard-magpie keyboard-magpie keyboard-magpie approved these changes

@drashna drashna drashna approved these changes

@fauxpark fauxpark Awaiting requested review from fauxpark

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.
8 participants
@casuanoob @drashna @burkfers @bstiq @tzarc @fauxpark @0xcharly @keyboard-magpie