GEN ONE Eclipse_65 keyboard addition #10669

rojasa1990 · 2020-10-17T00:23:06Z

Description

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

zvecr

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

rojasa1990 · 2020-10-17T01:17:25Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

ridingqwerty · 2020-10-17T16:07:39Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

From the qmk_firmware/ directory on your branch you should be able to do this:

rm -rf genone

git status will then show the following files being removed:

        deleted:    genone/eclipse_65/config.h
        deleted:    genone/eclipse_65/eclipse_65.c
        deleted:    genone/eclipse_65/eclipse_65.h
        deleted:    genone/eclipse_65/info.json
        deleted:    genone/eclipse_65/keymaps/default/keymap.c
        deleted:    genone/eclipse_65/readme.md
        deleted:    genone/eclipse_65/rules.mk
        deleted:    genone/genone_main.c

(note that keyboards/genone/ files will still be intact)

Then you can do these to commit the changes to your branch:

git add .
git commit -m "Removing duplicate files"
git push -u origin master

rojasa1990 · 2020-10-17T21:10:35Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

From the qmk_firmware/ directory on your branch you should be able to do this:

rm -rf genone

git status will then show the following files being removed:
        deleted:    genone/eclipse_65/config.h
        deleted:    genone/eclipse_65/eclipse_65.c
        deleted:    genone/eclipse_65/eclipse_65.h
        deleted:    genone/eclipse_65/info.json
        deleted:    genone/eclipse_65/keymaps/default/keymap.c
        deleted:    genone/eclipse_65/readme.md
        deleted:    genone/eclipse_65/rules.mk
        deleted:    genone/genone_main.c
(note that keyboards/genone/ files will still be intact)

Then you can do these to commit the changes to your branch:
git add .
git commit -m "Removing duplicate files"
git push -u origin master

Where would I type these lines of code? I searched around my branch but did not find a place to write this.

rojasa1990 · 2020-10-17T21:44:10Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

From the qmk_firmware/ directory on your branch you should be able to do this:
rm -rf genone
git status will then show the following files being removed:
        deleted:    genone/eclipse_65/config.h
        deleted:    genone/eclipse_65/eclipse_65.c
        deleted:    genone/eclipse_65/eclipse_65.h
        deleted:    genone/eclipse_65/info.json
        deleted:    genone/eclipse_65/keymaps/default/keymap.c
        deleted:    genone/eclipse_65/readme.md
        deleted:    genone/eclipse_65/rules.mk
        deleted:    genone/genone_main.c
(note that keyboards/genone/ files will still be intact)
Then you can do these to commit the changes to your branch:
git add .
git commit -m "Removing duplicate files"
git push -u origin master
Where would I type these lines of code? I searched around my branch but did not find a place to write this.

I figured it out on MSYS2

rojasa1990 · 2020-10-17T21:44:39Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

From the qmk_firmware/ directory on your branch you should be able to do this:
rm -rf genone
git status will then show the following files being removed:
        deleted:    genone/eclipse_65/config.h
        deleted:    genone/eclipse_65/eclipse_65.c
        deleted:    genone/eclipse_65/eclipse_65.h
        deleted:    genone/eclipse_65/info.json
        deleted:    genone/eclipse_65/keymaps/default/keymap.c
        deleted:    genone/eclipse_65/readme.md
        deleted:    genone/eclipse_65/rules.mk
        deleted:    genone/genone_main.c
(note that keyboards/genone/ files will still be intact)
Then you can do these to commit the changes to your branch:
git add .
git commit -m "Removing duplicate files"
git push -u origin master
Where would I type these lines of code? I searched around my branch but did not find a place to write this.
I figured it out on MSYS2

Thanks

keyboards/genone/eclipse_65/config.h

keyboards/genone/eclipse_65/keymaps/default/keymap.c

rojasa1990 · 2020-10-19T01:45:35Z

I have added a GPL2+ compatible license header in my keymap.c file, and will update the file. Also for the Vendor ID number, would that be purchased through a license or random? I have established my business with the IRS, State, and County.

________________________________ From: Drashna Jaelre <notifications@github.com> Sent: Sunday, October 18, 2020 7:42 PM To: qmk/qmk_firmware <qmk_firmware@noreply.github.com> Cc: Angel Rojas <angel012690@hotmail.com>; Author <author@noreply.github.com> Subject: Re: [qmk/qmk_firmware] GEN ONE Eclipse_65 keyboard addition (#10669) @drashna requested changes on this pull request.

________________________________ In keyboards/genone/eclipse_65/config.h<#10669 (comment)>:

+ *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x0001 // GEN ONE LLC This VID is actually owned already. Please change.

________________________________ In keyboards/genone/eclipse_65/keymaps/default/keymap.c<#10669 (comment)>:

@@ -0,0 +1,21 @@

+#include QMK_KEYBOARD_H Could you add a GPL2+ compatible license header here? For instance: https://github.com/qmk/qmk_firmware/blob/28ff51175b6d45ce5a8dbfe7ed6e7a12df3bc8a8/quantum/template/base/keyboard.c#L1-L15 — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#10669 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AP6P7PSXYNQVFVZVTXTIPALSLN4OZANCNFSM4ST6Z4NA>.

Taken the 0xFEED for vendor ID as suggested in vendor documentation and an available PID

Added the GPL2+ header to keymap.c file

keyboards/genone/eclipse_65/config.h

keyboards/genone/eclipse_65/eclipse_65.c

keyboards/genone/eclipse_65/readme.md

keyboards/genone/eclipse_65/rules.mk

keyboards/genone/genone_main.c

keyboards/genone/eclipse_65/keymaps/default/keymap.c

keyboards/genone/eclipse_65/eclipse_65.h

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

Thanks for the comment I removed suggested items, corrected some spacing issues, and added suggested items.

Thanks for the comment. Deleted genone_main.c file as requested

keyboards/genone/eclipse_65/readme.md

rojasa1990 · 2020-10-24T14:52:29Z

How do I get ZVECR for another review for approval?

…

________________________________ From: Ryan <notifications@github.com> Sent: Saturday, October 24, 2020 10:49 AM To: qmk/qmk_firmware <qmk_firmware@noreply.github.com> Cc: Angel Rojas <angel012690@hotmail.com>; Author <author@noreply.github.com> Subject: Re: [qmk/qmk_firmware] GEN ONE Eclipse_65 keyboard addition (#10669) @fauxpark approved this pull request. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#10669 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AP6P7PQUWWXPXRN3XS2CECLSMLSRHANCNFSM4ST6Z4NA>.

rojasa1990 · 2020-10-28T00:29:24Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

How do I fix the duplicate files from the root level problem?

I deleted duplicate files like requested.

rojasa1990 · 2020-10-28T00:35:38Z

Same issue as #10644. You will have to fix up the added files as this PR cannot be merged with the files duplicated at the root level.

Deleted duplicate files as requested.

rojasa1990 · 2020-10-29T01:34:21Z

Thank You, so much.

…

________________________________ From: Drashna Jaelre <notifications@github.com> Sent: Wednesday, October 28, 2020 6:45 PM To: qmk/qmk_firmware <qmk_firmware@noreply.github.com> Cc: Angel Rojas <angel012690@hotmail.com>; Author <author@noreply.github.com> Subject: Re: [qmk/qmk_firmware] GEN ONE Eclipse_65 keyboard addition (#10669) Merged #10669<#10669> into master. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#10669 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AP6P7PQBPBLRXWQYFRI6MK3SNCNKDANCNFSM4ST6Z4NA>.

* Add files via upload * Add files via upload * Add files via upload * Update config.h * Update rules.mk * Update config.h * Update config.h * Update config.h * Update config.h * Add files via upload * Removing duplicate files * Resolve VID and PID collisions as requested Taken the 0xFEED for vendor ID as suggested in vendor documentation and an available PID * add a GPL2+ compatible license header as requested Added the GPL2+ header to keymap.c file * Update keyboards/genone/eclipse_65/config.h Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/readme.md Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/eclipse_65.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/keymaps/default/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/genone/eclipse_65/eclipse_65.h Co-authored-by: Ryan <fauxpark@gmail.com> * Corrected items on rules.mk as suggested Thanks for the comment I removed suggested items, corrected some spacing issues, and added suggested items. * Deleted genone_main.c file Thanks for the comment. Deleted genone_main.c file as requested Co-authored-by: Ryan <fauxpark@gmail.com>

* upstream/master: (636 commits) [Keyboard] Adding info.json files for NIBBLE 65% keyboard (qmk#10769) [Keymap] Add KiCad keymap for ANAVI Macro Pad 8 (qmk#10766) [Keymap] add an autoclicker to my plaid keymap (qmk#10743) Roadster Edit (qmk#10784) [Keyboard] Redox via support added (qmk#10710) [Keyboard] Adding Little Alby the Arduino Keyboard (qmk#10713) Add brightness level API to OLED driver (qmk#10772) [Keyboard] Add via keymap to E6.5 (qmk#10771) [Keyboard] Add via keymap for percent booster (qmk#10768) xelus/kangaroo: fix info.json layout macro reference (qmk#10765) [Keyboard] Added polilla keyboard (squashed) (qmk#10686) docs(massdrop alt/ctrl): update link to loader releases (qmk#10781) [Keyboard] KBDfans Bella Soldered tidy-up (qmk#10753) [Keyboard] Add Via support for TG4x (qmk#10571) GEN ONE Eclipse_65 keyboard addition (qmk#10669) VN66 refactor (qmk#10776) Stella refactor (qmk#10775) [Keymap] greatwizard userspace and ortho 4x12 and 5x12 keymaps (qmk#9584) add rsync to the api update process [Keyboard] Add Projectkb/alice/rev2 LAYOUT_alice support (qmk#10697) ...

rojasa1990 · 2021-02-26T23:51:18Z

Hello once again. I made another pull request for my keyboard. "Added VIA folder under the keymaps folder #12021", for the Gen One Eclipse. This folder contains a keymap.c and rules.mk files to add VIA support. Would you be available to review the pull request?

…

________________________________ From: Drashna Jaelre <notifications@github.com> Sent: Friday, October 23, 2020 5:54 PM To: qmk/qmk_firmware <qmk_firmware@noreply.github.com> Cc: Angel Rojas <angel012690@hotmail.com>; Author <author@noreply.github.com> Subject: Re: [qmk/qmk_firmware] GEN ONE Eclipse_65 keyboard addition (#10669) @drashna approved this pull request. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub<#10669 (review)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/AP6P7PQGH5HA6AFC2P6WACTSMH3QFANCNFSM4ST6Z4NA>.

rojasa1990 added 10 commits October 14, 2020 19:01

Add files via upload

9fc542f

Add files via upload

e35c803

Add files via upload

b2c12d8

Update config.h

c9d22b1

Update rules.mk

29ec7f3

Update config.h

48baebc

Update config.h

2d649d9

Update config.h

46bffda

Update config.h

f66c440

Add files via upload

8e65e91

zvecr requested changes Oct 17, 2020

View reviewed changes

zvecr changed the title ~~Adding eclipse keyboard with corrected issues~~ GEN ONE Eclipse_65 keyboard addition Oct 17, 2020

Removing duplicate files

916a549

drashna requested changes Oct 18, 2020

View reviewed changes

keyboards/genone/eclipse_65/config.h Outdated Show resolved Hide resolved

keyboards/genone/eclipse_65/keymaps/default/keymap.c Show resolved Hide resolved

github-actions bot added the keymap label Oct 18, 2020

rojasa1990 added 2 commits October 23, 2020 08:04

Resolve VID and PID collisions as requested

30687f7

Taken the 0xFEED for vendor ID as suggested in vendor documentation and an available PID

add a GPL2+ compatible license header as requested

cc13e40

Added the GPL2+ header to keymap.c file

rojasa1990 requested review from zvecr and drashna October 23, 2020 13:35

drashna approved these changes Oct 23, 2020

View reviewed changes

drashna requested a review from a team October 23, 2020 21:54

fauxpark requested changes Oct 23, 2020

View reviewed changes

rojasa1990 and others added 2 commits October 23, 2020 22:43

Update keyboards/genone/eclipse_65/config.h

781912e

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

Update keyboards/genone/eclipse_65/readme.md

f1cb354

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

rojasa1990 and others added 7 commits October 23, 2020 22:50

Update keyboards/genone/eclipse_65/eclipse_65.c

6608198

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

Update keyboards/genone/eclipse_65/rules.mk

7b8a577

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

Update keyboards/genone/eclipse_65/keymaps/default/keymap.c

2f8edfb

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

Update keyboards/genone/eclipse_65/keymaps/default/keymap.c

9d938c7

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

Update keyboards/genone/eclipse_65/eclipse_65.h

de14d46

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

Corrected items on rules.mk as suggested

06d8e1f

Thanks for the comment I removed suggested items, corrected some spacing issues, and added suggested items.

Deleted genone_main.c file

962ba3b

Thanks for the comment. Deleted genone_main.c file as requested

rojasa1990 requested a review from fauxpark October 24, 2020 02:31

fauxpark reviewed Oct 24, 2020

View reviewed changes

keyboards/genone/eclipse_65/readme.md Show resolved Hide resolved

fauxpark approved these changes Oct 24, 2020

View reviewed changes

drashna merged commit 8685409 into qmk:master Oct 28, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GEN ONE Eclipse_65 keyboard addition #10669

GEN ONE Eclipse_65 keyboard addition #10669

rojasa1990 commented Oct 17, 2020 •

edited

Loading

zvecr left a comment

rojasa1990 commented Oct 17, 2020

ridingqwerty commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 19, 2020 via email

rojasa1990 commented Oct 24, 2020 via email

rojasa1990 commented Oct 28, 2020

rojasa1990 commented Oct 28, 2020

rojasa1990 commented Oct 29, 2020 via email

rojasa1990 commented Feb 26, 2021 via email

GEN ONE Eclipse_65 keyboard addition #10669

GEN ONE Eclipse_65 keyboard addition #10669

Conversation

rojasa1990 commented Oct 17, 2020 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

zvecr left a comment

Choose a reason for hiding this comment

rojasa1990 commented Oct 17, 2020

ridingqwerty commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 17, 2020

rojasa1990 commented Oct 19, 2020 via email

rojasa1990 commented Oct 24, 2020 via email

rojasa1990 commented Oct 28, 2020

rojasa1990 commented Oct 28, 2020

rojasa1990 commented Oct 29, 2020 via email

rojasa1990 commented Feb 26, 2021 via email

rojasa1990 commented Oct 17, 2020 •

edited

Loading