Merge remote-tracking branch 'upstream/develop'

3 files changed, 5 insertions, 36 deletions

diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h
index 50ca039a06..bdabde0782 100644
--- a/keyboards/idobao/id80/v3/ansi/config.h
+++ b/keyboards/idobao/id80/v3/ansi/config.h
@@ -3,16 +3,6 @@
 
 #pragma once
 
-#include "config_common.h"
-
-/* --------------------------------
- * Bootmagic Lite key configuration
- * use the Esc key
- * -------------------------------- */
-
-#define BOOTMAGIC_LITE_ROW      0
-#define BOOTMAGIC_LITE_COLUMN   5
-
 /* ----------------
  * RGB Matrix stuff
  * ---------------- */
diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json
index fccff8efda..9797c60dfe 100644
--- a/keyboards/idobao/id80/v3/ansi/info.json
+++ b/keyboards/idobao/id80/v3/ansi/info.json
@@ -25,6 +25,9 @@
         "pid": "0x0380",
         "device_version": "3.0.0"
     },
+    "bootmagic": {
+        "matrix": [0, 5]
+    },
     "layouts": {
         "LAYOUT_80_ansi": {
             "layout": [
diff --git a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
index faa483d88b..710bb8c089 100644
--- a/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
+++ b/keyboards/idobao/id80/v3/ansi/keymaps/idobao/keymap.c
@@ -29,13 +29,11 @@ enum {
 };
 
 enum {
-    KC_MCON = USER00,  // macOS Open Mission Control
-    KC_LPAD,           // macOS Open Launchpad
     #ifdef RGB_MATRIX_ENABLE
-    RGB_TPK,           // Toggle Per-Key
+    RGB_TPK = QK_KB_0,  // Toggle Per-Key
     RGB_TUG,           // Toggle Underglow
     #endif  // RGB_MATRIX_ENABLE
-    KB_VRSN = USER09   // debug, type version
+    KB_VRSN = QK_KB_9   // debug, type version
 };
 
 #ifndef RGB_MATRIX_ENABLE
@@ -43,11 +41,6 @@ enum {
     #define RGB_TUG _______
 #endif  // RGB_MATRIX_ENABLE
 
-enum macos_consumer_usages {
-    _AC_SHOW_ALL_WINDOWS = 0x29F,  // mapped to KC_MCON
-    _AC_SHOW_ALL_APPS    = 0x2A0   // mapped to KC_LPAD
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /*
      * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐
@@ -293,23 +286,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
 
-        // @see: https://github.com/qmk/qmk_firmware/issues/10111#issuecomment-752300353
-        case KC_MCON:
-            if (record->event.pressed) {
-                host_consumer_send(_AC_SHOW_ALL_WINDOWS);
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-
-        case KC_LPAD:
-            if (record->event.pressed) {
-                host_consumer_send(_AC_SHOW_ALL_APPS);
-            } else {
-                host_consumer_send(0);
-            }
-            return false;
-
         default:
             return true; /* Process all other keycodes normally */
     }