Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_SITL: use SocketAPM_native

This commit is contained in:
Andrew Tridgell 2023-12-26 13:21:11 +11:00
parent 931bae5b88
commit 69df468b88
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_HAL_SITL/CAN_Multicast.h
View File

@ -18,7 +18,7 @@ public:
} }
private: private:
SocketAPM sock{true}; SocketAPM_native sock{true};
}; };
#endif // HAL_NUM_CAN_IFACES #endif // HAL_NUM_CAN_IFACES

2
libraries/AP_HAL_SITL/SITL_Periph_State.cpp
View File

@ -17,7 +17,7 @@
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <SITL/SIM_JSBSim.h> #include <SITL/SIM_JSBSim.h>
#include <AP_HAL/utility/Socket.h> #include <AP_HAL/utility/Socket_native.h>
#include <AP_HAL/utility/getopt_cpp.h> #include <AP_HAL/utility/getopt_cpp.h>
#include <SITL/SITL.h> #include <SITL/SITL.h>

6
libraries/AP_HAL_SITL/SITL_Periph_State.h
View File

@ -22,7 +22,7 @@
#include <AP_InertialSensor/AP_InertialSensor.h> #include <AP_InertialSensor/AP_InertialSensor.h>
#include <AP_Compass/AP_Compass.h> #include <AP_Compass/AP_Compass.h>
#include <AP_Terrain/AP_Terrain.h> #include <AP_Terrain/AP_Terrain.h>
#include <AP_HAL/utility/Socket.h> #include <AP_HAL/utility/Socket_native.h>
class SimMCast : public SITL::Aircraft { class SimMCast : public SITL::Aircraft {
public: public:
@ -30,8 +30,8 @@ public:
void update(const struct sitl_input &input) override; void update(const struct sitl_input &input) override;
private: private:
SocketAPM sock{true}; SocketAPM_native sock{true};
SocketAPM servo_sock{true}; SocketAPM_native servo_sock{true};
// offset between multicast timestamp and local timestamp // offset between multicast timestamp and local timestamp
uint64_t base_time_us; uint64_t base_time_us;

2
libraries/AP_HAL_SITL/SITL_State.cpp
View File

@ -23,7 +23,7 @@
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <SITL/SIM_JSBSim.h> #include <SITL/SIM_JSBSim.h>
#include <AP_HAL/utility/Socket.h> #include <AP_HAL/utility/Socket_native.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

2
libraries/AP_HAL_SITL/SITL_State.h
View File

@ -85,7 +85,7 @@ private:
Scheduler *_scheduler; Scheduler *_scheduler;
SocketAPM _sitl_rc_in{true}; SocketAPM_native _sitl_rc_in{true};
bool _rc_in_started; bool _rc_in_started;
uint16_t _rcin_port; uint16_t _rcin_port;
uint16_t _fg_view_port; uint16_t _fg_view_port;

2
libraries/AP_HAL_SITL/SITL_State_common.cpp
View File

@ -18,7 +18,7 @@
#include <AP_Param/AP_Param.h> #include <AP_Param/AP_Param.h>
#include <SITL/SIM_JSBSim.h> #include <SITL/SIM_JSBSim.h>
#include <AP_HAL/utility/Socket.h> #include <AP_HAL/utility/Socket_native.h>
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;

4
libraries/AP_HAL_SITL/SITL_State_common.h
View File

@ -8,6 +8,7 @@
#define SITL_MCAST_PORT 20721 #define SITL_MCAST_PORT 20721
#define SITL_SERVO_PORT 20722 #define SITL_SERVO_PORT 20722
#include <AP_HAL/utility/Socket_native.h>
#include <SITL/SIM_Gimbal.h> #include <SITL/SIM_Gimbal.h>
#include <SITL/SIM_ADSB.h> #include <SITL/SIM_ADSB.h>
#include <SITL/SIM_ADSB_Sagetech_MXS.h> #include <SITL/SIM_ADSB_Sagetech_MXS.h>
@ -64,7 +65,6 @@
#include <AP_Terrain/AP_Terrain.h> #include <AP_Terrain/AP_Terrain.h>
#include <SITL/SITL.h> #include <SITL/SITL.h>
#include <SITL/SITL_Input.h> #include <SITL/SITL_Input.h>
#include <AP_HAL/utility/Socket.h>
class HAL_SITL; class HAL_SITL;
@ -220,7 +220,7 @@ public:
SITL::EFI_Hirth *efi_hirth; SITL::EFI_Hirth *efi_hirth;
// output socket for flightgear viewing // output socket for flightgear viewing
SocketAPM fg_socket{true}; SocketAPM_native fg_socket{true};
const char *defaults_path = HAL_PARAM_DEFAULTS_PATH; const char *defaults_path = HAL_PARAM_DEFAULTS_PATH;

2
libraries/AP_HAL_SITL/UARTDriver.h
View File

@ -6,7 +6,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdarg.h> #include <stdarg.h>
#include "AP_HAL_SITL_Namespace.h" #include "AP_HAL_SITL_Namespace.h"
#include <AP_HAL/utility/Socket.h> #include <AP_HAL/utility/Socket_native.h>
#include <AP_HAL/utility/RingBuffer.h> #include <AP_HAL/utility/RingBuffer.h>
#include <AP_CSVReader/AP_CSVReader.h> #include <AP_CSVReader/AP_CSVReader.h>