fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-14 16:23:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

CAN cfger - using consistent return types

Browse Source
This commit is contained in:
Pavel Kirienko
2015-12-27 19:42:38 +03:00
parent 288478fa4a
commit 1447674bfa
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan/include/uavcan/transport/can_acceptance_filter_configurator.hpp
+4 -2
View File
@@ -120,14 +120,16 @@ public:
/**
* Add an additional filter configuration.
* This method must not be invoked after @ref computeConfiguration().
* @return 0 = success, negative for error.
*/
int16_t addFilterConfig(const CanFilterConfig& config);
int addFilterConfig(const CanFilterConfig& config);
/**
* This method loads the configuration computed with mergeConfigurations() or explicitly added by addFilterConfig()
* to the CAN driver. Must be called after computeConfiguration() and addFilterConfig().
* @return 0 = success, negative for error.
*/
int16_t applyConfiguration();
int applyConfiguration();
/**
* Returns the configuration computed with mergeConfigurations() or added by addFilterConfig().
libuavcan/src/transport/uc_can_acceptance_filter_configurator.cpp
+2 -2
View File
@@ -102,7 +102,7 @@ int16_t CanAcceptanceFilterConfigurator::mergeConfigurations()
return 0;
}
int16_t CanAcceptanceFilterConfigurator::applyConfiguration(void)
int CanAcceptanceFilterConfigurator::applyConfiguration(void)
{
CanFilterConfig filter_conf_array[MaxCanAcceptanceFilters];
unsigned int filter_array_size = multiset_configs_.getSize();
@@ -224,7 +224,7 @@ uint16_t CanAcceptanceFilterConfigurator::getNumFilters() const
}
}
int16_t CanAcceptanceFilterConfigurator::addFilterConfig(const CanFilterConfig& config)
int CanAcceptanceFilterConfigurator::addFilterConfig(const CanFilterConfig& config)
{
if (multiset_configs_.emplace<const CanFilterConfig&>(config) == NULL)
{