rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6304 from mikeller/update_versions_after_3_4_0 

Updated versions after 3.4.0 release.
This commit is contained in:
Michael Keller 2018-07-09 02:24:53 +12:00 committed by GitHub
parent cce8a59be4 8d63e2698f
commit 76e049d248
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.github/pull_request_template.md vendored
View File

@ -1,14 +1,3 @@
## Important: Feature freeze / release candidate phase for Betaflight 3.4
From 01/06/2018 until the release of Betaflight 3.4.0 (scheduled for 01/07/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.4 release;
3. All other pull requests will be scheduled for 3.5, and discussed / reviewed / merged into `master` after 3.4.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 to 3.4.
## 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;

4
README.md
View File

@ -11,7 +11,9 @@ This fork differs from Baseflight and Cleanflight in that it focuses on flight p
| Date | Event |
| - | - |
| 01 July 2018 | Planned [release](https://github.com/betaflight/betaflight/milestone/7) date for Betaflight 3.4 |
| 22 July 2018 | Start of feature freeze / Release Candidate window for Betaflight 3.5 |
| 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 |
## Features

2
src/main/build/version.h
View File

@ -24,7 +24,7 @@
#define FC_FIRMWARE_NAME "Betaflight"
#define FC_VERSION_MAJOR 3 // increment when a major release is made (big new feature, etc)
#define FC_VERSION_MINOR 4 // increment when a minor release is made (small new feature, change etc)
#define FC_VERSION_MINOR 5 // 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)

2
src/main/interface/msp_protocol.h
View File

@ -62,7 +62,7 @@
#define MSP_PROTOCOL_VERSION 0
#define API_VERSION_MAJOR 1 // increment when major changes are made
#define API_VERSION_MINOR 39 // 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 40 // 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