Browse Source

global: use static method to construct AP_ServoRelayEvents

master
Lucas De Marchi 8 years ago committed by Francisco Ferreira
parent
commit
cc53e7bc4b
  1. 1
      APMrover2/Rover.cpp
  2. 2
      APMrover2/Rover.h
  3. 1
      ArduCopter/Copter.cpp
  4. 2
      ArduCopter/Copter.h
  5. 2
      ArduPlane/Plane.h
  6. 1
      ArduSub/Sub.cpp
  7. 2
      ArduSub/Sub.h

1
APMrover2/Rover.cpp

@ -31,7 +31,6 @@ Rover::Rover(void) : @@ -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

2
APMrover2/Rover.h

@ -204,7 +204,7 @@ private: @@ -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

1
ArduCopter/Copter.cpp

@ -66,7 +66,6 @@ Copter::Copter(void) @@ -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

2
ArduCopter/Copter.h

@ -539,7 +539,7 @@ private: @@ -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

2
ArduPlane/Plane.h

@ -270,7 +270,7 @@ private: @@ -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

1
ArduSub/Sub.cpp

@ -59,7 +59,6 @@ Sub::Sub(void) @@ -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

2
ArduSub/Sub.h

@ -411,7 +411,7 @@ private: @@ -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

Loading…
Cancel
Save