Global: all vehicles get AP_Relay and AP_ServoRelayEvent libraries

8 years ago · 7042d3e9c9
10 changed files with 4 additions and 17 deletions
--- a/APMrover2/make.inc
+++ b/APMrover2/make.inc
@ -22,8 +22,6 @@ LIBRARIES += Butter
				@@ -22,8 +22,6 @@ LIBRARIES += Butter
 LIBRARIES += AP_Buffer
 LIBRARIES += ModeFilter
 LIBRARIES += AverageFilter
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Camera
 LIBRARIES += GCS_MAVLink
--- a/APMrover2/wscript
+++ b/APMrover2/wscript
@ -16,8 +16,6 @@ def build(bld):
				@@ -16,8 +16,6 @@ def build(bld):
            'AP_Navigation',
            'AP_RCMapper',
            'AP_RSSI',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
            'PID',
            'AP_Stats',
            'AP_Beacon',
--- a/ArduCopter/make.inc
+++ b/ArduCopter/make.inc
@ -32,8 +32,6 @@ LIBRARIES += AP_OpticalFlow
				@@ -32,8 +32,6 @@ LIBRARIES += AP_OpticalFlow
 LIBRARIES += AP_RSSI
 LIBRARIES += Filter
 LIBRARIES += AP_Buffer
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Vehicle
--- a/ArduCopter/wscript
+++ b/ArduCopter/wscript
@ -24,8 +24,6 @@ def build(bld):
				@@ -24,8 +24,6 @@ def build(bld):
            'AP_Motors',
            'AP_Parachute',
            'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
            'AP_Avoidance',
            'AP_AdvancedFailsafe',
            'AP_Proximity',
--- a/ArduPlane/make.inc
+++ b/ArduPlane/make.inc
@ -13,7 +13,6 @@ LIBRARIES += RC_Channel
				@@ -13,7 +13,6 @@ LIBRARIES += RC_Channel
 LIBRARIES += AP_RangeFinder
 LIBRARIES += Filter
 LIBRARIES += AP_Buffer
-LIBRARIES += AP_Relay
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Terrain
 LIBRARIES += AP_AdvancedFailsafe
@ -40,7 +39,6 @@ LIBRARIES += AP_BattMonitor
				@@ -40,7 +39,6 @@ LIBRARIES += AP_BattMonitor
 LIBRARIES += AP_Arming
 LIBRARIES += AP_BoardConfig
 LIBRARIES += AP_Frsky_Telem
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Rally
 LIBRARIES += AP_OpticalFlow
 LIBRARIES += AP_RSSI
--- a/ArduPlane/wscript
+++ b/ArduPlane/wscript
@ -18,8 +18,6 @@ def build(bld):
				@@ -18,8 +18,6 @@ def build(bld):
            'AP_Navigation',
            'AP_Parachute',
            'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
            'AP_SpdHgtControl',
            'AP_TECS',
            'AP_InertialNav',
--- a/ArduSub/make.inc
+++ b/ArduSub/make.inc
@ -26,8 +26,6 @@ LIBRARIES += AP_Motors
				@@ -26,8 +26,6 @@ LIBRARIES += AP_Motors
 LIBRARIES += AP_RangeFinder
 LIBRARIES += AP_OpticalFlow
 LIBRARIES += Filter
-LIBRARIES += AP_Relay
-LIBRARIES += AP_ServoRelayEvents
 LIBRARIES += AP_Camera
 LIBRARIES += AP_Mount
 LIBRARIES += AP_Vehicle
--- a/ArduSub/wscript
+++ b/ArduSub/wscript
@ -18,8 +18,6 @@ def build(bld):
				@@ -18,8 +18,6 @@ def build(bld):
            'AP_LeakDetector',
            'AP_Motors',
            'AP_RCMapper',
-            'AP_Relay',
-            'AP_ServoRelayEvents',
            'AP_Proximity',
            'AP_Gripper',
            'AP_Beacon',
--- a/Tools/ardupilotwaf/ardupilotwaf.py
+++ b/Tools/ardupilotwaf/ardupilotwaf.py
@ -60,6 +60,8 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
				@@ -60,6 +60,8 @@ COMMON_VEHICLE_DEPENDENT_LIBRARIES = [
    'AP_ICEngine',
    'AP_Frsky_Telem',
    'AP_FlashStorage',
+    'AP_Relay',
+    'AP_ServoRelayEvents',
 ]

 def get_legacy_defines(sketch_name):
--- a/mk/make.inc
+++ b/mk/make.inc
@ -7,4 +7,5 @@ LIBRARIES += SRV_Channel
				@@ -7,4 +7,5 @@ LIBRARIES += SRV_Channel
 LIBRARIES += AP_UAVCAN
 LIBRARIES += AP_ADC
 LIBRARIES += AP_Airspeed
-
+LIBRARIES += AP_Relay
+LIBRARIES += AP_ServoRelayEvents