From 229170247305eb28e1553ee338f225b44ec6f704 Mon Sep 17 00:00:00 2001 From: Michael du Breuil Date: Wed, 8 Jan 2020 15:10:18 -0700 Subject: [PATCH] AP_Scripting: Raise SITL default heap size --- libraries/AP_Scripting/AP_Scripting.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/libraries/AP_Scripting/AP_Scripting.cpp b/libraries/AP_Scripting/AP_Scripting.cpp index 991425d00f..4af6e8a662 100644 --- a/libraries/AP_Scripting/AP_Scripting.cpp +++ b/libraries/AP_Scripting/AP_Scripting.cpp @@ -32,6 +32,14 @@ #define SCRIPTING_STACK_MAX_SIZE (64 * 1024) #endif // !defined(SCRIPTING_STACK_MAX_SIZE) +#if !defined(SCRIPTING_HEAP_SIZE) + #if CONFIG_HAL_BOARD == HAL_BOARD_SITL || CONFIG_HAL_BOARD == HAL_BOARD_LINUX + #define SCRIPTING_HEAP_SIZE (64 * 1024) + #else + #define SCRIPTING_HEAP_SIZE (43 * 1024) + #endif +#endif // !defined(SCRIPTING_HEAP_SIZE) + static_assert(SCRIPTING_STACK_SIZE >= SCRIPTING_STACK_MIN_SIZE, "Scripting requires a larger minimum stack size"); static_assert(SCRIPTING_STACK_SIZE <= SCRIPTING_STACK_MAX_SIZE, "Scripting requires a smaller stack size"); @@ -61,7 +69,7 @@ const AP_Param::GroupInfo AP_Scripting::var_info[] = { // @Increment: 1024 // @User: Advanced // @RebootRequired: True - AP_GROUPINFO("HEAP_SIZE", 3, AP_Scripting, _script_heap_size, 43*1024), + AP_GROUPINFO("HEAP_SIZE", 3, AP_Scripting, _script_heap_size, SCRIPTING_HEAP_SIZE), AP_GROUPINFO("DEBUG_LVL", 4, AP_Scripting, _debug_level, 1),