GH60 Refactor: Move Satan into GH60 directory (#6485)
* Move Satan into the GH60 directory to avoid the confusion of what PCB people have * set bootmagic to lite * rename gh60 file to revc
This commit is contained in:
		
							parent
							
								
									72f382fc02
								
							
						
					
					
						commit
						7f8922ae7b
					
				
					 120 changed files with 10 additions and 17 deletions
				
			
		
							
								
								
									
										3
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/.gitignore
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
updatemerge.sh
 | 
			
		||||
clear_flash.hex
 | 
			
		||||
resetboard.sh
 | 
			
		||||
							
								
								
									
										42
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
									
										
									
									
									
										Executable file
									
								
							
							
						
						
									
										42
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/build.sh
									
										
									
									
									
										Executable file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,42 @@
 | 
			
		|||
#!/bin/bash
 | 
			
		||||
# adjust for cpu 
 | 
			
		||||
# -j 16 gave best result on a hyperthreaded quad core core i7
 | 
			
		||||
 | 
			
		||||
LIMIT=10
 | 
			
		||||
THREADS="-j 16"
 | 
			
		||||
KMAP=iso_split_rshift
 | 
			
		||||
 | 
			
		||||
echo "We need sudo later"
 | 
			
		||||
sudo ls 2>&1 /dev/null
 | 
			
		||||
 | 
			
		||||
function wait_bootloader {
 | 
			
		||||
	echo "Waiting for Bootloader..."
 | 
			
		||||
	local STARTTIME=$(date +"%s")
 | 
			
		||||
	local REMIND=0
 | 
			
		||||
    local EXEC=dfu-programmer
 | 
			
		||||
    local TARGET=atmega32u4
 | 
			
		||||
	while true
 | 
			
		||||
	do
 | 
			
		||||
		sudo $EXEC $TARGET get > /dev/null 2>&1
 | 
			
		||||
		[ $? -eq 0 ] && break
 | 
			
		||||
		ENDTIME=$(date +"%s")
 | 
			
		||||
		DURATION=$(($ENDTIME-$STARTTIME))
 | 
			
		||||
		if [ $REMIND -eq 0 -a $DURATION -gt $LIMIT ]
 | 
			
		||||
		then 
 | 
			
		||||
			echo "Did you forget to press the reset button?"
 | 
			
		||||
			REMIND=1
 | 
			
		||||
		fi
 | 
			
		||||
        sleep 1
 | 
			
		||||
	done
 | 
			
		||||
}
 | 
			
		||||
make clean
 | 
			
		||||
make KEYMAP=${KMAP} ${THREADS}
 | 
			
		||||
if [[ $? -eq 0 ]]
 | 
			
		||||
then
 | 
			
		||||
    echo "please trigger flashing!"
 | 
			
		||||
    wait_bootloader
 | 
			
		||||
    sudo make KEYMAP=${KMAP} dfu ${THREADS}
 | 
			
		||||
else
 | 
			
		||||
    echo "make failed"
 | 
			
		||||
    exit 77
 | 
			
		||||
fi
 | 
			
		||||
							
								
								
									
										27
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										27
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/config.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,27 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2012 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 | 
			
		||||
This program is free software: you can redistribute it and/or modify
 | 
			
		||||
it under the terms of the GNU General Public License as published by
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
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_USER_H
 | 
			
		||||
#define CONFIG_USER_H
 | 
			
		||||
 | 
			
		||||
#include "../../config.h"
 | 
			
		||||
 | 
			
		||||
// only change
 | 
			
		||||
#undef RGB_DI_PIN 
 | 
			
		||||
#define RGB_DI_PIN B2
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
							
								
								
									
										115
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										115
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/keymap.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,115 @@
 | 
			
		|||
 | 
			
		||||
#include QMK_KEYBOARD_H
 | 
			
		||||
 | 
			
		||||
// TODO: replace your ugly german brckets with #defines
 | 
			
		||||
 | 
			
		||||
// Each layer gets a name for readability, which is then used in the keymap matrix below.
 | 
			
		||||
// The underscores don't mean anything - you can have a layer called STUFF or any other name.
 | 
			
		||||
// Layer names don't all need to be of the same length, obviously, and you can also skip them
 | 
			
		||||
// entirely and just use numbers.
 | 
			
		||||
#define _DEF 0
 | 
			
		||||
#define _SPC 1
 | 
			
		||||
#define _TAB 2
 | 
			
		||||
#define _SFX 3
 | 
			
		||||
 | 
			
		||||
// dual-role shortcuts
 | 
			
		||||
#define TABDUAL   LT(_TAB, KC_TAB)
 | 
			
		||||
#define CAPSDUAL  CTL_T(KC_ESC)
 | 
			
		||||
#define SPACEDUAL LT(_SPC, KC_SPACE)
 | 
			
		||||
#define ENTERDUAL CTL_T(KC_ENT)
 | 
			
		||||
// arrow cluster duality bottom right corner
 | 
			
		||||
#define ARRLEFT  ALT_T(KC_LEFT)
 | 
			
		||||
#define ARRDOWN  GUI_T(KC_DOWN)
 | 
			
		||||
#define ARRUP    SFT_T(KC_UP)
 | 
			
		||||
#define ARRRIGHT CTL_T(KC_RIGHT)
 | 
			
		||||
// german brackets
 | 
			
		||||
#define GER_CUR_L RALT(KC_7)    // [
 | 
			
		||||
#define GER_CUR_R RALT(KC_0)    // ]
 | 
			
		||||
#define GER_PAR_L LSFT(KC_8)    // (
 | 
			
		||||
#define GER_PAR_R LSFT(KC_9)    // )
 | 
			
		||||
#define GER_ANG_L KC_NUBS       // <
 | 
			
		||||
#define GER_ANG_R LSFT(KC_NUBS) // >
 | 
			
		||||
#define GER_BRC_L RALT(KC_8)    // [
 | 
			
		||||
#define GER_BRC_R RALT(KC_9)    // ]
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
    /* Keymap _DEF: Default Layer
 | 
			
		||||
     * ,-----------------------------------------------------------.
 | 
			
		||||
     * |Grv|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|   \ | Tab is Fn1
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Ctrl   | A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Sft | < |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2| RShift is UP
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl| Gui Menu, RCtrl is
 | 
			
		||||
     * `-----------------------------------------------------------'   LEFT DWN RIGHT
 | 
			
		||||
     */
 | 
			
		||||
    [_DEF] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_GRV,   KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,   \
 | 
			
		||||
        TABDUAL,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, \
 | 
			
		||||
        CAPSDUAL, KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, ENTERDUAL, \
 | 
			
		||||
        KC_LSFT,  KC_NUBS, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, ARRUP,   TG(_SFX),      \
 | 
			
		||||
        KC_LCTL,  KC_LGUI, KC_LALT,             SPACEDUAL,                       KC_RALT, ARRLEFT, ARRDOWN, ARRRIGHT),
 | 
			
		||||
 | 
			
		||||
    /* Keymap 1: F-and-vim Layer, modified with Space (by holding space)
 | 
			
		||||
     * ,-----------------------------------------------------------.
 | 
			
		||||
     * |PrSc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|Delete|
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |Paus| Up| [ | ] |   |   |   | ( | ) |   |   |   |     |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |      |Lft|Dwn|Rgt|   |   |Left|Down|Right|Up|  |   | PLAY |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |   |   |   | < | > |   |M0 |   |   |   |   | Vol+ |   |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |    |    |                        |Alt |Prev|Vol-|Next|
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_SPC] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_PSCR, KC_F1,   KC_F2,   KC_F3,     KC_F4,     KC_F5,     KC_F6,    KC_F7,     KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  \
 | 
			
		||||
        _______, KC_PAUS, KC_UP,   GER_BRC_L, GER_BRC_R, _______,   _______,  GER_PAR_L, GER_PAR_R, _______, _______, _______, _______, \
 | 
			
		||||
        _______, KC_LEFT, KC_DOWN, KC_RIGHT,  _______,   _______,   KC_LEFT,  KC_DOWN,   KC_UP,     KC_RGHT, _______, _______, _______, KC_MPLY, \
 | 
			
		||||
        _______, _______, _______, _______,   GER_ANG_L, GER_ANG_R, KC_SPACE, RALT(KC_SPC),_______,   _______, _______, _______, KC_VOLU, _______, \
 | 
			
		||||
        _______, _______, _______,                                  _______,                                 _______, KC_MPRV, KC_VOLD, KC_MNXT),
 | 
			
		||||
 | 
			
		||||
    /* Keymap 2: Tab Layer w/ vim pageup, modified with Tab (by holding tab)
 | 
			
		||||
     * ,-----------------------------------------------------------.
 | 
			
		||||
     * |WAKE|   |   |   |   |   |   |   |   |   |   |   |   |Insert|  TAB+GRC = WAKE
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |     |   |   |   |   |   |   |   | { | } |   |   |   |     |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |      |   |   |   |   |   |Pos1|PgDn|PgUp|End|  |   |Retrn |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |   |   |   |   |   |   |AF2|   |   |   |   | PgUp |   |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |    |    |                        |Alt |Pos1|PgDn|End |
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_TAB] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        KC_WAKE, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______, _______, _______, KC_INS,  \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, GER_CUR_L, GER_CUR_R, _______, _______, _______, _______, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN,    KC_PGUP,  KC_END,  _______, _______, _______, KC_ENT,  \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, A(KC_F2),   _______,  _______, _______, _______, KC_PGUP, _______, \
 | 
			
		||||
        _______, _______, _______,                            _______,                                _______, KC_HOME, KC_PGDN, KC_END),
 | 
			
		||||
 | 
			
		||||
    /* Keymap 3: Split right shift Numpad toggle Layer (by tapping the split rshift key)
 | 
			
		||||
     * ,-----------------------------------------------------------.
 | 
			
		||||
     * |RSET|  |   |   |   |   |   |  7|  8|  9|   |   |   |Backsp |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |     |   |   |   |   |   |   | 4 | 5 | 6 |   |   |   |   \ |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |      | L | L |   |   |   |   | 1 | 2 | 3 |   |   | Return |
 | 
			
		||||
     * |-----------------------------------------------------------|
 | 
			
		||||
     * |    |   | L | L | L | L | L | L |   | 0 |   |  /|  Up  |   | All "L"s represent
 | 
			
		||||
     * |-----------------------------------------------------------| LED controlling
 | 
			
		||||
     * |Ctrl|Win |Alt |                        |Alt |Left|Down|Right|
 | 
			
		||||
     * `-----------------------------------------------------------'
 | 
			
		||||
     */
 | 
			
		||||
    [_SFX] = LAYOUT_60_iso_split_rshift(
 | 
			
		||||
        RESET,   _______, _______, _______, _______, _______, _______, KC_7,    KC_8,    KC_9, _______, _______, _______, KC_BSPC, \
 | 
			
		||||
        _______, _______, _______, _______, _______, _______, _______, KC_4,    KC_5,    KC_6, _______, _______, _______, \
 | 
			
		||||
        _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, KC_1,    KC_2,    KC_3, _______, _______, XXXXXXX, KC_ENT,  \
 | 
			
		||||
        _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_0, _______, KC_SLSH, KC_UP,   _______, \
 | 
			
		||||
        _______, _______, _______,                            _______,                         _______, KC_LEFT, KC_DOWN, KC_RGHT),
 | 
			
		||||
};
 | 
			
		||||
							
								
								
									
										36
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										36
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,36 @@
 | 
			
		|||
toneman77's Satan Layout
 | 
			
		||||
=====================
 | 
			
		||||
 | 
			
		||||
##Quantum MK Firmware
 | 
			
		||||
For the full Quantum feature list, see the parent readme.md.
 | 
			
		||||
 | 
			
		||||
* heavily modified ISO (!) layout with split right shift key
 | 
			
		||||
* spaceFn
 | 
			
		||||
* Dual-Role keys:
 | 
			
		||||
* 
 | 
			
		||||
 | Original key     | when tapped   | when held     |
 | 
			
		||||
 | ---------------- | ------------- | ------------- |
 | 
			
		||||
 | Space            | Space         | layer change  |
 | 
			
		||||
 | Caps lock        | Escape        | Control       |
 | 
			
		||||
 | Tab              | Tab           | layer change  |
 | 
			
		||||
 | Enter            | Enter         | Control       |
 | 
			
		||||
 | 
			
		||||
* Lockable layer for LED functions and numpad
 | 
			
		||||
* vim-style arrow keys on hjkl (spacefn layer)
 | 
			
		||||
* corresponding Home/PgDn/PgUp/End on hjkl (tab layer)
 | 
			
		||||
* bonus arrow keys in the bottom right corner on Alt/Win/Menu/rCtrl/Shift
 | 
			
		||||
* more bonus arrow keys on wasd (spacefn layer)
 | 
			
		||||
* media keys prev/next/play/vol+/vol- (spacefn layer)
 | 
			
		||||
* firmware bootloader button
 | 
			
		||||
* WS2812 RGB Underglow Support (not needed anymore to solder directly to the atmega)
 | 
			
		||||
* additional brackets that only work in german layout due to horrible placement
 | 
			
		||||
in the default qwertz layout
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
### Additional Credits
 | 
			
		||||
* Keymap has been based on TerryMathews' fork of Aqoush's fork of qmk-satan-rgb. [here](https://github.com/TerryMathews/qmk-satan-rgb/tree/master/keyboard/satan)
 | 
			
		||||
* nice visualization of the layers [here](http://www.keyboard-layout-editor.com/#/gists/aba4e4396459ede85bc66a22cee88e48)
 | 
			
		||||
* no-need-to-solder-on-chip picture:
 | 
			
		||||

 | 
			
		||||
* special thanks to /u/TerryMathews  who suggested the pin PB2, so soldering
 | 
			
		||||
directly on the atmega is not needed anymore. Happened on [reddit](https://www.reddit.com/r/MechanicalKeyboards/comments/4ghq9z/photos_satan_rgb60_w1976/d2k5tra)
 | 
			
		||||
							
								
								
									
										13
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										13
									
								
								keyboards/gh60/satan/keymaps/iso_split_rshift/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,13 @@
 | 
			
		|||
BOOTMAGIC_ENABLE = yes # 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)
 | 
			
		||||
COMMAND_ENABLE   = yes # Commands for debug and configuration
 | 
			
		||||
NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 | 
			
		||||
RGBLIGHT_ENABLE  = yes # Enable keyboard underlight functionality (+4870)
 | 
			
		||||
BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality (+1150)
 | 
			
		||||
MIDI_ENABLE      = no  # MIDI controls
 | 
			
		||||
AUDIO_ENABLE     = no
 | 
			
		||||
UNICODE_ENABLE   = no  # Unicode
 | 
			
		||||
BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue