Merge branch 'master' into debounce_refactor

# Conflicts:
#	tmk_core/common/keyboard.c

5 files changed, 5 insertions, 46 deletions

diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/rorschach/keymaps/insertsnideremarks/config.h
index 90fb5120d..2048232c9 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/rorschach/keymaps/insertsnideremarks/config.h
@@ -11,7 +11,6 @@
 // #define MASTER_RIGHT
 #define EE_HANDS
 
-#define PREVENT_STUCK_MODIFIERS
 #define IGNORE_MOD_TAP_INTERRUPT
 #define TAPPING_TERM 175
 #define TAPPING_TOGGLE 2
diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c b/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c
index 5f4c26415..5d93e2f05 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c
+++ b/keyboards/rorschach/keymaps/insertsnideremarks/keymap.c
@@ -10,8 +10,6 @@ enum rorschach_layers {
   _FUNCTION,  // Function
   _FUNCTION2, // Function 2 (identical as _FUNCTION; used to allow for easier use of space and backspace while using function layer arrows)
   _NUMPAD,    // Numpad
-//  _COLEMAKGM,  // Colemak gaming/vanilla (no dual-role keys with layer access)
-//  _QWERTYGM,  // QWERTY gaming/vanilla (no dual-role keys with layer access)
   _ADJUST,    // Adjust layer, accessed via tri-layer feature)
   _ADJUST2    // Second Adjust layer, accessed outside of tri-layer feature)
 };
@@ -19,8 +17,6 @@ enum rorschach_layers {
 enum rorschach_keycodes {
   COLEMAK = SAFE_RANGE,
   QWERTY,
-//  COLEMAKGM,
-//  QWERTYGM,
   NUMPAD = TG(_NUMPAD),
   ADJUST = MO(_ADJUST2),
   SPCFN  = LT(_FUNCTION, KC_SPC),
@@ -269,8 +265,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         layer_off ( _FUNCTION);
         layer_off ( _FUNCTION2);
         layer_off ( _NUMPAD);
-//        layer_off ( _COLEMAKGM);
-//        layer_off ( _QWERTYGM);
         layer_off ( _ADJUST);
 		layer_off ( _ADJUST2);
       }
@@ -285,46 +279,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         layer_off ( _FUNCTION);
         layer_off ( _FUNCTION2);
         layer_off ( _NUMPAD);
-//        layer_off ( _COLEMAKGM);
-//        layer_off ( _QWERTYGM);
         layer_off ( _ADJUST);
 		layer_off ( _ADJUST2);
       }
       return false;
       break;
-/*    case COLEMAKGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _COLEMAKGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _QWERTYGM);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-    case QWERTYGM:
-      if (record->event.pressed) {
-        default_layer_set(1UL << _QWERTYGM);
-        layer_off ( _QWERTY);
-        layer_off ( _COLEMAK);
-        layer_off ( _NUMBERS);
-        layer_off ( _NUMBERS2);
-        layer_off ( _FUNCTION);
-        layer_off ( _FUNCTION2);
-        layer_off ( _NUMPAD);
-        layer_off ( _COLEMAKGM);
-        layer_off ( _ADJUST);
-		layer_off ( _ADJUST2);
-      }
-      return false;
-      break;
-*/
   }
   return true;
 }
\ No newline at end of file
diff --git a/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk b/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk
index 6beaae7ae..b9e39c053 100644
--- a/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk
+++ b/keyboards/rorschach/keymaps/insertsnideremarks/rules.mk
@@ -14,8 +14,6 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = yes        # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. 
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
-
-
diff --git a/keyboards/rorschach/rev1/config.h b/keyboards/rorschach/rev1/config.h
index 1c9ef8276..1ea6dde98 100644
--- a/keyboards/rorschach/rev1/config.h
+++ b/keyboards/rorschach/rev1/config.h
@@ -42,6 +42,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCING_DELAY 5
 
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rorschach/rules.mk b/keyboards/rorschach/rules.mk
index 9de068d2f..320125348 100644
--- a/keyboards/rorschach/rules.mk
+++ b/keyboards/rorschach/rules.mk
@@ -17,7 +17,7 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend