mirror of
https://github.com/betaflight/betaflight.git
synced 2025-07-17 13:25:30 +03:00
Updated version for 4.0.0.
This commit is contained in:
parent
1d710afd70
commit
e21cdecee2
3 changed files with 3 additions and 15 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 3.5
|
|
||||||
|
|
||||||
From 22/07/2018 until the release of Betaflight 3.5.0 (scheduled for 05/08/2018), 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 3.5 release;
|
|
||||||
|
|
||||||
3. All other pull requests will be scheduled for 4.0, and discussed / reviewed / merged into `master` after 3.5.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 3.5.
|
|
||||||
|
|
||||||
|
|
||||||
## Important considerations when opening a pull request:
|
## Important considerations when opening a pull request:
|
||||||
|
|
||||||
1. Pull requests will only be accepted if they are opened against the `master` branch. Pull requests opened against other branches without prior consent from the maintainers will be closed;
|
1. Pull requests will only be accepted if they are opened against the `master` branch. Pull requests opened against other branches without prior consent from the maintainers will be closed;
|
||||||
|
|
|
@ -8,8 +8,7 @@ This fork differs from Baseflight and Cleanflight in that it focuses on flight p
|
||||||
|
|
||||||
| Date | Event |
|
| Date | Event |
|
||||||
| - | - |
|
| - | - |
|
||||||
| 22 July 2018 | Start of feature freeze / Release Candidate window for Betaflight 3.5 |
|
| 01 December 2018 | Start of feature freeze / Release Candidate window for Betaflight 4.0 |
|
||||||
| 05 August 2018 | Planned [release](https://github.com/betaflight/betaflight/milestone/21) date for Betaflight 3.5 |
|
|
||||||
| 01 January 2019 | Planned [release](https://github.com/betaflight/betaflight/milestone/20) date for Betaflight 4.0 |
|
| 01 January 2019 | Planned [release](https://github.com/betaflight/betaflight/milestone/20) date for Betaflight 4.0 |
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
|
@ -23,8 +23,8 @@
|
||||||
#include "common/utils.h"
|
#include "common/utils.h"
|
||||||
|
|
||||||
#define FC_FIRMWARE_NAME "Betaflight"
|
#define FC_FIRMWARE_NAME "Betaflight"
|
||||||
#define FC_VERSION_MAJOR 3 // increment when a major release is made (big new feature, etc)
|
#define FC_VERSION_MAJOR 4 // increment when a major release is made (big new feature, etc)
|
||||||
#define FC_VERSION_MINOR 5 // increment when a minor release is made (small new feature, change etc)
|
#define FC_VERSION_MINOR 0 // 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_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)
|
#define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue