AP_Scripting: correct compilation when AP_SCRIPTING_SERIALDEVICE_ENABLED false

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

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>
 

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

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