From 1603132cbedc0c2ab0f1e8350236af35c6156bcc Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Fri, 13 Nov 2020 14:52:37 +1100
Subject: [PATCH] Add OUT_TOG

---
 config/corne.keymap     |  1 -
 config/makefile         |  2 +-
 miryoku/miryoku-zmk.org | 14 ++++++++------
 miryoku/miryoku.dtsi    |  3 ++-
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/config/corne.keymap b/config/corne.keymap
index 93a45ab..f7a26a0 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -1,4 +1,3 @@
 
 #include "../miryoku/split_3x6_3.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/makefile b/config/makefile
index 187cf5b..fbad86b 100644
--- a/config/makefile
+++ b/config/makefile
@@ -40,7 +40,7 @@ $(ZMK_APP_DIR)/build/planck_rev6/zephyr/zmk.uf2: planck_rev6.keymap ../miryoku/o
 zmk-%.uf2: $(ZMK_APP_DIR)/build/%/zephyr/zmk.uf2
 	cp -p $< $@
 
-$(ZMK_APP_DIR)/build/%/zephyr/zmk.uf2: # FORCE
+$(ZMK_APP_DIR)/build/%/zephyr/zmk.uf2: FORCE
 	cd $(ZMK_APP_DIR) && west build -d build/$(ZMK_TARGET) -b $(ZMK_BOARD) -- -DZMK_CONFIG=$(ZMK_CONFIG) $(ZMK_MACROS)
 
 .PHONY: FORCE
diff --git a/miryoku/miryoku-zmk.org b/miryoku/miryoku-zmk.org
index 2727270..a2fcfd8 100644
--- a/miryoku/miryoku-zmk.org
+++ b/miryoku/miryoku-zmk.org
@@ -134,14 +134,15 @@ configuration.  Not activated manually.
 
 Tertiary right-hand layer is media control, with volume up / down and next /
 prev mirroring the navigation keys.  Pause, stop and mute are on thumbs.  RGB
-control is on the top row (combine with shift to invert).  Unused keys are
-available for other related functions.
+control is on the top row (combine with shift to invert).  BT control is on the
+bottom row, and USB / BT output toggle on the home row inner index.
+
 
 #+NAME: medr
-| RGB_TOG    | RGB_MOD      | RGB_HUI      | RGB_SAI      | RGB_VAI      |
-|            | MPRV         | VOLD         | VOLU         | MNXT         |
-| &bt BT_CLR | &bt BT_SEL 0 | &bt BT_SEL 1 | &bt BT_SEL 2 | &bt BT_SEL 3 |
-| MSTP       | MPLY         | MUTE         | X_NP         | X_NP         |
+| RGB_TOG      | RGB_MOD      | RGB_HUI      | RGB_SAI      | RGB_VAI      |
+| &out OUT_TOG | MPRV         | VOLD         | VOLU         | MNXT         |
+| &bt BT_CLR   | &bt BT_SEL 0 | &bt BT_SEL 1 | &bt BT_SEL 2 | &bt BT_SEL 3 |
+| MSTP         | MPLY         | MUTE         | X_NP         | X_NP         |
 
 
 *** Numerals and Symbols (~NSL~)
@@ -782,6 +783,7 @@ K20       K21       K22  K23  K24  &kp NUM_4 &kp NUM_3 K25  K26  K27  K28      K
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/rgb.h>
+#include <dt-bindings/zmk/outputs.h>
 
 <<table-layer-defines()>>
 
diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi
index 2437566..d66d134 100644
--- a/miryoku/miryoku.dtsi
+++ b/miryoku/miryoku.dtsi
@@ -4,6 +4,7 @@
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/rgb.h>
+#include <dt-bindings/zmk/outputs.h>
 
 #define BASE 0
 #define TAP  1
@@ -200,7 +201,7 @@ X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp K_STOP2, &k
 #else
         MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        &rgb_ug RGB_TOG, &rgb_ug RGB_EFF, &rgb_ug RGB_HUI, &rgb_ug RGB_SAI, &rgb_ug RGB_BRI,
-&kp LGUI,    &kp LALT,    &kp LCTRL,   &kp LSHFT,   X_NA,        X_NU,        &kp K_PREV,  &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT,
+&kp LGUI,    &kp LALT,    &kp LCTRL,   &kp LSHFT,   X_NA,        &out OUT_TOG, &kp K_PREV,  &kp K_VOL_DN, &kp K_VOL_UP, &kp K_NEXT,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        &bt BT_CLR,  &bt BT_SEL 0, &bt BT_SEL 1, &bt BT_SEL 2, &bt BT_SEL 3,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp K_STOP2, &kp K_PP,    &kp K_MUTE,  X_NP,        X_NP
         )