Browse Source

ArduSub: move initialisation of serial and gcs to AP_Vehicle

c415-sdk
Peter Barker 5 years ago committed by Andrew Tridgell
parent
commit
e5858555de
  1. 5
      ArduSub/GCS_Sub.cpp
  2. 2
      ArduSub/GCS_Sub.h
  3. 11
      ArduSub/system.cpp

5
ArduSub/GCS_Sub.cpp

@ -2,6 +2,11 @@
#include "Sub.h" #include "Sub.h"
uint8_t GCS_Sub::sysid_this_mav() const
{
return sub.g.sysid_this_mav;
}
void GCS_Sub::update_vehicle_sensor_status_flags() void GCS_Sub::update_vehicle_sensor_status_flags()
{ {
control_sensors_present |= control_sensors_present |=

2
ArduSub/GCS_Sub.h

@ -34,6 +34,8 @@ public:
protected: protected:
uint8_t sysid_this_mav() const override;
// minimum amount of time (in microseconds) that must remain in // minimum amount of time (in microseconds) that must remain in
// the main scheduler loop before we are allowed to send any // the main scheduler loop before we are allowed to send any
// mavlink messages. We want to prioritise the main flight // mavlink messages. We want to prioritise the main flight

11
ArduSub/system.cpp

@ -36,15 +36,6 @@ void Sub::init_ardupilot()
celsius.init(1); celsius.init(1);
#endif #endif
// identify ourselves correctly with the ground station
mavlink_system.sysid = g.sysid_this_mav;
// initialise serial port
serial_manager.init();
// setup first port early to allow BoardConfig to report errors
gcs().setup_console();
// init cargo gripper // init cargo gripper
#if GRIPPER_ENABLED == ENABLED #if GRIPPER_ENABLED == ENABLED
g2.gripper.init(); g2.gripper.init();
@ -62,8 +53,6 @@ void Sub::init_ardupilot()
barometer.init(); barometer.init();
register_scheduler_delay_callback();
// setup telem slots with serial ports // setup telem slots with serial ports
gcs().setup_uarts(); gcs().setup_uarts();

Loading…
Cancel
Save