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

Fixup bastardkb charybdis & dilemma #19088

Closed
wants to merge 2 commits into from
Closed

Conversation

waffle87
Copy link
Member

Description

Don't try to compile */v2/splinky — needs a version specified (v2/v3)

Types of Changes

  • Keyboard (addition or update)

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

@fauxpark
Copy link
Member

I would prefer if the innermost folders were removed instead of skipping one.

@waffle87
Copy link
Member Author

The splinky/v*/ directories? Unsure what the best approach would be given the differences

diff v2/config.h v3/config.h
22c22
<     { GP28, GP15, GP6, GP7, GP8 }
---
>     { GP28, GP21, GP6, GP7, GP8 }
25,27c25,27
< #define SPI_SCK_PIN GP18
< #define SPI_MOSI_PIN GP19
< #define POINTING_DEVICE_CS_PIN GP14
---
> #define SPI_SCK_PIN GP22
> #define SPI_MOSI_PIN GP23
> #define POINTING_DEVICE_CS_PIN GP16

@fauxpark
Copy link
Member

eg. bastardkb/charybdis/3x5/v2/splinky_2/_3
There is precedent for this in the Teensy Onekeys:
image

@waffle87
Copy link
Member Author

Ah thanks that makes sense.

@fauxpark fauxpark requested a review from a team November 16, 2022 11:49
@fauxpark
Copy link
Member

Merge conflicts.

@0xcharly
Copy link
Contributor

0xcharly commented Nov 16, 2022

Could we hold these changes for now?

We already have merged an immediate fix on master, and there's other changes in flight that target master and that this PR will conflict with (namely #19083). Some of these changes will also not be necessary once the other PR is merged in, and some additional changes will be necessary for consistency between bastardkb/charybdis/*/v2/splinky_* and bastardkb/{tbkmini,scylla,skeletyl}/v2/splinky/*.

I'd rather handle this myself, if that's OK with you, and with the other fix in, the CI should not be blocking you.

@waffle87 waffle87 closed this Nov 16, 2022
@waffle87 waffle87 deleted the fix/bkb branch November 22, 2022 09:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants