From c6ff10a2577e0dcee1c8dc1ec25c84c3355d9986 Mon Sep 17 00:00:00 2001 From: jonavin <71780717+Jonavin@users.noreply.github.com> Date: Sun, 18 Sep 2022 18:57:37 -0400 Subject: [PATCH] FIx ARRAYSIZE def and Murphpad string array (#18392) Co-authored-by: Jonavin <=> --- keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c | 2 +- users/jonavin/jonavin.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c index b0288c5d7a..88c017cbff 100644 --- a/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c @@ -175,7 +175,7 @@ static const keycodedescType PROGMEM keyselection[] = { {"Break", KC_PAUS}, {"C-A-D", KC_CAD}, // Ctrl-Alt-Del {"AltF4", KC_AF4}, - {"QK_BOOT", QK_BOOT}, // firmware flash mode + {"RESET", QK_BOOT}, // firmware flash mode }; #define MAX_KEYSELECTION sizeof(keyselection)/sizeof(keyselection[0]) diff --git a/users/jonavin/jonavin.h b/users/jonavin/jonavin.h index ab2ce0dff2..3ebd3fe9f2 100644 --- a/users/jonavin/jonavin.h +++ b/users/jonavin/jonavin.h @@ -18,7 +18,9 @@ along with this program. If not, see . #pragma once // DEFINE MACROS +#ifndef ARRAYSIZE #define ARRAYSIZE(arr) sizeof(arr)/sizeof(arr[0]) +#endif // !ARRAYSIZE // LAYERS