Merge pull request #453 from denniszollo/v2.2.0-branch

V2.2.0 branch
swift-nav · Mar 24, 2017 · 847cc7b · 847cc7b
2 parents d827a7d + 73f91a9
commit 847cc7b
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,24 @@
 # Change Log
 
-## [v2.1.8](https://github.com/swift-nav/libsbp/tree/v2.1.8)
+## [2.2.0](https://github.com/swift-nav/libsbp/tree/v2.2.0)
 
+[Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.8...v2.2.0)
+
+**Merged pull requests:**
+
+- Utc msg fixes [\#452](https://github.com/swift-nav/libsbp/pull/452)
+- Update README to specify explicit Haskell Stack resolver [\#451](https://github.com/swift-nav/libsbp/pull/451)
+- python: pyserial driver.  Add hdw flow control to API [\#450](https://github.com/swift-nav/libsbp/pull/450)
+- Jdiamond/network status [\#449](https://github.com/swift-nav/libsbp/pull/449)
+- Increase timeouts for connections and reads [\#443](https://github.com/swift-nav/libsbp/pull/443)
+- python forwarder: add context [\#433](https://github.com/swift-nav/libsbp/pull/433)
+
+## [v2.1.8](https://github.com/swift-nav/libsbp/tree/v2.1.8) (2017-03-11)
 [Full Changelog](https://github.com/swift-nav/libsbp/compare/v2.1.7...v2.1.8)
 
 **Merged pull requests:**
 
+- V2.1.8 branch [\#448](https://github.com/swift-nav/libsbp/pull/448)
 - Split sbp\_process\(\) into two functions.  [\#444](https://github.com/swift-nav/libsbp/pull/444)
 - Add MsgAlmanacGps and MsgAlmanacGlo [\#441](https://github.com/swift-nav/libsbp/pull/441)
 - Pdf publish version fix [\#440](https://github.com/swift-nav/libsbp/pull/440)

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@ For a detailed index of changes, please see the
 
 Contents
 --------
+ * [v2.2.0](#v2.2.0)
  * [v2.1.8](#v2.1.8)
  * [v2.1.7](#v2.1.7)
  * [v2.1.6](#v2.1.6)
@@ -19,6 +20,16 @@ Contents
  * [v0.39](#v0.39)
  * [v0.33](#v0.33)
 
+v2.2.0 <a name="v2.2.0">
+--------------------------
+* Add Network Status Msg
+* Redefine Nanoseconds field of UTC time message as U32 rather than S32
+* Redefine Seconds field of UTC message as the floor of the current seconds in minute
+* Rename ns field that was a residual to ns_residual
+* Add RTCS/CTS option to python serial driver
+* Increase Network Driver timeouts for connection and reads
+* Add context manager to python client forwarder
+
 v2.1.8 <a name="v2.1.8">
 --------------------------
 * Add MSG_ALMANAC_GPS (0x70)

diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h
@@ -23,7 +23,7 @@
 /** Protocol major version. */
 #define SBP_MAJOR_VERSION 2
 /** Protocol minor version. */
-#define SBP_MINOR_VERSION 1
+#define SBP_MINOR_VERSION 2
 
 /** \} */
 

diff --git a/docs/sbp.pdf b/docs/sbp.pdf
diff --git a/haskell/sbp.cabal b/haskell/sbp.cabal
@@ -1,5 +1,5 @@
 name:                  sbp
-version:               2.1.8
+version:               2.2.0
 synopsis:              SwiftNav's SBP Library
 homepage:              https://github.com/swift-nav/libsbp
 license:               LGPL-3

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "libsbp",
-  "version": "2.1.8",
+  "version": "2.2.0",
   "description": "libsbp bindings for JavaScript. More information here: http://swift-nav.github.io/libsbp/",
   "files": [
     "javascript/*",