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

Added native Miryoku support #20366

Closed
wants to merge 3 commits into from
Closed

Added native Miryoku support #20366

wants to merge 3 commits into from

Conversation

dunk2k
Copy link
Contributor

@dunk2k dunk2k commented Apr 8, 2023

Description

  • added LAYOUT_split_3x5_3 to following variants:
    • 4x5
    • 4x5_5
    • 4x6
    • 4x6_5
    • 5x6
    • 5x6_5
  • Removed keymap Manna-harbour_miryoku from all variants where present.

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

  • n/a

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

- added LAYOUT_split_3x5_3 to following variants:
    - 4x5
    - 4x5_5
    - 4x6
    - 4x6_5
    - 5x6
    - 5x6_5
- removed keymap Manna-harbour_miryoku from all variants where present.
Copy link
Member

@fauxpark fauxpark left a comment

Choose a reason for hiding this comment

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

These layouts do not work with the data-driven direction keyboards are being moved in. All keys in a layout must have exactly one matrix position, no more, no less:

☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])
☒ Invalid LAYOUT macro in keyboards/handwired/dactyl_manuform/4x5/4x5.h: Key XXX in macro LAYOUT_split_3x5_3 has multiple matrix positions ([3, 0], [3, 1], [3, 2], [4, 0], [4, 1], [4, 2], [4, 3], [8, 0], [8, 2], [9, 0], [9, 1], [9, 2], [9, 3])

	modified:   keyboards/handwired/dactyl_manuform/4x5/4x5.h
    modified:   keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h
	modified:   keyboards/handwired/dactyl_manuform/4x6/4x6.h
	modified:   keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
	modified:   keyboards/handwired/dactyl_manuform/5x6/5x6.h
	modified:   keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
@dunk2k
Copy link
Contributor Author

dunk2k commented Apr 8, 2023

Aim is to update/add 'via' keymaps and modernise to data driven format.

In the interim, ethos is to make incremental changes to dactyl manuform keyboard directory(s).

	modified:   keyboards/handwired/dactyl_manuform/4x5/4x5.c
	modified:   keyboards/handwired/dactyl_manuform/4x5/4x5.h
	modified:   keyboards/handwired/dactyl_manuform/4x6/4x6.c
	modified:   keyboards/handwired/dactyl_manuform/4x6/4x6.h
	modified:   keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c
	modified:   keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h
	modified:   keyboards/handwired/dactyl_manuform/5x6/5x6.c
	modified:   keyboards/handwired/dactyl_manuform/5x6/5x6.h
	modified:   keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c
	modified:   keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h
@dunk2k
Copy link
Contributor Author

dunk2k commented Apr 8, 2023

Changes made in #20365 supersede changes made in this PR

@dunk2k dunk2k closed this Apr 8, 2023
@dunk2k dunk2k deleted the MiryokuDm branch April 8, 2023 08:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants