global: use static method to construct AP_ServoRelayEvents

This commit is contained in:
Lucas De Marchi 2017-08-29 11:26:28 -07:00 committed by Francisco Ferreira
parent df29015533
commit cc53e7bc4b
7 changed files with 4 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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