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

GH60 Refactor: Move Satan into GH60 directory #6485

Merged
merged 3 commits into from
Aug 5, 2019

Conversation

mechmerlin
Copy link
Contributor

@mechmerlin mechmerlin commented Aug 4, 2019

Description

There have been too many cases of people flashing GH60 firmware on a Satan and vice versa. Usually the user is not aware of the other. For support's sake, I've decided to combine the two into one subdirectory.

In addition, I've added extra things

  1. pragma once changes
  2. set bootmagic to lite
  3. Adjust readme for build targets

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

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.

Thanks!

@noroadsleft noroadsleft merged commit 7f8922a into qmk:master Aug 5, 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
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
incredibleweirdo pushed a commit to electricbrainreserve/qmk_firmware that referenced this pull request Aug 15, 2019
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
doughsay pushed a commit to doughsay/qmk_firmware that referenced this pull request Aug 31, 2019
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
swanmatch pushed a commit to swanmatch/qmk_firmware that referenced this pull request Sep 3, 2019
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
@mechmerlin mechmerlin deleted the feature/gh60refactor branch October 3, 2019 02:44
ripxorip pushed a commit to ripxorip/qmk_firmware that referenced this pull request Dec 3, 2019
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
ridingqwerty pushed a commit to ridingqwerty/qmk_firmware that referenced this pull request Jan 10, 2020
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
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