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

Add keyboard 3dp660 #10296

Merged
merged 49 commits into from
Sep 24, 2020
Merged

Add keyboard 3dp660 #10296

merged 49 commits into from
Sep 24, 2020

Conversation

gooberpsycho
Copy link
Contributor

@gooberpsycho gooberpsycho commented Sep 12, 2020

I followed MechMerlin's tutorials and wrote up the code for a handwired, 3d printed clueboard 660. The STL files are available on thingiverse at: https://www.thingiverse.com/thing:2897260. I have programmed it to use a Teensy 2.0 microcontroller. I also coded VIA support.

Description

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

@gooberpsycho gooberpsycho changed the title 3dp660 Add keyboard 3dp660 Sep 12, 2020
keyboards/handwired/3dp660/3dp660.h Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/3dp660.json Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/config.h Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/rules.mk Outdated Show resolved Hide resolved
@drashna drashna requested a review from a team September 21, 2020 02:46
Removed Description line

Co-authored-by: Drashna Jaelre <[email protected]>
@@ -0,0 +1 @@
LTO_ENABLE = YES
Copy link
Member

Choose a reason for hiding this comment

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

What you could do here is set LTO_ENABLE = yes at keyboard level, and delete this file and remove LTO from the VIA keymap's rules.mk.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just followed along with merlin on a YT video, so I'm a little green on what you're talking about. What do you mean by "at keyboard level"? Where would I place the LTO line? In the rules.mk in main 3dp660 folder, not keymaps folder? Or somewhere else?

Copy link
Member

Choose a reason for hiding this comment

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

Basically, yes. Anything you set in the keyboard-level rules.mk is inherited by the keymap, unless you override it in the keymap's rules.mk. So you can put the LTO_ENABLE in the keyboard rules.mk, and it will be applied for both (all) keymaps.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Understood, thank you. I'll do that.

Moved LTO to keyboard level.
Moved LTO to keyboard level.
Made obsolete by LTO move to keyboard level.
keyboards/handwired/3dp660/rules.mk Outdated Show resolved Hide resolved
capitalization errors.

Co-authored-by: Ryan <[email protected]>
Copy link
Member

@noroadsleft noroadsleft left a comment

Choose a reason for hiding this comment

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

GitHub tip: You can apply multiple suggestions to a single commit by using the Files Changed tab.

keyboards/handwired/3dp660/3dp660.h Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/info.json Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/keymaps/default/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/keymaps/via/keymap.c Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/readme.md Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/info.json Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/info.json Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/info.json Outdated Show resolved Hide resolved
keyboards/handwired/3dp660/info.json Outdated Show resolved Hide resolved
Housekeeping, changing code for readability.

Co-authored-by: James Young <[email protected]>
@noroadsleft noroadsleft merged commit 30ffae2 into qmk:master Sep 24, 2020
@noroadsleft
Copy link
Member

Thanks!

@gooberpsycho gooberpsycho deleted the 3dp660 branch September 24, 2020 02:56
rgoulter pushed a commit to rgoulter/qmk_firmware that referenced this pull request Oct 4, 2020
* Create keymap.c

* Add files via upload

* Added files for handwired 3d printed clueboard 660

* create via layout files

* added layout files for via

* updated product ID to fix id conflicts

* change product ID to fix ID conflicts.

* fixed capitalization error that was causing issues

* fixed capitalization issues.

* fix syntax errors

* Fixed syntax errors (stray punctuation)

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* capitalization fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility Fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility changes

* upkeep, fixing typos

* Update keyboards/handwired/3dp660/config.h

Removed Description line

* Update keyboards/handwired/3dp660/rules.mk

correct bootloader

* Update keyboards/handwired/3dp660/3dp660.h

fix case sensitive typos

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

change tab indentation to space indentations.

* Update keyboards/handwired/3dp660/keymaps/via/keymap.c

change tab indentations to space indentations

* Delete 3dp660.json

This file was for VIA, and shouldn't be in this repo. I placed it here so I wouldn't misplace it in my filesystem. My apologies.

* Update info.json

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

more capitalization fixes

* Update keyboards/handwired/3dp660/readme.md

shortened imgur url

* Update keyboards/handwired/3dp660/rules.mk

remove extraneous comments

* Delete config.h

* Update keyboards/handwired/3dp660/rules.mk

* Update 3dp660.c

add license headers to all .c and .h files

* Update 3dp660.h

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keyboards/handwired/3dp660/readme.md

Add maintainer URL

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

remove extraneous default keymap layers

* Update keyboards/handwired/3dp660/keymaps/default/rules.mk

* Update rules.mk

Moved LTO to keyboard level.

* Update rules.mk

Moved LTO to keyboard level.

* Delete rules.mk

Made obsolete by LTO move to keyboard level.

* Update keyboards/handwired/3dp660/rules.mk

capitalization errors.

* Apply suggestions from code review

Housekeeping, changing code for readability.
kjganz pushed a commit to kjganz/qmk_firmware that referenced this pull request Oct 28, 2020
* Create keymap.c

* Add files via upload

* Added files for handwired 3d printed clueboard 660

* create via layout files

* added layout files for via

* updated product ID to fix id conflicts

* change product ID to fix ID conflicts.

* fixed capitalization error that was causing issues

* fixed capitalization issues.

* fix syntax errors

* Fixed syntax errors (stray punctuation)

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility fixes

* capitalization fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility Fixes

* Compatibility fixes

* Compatibility fixes

* Compatibility changes

* upkeep, fixing typos

* Update keyboards/handwired/3dp660/config.h

Removed Description line

* Update keyboards/handwired/3dp660/rules.mk

correct bootloader

* Update keyboards/handwired/3dp660/3dp660.h

fix case sensitive typos

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

change tab indentation to space indentations.

* Update keyboards/handwired/3dp660/keymaps/via/keymap.c

change tab indentations to space indentations

* Delete 3dp660.json

This file was for VIA, and shouldn't be in this repo. I placed it here so I wouldn't misplace it in my filesystem. My apologies.

* Update info.json

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

change suggestions to other file said to lowercase "ansi", caused reference issues, changed all instances of "ANSI" to "ansi".

* Update keymap.c

more capitalization fixes

* Update keyboards/handwired/3dp660/readme.md

shortened imgur url

* Update keyboards/handwired/3dp660/rules.mk

remove extraneous comments

* Delete config.h

* Update keyboards/handwired/3dp660/rules.mk

* Update 3dp660.c

add license headers to all .c and .h files

* Update 3dp660.h

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keymap.c

added license header to all .c and .h files.

* Update keyboards/handwired/3dp660/readme.md

Add maintainer URL

* Update keyboards/handwired/3dp660/keymaps/default/keymap.c

remove extraneous default keymap layers

* Update keyboards/handwired/3dp660/keymaps/default/rules.mk

* Update rules.mk

Moved LTO to keyboard level.

* Update rules.mk

Moved LTO to keyboard level.

* Delete rules.mk

Made obsolete by LTO move to keyboard level.

* Update keyboards/handwired/3dp660/rules.mk

capitalization errors.

* Apply suggestions from code review

Housekeeping, changing code for readability.
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.

4 participants