Skip to content

Commit

Permalink
GH60 Refactor: Move Satan into GH60 directory (#6485)
Browse files Browse the repository at this point in the history
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have

* set bootmagic to lite

* rename gh60 file to revc
  • Loading branch information
mechmerlin authored and noroadsleft committed Aug 5, 2019
1 parent 72f382f commit 7f8922a
Show file tree
Hide file tree
Showing 120 changed files with 10 additions and 17 deletions.
6 changes: 0 additions & 6 deletions keyboards/gh60/config.h → keyboards/gh60/revc/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ 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/>.
*/

#ifndef CONFIG_H
#define CONFIG_H

#include "config_common.h"

/* USB Device descriptor parameter */
Expand Down Expand Up @@ -152,5 +148,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION

#endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 4 additions & 3 deletions keyboards/gh60/readme.md → keyboards/gh60/revc/readme.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
GH60
===
# GH60 Rev C

![gh60 Rev C PCB](https://i.imgur.com/FejpoNF.jpg)

Expand All @@ -11,7 +10,9 @@ Hardware Availability: http://blog.komar.be/projects/gh60-programmable-keyboard/

Make example for this keyboard (after setting up your build environment):

make gh60:default
make gh60/revc:default

**Note:** This GH60 firmware will not be compatible with the GH60 Satan PCB. Conversely, the GH60 Satan firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing.

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

Expand Down
2 changes: 1 addition & 1 deletion keyboards/gh60/gh60.c → keyboards/gh60/revc/revc.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "gh60.h"
#include "revc.h"


extern inline void gh60_caps_led_on(void);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion keyboards/gh60/rules.mk → keyboards/gh60/revc/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000)
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = yes # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
# CONSOLE_ENABLE = yes # Console for debug(+400)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 3 additions & 1 deletion keyboards/satan/readme.md → keyboards/gh60/satan/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ Hardware Availability: https://www.1upkeyboards.com/shop/controllers/gh60-satan-

Make example for this keyboard (after setting up your build environment):

make satan:default
make gh60/satan:default

**Note:** This GH60 Satan firmware will not be compatible with the GH60 Rev C PCB. Conversely, the GH60 Rev C firmware will not be compatible with this PCB. Please ensure you have the correct firmware/pcb combination before flashing.

See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

Expand Down
2 changes: 1 addition & 1 deletion keyboards/satan/rules.mk → keyboards/gh60/satan/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=4096
# Build Options
# comment out to disable the options.
#
BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000)
BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration(+1000)
MOUSEKEY_ENABLE = no # Mouse keys(+4700)
EXTRAKEY_ENABLE = yes # Audio control and System control(+450)
CONSOLE_ENABLE = yes # Console for debug(+400)
Expand Down
File renamed without changes.
File renamed without changes.
4 changes: 0 additions & 4 deletions keyboards/satan/keymaps/iso_split_rshift/resetboard.sh

This file was deleted.

0 comments on commit 7f8922a

Please sign in to comment.