11452150858

Committed 22 Oct 2024 02:32AM CUT coverage: 37.403% (+0.02%) from 37.381%

Build # 11452150858

Build Type

push

github

Committed by

web-flow

Commit Message

camera_server: prevent double ack+message (#2430)

It turns out we were sending the ack and message for storage information
as well as capture status twice, once directly in the request handler
callback, and once the MAVSDK user would call the respond function.

We should only call it in the respond function, not in the callback.

Run Details

11105 of 29690 relevant lines covered (37.4%)

255.6 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/mavsdk/plugins/calibration/calibration.cpp

// WARNING: THIS FILE IS AUTOGENERATED! As such, it should not be edited.
// Edits need to be made to the proto files
// (see https://github.com/mavlink/MAVSDK-Proto/blob/master/protos/calibration/calibration.proto)

#include <iomanip>

#include "calibration_impl.h"
#include "plugins/calibration/calibration.h"

namespace mavsdk {

using ProgressData = Calibration::ProgressData;

Calibration::Calibration(System& system) :
    PluginBase(),
    _impl{std::make_unique<CalibrationImpl>(system)}
{}

Calibration::Calibration(std::shared_ptr<System> system) :
    PluginBase(),
    _impl{std::make_unique<CalibrationImpl>(system)}
{}

Calibration::~Calibration() {}

void Calibration::calibrate_gyro_async(const CalibrateGyroCallback& callback)
{
    _impl->calibrate_gyro_async(callback);
}

void Calibration::calibrate_accelerometer_async(const CalibrateAccelerometerCallback& callback)
{
    _impl->calibrate_accelerometer_async(callback);
}

void Calibration::calibrate_magnetometer_async(const CalibrateMagnetometerCallback& callback)
{
    _impl->calibrate_magnetometer_async(callback);
}

void Calibration::calibrate_level_horizon_async(const CalibrateLevelHorizonCallback& callback)
{
    _impl->calibrate_level_horizon_async(callback);
}

void Calibration::calibrate_gimbal_accelerometer_async(
    const CalibrateGimbalAccelerometerCallback& callback)
{
    _impl->calibrate_gimbal_accelerometer_async(callback);
}

Calibration::Result Calibration::cancel() const
{
    return _impl->cancel();
}

std::ostream& operator<<(std::ostream& str, Calibration::Result const& result)
{
    switch (result) {
        case Calibration::Result::Unknown:
            return str << "Unknown";
        case Calibration::Result::Success:
            return str << "Success";
        case Calibration::Result::Next:
            return str << "Next";
        case Calibration::Result::Failed:
            return str << "Failed";
        case Calibration::Result::NoSystem:
            return str << "No System";
        case Calibration::Result::ConnectionError:
            return str << "Connection Error";
        case Calibration::Result::Busy:
            return str << "Busy";
        case Calibration::Result::CommandDenied:
            return str << "Command Denied";
        case Calibration::Result::Timeout:
            return str << "Timeout";
        case Calibration::Result::Cancelled:
            return str << "Cancelled";
        case Calibration::Result::FailedArmed:
            return str << "Failed Armed";
        case Calibration::Result::Unsupported:
            return str << "Unsupported";
        default:
            return str << "Unknown";
    }
}

bool operator==(const Calibration::ProgressData& lhs, const Calibration::ProgressData& rhs)
{
    return (rhs.has_progress == lhs.has_progress) &&
           ((std::isnan(rhs.progress) && std::isnan(lhs.progress)) ||
            rhs.progress == lhs.progress) &&
           (rhs.has_status_text == lhs.has_status_text) && (rhs.status_text == lhs.status_text);
}

std::ostream& operator<<(std::ostream& str, Calibration::ProgressData const& progress_data)
{
    str << std::setprecision(15);
    str << "progress_data:" << '\n' << "{\n";
    str << "    has_progress: " << progress_data.has_progress << '\n';
    str << "    progress: " << progress_data.progress << '\n';
    str << "    has_status_text: " << progress_data.has_status_text << '\n';
    str << "    status_text: " << progress_data.status_text << '\n';
    str << '}';
    return str;
}

} // namespace mavsdk

1	// WARNING: THIS FILE IS AUTOGENERATED! As such, it should not be edited.
2	// Edits need to be made to the proto files
3	// (see https://github.com/mavlink/MAVSDK-Proto/blob/master/protos/calibration/calibration.proto)
4
5	#include <iomanip>
6
7	#include "calibration_impl.h"
8	#include "plugins/calibration/calibration.h"
9
10	namespace mavsdk {
11
12	using ProgressData = Calibration::ProgressData;
13
14	Calibration::Calibration(System& system) :	×
15	PluginBase(),
16	_impl{std::make_unique<CalibrationImpl>(system)}	×
17	{}	×
18
19	Calibration::Calibration(std::shared_ptr<System> system) :	×
20	PluginBase(),
21	_impl{std::make_unique<CalibrationImpl>(system)}	×
22	{}	×
23
24	Calibration::~Calibration() {}	×
25
26	void Calibration::calibrate_gyro_async(const CalibrateGyroCallback& callback)	×
27	{
28	_impl->calibrate_gyro_async(callback);	×
29	}	×
30
31	void Calibration::calibrate_accelerometer_async(const CalibrateAccelerometerCallback& callback)	×
32	{
33	_impl->calibrate_accelerometer_async(callback);	×
34	}	×
35
36	void Calibration::calibrate_magnetometer_async(const CalibrateMagnetometerCallback& callback)	×
37	{
38	_impl->calibrate_magnetometer_async(callback);	×
39	}	×
40
41	void Calibration::calibrate_level_horizon_async(const CalibrateLevelHorizonCallback& callback)	×
42	{
43	_impl->calibrate_level_horizon_async(callback);	×
44	}	×
45
46	void Calibration::calibrate_gimbal_accelerometer_async(	×
47	const CalibrateGimbalAccelerometerCallback& callback)
48	{
49	_impl->calibrate_gimbal_accelerometer_async(callback);	×
50	}	×
51
52	Calibration::Result Calibration::cancel() const	×
53	{
54	return _impl->cancel();	×
55	}
56
57	std::ostream& operator<<(std::ostream& str, Calibration::Result const& result)	×
58	{
59	switch (result) {	×
60	case Calibration::Result::Unknown:	×
61	return str << "Unknown";	×
62	case Calibration::Result::Success:	×
63	return str << "Success";	×
64	case Calibration::Result::Next:	×
65	return str << "Next";	×
66	case Calibration::Result::Failed:	×
67	return str << "Failed";	×
68	case Calibration::Result::NoSystem:	×
69	return str << "No System";	×
70	case Calibration::Result::ConnectionError:	×
71	return str << "Connection Error";	×
72	case Calibration::Result::Busy:	×
73	return str << "Busy";	×
74	case Calibration::Result::CommandDenied:	×
75	return str << "Command Denied";	×
76	case Calibration::Result::Timeout:	×
77	return str << "Timeout";	×
78	case Calibration::Result::Cancelled:	×
79	return str << "Cancelled";	×
80	case Calibration::Result::FailedArmed:	×
81	return str << "Failed Armed";	×
82	case Calibration::Result::Unsupported:	×
83	return str << "Unsupported";	×
84	default:	×
85	return str << "Unknown";	×
86	}
87	}
88
89	bool operator==(const Calibration::ProgressData& lhs, const Calibration::ProgressData& rhs)	×
90	{
91	return (rhs.has_progress == lhs.has_progress) &&	×
92	((std::isnan(rhs.progress) && std::isnan(lhs.progress)) \|\|	×
93	rhs.progress == lhs.progress) &&	×
94	(rhs.has_status_text == lhs.has_status_text) && (rhs.status_text == lhs.status_text);	×
95	}
96
97	std::ostream& operator<<(std::ostream& str, Calibration::ProgressData const& progress_data)	×
98	{
99	str << std::setprecision(15);	×
100	str << "progress_data:" << '\n' << "{\n";	×
101	str << " has_progress: " << progress_data.has_progress << '\n';	×
102	str << " progress: " << progress_data.progress << '\n';	×
103	str << " has_status_text: " << progress_data.has_status_text << '\n';	×
104	str << " status_text: " << progress_data.status_text << '\n';	×
105	str << '}';	×
106	return str;	×
107	}
108
109	} // namespace mavsdk

mavlink / MAVSDK / 11452150858

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous