summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjonavin <71780717+Jonavin@users.noreply.github.com>2022-09-18 18:57:37 -0400
committerGitHub <noreply@github.com>2022-09-18 18:57:37 -0400
commitc6ff10a2577e0dcee1c8dc1ec25c84c3355d9986 (patch)
treee0d9f51813bc5c16e3f2eb4195744ca73e199ddd
parentc56dc9c0bbe8ba1449e39923e3de2f562707eb40 (diff)
FIx ARRAYSIZE def and Murphpad string array (#18392)
Co-authored-by: Jonavin <=>
-rw-r--r--keyboards/mechwild/murphpad/keymaps/jonavin/keymap.c2
-rw-r--r--users/jonavin/jonavin.h2
2 files changed, 3 insertions, 1 deletions
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 <http://www.gnu.org/licenses/>.
#pragma once
// DEFINE MACROS
+#ifndef ARRAYSIZE
#define ARRAYSIZE(arr) sizeof(arr)/sizeof(arr[0])
+#endif // !ARRAYSIZE
// LAYERS