x

peterbarker · peterbarker · commit cb7ce5275bc0 · 2026-03-09T10:51:52.000+11:00
diff --git a/libraries/AP_IBUS2/AP_IBUS2.h b/libraries/AP_IBUS2/AP_IBUS2.h
@@ -29,11 +29,7 @@
 
 #pragma once
 
-#include <AP_HAL/AP_HAL_Boards.h>
-
-#ifndef AP_IBUS2_ENABLED
-#define AP_IBUS2_ENABLED (HAL_PROGRAM_SIZE_LIMIT_KB > 2048)
-#endif
+#include "AP_IBUS2_config.h"
 
 #if AP_IBUS2_ENABLED
 
diff --git a/libraries/AP_IBUS2_Master/AP_IBUS2_Master.h b/libraries/AP_IBUS2_Master/AP_IBUS2_Master.h
@@ -33,14 +33,11 @@
 
 #pragma once
 
-#include <AP_IBUS2/AP_IBUS2.h>
-
-#ifndef AP_IBUS2_MASTER_ENABLED
-#define AP_IBUS2_MASTER_ENABLED AP_IBUS2_ENABLED
-#endif
+#include <AP_IBUS2/AP_IBUS2_config.h>
 
 #if AP_IBUS2_MASTER_ENABLED
 
+#include <AP_IBUS2/AP_IBUS2.h>
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_SerialManager/AP_SerialManager.h>
diff --git a/libraries/AP_IBUS2_Slave/AP_IBUS2_Slave.h b/libraries/AP_IBUS2_Slave/AP_IBUS2_Slave.h
@@ -35,14 +35,11 @@
 
 #pragma once
 
-#include <AP_IBUS2/AP_IBUS2.h>
-
-#ifndef AP_IBUS2_SLAVE_ENABLED
-#define AP_IBUS2_SLAVE_ENABLED AP_IBUS2_ENABLED
-#endif
+#include <AP_IBUS2/AP_IBUS2_config.h>
 
 #if AP_IBUS2_SLAVE_ENABLED
 
+#include <AP_IBUS2/AP_IBUS2.h>
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_SerialManager/AP_SerialManager.h>
diff --git a/modules/mavlink b/modules/mavlink
@@ -1 +1 @@
-Subproject commit 375f640979b0c8e0e5764a38467bf6da09f41142
+Subproject commit 064c44c7d1b7706149d84d21f83ecf6397a527b2
