diff --git a/APMrover2/Rover.cpp b/APMrover2/Rover.cpp index 779b03158b..743388ff1c 100644 --- a/APMrover2/Rover.cpp +++ b/APMrover2/Rover.cpp @@ -31,7 +31,6 @@ Rover::Rover(void) : modes(&g.mode1), L1_controller(ahrs, nullptr), nav_controller(&L1_controller), - ServoRelayEvents(relay), #if CAMERA == ENABLED camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs), #endif diff --git a/APMrover2/Rover.h b/APMrover2/Rover.h index d3766185b2..3f76ffb54e 100644 --- a/APMrover2/Rover.h +++ b/APMrover2/Rover.h @@ -204,7 +204,7 @@ private: // relay support AP_Relay relay = AP_Relay::create(); - AP_ServoRelayEvents ServoRelayEvents; + AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay); // Camera #if CAMERA == ENABLED diff --git a/ArduCopter/Copter.cpp b/ArduCopter/Copter.cpp index b325830433..ce7e1a3842 100644 --- a/ArduCopter/Copter.cpp +++ b/ArduCopter/Copter.cpp @@ -66,7 +66,6 @@ Copter::Copter(void) mainLoop_count(0), rtl_loiter_start_time(0), auto_trim_counter(0), - ServoRelayEvents(relay), #if CAMERA == ENABLED camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs), #endif diff --git a/ArduCopter/Copter.h b/ArduCopter/Copter.h index 5542e121e0..e03b233481 100644 --- a/ArduCopter/Copter.h +++ b/ArduCopter/Copter.h @@ -539,7 +539,7 @@ private: AP_Relay relay = AP_Relay::create(); // handle repeated servo and relay events - AP_ServoRelayEvents ServoRelayEvents; + AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay); // Reference to the camera object (it uses the relay object inside it) #if CAMERA == ENABLED diff --git a/ArduPlane/Plane.h b/ArduPlane/Plane.h index 5c14b3324c..2d1116537e 100644 --- a/ArduPlane/Plane.h +++ b/ArduPlane/Plane.h @@ -270,7 +270,7 @@ private: AP_Relay relay = AP_Relay::create(); // handle servo and relay events - AP_ServoRelayEvents ServoRelayEvents {relay}; + AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay); // Camera #if CAMERA == ENABLED diff --git a/ArduSub/Sub.cpp b/ArduSub/Sub.cpp index a0c1d16ff0..7cf7d646bd 100644 --- a/ArduSub/Sub.cpp +++ b/ArduSub/Sub.cpp @@ -59,7 +59,6 @@ Sub::Sub(void) pmTest1(0), fast_loopTimer(0), mainLoop_count(0), - ServoRelayEvents(relay), #if CAMERA == ENABLED camera(&relay, MASK_LOG_CAMERA, current_loc, gps, ahrs), #endif diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h index cdf45cc215..549dc2f5d8 100644 --- a/ArduSub/Sub.h +++ b/ArduSub/Sub.h @@ -411,7 +411,7 @@ private: AP_Relay relay = AP_Relay::create(); // handle repeated servo and relay events - AP_ServoRelayEvents ServoRelayEvents; + AP_ServoRelayEvents ServoRelayEvents = AP_ServoRelayEvents::create(relay); // Reference to the camera object (it uses the relay object inside it) #if CAMERA == ENABLED