From 3194fa1385bdc6f07024fc1fbd8d4ea651bc5a92 Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Fri, 9 Aug 2024 14:59:56 +1000
Subject: [PATCH] AP_Scripting: correct compilation when
 AP_SCRIPTING_SERIALDEVICE_ENABLED false

---
 libraries/AP_Scripting/AP_Scripting.h                | 6 ++----
 libraries/AP_Scripting/AP_Scripting_SerialDevice.cpp | 3 ++-
 libraries/AP_Scripting/AP_Scripting_SerialDevice.h   | 6 ++++++
 libraries/AP_Scripting/AP_Scripting_config.h         | 5 +++++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/libraries/AP_Scripting/AP_Scripting.h b/libraries/AP_Scripting/AP_Scripting.h
index e10680477b..367354227d 100644
--- a/libraries/AP_Scripting/AP_Scripting.h
+++ b/libraries/AP_Scripting/AP_Scripting.h
@@ -14,6 +14,8 @@
  */
 #pragma once
 
+#include "AP_Scripting/AP_Scripting_config.h"
+
 #if AP_SCRIPTING_ENABLED
 
 #include <GCS_MAVLink/GCS_config.h>
@@ -39,10 +41,6 @@
 class SocketAPM;
 #endif
 
-#ifndef AP_SCRIPTING_SERIALDEVICE_ENABLED
-#define AP_SCRIPTING_SERIALDEVICE_ENABLED AP_SERIALMANAGER_REGISTER_ENABLED && (BOARD_FLASH_SIZE>1024)
-#endif
-
 #if AP_SCRIPTING_SERIALDEVICE_ENABLED
 #include "AP_Scripting_SerialDevice.h"
 #endif
diff --git a/libraries/AP_Scripting/AP_Scripting_SerialDevice.cpp b/libraries/AP_Scripting/AP_Scripting_SerialDevice.cpp
index 39412246d5..7f7f13fb64 100644
--- a/libraries/AP_Scripting/AP_Scripting_SerialDevice.cpp
+++ b/libraries/AP_Scripting/AP_Scripting_SerialDevice.cpp
@@ -3,10 +3,11 @@
  */
 
 #include "AP_Scripting_config.h"
-#include "AP_Scripting.h"
 
 #if AP_SCRIPTING_ENABLED && AP_SCRIPTING_SERIALDEVICE_ENABLED
 
+#include "AP_Scripting.h"
+
 #include <AP_Math/AP_Math.h>
 #include <AP_BoardConfig/AP_BoardConfig.h>
 
diff --git a/libraries/AP_Scripting/AP_Scripting_SerialDevice.h b/libraries/AP_Scripting/AP_Scripting_SerialDevice.h
index 979405a8b3..86273f1266 100644
--- a/libraries/AP_Scripting/AP_Scripting_SerialDevice.h
+++ b/libraries/AP_Scripting/AP_Scripting_SerialDevice.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "AP_Scripting_config.h"
+
+#if AP_SCRIPTING_SERIALDEVICE_ENABLED
+
 #include <AP_SerialManager/AP_SerialManager.h>
 
 #ifndef AP_SCRIPTING_SERIALDEVICE_NUM_PORTS
@@ -61,3 +65,5 @@ public:
 
     Port ports[AP_SCRIPTING_SERIALDEVICE_NUM_PORTS];
 };
+
+#endif  // AP_SCRIPTING_SERIALDEVICE_ENABLED
diff --git a/libraries/AP_Scripting/AP_Scripting_config.h b/libraries/AP_Scripting/AP_Scripting_config.h
index a58d83062b..77f9dc8d76 100644
--- a/libraries/AP_Scripting/AP_Scripting_config.h
+++ b/libraries/AP_Scripting/AP_Scripting_config.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <AP_HAL/AP_HAL_Boards.h>
+#include <AP_SerialManager/AP_SerialManager_config.h>
 
 #ifndef AP_SCRIPTING_ENABLED
 #define AP_SCRIPTING_ENABLED (BOARD_FLASH_SIZE > 1024)
@@ -12,3 +13,7 @@
         #error "Scripting requires a filesystem"
     #endif
 #endif
+
+#ifndef AP_SCRIPTING_SERIALDEVICE_ENABLED
+#define AP_SCRIPTING_SERIALDEVICE_ENABLED AP_SERIALMANAGER_REGISTER_ENABLED && (BOARD_FLASH_SIZE>1024)
+#endif