3 files changed, 37 insertions, 48 deletions
diff --git a/keyboards/rocketboard_16/config.h b/keyboards/rocketboard_16/config.h
index 6e0f26f62b..29db0066eb 100644
--- a/keyboards/rocketboard_16/config.h
+++ b/keyboards/rocketboard_16/config.h
@@ -17,24 +17,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* key matrix size */
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 4
-
 #define MATRIX_ROW_PINS { A9, B13, B14, B15, B3 }
 #define MATRIX_COL_PINS { B8, B9, B10, B11 }
 #define DIODE_DIRECTION COL2ROW
 
-/* Bootmagic key - row 4, col 1 */
-#define BOOTMAGIC_LITE_ROW 4
-#define BOOTMAGIC_LITE_COLUMN 1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    5
-
 #define RGBLIGHT_EFFECT_BREATHING
 #define RGBLIGHT_EFFECT_RAINBOW_MOOD
 #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
diff --git a/keyboards/rocketboard_16/info.json b/keyboards/rocketboard_16/info.json
index f9accb9629..4e81d951a7 100644
--- a/keyboards/rocketboard_16/info.json
+++ b/keyboards/rocketboard_16/info.json
@@ -8,6 +8,9 @@
         "pid": "0xFF16",
         "device_version": "0.0.1"
     },
+    "bootmagic": {
+        "matrix": [4, 1]
+    },
     "layout_aliases": {
         "LAYOUT_default": "LAYOUT"
     },
diff --git a/keyboards/rocketboard_16/keycode_lookup.c b/keyboards/rocketboard_16/keycode_lookup.c
index e744aee527..61b73bd0c0 100644
--- a/keyboards/rocketboard_16/keycode_lookup.c
+++ b/keyboards/rocketboard_16/keycode_lookup.c
@@ -337,38 +337,38 @@ lookup_table_t lookup_table[333] =
  {"SC_RCPC", SC_RCPC},
  {"SC_LAPO", SC_LAPO},
  {"SC_RAPC", SC_RAPC},
- {"FN_MO13", FN_MO13},
- {"FN_MO23", FN_MO23},
- {"MACRO00", MACRO00},
- {"MACRO01", MACRO01},
- {"MACRO02", MACRO02},
- {"MACRO03", MACRO03},
- {"MACRO04", MACRO04},
- {"MACRO05", MACRO05},
- {"MACRO06", MACRO06},
- {"MACRO07", MACRO07},
- {"MACRO08", MACRO08},
- {"MACRO09", MACRO09},
- {"MACRO10", MACRO10},
- {"MACRO11", MACRO11},
- {"MACRO12", MACRO12},
- {"MACRO13", MACRO13},
- {"MACRO14", MACRO14},
- {"MACRO15", MACRO15},
- {"USER00", USER00},
- {"USER01", USER01},
- {"USER02", USER02},
- {"USER03", USER03},
- {"USER04", USER04},
- {"USER05", USER05},
- {"USER06", USER06},
- {"USER07", USER07},
- {"USER08", USER08},
- {"USER09", USER09},
- {"USER10", USER10},
- {"USER11", USER11},
- {"USER12", USER12},
- {"USER13", USER13},
- {"USER14", USER14},
- {"USER15", USER15}
+ {"TL_LOWR", TL_LOWR},
+ {"TL_UPPR", TL_UPPR},
+ {"QK_MACRO_0", QK_MACRO_0},
+ {"QK_MACRO_1", QK_MACRO_1},
+ {"QK_MACRO_2", QK_MACRO_2},
+ {"QK_MACRO_3", QK_MACRO_3},
+ {"QK_MACRO_4", QK_MACRO_4},
+ {"QK_MACRO_5", QK_MACRO_5},
+ {"QK_MACRO_6", QK_MACRO_6},
+ {"QK_MACRO_7", QK_MACRO_7},
+ {"QK_MACRO_8", QK_MACRO_8},
+ {"QK_MACRO_9", QK_MACRO_9},
+ {"QK_MACRO_10", QK_MACRO_10},
+ {"QK_MACRO_11", QK_MACRO_11},
+ {"QK_MACRO_12", QK_MACRO_12},
+ {"QK_MACRO_13", QK_MACRO_13},
+ {"QK_MACRO_14", QK_MACRO_14},
+ {"QK_MACRO_15", QK_MACRO_15},
+ {"QK_KB_0", QK_KB_0},
+ {"QK_KB_1", QK_KB_1},
+ {"QK_KB_2", QK_KB_2},
+ {"QK_KB_3", QK_KB_3},
+ {"QK_KB_4", QK_KB_4},
+ {"QK_KB_5", QK_KB_5},
+ {"QK_KB_6", QK_KB_6},
+ {"QK_KB_7", QK_KB_7},
+ {"QK_KB_8", QK_KB_8},
+ {"QK_KB_9", QK_KB_9},
+ {"QK_KB_10", QK_KB_10},
+ {"QK_KB_11", QK_KB_11},
+ {"QK_KB_12", QK_KB_12},
+ {"QK_KB_13", QK_KB_13},
+ {"QK_KB_14", QK_KB_14},
+ {"QK_KB_15", QK_KB_15}
 };