120 files changed, 10 insertions(+), 17 deletions(-)

R keyboards/gh60/{ => revc}/config.h
R keyboards/gh60/{ => revc}/info.json
R keyboards/gh60/{ => revc}/keymaps/bluezio/keymap.c
R keyboards/gh60/{ => revc}/keymaps/bluezio/rules.mk
R keyboards/gh60/{ => revc}/keymaps/chaser/README.md
R keyboards/gh60/{ => revc}/keymaps/chaser/keymap.c
R keyboards/gh60/{ => revc}/keymaps/dbroqua/config.h
R keyboards/gh60/{ => revc}/keymaps/dbroqua/keymap.c
R keyboards/gh60/{ => revc}/keymaps/dbroqua/rules.mk
R keyboards/gh60/{ => revc}/keymaps/dbroqua_7U/keymap.c
R keyboards/gh60/{ => revc}/keymaps/dbroqua_7U/rules.mk
R keyboards/gh60/{ => revc}/keymaps/default/keymap.c
R keyboards/gh60/{ => revc}/keymaps/emiilsd/keymap.c
R keyboards/gh60/{ => revc}/keymaps/maartenwut/keymap.c
R keyboards/gh60/{ => revc}/keymaps/maxr1998/config.h
R keyboards/gh60/{ => revc}/keymaps/maxr1998/keymap.c
R keyboards/gh60/{ => revc}/keymaps/maxr1998/rules.mk
R keyboards/gh60/{ => revc}/keymaps/robotmaxtron/config.h
R keyboards/gh60/{ => revc}/keymaps/robotmaxtron/keymap.c
R keyboards/gh60/{ => revc}/keymaps/robotmaxtron/readme.md
R keyboards/gh60/{ => revc}/keymaps/robotmaxtron/rules.mk
R keyboards/gh60/{ => revc}/keymaps/sethbc/keymap.c
R keyboards/gh60/{ => revc}/keymaps/sethbc/rules.mk
R keyboards/gh60/{ => revc}/keymaps/xyverz/keymap.c
R keyboards/gh60/{ => revc}/pinout.txt
R keyboards/gh60/{ => revc}/readme.md
R keyboards/gh60/{gh60 => revc/revc}.c
R keyboards/gh60/{gh60 => revc/revc}.h
R keyboards/gh60/{ => revc}/rules.mk
R keyboards/{ => gh60}/satan/config.h
R keyboards/{ => gh60}/satan/info.json
R keyboards/{ => gh60}/satan/keymaps/abhixec/keymap.c
R keyboards/{ => gh60}/satan/keymaps/abhixec/readme.md
R keyboards/{ => gh60}/satan/keymaps/abhixec/rules.mk
R keyboards/{ => gh60}/satan/keymaps/addcninblue/keymap.c
R keyboards/{ => gh60}/satan/keymaps/addcninblue/readme.md
R keyboards/{ => gh60}/satan/keymaps/addcninblue/rules.mk
R keyboards/{ => gh60}/satan/keymaps/admiralStrokers/config.h
R keyboards/{ => gh60}/satan/keymaps/admiralStrokers/keymap.c
R keyboards/{ => gh60}/satan/keymaps/admiralStrokers/readme.md
R keyboards/{ => gh60}/satan/keymaps/admiralStrokers/rules.mk
R keyboards/{ => gh60}/satan/keymaps/ben_iso/config.h
R keyboards/{ => gh60}/satan/keymaps/ben_iso/keymap.c
R keyboards/{ => gh60}/satan/keymaps/ben_iso/readme.md
R keyboards/{ => gh60}/satan/keymaps/ben_iso/rules.mk
R keyboards/{ => gh60}/satan/keymaps/bri/keymap.c
R keyboards/{ => gh60}/satan/keymaps/bri/readme.md
R keyboards/{ => gh60}/satan/keymaps/chaser/keymap.c
R keyboards/{ => gh60}/satan/keymaps/chaser/readme.md
R keyboards/{ => gh60}/satan/keymaps/chaser/rules.mk
R keyboards/{ => gh60}/satan/keymaps/colemak/keymap.c
R keyboards/{ => gh60}/satan/keymaps/colemak/readme.md
R keyboards/{ => gh60}/satan/keymaps/colemak/rules.mk
R keyboards/{ => gh60}/satan/keymaps/dbroqua/keymap.c
R keyboards/{ => gh60}/satan/keymaps/dbroqua/readme.md
R keyboards/{ => gh60}/satan/keymaps/default/keymap.c
R keyboards/{ => gh60}/satan/keymaps/default/readme.md
R keyboards/{ => gh60}/satan/keymaps/default/rules.mk
R keyboards/{ => gh60}/satan/keymaps/dende_iso/keymap.c
R keyboards/{ => gh60}/satan/keymaps/dende_iso/readme.md
R keyboards/{ => gh60}/satan/keymaps/dende_iso/rules.mk
R keyboards/{ => gh60}/satan/keymaps/denolfe/README.md
R keyboards/{ => gh60}/satan/keymaps/denolfe/keymap.c
R keyboards/{ => gh60}/satan/keymaps/denolfe/rules.mk
R keyboards/{ => gh60}/satan/keymaps/dkrieger/config.h
R keyboards/{ => gh60}/satan/keymaps/dkrieger/keymap.c
R keyboards/{ => gh60}/satan/keymaps/dkrieger/readme.md
R keyboards/{ => gh60}/satan/keymaps/dkrieger/rules.mk
R keyboards/{ => gh60}/satan/keymaps/fakb/config.h
R keyboards/{ => gh60}/satan/keymaps/fakb/keymap.c
R keyboards/{ => gh60}/satan/keymaps/fakb/readme.md
R keyboards/{ => gh60}/satan/keymaps/fakb/rules.mk
R keyboards/{ => gh60}/satan/keymaps/hhkb_7u/keymap.c
R keyboards/{ => gh60}/satan/keymaps/hhkb_7u/readme.md
R keyboards/{ => gh60}/satan/keymaps/isoHHKB/keymap.c
R keyboards/{ => gh60}/satan/keymaps/isoHHKB/readme.md
R keyboards/{ => gh60}/satan/keymaps/isoHHKB/rules.mk
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/.gitignore
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/build.sh
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/config.h
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/keymap.c
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/readme.md
R keyboards/{ => gh60}/satan/keymaps/iso_split_rshift/rules.mk
R keyboards/{ => gh60}/satan/keymaps/jarred/keymap.c
R keyboards/{ => gh60}/satan/keymaps/jarred/readme.md
R keyboards/{ => gh60}/satan/keymaps/lepa/keymap.c
R keyboards/{ => gh60}/satan/keymaps/lepa/readme.md
R keyboards/{ => gh60}/satan/keymaps/lepa/rules.mk
R keyboards/{ => gh60}/satan/keymaps/mark1/keymap.c
R keyboards/{ => gh60}/satan/keymaps/mark1/readme.md
R keyboards/{ => gh60}/satan/keymaps/midi/config.h
R keyboards/{ => gh60}/satan/keymaps/midi/keymap.c
R keyboards/{ => gh60}/satan/keymaps/midi/readme.md
R keyboards/{ => gh60}/satan/keymaps/midi/rules.mk
R keyboards/{ => gh60}/satan/keymaps/no_caps_lock/keymap.c
R keyboards/{ => gh60}/satan/keymaps/no_caps_lock/readme.md
R keyboards/{ => gh60}/satan/keymaps/olligranlund_iso/config.h
R keyboards/{ => gh60}/satan/keymaps/olligranlund_iso/keymap.c
R keyboards/{ => gh60}/satan/keymaps/olligranlund_iso/readme.md
R keyboards/{ => gh60}/satan/keymaps/olligranlund_iso/rules.mk
R keyboards/{ => gh60}/satan/keymaps/poker/keymap.c
R keyboards/{ => gh60}/satan/keymaps/rask63/keymap.c
R keyboards/{ => gh60}/satan/keymaps/sethbc/keymap.c
R keyboards/{ => gh60}/satan/keymaps/sethbc/readme.md
R keyboards/{ => gh60}/satan/keymaps/sethbc/rules.mk
R keyboards/{ => gh60}/satan/keymaps/smt/keymap.c
R keyboards/{ => gh60}/satan/keymaps/smt/readme.md
R keyboards/{ => gh60}/satan/keymaps/smt/rules.mk
R keyboards/{ => gh60}/satan/keymaps/spacemanspiff/keymap.c
R keyboards/{ => gh60}/satan/keymaps/spacemanspiff/readme.md
R keyboards/{ => gh60}/satan/keymaps/stanleylai/config.h
R keyboards/{ => gh60}/satan/keymaps/stanleylai/keymap.c
R keyboards/{ => gh60}/satan/keymaps/unxmaal/README.md
R keyboards/{ => gh60}/satan/keymaps/unxmaal/keymap.c
R keyboards/{ => gh60}/satan/keymaps/unxmaal/rules.mk
R keyboards/{ => gh60}/satan/readme.md
R keyboards/{ => gh60}/satan/rules.mk
R keyboards/{ => gh60}/satan/satan.c
R keyboards/{ => gh60}/satan/satan.h
D keyboards/satan/keymaps/iso_split_rshift/resetboard.sh

@@ 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 */


@@ 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

@@ 1,5 1,4 @@
-GH60
-===
+# GH60 Rev C
 
 ![gh60 Rev C PCB](https://i.imgur.com/FejpoNF.jpg)
 


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

@@ 1,4 1,4 @@
-#include "gh60.h"
+#include "revc.h"
 
 
 extern inline void gh60_caps_led_on(void);

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

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

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

@@ 1,4 0,0 @@
-#!/bin/bash
-sudo dfu-programmer atmega32u4 erase --force
-sudo dfu-programmer atmega32u4 flash clear_flash.hex
-sudo dfu-programmer atmega32u4 reset