源代码管理
分支模型
PX4 项目使用三分支 Git 模型:
- main is by default unstable and sees rapid development.
- beta has been thoroughly tested. 它是供飞行测试人员使用的。
- stable points to the last release.
We try to retain a linear history through rebases and avoid the Github flow. 然而,由于全球团队和快速的发展,我们可能有时会进行合并。
To contribute new functionality, sign up for Github, then fork the repository, create a new branch, add your changes as commits, and finally send a pull request. Changes will be merged when they pass our continuous integration tests.
All code contributions have to be under the permissive BSD 3-clause license and all code must not impose any further constraints on the use.
Code Style
PX4 uses the Google C++ style guide, with the following (minimal) modifications:
INFO
Not all PX4 source code matches the style guide, but any new code that you write should do so — in both new and existing files. If you update an existing file you are not required to make the whole file comply with the style guide, just the code you've modified.
Tabs
- Tabs are used for indentation (equivalent to 8 spaces).
- Spaces are used for alignment.
Line Length
- Maximum line length is 120 characters.
File Extensions
- Source files use extension
*.cpp
instead of*.cc
.
Function and Method Names
lowerCamelCase()
is used for functions and methods to visually distinguish them fromClassConstructors()
andClassNames
.
Private Class Member Variable Names
_underscore_prefixed_snake_case
is used for private class member variable names, as oppose tounderscore_postfixed_
.
Class Privacy Keywords
- zero spaces before
public:
,private:
, orprotected:
keywords.
Example Code Snippet
cpp
class MyClass {
public:
/**
* @brief Description of what this function does.
*
* @param[in] input_param Clear description of the input [units]
* @return Whatever we are returning [units]
*/
float doSomething(const float input_param) const {
const float in_scope_variable = input_param + kConstantFloat;
return in_scope_variable * _private_member_variable;
}
void setPrivateMember(const float private_member_variable) { _private_member_variable = private_member_variable; }
/**
* @return Whatever we are "getting" [units]
*/
float getPrivateMember() const { return _private_member_variable; }
private:
// Clear description of the constant if not completely obvious from the name [units]
static constexpr float kConstantFloat = ...;
// Clear description of the variable if not completely obvious from the name [units]
float _private_member_variable{...};
};
提交和提交消息
PX4 developers are encouraged to create appropriate in-source documentation.
INFO
Source-code documentation standards are not enforced, and the code is currently inconsistently documented. We'd like to do better!
Currently we have two types of source-based documentation:
PRINT_MODULE_*
methods are used for both module run time usage instructions and for the Modules & Commands Reference in this guide.- The API is documented in the source code here.
- Good examples of usage include the Application/Module Template and the files linked from the modules reference.
We encourage other in-source documentation where it adds value/is not redundant.
TIP
Developers should name C++ entities (classes, functions, variables etc.) such that their purpose can be inferred - reducing the need for explicit documentation.
:::
- Do not add documentation that can trivially be inferred from C++ entity names.
- ALWAYS specify units of variables, constants, and input/return parameters where they are defined.
- Commonly you may want to add information about corner cases and error handling.
- Doxgyen tags should be used if documentation is needed:
@class
,@file
,@param
,@return
,@brief
,@var
,@see
,@note
. A good example of usage is src/modules/events/send_event.h.
Please avoid "magic numbers", for example, where does this number in the conditional come from? What about the multiplier on yaw stick input?
cpp
if (fabsf(yaw_stick_normalized_input) < 0.1f) {
yaw_rate_setpoint = 0.0f;
}
else {
yaw_rate_setpoint = 0.52f * yaw_stick_normalized_input;
}
Instead, define the numbers as named constants with appropriate context in the header:
cpp
// Deadzone threshold for normalized yaw stick input
static constexpr float kYawStickDeadzone = 0.1f;
// [rad/s] Deadzone threshold for normalized yaw stick input
static constexpr float kMaxYawRate = math::radians(30.0f);
and update the source implementation.
cpp
if (fabsf(yaw_stick_normalized_input) < kYawStickDeadzone) {
yaw_rate_setpoint = 0.0f;
}
else {
yaw_rate_setpoint = kMaxYawRate * yaw_stick_normalized_input;
}
Commits and Commit Messages
Use descriptive, multi-paragraph commit messages for all non-trivial changes. Structure them well so they make sense in the one-line summary but also provide full detail.
plain
Component: Explain the change in one sentence. Fixes #1234
Prepend the software component to the start of the summary
line, either by the module name or a description of it.
(e.g. "mc_att_ctrl" or "multicopter attitude controller").
If the issue number is appended as <Fixes #1234>, Github
will automatically close the issue when the commit is
merged to the master branch.
The body of the message can contain several paragraphs.
Describe in detail what you changed. Link issues and flight
logs either related to this fix or to the testing results
of this commit.
Describe the change and why you changed it, avoid to
paraphrase the code change (Good: "Adds an additional
safety check for vehicles with low quality GPS reception".
Bad: "Add gps_reception_check() function").
Reported-by: Name <email@px4.io>
Use git commit -s
to sign off on all of your commits. This will add signed-off-by:
with your name and email as the last line.
This commit guide is based on best practices for the Linux Kernel and other projects maintained by Linus Torvalds.
Pull Requests
Github Pull Requests (PRs) are the primary mechanism used to submit new functionality and bug fixes to PX4.
They include the new set of commits in your branch (relative the main branch), and a description of the changes.
The description should include:
- An overview of what the changes deliver; enough to understand the broad purpose of the code
- Links to related issues or supporting information.
- Information about what testing of the PR functionality has been done, with links to flight logs.
- Where possible, the results from general Test Flights both before and after the change.