mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-13 03:20:00 +03:00
Incremented release version to 4.3.0. Also incremented MSP version to 1.43 and removed release timeline from README.
This commit is contained in:
parent
8f2d21460a
commit
d1ead96d18
4 changed files with 2 additions and 16 deletions
11
.github/pull_request_template.md
vendored
11
.github/pull_request_template.md
vendored
|
@ -1,14 +1,3 @@
|
|||
## Important: Feature freeze / release candidate phase for Betaflight 4.2
|
||||
|
||||
From 25 March 2020 until the release of Betaflight 4.2.0 (scheduled for 01 May 2020), the project is in a 'feature freeze / release candidate' phase. This means:
|
||||
|
||||
1. Pull requests can still be submitted as normal. Comments / discussions will probably be slower than normal due to shifted priorities;
|
||||
|
||||
2. If your pull request is a fix for an existing bug, or an update for a single target that has a low risk of side effect for other targets, it will be reviewed, and if accepted merged into `master` for the 4.2 release;
|
||||
|
||||
3. All other pull requests will be scheduled for 4.3, and discussed / reviewed / merged into `master` after 4.2.0 has been released. Please keep in mind that this potentially means that you will have to rebase your changes if they are broken by bugfixes made for 4.2.
|
||||
|
||||
|
||||
## Important considerations when opening a pull request:
|
||||
|
||||
1. Make sure you do not make the changes you want to open a pull request for on the `master` branch of your fork, or open the pull request from the `master` branch of your fork. Some of our integrations will fail if you do this, resulting in your pull request not being accepted. If this is your first pull request, it is probably a good idea to first read up on how opening pull requests work (https://opensource.com/article/19/7/create-pull-request-github is a good introduction);
|
||||
|
|
|
@ -15,9 +15,6 @@ This fork differs from Baseflight and Cleanflight in that it focuses on flight p
|
|||
|
||||
| Date | Event |
|
||||
| - | - |
|
||||
| 25 March 2020 | Deadline for pull request submission into 4.2 |
|
||||
| 1 April 2020 | Start of feature freeze / Release Candidate window for Betaflight 4.2 |
|
||||
| 1 May 2020 | Planned [release](https://github.com/betaflight/betaflight/milestone/38) date for Betaflight 4.2 |
|
||||
|
||||
|
||||
## News
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#define FC_FIRMWARE_NAME "Betaflight"
|
||||
#define FC_FIRMWARE_IDENTIFIER "BTFL"
|
||||
#define FC_VERSION_MAJOR 4 // increment when a major release is made (big new feature, etc)
|
||||
#define FC_VERSION_MINOR 2 // increment when a minor release is made (small new feature, change etc)
|
||||
#define FC_VERSION_MINOR 3 // increment when a minor release is made (small new feature, change etc)
|
||||
#define FC_VERSION_PATCH_LEVEL 0 // increment when a bug is fixed
|
||||
|
||||
#define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
|
||||
|
|
|
@ -62,7 +62,7 @@
|
|||
#define MSP_PROTOCOL_VERSION 0
|
||||
|
||||
#define API_VERSION_MAJOR 1 // increment when major changes are made
|
||||
#define API_VERSION_MINOR 43 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release)
|
||||
#define API_VERSION_MINOR 44 // increment after a release, to set the version for all changes to go into the following release (if no changes to MSP are made between the releases, this can be reverted before the release)
|
||||
|
||||
#define API_VERSION_LENGTH 2
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue