Merge branch 'master' of https://github.com/qmk/qmk_firmware

19 files changed, 2 insertions, 91 deletions

diff --git a/keyboards/satan/keymaps/admiralStrokers/keymap.c b/keyboards/satan/keymaps/admiralStrokers/keymap.c
index a728f5a539..a3626dff87 100644
--- a/keyboards/satan/keymaps/admiralStrokers/keymap.c
+++ b/keyboards/satan/keymaps/admiralStrokers/keymap.c
@@ -187,10 +187,3 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
 						if (record->event.pressed) { } else { }; break;
     } return MACRO_NONE;
 };
-/*
-		Later use:
-		void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { }
-		enum function_id { };
-		const uint16_t PROGMEM fn_actions[] = { };
-
-*/
diff --git a/keyboards/satan/keymaps/admiralStrokers/rules.mk b/keyboards/satan/keymaps/admiralStrokers/rules.mk
index 22908296ce..7c3f5bd90b 100644
--- a/keyboards/satan/keymaps/admiralStrokers/rules.mk
+++ b/keyboards/satan/keymaps/admiralStrokers/rules.mk
@@ -19,6 +19,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no# Breathing sleep LED during USB suspend
 API_SYSEX_ENABLE = no # This enables using the Quantum SYSEX API to send strings
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
+
diff --git a/keyboards/satan/keymaps/ben_iso/rules.mk b/keyboards/satan/keymaps/ben_iso/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/ben_iso/rules.mk
+++ b/keyboards/satan/keymaps/ben_iso/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/bri/keymap.c b/keyboards/satan/keymaps/bri/keymap.c
index 96775488e5..7f38ba6f5f 100644
--- a/keyboards/satan/keymaps/bri/keymap.c
+++ b/keyboards/satan/keymaps/bri/keymap.c
@@ -66,38 +66,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______,_______,_______,              _______,                        _______,_______,_______,_______),
     
 };
-/*
-enum function_id {
-    SHIFT_ESC,
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-  [0]  = ACTION_FUNCTION(SHIFT_ESC),
-};
-
-void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
-  static uint8_t shift_esc_shift_mask;
-  switch (id) {
-    case SHIFT_ESC:
-      shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
-      if (record->event.pressed) {
-        if (shift_esc_shift_mask) {
-          add_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          add_key(KC_ESC);
-          send_keyboard_report();
-        }
-      } else {
-        if (shift_esc_shift_mask) {
-          del_key(KC_GRV);
-          send_keyboard_report();
-        } else {
-          del_key(KC_ESC);
-          send_keyboard_report();
-        }
-      }
-      break;
-  }
-}
-*/
diff --git a/keyboards/satan/keymaps/chaser/rules.mk b/keyboards/satan/keymaps/chaser/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/chaser/rules.mk
+++ b/keyboards/satan/keymaps/chaser/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/colemak/rules.mk b/keyboards/satan/keymaps/colemak/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/colemak/rules.mk
+++ b/keyboards/satan/keymaps/colemak/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/default/rules.mk b/keyboards/satan/keymaps/default/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/default/rules.mk
+++ b/keyboards/satan/keymaps/default/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/dende_iso/rules.mk b/keyboards/satan/keymaps/dende_iso/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/dende_iso/rules.mk
+++ b/keyboards/satan/keymaps/dende_iso/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/denolfe/rules.mk b/keyboards/satan/keymaps/denolfe/rules.mk
index 04d2743065..5a8745b689 100644
--- a/keyboards/satan/keymaps/denolfe/rules.mk
+++ b/keyboards/satan/keymaps/denolfe/rules.mk
@@ -15,6 +15,3 @@ AUDIO_ENABLE = no
 UNICODE_ENABLE = no 		# Unicode
 BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/dkrieger/rules.mk b/keyboards/satan/keymaps/dkrieger/rules.mk
index f2434d30e5..d91b0edbf3 100644
--- a/keyboards/satan/keymaps/dkrieger/rules.mk
+++ b/keyboards/satan/keymaps/dkrieger/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/fakb/rules.mk b/keyboards/satan/keymaps/fakb/rules.mk
index c2b5df6cdd..a0d2447994 100644
--- a/keyboards/satan/keymaps/fakb/rules.mk
+++ b/keyboards/satan/keymaps/fakb/rules.mk
@@ -11,6 +11,3 @@ AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/isoHHKB/rules.mk b/keyboards/satan/keymaps/isoHHKB/rules.mk
index 80ce560588..08e77f9ebc 100644
--- a/keyboards/satan/keymaps/isoHHKB/rules.mk
+++ b/keyboards/satan/keymaps/isoHHKB/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/iso_split_rshift/rules.mk b/keyboards/satan/keymaps/iso_split_rshift/rules.mk
index d1e07da3fc..15cabfcd85 100644
--- a/keyboards/satan/keymaps/iso_split_rshift/rules.mk
+++ b/keyboards/satan/keymaps/iso_split_rshift/rules.mk
@@ -11,6 +11,3 @@ AUDIO_ENABLE     = no
 UNICODE_ENABLE   = no  # Unicode
 BLUETOOTH_ENABLE = no  # Enable Bluetooth with the Adafruit EZ-Key HID
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/lepa/rules.mk b/keyboards/satan/keymaps/lepa/rules.mk
index 72ca006465..74a42b647c 100644
--- a/keyboards/satan/keymaps/lepa/rules.mk
+++ b/keyboards/satan/keymaps/lepa/rules.mk
@@ -17,6 +17,3 @@ RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/midi/rules.mk b/keyboards/satan/keymaps/midi/rules.mk
index d144314de7..87025ed6fe 100644
--- a/keyboards/satan/keymaps/midi/rules.mk
+++ b/keyboards/satan/keymaps/midi/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/sethbc/rules.mk b/keyboards/satan/keymaps/sethbc/rules.mk
index bb535beb34..53644093d6 100644
--- a/keyboards/satan/keymaps/sethbc/rules.mk
+++ b/keyboards/satan/keymaps/sethbc/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/smt/rules.mk b/keyboards/satan/keymaps/smt/rules.mk
index 806c2cb84b..3fe140adcc 100644
--- a/keyboards/satan/keymaps/smt/rules.mk
+++ b/keyboards/satan/keymaps/smt/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/keymaps/unxmaal/rules.mk b/keyboards/satan/keymaps/unxmaal/rules.mk
index 470d621b10..e724782513 100644
--- a/keyboards/satan/keymaps/unxmaal/rules.mk
+++ b/keyboards/satan/keymaps/unxmaal/rules.mk
@@ -16,6 +16,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 
-ifndef QUANTUM_DIR
-	include ../../../../Makefile
-endif
diff --git a/keyboards/satan/readme.md b/keyboards/satan/readme.md
index fddadcd478..a2552edf8d 100644
--- a/keyboards/satan/readme.md
+++ b/keyboards/satan/readme.md
@@ -12,4 +12,4 @@ Make example for this keyboard (after setting up your build environment):
 
     make satan:default
 
-See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.