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

Addition of EC 60X #24028

Merged
merged 11 commits into from
Jul 4, 2024
Merged

Addition of EC 60X #24028

merged 11 commits into from
Jul 4, 2024

Conversation

Cipulot
Copy link
Contributor

@Cipulot Cipulot commented Jul 1, 2024 •
edited
Loading

Description

Addition of the EC 60X.

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 Jul 1, 2024
@dunk2k
Copy link
Contributor

dunk2k commented Jul 1, 2024

@Cipulot
Could you confirm the matrix co-ordinates (i.e. 3,5) for split Right Shift that is 1.75u-1u?

@Cipulot
Copy link
Contributor Author

Cipulot commented Jul 1, 2024

@Cipulot Could you confirm the matrix co-ordinates (i.e. 3,5) for split Right Shift that is 1.75u-1u?

keyboard-layout

dunk2k
dunk2k suggested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@dunk2k dunk2k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add Community Layout support; further support pending answer

keyboards/cipulot/ec_60x/keyboard.json Outdated Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Show resolved Hide resolved
keyboards/cipulot/ec_60x/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/cipulot/ec_60x/keymaps/via/keymap.c Outdated Show resolved Hide resolved
Cipulot and others added 6 commits July 1, 2024 12:51
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keymaps/via/keymap.c
1ccabbb 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keymaps/default/keymap.c
99c8536 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keyboard.json
5f49ef6 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keyboard.json
31cc614 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keyboard.json
a5cdc17 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot @dunk2k
Update keyboards/cipulot/ec_60x/keyboard.json
5fb9706 
Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
@Cipulot
Copy link
Contributor Author

Cipulot commented Jul 1, 2024

The community layouts have been added, further support is not necessary tbh. the other 23235345345 bazillion of options are just for the 1/2 ppl that want to use them, and they will use them through VIA anyway.

dunk2k
dunk2k suggested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@dunk2k dunk2k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conform ISO Enter position/sequence to Community Layout

keyboards/cipulot/ec_60x/keyboard.json Outdated Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Show resolved Hide resolved
dunk2k
dunk2k suggested changes Jul 1, 2024
View reviewed changes
Copy link
Contributor

@dunk2k dunk2k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conform ISO Enter position/sequence to respective Community Layout

keyboards/cipulot/ec_60x/keyboard.json Outdated Show resolved Hide resolved
keyboards/cipulot/ec_60x/keyboard.json Outdated Show resolved Hide resolved
@Cipulot
Copy link
Contributor Author

Cipulot commented Jul 1, 2024 •
edited
Loading

the sequence isn't to be modified to comply with how the matrix scan is performed, since they are used for the scan at a PCB electrical level, the changes will be disregarded.
If that breaks the addition of the community layout support applied prior, then I'll remove that too, the support of community layout isn't a thing we look for in this particular case

@Cipulot
Copy link
Contributor Author

Cipulot commented Jul 1, 2024

Actually, now that I think of it I won't add them at all, sorry man

@dunk2k
Copy link
Contributor

dunk2k commented Jul 1, 2024 •
edited
Loading

Actually, now that I think of it I won't add them at all, sorry man

Thanks for saying 😊

For the benefit of users, Could respective KLE image be added into readme.md?

drashna
drashna requested changes Jul 3, 2024
View reviewed changes
keyboards/cipulot/ec_60x/mcuconf.h Outdated Show resolved Hide resolved
@Cipulot @drashna
Update keyboards/cipulot/ec_60x/mcuconf.h
89df268 
Co-authored-by: Drashna Jaelre <drashna@live.com>
@waffle87 waffle87 merged commit 1c6cdb8 into qmk:master Jul 4, 2024
3 checks passed
@Cipulot Cipulot deleted the add_ec_60x branch July 5, 2024 07:13
@Cipulot Cipulot mentioned this pull request Jul 5, 2024
Merged
8 tasks
dlip added a commit to dlip/qmk_firmware that referenced this pull request Jul 6, 2024
@dlip
Merge remote-tracking branch 'upstream/master' into dlip
2f3a37a 
* upstream/master: (431 commits)
  `handwired/swiftrax/bumblebee`: fix layout name (qmk#24064)
  [docs] Update RGBLight (Underglow) keycode names (qmk#23999)
  `playkbtw/pk64rgb`: move RGB Matrix LED config to data driven (qmk#24062)
  Bump JamesIves/github-pages-deploy-action from 4.6.1 to 4.6.3 (qmk#24063)
  `kbdfans/baguette66`: fix layout name (qmk#24061)
  Add support for Equinox XL (qmk#23695)
  `kakunpc/rabbit_capture_plan`: add additional layouts (qmk#24059)
  `kakunpc/angel64`: add additional layouts (qmk#24058)
  `ash_xiix`: add additional layouts (qmk#24057)
  `handwired/tkk`: fix layout name (qmk#24056)
  `dc01/arrow`: fix layout name (qmk#24025)
  Add Sleepy Craft Studios Sleepy Keeb Split (qmk#23844)
  `salicylic_acid3/setta21`: fix RGB Matrix LED config (qmk#24041)
  `kikoslab/kl90`: add additional layouts (qmk#24024)
  Fixes duplicate pid/vid for sofle_choc (qmk#24030)
  [Keyboard] Addition of EC 60X (qmk#24028)
  [Keyboard] Add chlx lfn merro (qmk#24026)
  monsgeek/m5: make numlock and capslock LEDs work (qmk#24027)
  [Keyboard] Add Ashwing66 (qmk#24031)
  Minimum python version listing. (qmk#23989)
  ...
AJO-Python pushed a commit to AJO-Python/qmk_firmware that referenced this pull request Jul 7, 2024
@Cipulot @dunk2k
@drashna @AJO-Python
[Keyboard] Addition of EC 60X (qmk#24028)
d92e316 
* Addition of EC 60X

* Update keyboards/cipulot/ec_60x/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Update keyboards/cipulot/ec_60x/keyboard.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5f49ef6.

* Revert "Update keyboards/cipulot/ec_60x/keyboard.json"

This reverts commit 5fb9706.

* revert of what was done with the layouts

* Update keyboards/cipulot/ec_60x/mcuconf.h

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

---------

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dunk2k dunk2k dunk2k requested changes

@nooges nooges nooges approved these changes

@drashna drashna drashna approved these changes

@waffle87 waffle87 waffle87 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
5 participants
@Cipulot @dunk2k @nooges @drashna @waffle87