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

SITL: FlightAxis: add option to silence FPS

This commit is contained in:
Bob Long 2024-10-02 19:24:26 +10:00 committed by Peter Barker
parent 49bbb2c923
commit 61593e2b36
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/SITL/SIM_FlightAxis.cpp
View File

@ -43,6 +43,7 @@ const AP_Param::GroupInfo FlightAxis::var_info[] = {
// @Bitmask: 0: Reset position on startup // @Bitmask: 0: Reset position on startup
// @Bitmask: 1: Swap first 4 and last 4 servos (for quadplane testing) // @Bitmask: 1: Swap first 4 and last 4 servos (for quadplane testing)
// @Bitmask: 2: Demix heli servos and send roll/pitch/collective/yaw // @Bitmask: 2: Demix heli servos and send roll/pitch/collective/yaw
// @Bitmask: 3: Don't print frame rate stats
// @User: Advanced // @User: Advanced
AP_GROUPINFO("OPTS", 1, FlightAxis, _options, uint32_t(Option::ResetPosition)), AP_GROUPINFO("OPTS", 1, FlightAxis, _options, uint32_t(Option::ResetPosition)),
AP_GROUPEND AP_GROUPEND
@ -603,8 +604,10 @@ void FlightAxis::report_FPS(void)
uint64_t frames = socket_frame_counter - last_socket_frame_counter; uint64_t frames = socket_frame_counter - last_socket_frame_counter;
last_socket_frame_counter = socket_frame_counter; last_socket_frame_counter = socket_frame_counter;
double dt = state.m_currentPhysicsTime_SEC - last_frame_count_s; double dt = state.m_currentPhysicsTime_SEC - last_frame_count_s;
printf("%.2f/%.2f FPS avg=%.2f glitches=%u\n", if(!option_is_set(Option::SilenceFPS)) {
frames / dt, 1000 / dt, 1.0/average_frame_time_s, unsigned(glitch_count)); printf("%.2f/%.2f FPS avg=%.2f glitches=%u\n",
frames / dt, 1000 / dt, 1.0/average_frame_time_s, unsigned(glitch_count));
}
} else { } else {
printf("Initial position %f %f %f\n", position.x, position.y, position.z); printf("Initial position %f %f %f\n", position.x, position.y, position.z);
} }

1
libraries/SITL/SIM_FlightAxis.h
View File

@ -180,6 +180,7 @@ private:
ResetPosition = (1U<<0), ResetPosition = (1U<<0),
Rev4Servos = (1U<<1), Rev4Servos = (1U<<1),
HeliDemix = (1U<<2), HeliDemix = (1U<<2),
SilenceFPS = (1U<<3),
}; };
// return true if an option is set // return true if an option is set