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

140% keyboard fluorite keymaps #7473

Merged
merged 34 commits into from
Dec 1, 2019
Merged

140% keyboard fluorite keymaps #7473

merged 34 commits into from
Dec 1, 2019

Conversation

ihotsuno
Copy link
Contributor

first pull request

Description

first comit

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

  • This is the first pull request. Thank you.

Checklist

  • My code follows the code style of this project.
  • 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).

fauxpark
fauxpark requested changes Nov 25, 2019
View reviewed changes
keyboards/fluorite/config.h Outdated Show resolved Hide resolved
keyboards/fluorite/config.h Outdated Show resolved Hide resolved
keyboards/fluorite/fluorite.c Outdated Show resolved Hide resolved
keyboards/fluorite/fluorite.h Outdated Show resolved Hide resolved
keyboards/fluorite/readme.md Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
@fauxpark fauxpark requested a review from a team November 25, 2019 01:38
ihotsuno and others added 20 commits November 25, 2019 14:20
@ihotsuno
Update config.h
51fa8fa
@ihotsuno
Update fluorite.c
9cff40d 
I corrected the points that were pointed out.
@ihotsuno
Update fluorite.h
3367bcc 
I corrected the points that were pointed out.
@ihotsuno
Update config.h
f414a79 
I corrected the points that were pointed out.
@ihotsuno
Update keymap.c
0b871e5 
I corrected the points that were pointed out.
@ihotsuno @fauxpark
Update keyboards/fluorite/config.h
cc1716c 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/readme.md
3468d6d 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
d525298 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
776c2e8 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
8aebbf6 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
a289272 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
4a456d0 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/readme.md
9869ac7 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/readme.md
fddcb3e 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
2cd773a 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
15ed585 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
c23ac9d 
thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno
Update keymap.c
7fee847 
I corrected the points that were pointed out.
@ihotsuno
Update fluorite.c
e07f6e4 
I corrected the points that were pointed out.
@ihotsuno
Update rules.mk
e4ac7e8 
I corrected the points that were pointed out.
fauxpark
fauxpark requested changes Nov 26, 2019
View reviewed changes
keyboards/fluorite/rules.mk Outdated Show resolved Hide resolved
keyboards/fluorite/rules.mk Show resolved Hide resolved
ihotsuno and others added 4 commits November 26, 2019 12:15
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
95e7943 
Thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno @fauxpark
Update keyboards/fluorite/rules.mk
0fee994 
Thanks!

Co-Authored-By: fauxpark <fauxpark@gmail.com>
@ihotsuno
Update keymap.c
e133eba 
I corrected the points that were pointed out.
@ihotsuno
Update fluorite.h
7af0571 
I corrected the points that were pointed out.
@ihotsuno ihotsuno requested a review from fauxpark November 26, 2019 14:01
@ihotsuno
Update keymap.c
f55d4ad 
I corrected the points that were pointed out.
@ihotsuno
Update keymap.c
d574c0c 
I corrected the points.
c:165:68 
XDXXXXX >> XXXXXXX

Reverted,because error log.
ADJUST,
@ihotsuno
Update keymap.c
eafd897 
I corrected the points that were pointed out.
@drashna
Copy link
Member

drashna commented Nov 29, 2019

Thanks!

@ihotsuno
Update readme.md
3550277 
link added
@ihotsuno
Update readme.md
1cad536 
photo link added
@ihotsuno
Update readme.md
449063d 
link Modify
noroadsleft
noroadsleft requested changes Dec 1, 2019
View reviewed changes
keyboards/fluorite/readme.md Outdated Show resolved Hide resolved
keyboards/fluorite/readme.md Outdated Show resolved Hide resolved
@noroadsleft
Copy link
Member

For future reference, we recommend against committing to your master branch as you've done here, because pull requests from modified master branches can make it more difficult to keep your QMK fork updated. It is highly recommended for QMK development – regardless of what is being done or where – to keep your master updated, but NEVER commit to it. Instead, do all your changes in a branch (branches are basically free in Git) and issue PRs from your branches when you're developing.

There are instructions on how to keep your fork updated here:

Best Practices: Your Fork's Master: Update Often, Commit Never

If you need any help with this just ask.

You do not need to close this pull request at this time. Until your pull request is merged, please continue to commit relevant changes to your master branch.

ihotsuno and others added 2 commits December 2, 2019 06:08
@ihotsuno @noroadsleft
Update keyboards/fluorite/readme.md
6ef45ff 
Thanks!

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@ihotsuno @noroadsleft
Update keyboards/fluorite/readme.md
56fcfa4 
Thanks!

Co-Authored-By: James Young <18669334+noroadsleft@users.noreply.github.com>
@noroadsleft
Copy link
Member

Thanks!

@noroadsleft noroadsleft merged commit d9cf6c6 into qmk:master Dec 1, 2019
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
@ihotsuno
[Keyboard] 140% keyboard fluorite keymaps (qmk#7473)
3b869ab 
* fluorite keymaps

* Update config.h

* Update fluorite.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update config.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keyboards/fluorite/config.h

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.c

I corrected the points that were pointed out.

* Update rules.mk

I corrected the points that were pointed out.

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points.
c:165:68 
XDXXXXX >> XXXXXXX

Reverted,because error log.
ADJUST,

* Update keymap.c

I corrected the points that were pointed out.

* Update readme.md

link added

* Update readme.md

photo link added

* Update readme.md

link Modify

* Update keyboards/fluorite/readme.md

Thanks!

* Update keyboards/fluorite/readme.md

Thanks!
patrl pushed a commit to patrl/qmk_firmware that referenced this pull request Dec 29, 2019
@ihotsuno @patrl
[Keyboard] 140% keyboard fluorite keymaps (qmk#7473)
1b98bb0 
* fluorite keymaps

* Update config.h

* Update fluorite.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update config.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keyboards/fluorite/config.h

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.c

I corrected the points that were pointed out.

* Update rules.mk

I corrected the points that were pointed out.

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points.
c:165:68 
XDXXXXX >> XXXXXXX

Reverted,because error log.
ADJUST,

* Update keymap.c

I corrected the points that were pointed out.

* Update readme.md

link added

* Update readme.md

photo link added

* Update readme.md

link Modify

* Update keyboards/fluorite/readme.md

Thanks!

* Update keyboards/fluorite/readme.md

Thanks!
HokieGeek pushed a commit to HokieGeek/qmk_firmware that referenced this pull request Feb 21, 2020
@ihotsuno @HokieGeek
[Keyboard] 140% keyboard fluorite keymaps (qmk#7473)
aa17f28 
* fluorite keymaps

* Update config.h

* Update fluorite.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update config.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keyboards/fluorite/config.h

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/readme.md

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keyboards/fluorite/rules.mk

thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.c

I corrected the points that were pointed out.

* Update rules.mk

I corrected the points that were pointed out.

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keyboards/fluorite/rules.mk

Thanks!

* Update keymap.c

I corrected the points that were pointed out.

* Update fluorite.h

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points that were pointed out.

* Update keymap.c

I corrected the points.
c:165:68 
XDXXXXX >> XXXXXXX

Reverted,because error log.
ADJUST,

* Update keymap.c

I corrected the points that were pointed out.

* Update readme.md

link added

* Update readme.md

photo link added

* Update readme.md

link Modify

* Update keyboards/fluorite/readme.md

Thanks!

* Update keyboards/fluorite/readme.md

Thanks!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fauxpark fauxpark fauxpark approved these changes

@drashna drashna drashna approved these changes

@noroadsleft noroadsleft noroadsleft approved these changes

Assignees
No one assigned
Labels
keyboard
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ihotsuno @drashna @noroadsleft @fauxpark