Pulled some functionality from the engame keymap for the Drop Ctrl #8953

elijahblake81 · 2020-04-27T22:32:15Z

Description

Added Static
Red Escape
Green WASD/Arrows
Most QMK Animations/Effects are included.
Keys in the 2nd/Function Layer light up if they have a use.

Types of Changes

Issues Fixed or Closed by This PR

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

updating my fork

qmk_firmware/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile

qmk_firmware/keyboards/preonic/keymaps/that_canadian/Makefile

…"COLOR" in the layout template.

elijahblake81

Updated/cleaned up/fixed a few bugs. Took away all the RGB timeout settings

keyboards/massdrop/alt/keymaps/elijahblake/config_led.c

keyboards/massdrop/alt/keymaps/elijahblake/rules.mk

keyboards/massdrop/alt/keymaps/elijahblake/config_led.c

ault RGB color

drashna · 2020-05-19T09:56:51Z

keyboards/massdrop/alt/keymaps/pregame/keymap.h

+
+//========================================================== CONFIGURABLE DEFAULTS ==========================================================
+extern bool g_suspend_state;
+extern rgb_config_t rgb_matrix_config;


This shouldn't be needed. Especially now. There are query options for all of the rgb matrix config.

what doesn't need to be here anymore?

so take out lines 30 and 31?

Both of them have functions to return their values. Which is ... easier to manage, especially if there are architectural changes.

https://docs.qmk.fm/#/feature_rgb_matrix?id=query-current-status

So, yeah. And anything that uses them explicitly would need updating.

stale · 2020-07-03T10:07:18Z

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 awaiting review, breaking_change, in progress, or on hold to prevent the issue from being re-flagged.

elijahblake81

CHanges have been made

elijahblake81

made changes.

noroadsleft

#8953 (comment) still needs to be resolved.

You may need to rename twice – e.g. README.md -> read me.md -> readme.md – to get it to take.

elijahblake81 · 2020-11-10T02:22:45Z

i'll try that.. Trying to rename this caused my git to get all out of sync... Not sure why

…

On Mon, Nov 9, 2020 at 3:41 PM James Young ***@***.***> wrote: ***@***.**** commented on this pull request. https://github.com/qmk/qmk_firmware/pull/8953/files#r516255393 still needs to be resolved. You may need to rename twice – e.g. README.md -> read me.md -> readme.md – to get it to take. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#8953 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABUHEKB2IEK42WNGFV6BLGDSPBO2HANCNFSM4MSKC7HQ> .

noroadsleft · 2020-11-10T06:40:01Z

Ah, you seem to be using GitHub's web interface as well as a local cloned repo for your QMK work. This is fine, but managing pull requests can be a bit confusing working this way.

When you push a branch from your computer to GitHub, GitHub actually creates a copy of your local branch on their servers. Your local Git install can and will keep track of the relationship between the branch on your computer and the branch on GitHub, but the two aren't inherently linked – you can make changes to one without modifying the other.

When you change either branch (local or remote), that branch's state diverges from the state of the other branch. Because commits in Git are hierarchical, commits have a parent-child relationship, and the branches themselves exist in sort of parallel universes.

So when you initially push a branch to GitHub, the remote copy of the branch is the same, but if you then use GitHub.com to change that branch, your local version is completely unaware of that change. To make your local copy aware, you need to pull the remote changes to your local branch. Usually a simple git pull is enough to do this. Once both versions have the same state, you can work from whichever version suits you, but when you're done, the other branch needs to be made aware of what has changed. That being the case, you can 1) edit the branch locally, and git push the changes to the remote, or 2) edit the branch on the remote, and git pull the changes to your local repository.

Failure to synchronize the branches before editing one is what creates the situation where you have to merge one branch into the other, as you've done in 6b7201f.

keyboards/massdrop/alt/keymaps/pregame/reading.md

elijahblake81 · 2020-11-10T13:30:05Z

That should be done.. How do I fix this? ========================================= ebfulton@iQ:/mnt/c/Users/eli/documents/GitHub/qmk_firmware$ git status On branch master Your branch is up to date with 'origin/master'. You are currently rebasing branch 'master' on '9e07b7cd8'. (all conflicts fixed: run "git rebase --continue") =================================================== ebfulton@iQ:/mnt/c/Users/eli/documents/GitHub/qmk_firmware$ git rebase --continue Applying: Added changes recommended by fauxpark No changes - did you forget to use 'git add'? If there is nothing left to stage, chances are that something else already introduced the same changes; you might want to skip this patch. Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort".

…

On Tue, Nov 10, 2020 at 12:43 AM James Young ***@***.***> wrote: ***@***.**** requested changes on this pull request. ------------------------------ In keyboards/massdrop/alt/keymaps/pregame/reading.md <#8953 (comment)>: > @@ -0,0 +1,36 @@ +# Massdrop Alt Pregame This file can be completely deleted. As I explained above, you may either work locally and push: git rm -- keyboards/massdrop/alt/keymaps/pregame/reading.md git commit -m "Delete reading.md" git push or work remotely ***@***.***/github/managing-files-in-a-repository/deleting-files> and pull: [delete the file through GitHub.com, as detailed above] [open your Git command-line interface, and run:] git pull — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#8953 (review)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABUHEKGUGMQESVZF4OVIJHTSPDOI7ANCNFSM4MSKC7HQ> .

elijahblake81 · 2020-11-10T13:37:36Z

I wasn't aware I made any changes on the web side other than marking things as done and checking viewed checkbox. But yes, things are definitely out of sync and I'm not sure how to get it back correct.

…

On Tue, Nov 10, 2020 at 12:40 AM James Young ***@***.***> wrote: Ah, you seem to be using GitHub's web interface as well as a local cloned repo for your QMK work. This is fine, but managing pull requests can be a bit confusing working this way. When you push a branch from your computer to GitHub, GitHub actually creates a copy of your local branch on their servers. Your local Git install can and will keep track of the relationship between the branch on your computer and the branch on GitHub, but the two aren't inherently linked – you can make changes to one without modifying the other. When you change either branch (local or remote), that branch's state diverges from the state of the other branch. Because commits in Git are hierarchical, commits have a parent-child relationship, and the branches themselves exist in sort of parallel universes. So when you initially push a branch to GitHub, the remote copy of the branch is the same, but if you then use GitHub.com to change that branch, your local version is completely unaware of that change. To make your local copy aware, you need to *pull* the remote changes to your local branch. Usually a simple git pull is enough to do this. Once both versions have the same state, you can work from whichever version suits you, but when you're done, the other branch needs to be made aware of what has changed. That being the case, you can 1) edit the branch locally, and git push the changes to the remote, or 2) edit the branch on the remote, and git pull the changes to your local repository. Failure to synchronize the branches before editing one is what creates the situation where you have to merge one branch into the other, as you've done in 6b7201f <6b7201f> . — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#8953 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABUHEKDIQBEZBWA76R7NC7LSPDN47ANCNFSM4MSKC7HQ> .

noroadsleft

Sorry it took me so long to get back to this; have had an unusually busy week.

Anyway, just some stuff on the readme I noticed. Everything else looks good to me.

keyboards/massdrop/alt/keymaps/pregame/readme.md

noroadsleft · 2020-11-18T23:55:01Z

Thanks!

elijahblake81 · 2020-11-19T00:58:47Z

thank you!

…

On Wed, Nov 18, 2020 at 5:55 PM James Young ***@***.***> wrote: Thanks! — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#8953 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ABUHEKHMK4KAKYFXM3DBQCTSQRNGFANCNFSM4MSKC7HQ> .

Pulled some functionality from the endgame keymap for the Drop Ctrl. * very shortened version of the Endgame keymap * fixed pictures * fixed link * fixed link * fix files * add GREEN RGB * fixed GREEN RGB * not supposed to be in my fork... * wasn't supposed to be in my fork. * I have fixed the layer 0 RGB Settings; you can now apply layer using "COLOR" in the layout template. * I've renamed to pregame, fixed several files * added Underglow RGB layout, changed def ault RGB color * fixed the color of the default profile like i want it * Added IRL Photo * Update keymap.c disabled debugging. * Update keymap.c * Update config.h * Update README.md * Update keymap.h * Changed some settings on rules for clean up. * Changed some settings on rules for clean up. * fixed some errors, cleaned things up * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Fixed changes recommended by Fauxpark * Added changes recommended by fauxpark * trying to fix my repo * Still trying to fix merge issues * changed to lowercase * Delete reading.md * Trying to rebase my repo * stuck in rebase loop trying to fix local files and update * updating readme file

elijahblake81 added 9 commits April 21, 2020 08:34

Merge pull request #1 from qmk/master

7b612f6

updating my fork

very shortened version of the Endgame keymap

a5995fe

fixed pictures

2c61493

fixed link

f7136fd

fixed link

5487443

Merge remote-tracking branch 'upstream/master'

88333fb

fix files

8912eeb

add GREEN RGB

de50be6

fixed GREEN RGB

e25b883

zvecr requested changes Apr 27, 2020

View reviewed changes

qmk_firmware/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile Outdated Show resolved Hide resolved

qmk_firmware/keyboards/preonic/keymaps/that_canadian/Makefile Outdated Show resolved Hide resolved

zvecr added the keymap label Apr 27, 2020

elijahblake81 added 2 commits April 27, 2020 18:34

not supposed to be in my fork...

706f3d7

wasn't supposed to be in my fork.

be8dabd

elijahblake81 requested a review from zvecr April 28, 2020 00:19

elijahblake81 added 2 commits April 28, 2020 13:22

I have fixed the layer 0 RGB Settings; you can now apply layer using …

42445b1

…"COLOR" in the layout template.

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

032f4a2

elijahblake81 commented Apr 28, 2020

View reviewed changes

drashna reviewed Apr 29, 2020

View reviewed changes

keyboards/massdrop/alt/keymaps/elijahblake/config_led.c Outdated Show resolved Hide resolved

drashna requested changes Apr 29, 2020

View reviewed changes

keyboards/massdrop/alt/keymaps/elijahblake/rules.mk Outdated Show resolved Hide resolved

keyboards/massdrop/alt/keymaps/elijahblake/config_led.c Outdated Show resolved Hide resolved

I've renamed to pregame, fixed several files

ed7dc42

elijahblake81 requested a review from drashna April 30, 2020 16:41

elijahblake81 added 5 commits May 1, 2020 08:04

Merge remote-tracking branch 'upstream/master'

fb69559

added Underglow RGB layout, changed def

f70787e

ault RGB color

fixed the color of the default profile like i want it

e9637ff

Merge remote-tracking branch 'upstream/master'

1fd0450

Added IRL Photo

c8fda6c

drashna reviewed May 19, 2020

View reviewed changes

drashna approved these changes May 19, 2020

View reviewed changes

drashna requested a review from a team May 19, 2020 09:58

elijahblake81 commented Nov 2, 2020

View reviewed changes

elijahblake81 requested a review from fauxpark November 4, 2020 02:18

noroadsleft reviewed Nov 9, 2020

View reviewed changes

elijahblake81 added 3 commits November 9, 2020 20:29

Merge remote-tracking branch 'upstream/master'

6b7201f

Still trying to fix merge issues

cc95dea

changed to lowercase

4cc3ed0

noroadsleft requested changes Nov 10, 2020

View reviewed changes

keyboards/massdrop/alt/keymaps/pregame/reading.md Outdated Show resolved Hide resolved

Delete reading.md

167a05f

elijahblake81 requested a review from noroadsleft November 10, 2020 23:55

elijahblake81 added 2 commits November 12, 2020 12:12

Trying to rebase my repo

5be76cb

stuck in rebase loop trying to fix local files and update

08fc58b

noroadsleft requested changes Nov 14, 2020

View reviewed changes

keyboards/massdrop/alt/keymaps/pregame/readme.md Outdated Show resolved Hide resolved

keyboards/massdrop/alt/keymaps/pregame/readme.md Outdated Show resolved Hide resolved

updating readme file

0dde1a9

elijahblake81 requested a review from noroadsleft November 17, 2020 16:58

noroadsleft approved these changes Nov 18, 2020

View reviewed changes

noroadsleft merged commit 6dc2d59 into qmk:master Nov 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pulled some functionality from the engame keymap for the Drop Ctrl #8953

Pulled some functionality from the engame keymap for the Drop Ctrl #8953

elijahblake81 commented Apr 27, 2020 •

edited

Loading

elijahblake81 left a comment

drashna May 19, 2020

elijahblake81 Aug 21, 2020

elijahblake81 Aug 21, 2020

drashna Aug 22, 2020 •

edited

Loading

stale bot commented Jul 3, 2020

elijahblake81 left a comment

elijahblake81 left a comment

noroadsleft left a comment •

edited

Loading

elijahblake81 commented Nov 10, 2020 via email

noroadsleft commented Nov 10, 2020

elijahblake81 commented Nov 10, 2020 via email

elijahblake81 commented Nov 10, 2020 via email

noroadsleft left a comment

noroadsleft commented Nov 18, 2020

elijahblake81 commented Nov 19, 2020 via email

Pulled some functionality from the engame keymap for the Drop Ctrl #8953

Pulled some functionality from the engame keymap for the Drop Ctrl #8953

Conversation

elijahblake81 commented Apr 27, 2020 • edited Loading

Description

Types of Changes

Issues Fixed or Closed by This PR

Checklist

elijahblake81 left a comment

Choose a reason for hiding this comment

drashna May 19, 2020

Choose a reason for hiding this comment

elijahblake81 Aug 21, 2020

Choose a reason for hiding this comment

elijahblake81 Aug 21, 2020

Choose a reason for hiding this comment

drashna Aug 22, 2020 • edited Loading

Choose a reason for hiding this comment

stale bot commented Jul 3, 2020

elijahblake81 left a comment

Choose a reason for hiding this comment

elijahblake81 left a comment

Choose a reason for hiding this comment

noroadsleft left a comment • edited Loading

Choose a reason for hiding this comment

elijahblake81 commented Nov 10, 2020 via email

noroadsleft commented Nov 10, 2020

elijahblake81 commented Nov 10, 2020 via email

elijahblake81 commented Nov 10, 2020 via email

noroadsleft left a comment

Choose a reason for hiding this comment

noroadsleft commented Nov 18, 2020

elijahblake81 commented Nov 19, 2020 via email

elijahblake81 commented Apr 27, 2020 •

edited

Loading

drashna Aug 22, 2020 •

edited

Loading

noroadsleft left a comment •

edited

Loading