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

Add Matrimony Keyboard #19383

Closed
wants to merge 13 commits into from
Closed

Add Matrimony Keyboard #19383

wants to merge 13 commits into from

Conversation

hypanim
Copy link

@hypanim hypanim commented Dec 20, 2022 •
edited
Loading

Description

Adding the Matrimony Keyboard, which was sold in a group buy created by u/solciona on Reddit.

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

waffle87
waffle87 requested changes Dec 20, 2022
View reviewed changes
keyboards/matrimony/info.json Show resolved Hide resolved
keyboards/matrimony/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/matrimony/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/matrimony/keymaps/left_only/keymap.c Outdated Show resolved Hide resolved
keyboards/matrimony/readme.md Show resolved Hide resolved
keyboards/matrimony/keymaps/left_only/keymap.c Outdated Show resolved Hide resolved
@hypanim
Copy link
Author

hypanim commented Dec 20, 2022

Changes are added!

drashna
drashna requested changes Dec 23, 2022
View reviewed changes
keyboards/matrimony/readme.md Outdated Show resolved Hide resolved
keyboards/matrimony/rules.mk Outdated Show resolved Hide resolved
keyboards/matrimony/rules.mk Outdated Show resolved Hide resolved
@hypanim
Copy link
Author

hypanim commented Dec 23, 2022

Fixed! Thanks to everyone for their input!

@drashna drashna requested a review from a team December 27, 2022 20:18
fauxpark
fauxpark requested changes Dec 29, 2022
View reviewed changes
keyboards/matrimony/rules.mk Outdated Show resolved Hide resolved
@hypanim @fauxpark
Update keyboards/matrimony/rules.mk
7b8247f 
adding comments

Co-authored-by: Ryan <[email protected]>
@github-actions
Copy link

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Feb 14, 2023
fauxpark
fauxpark requested changes Feb 14, 2023
View reviewed changes
keyboards/matrimony/config.h
Comment on lines +25 to +30
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
#define MATRIX_COLS 13


Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
/* key matrix size */
// Rows are doubled-up
#define MATRIX_ROWS 10
#define MATRIX_COLS 13

Copy link
Author

Choose a reason for hiding this comment

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

These lines are required for my keyboard to work I think, I tried flashing without, and it doesn't work.

Copy link
Member

Choose a reason for hiding this comment

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

See #19581

keyboards/matrimony/config.h
Comment on lines +40 to +41
// Set 0 if debouncing isn't needed
#define DEBOUNCE 5
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
// Set 0 if debouncing isn't needed
#define DEBOUNCE 5

keyboards/matrimony/rules.mk
Comment on lines +1 to +6
# MCU name
MCU = atmega32u4

# Bootloader selection
BOOTLOADER = atmel-dfu

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
# MCU name
MCU = atmega32u4
# Bootloader selection
BOOTLOADER = atmel-dfu

keyboards/matrimony/info.json
"vid": "0xFEED",
"pid": "0x0001",
"device_version": "1.0.0"
},
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
},
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",

@hypanim
Copy link
Author

hypanim commented Feb 14, 2023

Hello, I'm curious as to what changes are needed for this merge to be approved.

@github-actions github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Feb 15, 2023
waffle87
waffle87 requested changes Feb 17, 2023
View reviewed changes
Copy link
Member

@waffle87 waffle87 left a comment

Choose a reason for hiding this comment

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

Fauxpark's suggestions also need applying.

keyboards/matrimony/readme.md

* Bootmagic reset: For the left side, hold down the top-left key and plug in the keyboard. For the right side, hold down the top right key and plug in the keyboard.
* Physical reset button: Briefly press the button on the Elite-C

Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Make example for this keyboard (after setting up your build environment):
make matrimony:default
Flashing example for this keyboard:
make matrimony:default:flash

keyboards/matrimony/keymaps/default/readme.md
@@ -0,0 +1 @@
# The default keymap for matrimony
Copy link
Member

Choose a reason for hiding this comment

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

This file should be removed.

@github-actions
Copy link

github-actions bot commented Apr 4, 2023

Thank you for your contribution!
This pull request has been automatically marked as stale because it has not had activity in the last 45 days. It will be closed in 30 days if no further activity occurs. Please feel free to give a status update now, or re-open when it's ready.
For maintainers: Please label with bug, awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

@github-actions github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Apr 4, 2023
@github-actions
Copy link

github-actions bot commented May 5, 2023

Thank you for your contribution!
This pull request has been automatically closed because it has not had activity in the last 30 days. Please feel free to give a status update now, ping for review, or re-open when it's ready.
// [stale-action-closed]

@github-actions github-actions bot closed this May 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark requested changes

@waffle87 waffle87 waffle87 requested changes

@drashna drashna drashna approved these changes

Assignees
No one assigned
Labels
keyboard keymap stale Issues or pull requests that have become inactive without resolution.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@hypanim @drashna @fauxpark @waffle87