Merge remote-tracking branch 'origin/master' into develop

keyboards/boardsource/the_mark/keymaps/stanrc85/keymap.c

@@ -53,9 +53,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void rgb_matrix_indicators_user(void) {
   uint8_t layer = get_highest_layer(layer_state);
   switch (layer) {
-    case _QWERTY:
-      rgb_matrix_set_color(10, 0, 0, 0); 
-      break;
     case _FN1_60:
       rgb_matrix_set_color(10, 0, 0, 255); 
       break;

keyboards/boardsource/the_mark/keymaps/stanrc85/rules.mk

@@ -1 +0,0 @@
-VIA_ENABLE = yes

layouts/community/60_ansi/stanrc85-ansi/readme.md

@@ -1,4 +1,4 @@
-<!-- Copyright 2019 Stanrc85
+<!-- Copyright 2021 Stanrc85
 
 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
@@ -13,21 +13,26 @@ 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/>.-->
 
-# Stanrc85's Standard ANSI 60% Layout
+# Stanrc85's Standard Layout
+
+Shared keymap between 60%, 65%, Alice layouts:
+- 1upkeyboards60HSE
+- Mark65
+- Sneakbox Alice
 
 ## Keymap Notes
 - Layer 0 is default QWERTY layout with additional custom features:
     - SpaceFN to function layer 2 on `Space`
     - `CTRL` when held and `ESC` when tapped on `CAPS LOCK`
     - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L`
-    - Tap Dance on `ESC` for `ESC` and  ` ` `
+    - Tap Dance on `ESC` for `ESC` and  ` ` ` 
 
-![Base QWERTY Layer](https://imgur.com/lGcyLJx.png)
+![Base QWERTY Layer](https://imgur.com/gvCkVUW.png)
 
 - Layer 1 is default QWERTY with no custom features used mostly for gaming
-    - Enabled by `Fn2+CAPS` from base layer
+    - Enabled by `Fn2+RCTL` from base layer
 
-![Default ANSI Layer](https://imgur.com/M7T9PNT.png)
+![Default ANSI Layer](https://imgur.com/2SAel0K.png)
 
 - Layer 2 is Function layer:
     - F keys
@@ -37,12 +42,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         - AHK Mic is used to mute/unmute microphone
         - AHK Speaker switches audio output between headphones and speakers
 
-![Function Layer](https://imgur.com/YPl0JrU.png)
+![Function Layer](https://imgur.com/FUjG0pL.png)
+
+- Layer 3 is RGB Underglow control and RESET
+    - `Fn2+RCTL` used to toggle Default QWERTY layer on and off
+    - `qmk compile` command on `Fn2+Enter`
+    - `qmk flash` command on `Fn2+Shift+enter`
+
+![RGB and RESET Layer](https://imgur.com/UPdhR12.png)
 
-- Layer 3 is RGB control and RESET
-    - `Fn2+CAPS` used to toggle Default QWERTY layer on and off
 
-![RGB and RESET Layer](https://imgur.com/8K7gSgh.png)
 
 ### Build
 To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi`.

layouts/community/alice/stanrc85-alice/readme.md

@@ -0,0 +1,57 @@
+<!-- Copyright 2021 Stanrc85
+
+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/>.-->
+
+# Stanrc85's Standard Layout
+
+Shared keymap between 60%, 65%, Alice layouts:
+- 1upkeyboards60HSE
+- Mark65
+- Sneakbox Alice
+
+## Keymap Notes
+- Layer 0 is default QWERTY layout with additional custom features:
+    - SpaceFN to function layer 2 on `Space`
+    - `CTRL` when held and `ESC` when tapped on `CAPS LOCK`
+    - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L`
+    - Tap Dance on `ESC` for `ESC` and  ` ` ` 
+
+![Base QWERTY Layer](https://imgur.com/SrLWaoj.png)
+
+- Layer 1 is default QWERTY with no custom features used mostly for gaming
+    - Enabled by `Fn2+RCTL` from base layer
+
+![Default ANSI Layer](https://imgur.com/KMxFZ2v.png)
+
+- Layer 2 is Function layer:
+    - F keys
+    - Arrows
+    - Volume and Media controls
+    - AutoHotkey shortcuts based on [Speaker Control](https://github.com/stanrc85/Speaker-Control) script
+        - AHK Mic is used to mute/unmute microphone
+        - AHK Speaker switches audio output between headphones and speakers
+
+![Function Layer](https://imgur.com/Luqo4cg.png)
+
+- Layer 3 is RGB Underglow control and RESET
+    - `Fn2+RCTL` used to toggle Default QWERTY layer on and off
+    - `qmk compile` command on `Fn2+Enter`
+    - `qmk flash` command on `Fn2+Shift+enter`
+
+![RGB and RESET Layer](https://imgur.com/tlpoP5E.png)
+
+
+
+### Build
+To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-alice`.

users/stanrc85/config.h

@@ -2,6 +2,7 @@
 
 #define TAPPING_TERM 250
 #define RETRO_TAPPING
+#define FORCE_NKRO
 
 #ifdef RGBLIGHT_ENABLE
   #define RGBLIGHT_LAYERS

users/stanrc85/readme.md

@@ -1,4 +1,4 @@
-<!-- Copyright 2019 Stanrc85
+<!-- Copyright 2021 Stanrc85
 
 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
@@ -13,11 +13,12 @@ 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/>.-->
 
-# Stanrc85's Standard ANSI 60% Layout
+# Stanrc85's Standard Layout
 
-Shared keymap between two 60% PCB:
+Shared keymap between 60%, 65%, Alice layouts:
 - 1upkeyboards60HSE
-- DZ60 (hotswap)
+- Mark65
+- Sneakbox Alice
 
 ## Keymap Notes
 - Layer 0 is default QWERTY layout with additional custom features:
@@ -26,12 +27,12 @@ Shared keymap between two 60% PCB:
     - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L`
     - Tap Dance on `ESC` for `ESC` and  ` ` ` 
 
-![Base QWERTY Layer](https://imgur.com/lGcyLJx.png)
+![Base QWERTY Layer](https://imgur.com/gvCkVUW.png)
 
 - Layer 1 is default QWERTY with no custom features used mostly for gaming
-    - Enabled by `Fn2+CAPS` from base layer
+    - Enabled by `Fn2+RCTL` from base layer
 
-![Default ANSI Layer](https://imgur.com/M7T9PNT.png)
+![Default ANSI Layer](https://imgur.com/2SAel0K.png)
 
 - Layer 2 is Function layer:
     - F keys
@@ -41,12 +42,16 @@ Shared keymap between two 60% PCB:
         - AHK Mic is used to mute/unmute microphone
         - AHK Speaker switches audio output between headphones and speakers
 
-![Function Layer](https://imgur.com/YPl0JrU.png)
+![Function Layer](https://imgur.com/FUjG0pL.png)
 
 - Layer 3 is RGB Underglow control and RESET
-    - `Fn2+CAPS` used to toggle Default QWERTY layer on and off
+    - `Fn2+RCTL` used to toggle Default QWERTY layer on and off
+    - `qmk compile` command on `Fn2+Enter`
+    - `qmk flash` command on `Fn2+Shift+enter`
+
+![RGB and RESET Layer](https://imgur.com/UPdhR12.png)
+
 
-![RGB and RESET Layer](https://imgur.com/PyB8z7k.png)
 
 ### Build
-To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi`.
+To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi` or `make your_keyboard:stanrc85-alice`.

users/stanrc85/rules.mk

@@ -6,7 +6,9 @@ BOOTMAGIC_ENABLE = no
 MOUSEKEY_ENABLE = no
 AUDIO_ENABLE = no
 CONSOLE_ENABLE = no
-NKRO_ENABLE = no
+NKRO_ENABLE = yes
+LTO_ENABLE = yes
+VIA_ENABLE = yes
 
 SRC += stanrc85.c
 
@@ -14,8 +16,6 @@ ifeq ($(strip $(KEYBOARD)), projectkb/alice/rev2)
   SRC += rgblight_layers.c
   SRC += startup_fanfare.c
   OPT_DEFS += -DHAS_INDICATORS
-  VIA_ENABLE = yes
-  LTO_ENABLE = no
   VELOCIKEY_ENABLE=yes
 endif
 ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone)
@@ -23,13 +23,9 @@ ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone)
   SRC += startup_fanfare.c
   OPT_DEFS += -DHAS_INDICATORS
   OPT_DEFS += -DHAS_ROTARY
-  VIA_ENABLE = yes
-  LTO_ENABLE = no
 endif
 ifeq ($(strip $(KEYBOARD)), tkc/osav2)
   SRC += rgblight_layers_osa.c
-  VIA_ENABLE = yes
-  LTO_ENABLE = no
   VELOCIKEY_ENABLE=yes
 endif
 ifeq ($(strip $(KEYBOARD)), boardsource/the_mark)

users/stanrc85/stanrc85.c

@@ -109,11 +109,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       uint8_t mods = get_mods();
       clear_mods();
         if (mods & MOD_MASK_SHIFT) {
-          send_string_with_delay_P(PSTR("qmk flash -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way
+          send_string_with_delay_P(PSTR("qmk flash -j 6 -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way
           reset_keyboard();
         }
         else
-          send_string_with_delay_P(PSTR("qmk compile -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way
+          send_string_with_delay_P(PSTR("qmk compile -j 6 -kb " QMK_KEYBOARD " -km " QMK_KEYMAP "\n"), 10); //New way
       set_mods(mods);
       }
     break;