Add Matrimony Keyboard #19383

hypanim · 2022-12-20T02:50:53Z

Description

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

Types of Changes

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

keyboards/matrimony/info.json

keyboards/matrimony/keymaps/default/keymap.c

keyboards/matrimony/keymaps/left_only/keymap.c

keyboards/matrimony/readme.md

keyboards/matrimony/keymaps/left_only/keymap.c

adding layout information Co-authored-by: jack <0x6a73@protonmail.com>

add enum Co-authored-by: jack <0x6a73@protonmail.com>

Co-authored-by: jack <0x6a73@protonmail.com>

Add Keychron S1 (qmk#19378)

added changes given in pull request

hypanim · 2022-12-20T13:02:34Z

Changes are added!

keyboards/matrimony/readme.md

keyboards/matrimony/rules.mk

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

hypanim · 2022-12-23T15:39:49Z

Fixed! Thanks to everyone for their input!

keyboards/matrimony/rules.mk

adding comments Co-authored-by: Ryan <fauxpark@gmail.com>

github-actions · 2023-02-14T02:05:49Z

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.

fauxpark · 2023-02-14T02:32:36Z

keyboards/matrimony/config.h

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


Suggested change

/* key matrix size */

// Rows are doubled-up

#define MATRIX_ROWS 10

#define MATRIX_COLS 13

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

fauxpark · 2023-02-14T02:32:42Z

keyboards/matrimony/config.h

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


Suggested change

// Set 0 if debouncing isn't needed

#define DEBOUNCE 5

fauxpark · 2023-02-14T02:33:07Z

keyboards/matrimony/rules.mk

+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+


Suggested change

# MCU name

MCU = atmega32u4

# Bootloader selection

BOOTLOADER = atmel-dfu

fauxpark · 2023-02-14T02:33:28Z

keyboards/matrimony/info.json

+        "vid": "0xFEED",
+        "pid": "0x0001",
+        "device_version": "1.0.0"
+    },


Suggested change

},

},

"processor": "atmega32u4",

"bootloader": "atmel-dfu",

hypanim · 2023-02-14T22:25:29Z

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

waffle87

Fauxpark's suggestions also need applying.

waffle87 · 2023-02-17T03:28:17Z

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
+


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

waffle87 · 2023-02-17T03:28:40Z

keyboards/matrimony/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default keymap for matrimony


This file should be removed.

github-actions · 2023-04-04T01:56:17Z

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 · 2023-05-05T01:51:14Z

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]

adding matrimony keyboard

6b48ec0

github-actions bot added keyboard keymap labels Dec 20, 2022

fixing license issues

9f778d7

waffle87 requested changes Dec 20, 2022

View reviewed changes

hypanim and others added 7 commits December 20, 2022 06:11

Update keyboards/matrimony/keymaps/default/keymap.c

e3f1f7e

adding layout information Co-authored-by: jack <0x6a73@protonmail.com>

Update keyboards/matrimony/keymaps/default/keymap.c

563789f

add enum Co-authored-by: jack <0x6a73@protonmail.com>

Update keyboards/matrimony/keymaps/left_only/keymap.c

5e8d255

Co-authored-by: jack <0x6a73@protonmail.com>

Update keyboards/matrimony/keymaps/left_only/keymap.c

3261871

Co-authored-by: jack <0x6a73@protonmail.com>

Merge pull request #1 from qmk/master

8b512c8

Add Keychron S1 (qmk#19378)

waffle87 changes

f31d090

added changes given in pull request

Merge branch 'master' of https://github.com/hypanim/qmk_firmware

50935a0

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 and others added 3 commits December 23, 2022 09:37

Update keyboards/matrimony/readme.md

63428c2

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

Update keyboards/matrimony/rules.mk

c5e6498

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

Update keyboards/matrimony/rules.mk

40dde5e

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

drashna approved these changes Dec 27, 2022

View reviewed changes

drashna requested a review from a team December 27, 2022 20:18

fauxpark requested changes Dec 29, 2022

View reviewed changes

keyboards/matrimony/rules.mk Outdated Show resolved Hide resolved

Update keyboards/matrimony/rules.mk

7b8247f

adding comments Co-authored-by: Ryan <fauxpark@gmail.com>

github-actions bot added the stale Issues or pull requests that have become inactive without resolution. label Feb 14, 2023

fauxpark requested changes Feb 14, 2023

View reviewed changes

github-actions bot removed the stale Issues or pull requests that have become inactive without resolution. label Feb 15, 2023

waffle87 requested changes Feb 17, 2023

View reviewed changes

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

github-actions bot closed this May 5, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Matrimony Keyboard #19383

Add Matrimony Keyboard #19383

hypanim commented Dec 20, 2022 •

edited

Loading

hypanim commented Dec 20, 2022

hypanim commented Dec 23, 2022

github-actions bot commented Feb 14, 2023

fauxpark Feb 14, 2023

hypanim Feb 14, 2023

fauxpark Feb 15, 2023

fauxpark Feb 14, 2023

fauxpark Feb 14, 2023

fauxpark Feb 14, 2023

hypanim commented Feb 14, 2023

waffle87 left a comment

waffle87 Feb 17, 2023

waffle87 Feb 17, 2023

github-actions bot commented Apr 4, 2023

github-actions bot commented May 5, 2023

-    },
+    },
+    "processor": "atmega32u4",
+    "bootloader": "atmel-dfu",


		* 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

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

Add Matrimony Keyboard #19383

Add Matrimony Keyboard #19383

Conversation

hypanim commented Dec 20, 2022 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

hypanim commented Dec 20, 2022

hypanim commented Dec 23, 2022

github-actions bot commented Feb 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hypanim commented Feb 14, 2023

waffle87 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

github-actions bot commented Apr 4, 2023

github-actions bot commented May 5, 2023

hypanim commented Dec 20, 2022 •

edited

Loading