From e21cdecee2ba47831eb46d6b2609a15a76d171a5 Mon Sep 17 00:00:00 2001 From: mikeller Date: Wed, 15 Aug 2018 19:31:42 +1200 Subject: [PATCH] Updated version for 4.0.0. --- .github/pull_request_template.md | 11 ----------- README.md | 3 +-- src/main/build/version.h | 4 ++-- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 5b1aff09d..23f834563 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -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: 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; diff --git a/README.md b/README.md index 71a8f5ee5..a6320e78a 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,7 @@ This fork differs from Baseflight and Cleanflight in that it focuses on flight p | Date | Event | | - | - | -| 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 December 2018 | Start of feature freeze / Release Candidate window for Betaflight 4.0 | | 01 January 2019 | Planned [release](https://github.com/betaflight/betaflight/milestone/20) date for Betaflight 4.0 | ## Features diff --git a/src/main/build/version.h b/src/main/build/version.h index cbddee110..1c748f90e 100644 --- a/src/main/build/version.h +++ b/src/main/build/version.h @@ -23,8 +23,8 @@ #include "common/utils.h" #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 5 // increment when a minor release is made (small new feature, change etc) +#define FC_VERSION_MAJOR 4 // increment when a major release is made (big new feature, 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_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)