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-discipline #6464

Merged
merged 17 commits into from
Aug 4, 2019
Merged

add keyboard-discipline #6464

merged 17 commits into from
Aug 4, 2019

Conversation

coseyfannitutti
Copy link
Contributor

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

@noroadsleft noroadsleft requested review from a team August 2, 2019 01:12
@noroadsleft
Copy link
Member

Any particular reason you haven't put this in your keyboards/coseyfannitutti/ folder?

@coseyfannitutti
Copy link
Contributor Author

Any particular reason you haven't put this in your keyboards/coseyfannitutti/ folder?

No, I should have done that. That can be changed, and the example flash command in the readme can be changed to reflect that.
Do I need to change that on my end and submit another pull request for that to happen?

@noroadsleft
Copy link
Member

You don't need to open a new pull request. Just check out your master branch (git checkout master), then run:

git mv keyboards/discipline/ keyboards/coseyfannitutti/discipline/
git commit -m "[commit message]"
git push

and that will update this pull request.

keyboards/coseyfannitutti/discipline/discipline.h Outdated Show resolved Hide resolved
keyboards/coseyfannitutti/discipline/discipline.h Outdated Show resolved Hide resolved
keyboards/coseyfannitutti/discipline/info.json Outdated Show resolved Hide resolved
keyboards/coseyfannitutti/discipline/info.json Outdated Show resolved Hide resolved
keyboards/coseyfannitutti/discipline/readme.md Outdated Show resolved Hide resolved
keyboards/coseyfannitutti/discipline/rules.mk Show resolved Hide resolved
@noroadsleft noroadsleft requested a review from a team August 2, 2019 03:13
coseyfannitutti and others added 12 commits August 2, 2019 00:54
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
…eymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
…eymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>
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.

Looks good to me. 👍

@noroadsleft noroadsleft requested a review from a team August 2, 2019 05:17
Co-Authored-By: Drashna Jaelre <drashna@live.com>
Copy link
Member

@drashna drashna left a comment

Choose a reason for hiding this comment

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

Awesome, thanks!

@drashna drashna merged commit 430c370 into qmk:master Aug 4, 2019
Shinichi-Ohki added a commit to Shinichi-Ohki/qmk_firmware that referenced this pull request Aug 6, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (240 commits)
  Move maartenwut's keyboards to one folder (qmk#6484)
  GH60 Refactor: Move Satan into GH60 directory (qmk#6485)
  Remove unused _BOOTLOADER defines
  [Keyboard] add keyboard-discipline (qmk#6464)
  [Split] Add config option for DIRECT_PINS_RIGHT (qmk#6479)
  [Keymap] Add some more commonly used symbols to melody96/zunger. (qmk#6478)
  [Keyboard] WT75-A & WT75-B fixes for QMK Configurator (qmk#6472)
  [Keymap] update to dsanchezseco keymap (qmk#6470)
  [Keymap] Fixed Tanuki RGB lighting (qmk#6462)
  Add iS0 Keypad (qmk#6456)
  [Keymap] jotix ortho_4x12_layout (qmk#6458)
  [Keyboard] New Keyboard: KBDPad MKI (qmk#6452)
  [Keymap] Adds Keymap for Iris/blucky (qmk#6449)
  [Keymap] Fixing Sol Rev2 default keymap OLED rotation. (qmk#6448)
  [Keyboard] QWERTYYdox refactor (qmk#6446)
  [Keymap] Adds keymap for muzfuz/lunar (qmk#6432)
  [Docs] Add dfu-util and caterina udev examples (qmk#6429)
  updates to akb/raine in ready for production units (qmk#6457)
  Removed print call to resolve  qmk#6364 (qmk#6413)
  Fix typo for building Ergodox EZ keyboards (qmk#6453)
  ...
Acaki pushed a commit to Acaki/qmk_firmware that referenced this pull request Aug 6, 2019
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
incredibleweirdo pushed a commit to electricbrainreserve/qmk_firmware that referenced this pull request Aug 15, 2019
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
swanmatch pushed a commit to swanmatch/qmk_firmware that referenced this pull request Sep 3, 2019
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* add keyboard-discipline

* move discipline to /coseyfannitutti

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/discipline.h

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/info.json

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/67_ansi/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/coseyfannitutti/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/keymaps/default/keymap.c

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/readme.md

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update keyboards/coseyfannitutti/discipline/rules.mk

Co-Authored-By: noroadsleft <18669334+noroadsleft@users.noreply.github.com>

* Update readme.md

* Update keyboards/coseyfannitutti/discipline/discipline.c

Co-Authored-By: Drashna Jaelre <drashna@live.com>
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.

3 participants