From b06828ed23c229d2a1a63eb0ca7a7dd331464ccf Mon Sep 17 00:00:00 2001
From: Gautier Hattenberger <gautier.hattenberger@enac.fr>
Date: Fri, 3 Feb 2023 15:36:13 +0100
Subject: [PATCH] stable release v6.2

---
 CHANGELOG.md                             | 31 ++++++++++++++++++++++++
 doc/sphinx/source/quickstart/install.rst |  2 +-
 paparazzi_version                        |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d002a09ced7..aeb68fbc32f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+Paparazzi v6.2.0_stable
+=======================
+
+Stable version release v6.2.
+The biggest change is the reorganization of the airborne code for AP and FBW.
+FBW is now merged with AP in normal operation (so single thread) and the
+main_ap code is common for all firmwares.
+
+General
+-------
+- Improve documentation for sphinx
+- fix Ivy for mutex (#2835)
+- support for rover with steering wheel (#2845)
+- use new PprzGCS as default
+- use Python PPRZ center as default
+- cleaning outdated confs (#2881)
+- update docker, mavlink, libopencm3, hacl-c, bmp_swd scripts
+- display object from natnet tool (#2958)
+
+Airborne
+--------
+- merge AP/FBW in normal operation (#2828)
+- improve EKF2 support (#2833) (#2835) (#2850) (#2829)
+- small bug fixes
+- support for H7 with ChibiOS (#2859)
+- usb serial for ChibiOS (#2878)
+- multi IMU support (#2890)
+- add new modules: tag_tracking (#2931), QMC5883L mag driver
+- fix PVT message support for UBlox (#2939)
+
+
 Paparazzi v6.1.0_stable
 =====================
 
diff --git a/doc/sphinx/source/quickstart/install.rst b/doc/sphinx/source/quickstart/install.rst
index b6ce2940543..28282ecfc68 100644
--- a/doc/sphinx/source/quickstart/install.rst
+++ b/doc/sphinx/source/quickstart/install.rst
@@ -53,7 +53,7 @@ Clone the repository:
 
 .. code-block:: bash
 
-    git checkout -b v6.1 upstream/v6.1
+    git checkout -b v6.2 upstream/v6.2
 
 Get the submodules and build Paparazzi. This step might take a long time the first time you launch it:
 
diff --git a/paparazzi_version b/paparazzi_version
index a66d1063cdc..a05240f4a55 100755
--- a/paparazzi_version
+++ b/paparazzi_version
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEF_VER=v6.2_unstable
+DEF_VER=v6.2.0_stable
 
 # First try git describe (if running on a git repo),
 # then use default version from above (for release tarballs).