Merge branch 'master' into taamas

8 files changed, 28 insertions, 13 deletions

diff --git a/keyboards/moonlander/config.h b/keyboards/moonlander/config.h
index 9930e64063..b0ff86ee81 100644
--- a/keyboards/moonlander/config.h
+++ b/keyboards/moonlander/config.h
@@ -20,17 +20,8 @@
 
 #include "config_common.h"
 
-/* USB Device descriptor parameter */
-// clang-format off
-#define VENDOR_ID       0x3297
-#define PRODUCT_ID      0x1969
-#define MANUFACTURER    ZSA Technology Labs
-#define PRODUCT         Moonlander Mark I
-#define DEVICE_VER      0x0001
 #define WEBUSB_LANDING_PAGE_URL u8"configure.ergodox-ez.com"
 
-// clang-format on
-
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 7
diff --git a/keyboards/moonlander/info.json b/keyboards/moonlander/info.json
index 60b560eeee..6322dccd5b 100644
--- a/keyboards/moonlander/info.json
+++ b/keyboards/moonlander/info.json
@@ -1,7 +1,13 @@
 {
     "keyboard_name": "Moonlander Mark I",
+    "manufacturer": "ZSA Technology Labs",
     "url": "zsa.io/moonlander",
     "maintainer": "ZSA via Drashna",
+    "usb": {
+        "vid": "0x3297",
+        "pid": "0x1969",
+        "device_version": "0.0.1"
+    },
     "layouts": {
         "LAYOUT_moonlander": {
             "layout": [
diff --git a/keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h b/keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h
index 6ea1541da2..44679baf74 100644
--- a/keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h
+++ b/keyboards/moonlander/keymaps/manna-harbour_miryoku/config.h
@@ -1,6 +1,5 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
 
 // 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/>.
 
diff --git a/keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c b/keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c
index 7c5717a0fe..dbab7f9820 100644
--- a/keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c
+++ b/keyboards/moonlander/keymaps/manna-harbour_miryoku/keymap.c
@@ -1,5 +1,4 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated -*- buffer-read-only: t -*-
 
 // 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/>.
diff --git a/keyboards/moonlander/matrix.c b/keyboards/moonlander/matrix.c
index b6bac9515e..36017fcd12 100644
--- a/keyboards/moonlander/matrix.c
+++ b/keyboards/moonlander/matrix.c
@@ -227,3 +227,7 @@ void matrix_power_up(void) {
     }
 
 }
+
+bool is_transport_connected(void) {
+    return mcp23018_initd;
+}
\ No newline at end of file
diff --git a/keyboards/moonlander/moonlander.c b/keyboards/moonlander/moonlander.c
index e2e163f116..927c88925e 100644
--- a/keyboards/moonlander/moonlander.c
+++ b/keyboards/moonlander/moonlander.c
@@ -320,7 +320,7 @@ bool music_mask_kb(uint16_t keycode) {
         case QK_LAYER_TAP_TOGGLE ... QK_LAYER_MOD_MAX:
         case QK_MOD_TAP ... QK_MOD_TAP_MAX:
         case AU_ON ... MUV_DE:
-        case RESET:
+        case QK_BOOT:
         case EEP_RST:
             return false;
         default:
diff --git a/keyboards/moonlander/moonlander.h b/keyboards/moonlander/moonlander.h
index 8598260211..90ce84b3e3 100644
--- a/keyboards/moonlander/moonlander.h
+++ b/keyboards/moonlander/moonlander.h
@@ -82,3 +82,5 @@ typedef union {
 } keyboard_config_t;
 
 extern keyboard_config_t keyboard_config;
+
+bool is_transport_connected(void);
\ No newline at end of file
diff --git a/keyboards/moonlander/readme.md b/keyboards/moonlander/readme.md
index bf80f05569..733780abde 100644
--- a/keyboards/moonlander/readme.md
+++ b/keyboards/moonlander/readme.md
@@ -41,4 +41,18 @@ If you're using the Smart LED (layer indication) feature from the Oryx Configura
 
 This changes the `RGB_TOG` keycode so that it will toggle the lights on and off, in a way that will allow the Smart LEDs to continue to work, even with the rest of the LEDs turned off. 
 
-Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.  
+Additionally, a new keycode has been added to toggle the Smart LEDs.  Use `TOGGLE_LAYER_COLOR`, if you aren't already.
+
+### Detecting split / Gaming mode
+
+To make it extra gaming friendly, you can configure what happens when you disconnect the right half. This is especially useful when using gaming unfriendly layers or layouts (e.g. home row mods, dvorak, colemak).
+
+Example for enabling a specific layer while right side is disconnected:
+
+```
+void housekeeping_task_user(void) {
+    if (!is_transport_connected()) {
+        // set layer
+    }
+}
+```
\ No newline at end of file