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 support for LAZYDESIGNERS/THE60/rev2 #13015

Merged
merged 8 commits into from
Jun 9, 2021
Merged

Add support for LAZYDESIGNERS/THE60/rev2 #13015

merged 8 commits into from
Jun 9, 2021

Conversation

jackytrabbit
Copy link
Contributor

Add support for LAZYDESIGNERS/THE60/rev2

Description

  1. Add support for lazydesigners/the60/rev2
  2. Put THE60 Round 1 in the60/rev1 folder

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

THE60rev2
@github-actions github-actions bot added keyboard keymap via Adds via keymap and/or updates keyboard for via support labels May 27, 2021
@jackytrabbit
Copy link
Contributor Author

@drashna I checked others' work and fixed the issue. Now it's using rev1/rev2 for different version. Thank you!

Copy link
Member

@Erovia Erovia left a comment

Choose a reason for hiding this comment

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

This is currently breaking the user workflow as lazydesigners/the60 will no longer be a valid build target.

You can work this around by having the following files:

keyboards/lazydesigners/the60/rules.mk file with the following content:

DEFAULT_FOLDER = lazydesigners/the60/rev1

keyboards/lazydesigners/the60/the60.h:

#pragma once

#include "quantum.h"

#ifdef KEYBOARD_lazydesigners_the60_rev1
    #include "rev1.h"
#elif KEYBOARD_lazydesigners_the60_rev2
    #include "rev2.h"
endif

keyboards/lazydesigners/the60/the60.c:

#include "the60.h"

jackytrabbit and others added 2 commits May 30, 2021 12:16
Add the60.h, the60.c and rules.mk under THE60 folder.
@jackytrabbit
Copy link
Contributor Author

@Erovia Got it! I have added the file to make 'make lazydesigners/the60:default' work. As rev2 will be the main version that THE60 will be made, I pointed the default folder to rev2. Thanks for helping me with this!

@jackytrabbit
Copy link
Contributor Author

@Erovia Deleted rules.mk, the60.c and the60.h. Tested and everything is OK.

@Erovia Erovia merged commit 39c8ed3 into qmk:master Jun 9, 2021
@jackytrabbit jackytrabbit deleted the the60commit branch June 10, 2021 02:50
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Jul 11, 2021
wox pushed a commit to wox/qmk_firmware that referenced this pull request Aug 14, 2021
nhongooi pushed a commit to nhongooi/qmk_firmware that referenced this pull request Dec 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
keyboard keymap via Adds via keymap and/or updates keyboard for via support
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants