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: upstream recent changes #18903

Merged
merged 14 commits into from
Nov 15, 2022
Merged

Bastard Keyboards: upstream recent changes #18903

merged 14 commits into from
Nov 15, 2022

Conversation

0xcharly
Copy link
Contributor

Description

Upstreams the latest changes to the Bastard Keyboards line up.

These include bug fixes, enhancements, and new keyboards.

Types of Changes

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

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 29, 2022
@0xcharly 0xcharly force-pushed the 2022-10-29-upstream branch 2 times, most recently from cd707d4 to 19ed9d5 Compare October 29, 2022 06:04
@0xcharly 0xcharly marked this pull request as ready for review October 29, 2022 07:34
@0xcharly
Copy link
Contributor Author

I've confirmed that the build errors are not a regression, and reproduce against master, including this keymap which seems to have been broken 4 months ago by a merge: https://github.com/qmk/qmk_firmware/blame/master/users/bbaserdem/bbaserdem.c#L343-L375

@0xcharly
Copy link
Contributor Author

@drashna as discussed live. Once this is in, we can start looking into converting what we can to data-driven.

@0xcharly 0xcharly changed the title Upstream recent changes Bastard Keyboards: upstream recent changes Oct 29, 2022
drashna
drashna requested changes Oct 29, 2022
View reviewed changes
keyboards/bastardkb/charybdis/3x5/v2/stemcell/rules.mk Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x6/v2/stemcell/rules.mk Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/4x6/v2/stemcell/rules.mk Outdated Show resolved Hide resolved
keyboards/bastardkb/dilemma/3x5_3/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/keymap.c Outdated Show resolved Hide resolved
drashna
drashna reviewed Oct 29, 2022
View reviewed changes
keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x5/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/4x6/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/4x6/v2/stemcell/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/dilemma/3x5_3/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x5/v2/stemcell/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x6/v2/splinky/config.h Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x6/v2/stemcell/config.h Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team November 4, 2022 04:33
@drashna
Copy link
Member

drashna commented Nov 4, 2022

CI errors are from bbaserdem, bcat and drashna keymaps. Can be safely ignored, as default, via and other keymaps appear to compile fine.

fauxpark
fauxpark requested changes Nov 4, 2022
View reviewed changes
keyboards/bastardkb/tbkmini/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/skeletyl/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/skeletyl/readme.md Outdated Show resolved Hide resolved
keyboards/bastardkb/scylla/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/scylla/readme.md Outdated Show resolved Hide resolved
keyboards/bastardkb/dilemma/3x5_2/assembled/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/4x6/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x6/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/charybdis/3x5/v2/stemcell/info.json Outdated Show resolved Hide resolved
keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/README.md Outdated Show resolved Hide resolved
@0xcharly
Copy link
Contributor Author

0xcharly commented Nov 4, 2022

Comment addressed, thanks for the review!

fauxpark
fauxpark requested changes Nov 4, 2022
View reviewed changes
keyboards/bastardkb/tbkmini/readme.md Outdated Show resolved Hide resolved
keyboards/bastardkb/skeletyl/readme.md Outdated Show resolved Hide resolved
keyboards/bastardkb/scylla/readme.md Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team November 6, 2022 01:16
@0xcharly
bastardkb: cleanup blackpill configuration
fdec7cd 
Fixes qmk#17
@0xcharly
bastardkb: fix splinky configuration
0afe6e2 
The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15
@0xcharly
bastardkb: add support for STeMCell
213e954
@0xcharly
Update scylla/tbkmini/skeletyl outdated readmes
b797e6e
@0xcharly
bastardkb/dilemma: enable circular scroll
8272387
@0xcharly
bastardkb/dilemma: add initial version of the via keymap
e47ead7
@0xcharly
bastardkb/dilemma/assembled: add new keyboard
618088f 
Fixes qmk#20
@0xcharly
bastardkb/dilemma: remove elite-c
f749aa3
@0xcharly
Initial support for the Dilemma 3x5+3 Assembled RGB
9378b88
@0xcharly
Address code review comments
aa6bb88
@0xcharly
Copy link
Contributor Author

0xcharly commented Nov 9, 2022

Synced with latest master.

@drashna drashna requested a review from a team November 15, 2022 07:17
@keyboard-magpie keyboard-magpie merged commit 30b2dbe into qmk:master Nov 15, 2022
@0xcharly 0xcharly deleted the 2022-10-29-upstream branch November 15, 2022 08:54
dkruyt pushed a commit to dkruyt/qmk_firmware that referenced this pull request Nov 18, 2022
@0xcharly @dkruyt
Bastard Keyboards: upstream recent changes (qmk#18903)
2e05067 
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
thystips pushed a commit to thystips/qmk_firmware that referenced this pull request Nov 24, 2022
@0xcharly @thystips
Bastard Keyboards: upstream recent changes (qmk#18903)
117c300 
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
ramonimbao pushed a commit to ramonimbao/qmk_firmware that referenced this pull request Nov 28, 2022
@0xcharly @ramonimbao
Bastard Keyboards: upstream recent changes (qmk#18903)
d73f80f 
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
elpekenin pushed a commit to elpekenin/qmk_firmware that referenced this pull request Dec 7, 2022
@0xcharly @elpekenin
Bastard Keyboards: upstream recent changes (qmk#18903)
1751d4c 
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
crembz pushed a commit to crembz/qmk_firmware that referenced this pull request Dec 18, 2022
@0xcharly @crembz
Bastard Keyboards: upstream recent changes (qmk#18903)
1d3873e 
* bastardkb: cleanup blackpill configuration

Fixes #17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes #15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes #20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
nolanseaton pushed a commit to nolanseaton/qmk_firmware that referenced this pull request Jan 23, 2023
@0xcharly @nolanseaton
Bastard Keyboards: upstream recent changes (qmk#18903)
1adfffd 
* bastardkb: cleanup blackpill configuration

Fixes qmk#17

* bastardkb: fix splinky configuration

The pinout of the splinky changed between the last beta batch, and the
production one. This commit updates the keyboard definition to support
the new pinout by default, while offering backward compatibility.

Define `SPLINKY_BETA_PINOUT` to build the firmware with pre-production
pinout.

Fixes qmk#15

* bastardkb: add support for STeMCell

* Update scylla/tbkmini/skeletyl outdated readmes

* bastardkb/dilemma: enable circular scroll

* bastardkb/dilemma: add initial version of the `via` keymap

* bastardkb/dilemma/assembled: add new keyboard

Fixes qmk#20

* bastardkb/dilemma: remove elite-c

* Initial support for the Dilemma 3x5+3 Assembled RGB

* Address code review comments

* Address more comments

* Address review comments

* Address more nits

* bastardkb: split splinky-based keyboards to distinguish between Splinky v2 and v3 pinout
@casuanoob casuanoob mentioned this pull request Oct 2, 2023
Merged
14 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@drashna drashna drashna approved these changes

@keyboard-magpie keyboard-magpie keyboard-magpie 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
@0xcharly @drashna @fauxpark @keyboard-magpie