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/arm_authorizer_server/arm_authorizer_server.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/arm_authorizer_server/arm_authorizer_server.proto)

#include <iomanip>

#include "arm_authorizer_server_impl.h"
#include "plugins/arm_authorizer_server/arm_authorizer_server.h"

namespace mavsdk {

ArmAuthorizerServer::ArmAuthorizerServer(std::shared_ptr<ServerComponent> server_component) :
    ServerPluginBase(),
    _impl{std::make_unique<ArmAuthorizerServerImpl>(server_component)}
{}

ArmAuthorizerServer::~ArmAuthorizerServer() {}

ArmAuthorizerServer::ArmAuthorizationHandle
ArmAuthorizerServer::subscribe_arm_authorization(const ArmAuthorizationCallback& callback)
{
    return _impl->subscribe_arm_authorization(callback);
}

void ArmAuthorizerServer::unsubscribe_arm_authorization(ArmAuthorizationHandle handle)
{
    _impl->unsubscribe_arm_authorization(handle);
}

ArmAuthorizerServer::Result
ArmAuthorizerServer::accept_arm_authorization(int32_t valid_time_s) const
{
    return _impl->accept_arm_authorization(valid_time_s);
}

ArmAuthorizerServer::Result ArmAuthorizerServer::reject_arm_authorization(
    bool temporarily, RejectionReason reason, int32_t extra_info) const
{
    return _impl->reject_arm_authorization(temporarily, reason, extra_info);
}

std::ostream& operator<<(std::ostream& str, ArmAuthorizerServer::Result const& result)
{
    switch (result) {
        case ArmAuthorizerServer::Result::Unknown:
            return str << "Unknown";
        case ArmAuthorizerServer::Result::Success:
            return str << "Success";
        case ArmAuthorizerServer::Result::Failed:
            return str << "Failed";
        default:
            return str << "Unknown";
    }
}

std::ostream&
operator<<(std::ostream& str, ArmAuthorizerServer::RejectionReason const& rejection_reason)
{
    switch (rejection_reason) {
        case ArmAuthorizerServer::RejectionReason::Generic:
            return str << "Generic";
        case ArmAuthorizerServer::RejectionReason::None:
            return str << "None";
        case ArmAuthorizerServer::RejectionReason::InvalidWaypoint:
            return str << "Invalid Waypoint";
        case ArmAuthorizerServer::RejectionReason::Timeout:
            return str << "Timeout";
        case ArmAuthorizerServer::RejectionReason::AirspaceInUse:
            return str << "Airspace In Use";
        case ArmAuthorizerServer::RejectionReason::BadWeather:
            return str << "Bad Weather";
        default:
            return str << "Unknown";
    }
}

} // 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
4	// https://github.com/mavlink/MAVSDK-Proto/blob/master/protos/arm_authorizer_server/arm_authorizer_server.proto)
5
6	#include <iomanip>
7
8	#include "arm_authorizer_server_impl.h"
9	#include "plugins/arm_authorizer_server/arm_authorizer_server.h"
10
11	namespace mavsdk {
12
13	ArmAuthorizerServer::ArmAuthorizerServer(std::shared_ptr<ServerComponent> server_component) :	×
14	ServerPluginBase(),
15	_impl{std::make_unique<ArmAuthorizerServerImpl>(server_component)}	×
16	{}	×
17
18	ArmAuthorizerServer::~ArmAuthorizerServer() {}	×
19
20	ArmAuthorizerServer::ArmAuthorizationHandle
21	ArmAuthorizerServer::subscribe_arm_authorization(const ArmAuthorizationCallback& callback)	×
22	{
23	return _impl->subscribe_arm_authorization(callback);	×
24	}
25
26	void ArmAuthorizerServer::unsubscribe_arm_authorization(ArmAuthorizationHandle handle)	×
27	{
28	_impl->unsubscribe_arm_authorization(handle);	×
29	}	×
30
31	ArmAuthorizerServer::Result
32	ArmAuthorizerServer::accept_arm_authorization(int32_t valid_time_s) const	×
33	{
34	return _impl->accept_arm_authorization(valid_time_s);	×
35	}
36
37	ArmAuthorizerServer::Result ArmAuthorizerServer::reject_arm_authorization(	×
38	bool temporarily, RejectionReason reason, int32_t extra_info) const
39	{
40	return _impl->reject_arm_authorization(temporarily, reason, extra_info);	×
41	}
42
43	std::ostream& operator<<(std::ostream& str, ArmAuthorizerServer::Result const& result)	×
44	{
45	switch (result) {	×
46	case ArmAuthorizerServer::Result::Unknown:	×
47	return str << "Unknown";	×
48	case ArmAuthorizerServer::Result::Success:	×
49	return str << "Success";	×
50	case ArmAuthorizerServer::Result::Failed:	×
51	return str << "Failed";	×
52	default:	×
53	return str << "Unknown";	×
54	}
55	}
56
57	std::ostream&
58	operator<<(std::ostream& str, ArmAuthorizerServer::RejectionReason const& rejection_reason)	×
59	{
60	switch (rejection_reason) {	×
61	case ArmAuthorizerServer::RejectionReason::Generic:	×
62	return str << "Generic";	×
63	case ArmAuthorizerServer::RejectionReason::None:	×
64	return str << "None";	×
65	case ArmAuthorizerServer::RejectionReason::InvalidWaypoint:	×
66	return str << "Invalid Waypoint";	×
67	case ArmAuthorizerServer::RejectionReason::Timeout:	×
68	return str << "Timeout";	×
69	case ArmAuthorizerServer::RejectionReason::AirspaceInUse:	×
70	return str << "Airspace In Use";	×
71	case ArmAuthorizerServer::RejectionReason::BadWeather:	×
72	return str << "Bad Weather";	×
73	default:	×
74	return str << "Unknown";	×
75	}
76	}
77
78	} // 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