AP_Menu: use ARRAY_SIZE macro

10 years ago · fdc6a75124
1 changed files with 2 additions and 2 deletions
--- a/libraries/AP_Menu/AP_Menu.h
+++ b/libraries/AP_Menu/AP_Menu.h
@ -168,10 +168,10 @@ private:
				@@ -168,10 +168,10 @@ private:
 ///
 #define MENU(name, prompt, commands)                                                    \
    static const char __menu_name__ ## name[] PROGMEM = prompt;      \
-    static Menu name(__menu_name__ ## name, commands, sizeof(commands) / sizeof(commands[0]))
+    static Menu name(__menu_name__ ## name, commands, ARRAY_SIZE(commands))

 #define MENU2(name, prompt, commands, preprompt)                                \
    static const char __menu_name__ ## name[] PROGMEM = prompt;      \
-    static Menu name(__menu_name__ ## name, commands, sizeof(commands) / sizeof(commands[0]), preprompt)
+    static Menu name(__menu_name__ ## name, commands, ARRAY_SIZE(commands), preprompt)

 #endif // __AP_COMMON_MENU_H__