From 634dc503478ab9fcf14181f76f517b703afe00ad Mon Sep 17 00:00:00 2001 From: LayKuan Loh Date: Thu, 31 Mar 2022 14:14:09 -0700 Subject: [PATCH 1/3] SBP_MSG_UNKNOWN type added --- c/include/libsbp/sbp_msg_type.h | 1 + c/include/libsbp/version.h | 8 ++++---- .../sbpg/targets/resources/c/sbp_msg_type_template.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/c/include/libsbp/sbp_msg_type.h b/c/include/libsbp/sbp_msg_type.h index e593f639f6..2b7b63f87c 100644 --- a/c/include/libsbp/sbp_msg_type.h +++ b/c/include/libsbp/sbp_msg_type.h @@ -256,6 +256,7 @@ typedef enum { SbpMsgVelNed = SBP_MSG_VEL_NED, SbpMsgWheeltick = SBP_MSG_WHEELTICK, SbpMsgAll = SBP_MSG_ALL, + SbpMsgUnknown = SBP_MSG_ALL, } sbp_msg_type_t; #ifdef __cplusplus diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h index 2ddc171b88..5e580af4f4 100644 --- a/c/include/libsbp/version.h +++ b/c/include/libsbp/version.h @@ -21,14 +21,14 @@ * \{ */ /** Protocol major version. */ -#define SBP_MAJOR_VERSION 4 +#define SBP_MAJOR_VERSION 3 /** Protocol minor version. */ -#define SBP_MINOR_VERSION 1 +#define SBP_MINOR_VERSION 4 /** Protocol patch version. */ -#define SBP_PATCH_VERSION 5 +#define SBP_PATCH_VERSION 10 /** Full SBP version string. */ -#define SBP_VERSION "4.1.6-alpha" +#define SBP_VERSION "3.4.11-alpha" /** \} */ diff --git a/generator/sbpg/targets/resources/c/sbp_msg_type_template.h b/generator/sbpg/targets/resources/c/sbp_msg_type_template.h index cc9b75490f..41d679d7c4 100644 --- a/generator/sbpg/targets/resources/c/sbp_msg_type_template.h +++ b/generator/sbpg/targets/resources/c/sbp_msg_type_template.h @@ -34,6 +34,7 @@ typedef enum { (((m.v4_msg_type))) = (((m.legacy_msg_type))), ((*- endfor *)) SbpMsgAll = SBP_MSG_ALL, + SbpMsgUnknown = SBP_MSG_ALL, } sbp_msg_type_t; #ifdef __cplusplus From fa01acfd0abc7096eed7231c69b29b1a5a1a6c96 Mon Sep 17 00:00:00 2001 From: LayKuan Loh Date: Thu, 31 Mar 2022 14:36:46 -0700 Subject: [PATCH 2/3] Update version after tag pull --- c/include/libsbp/version.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/c/include/libsbp/version.h b/c/include/libsbp/version.h index 5e580af4f4..2ddc171b88 100644 --- a/c/include/libsbp/version.h +++ b/c/include/libsbp/version.h @@ -21,14 +21,14 @@ * \{ */ /** Protocol major version. */ -#define SBP_MAJOR_VERSION 3 +#define SBP_MAJOR_VERSION 4 /** Protocol minor version. */ -#define SBP_MINOR_VERSION 4 +#define SBP_MINOR_VERSION 1 /** Protocol patch version. */ -#define SBP_PATCH_VERSION 10 +#define SBP_PATCH_VERSION 5 /** Full SBP version string. */ -#define SBP_VERSION "3.4.11-alpha" +#define SBP_VERSION "4.1.6-alpha" /** \} */ From 9193e04bc874422477112bbee5883887206d9db0 Mon Sep 17 00:00:00 2001 From: LayKuan Loh Date: Thu, 31 Mar 2022 14:39:01 -0700 Subject: [PATCH 3/3] Update readme --- README.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e75ea7ad1e..09a306b0d5 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,17 @@ but works on all platforms that Python itself supports. ## Building / installing +Before you start, run +``` +git pull --tags +``` +in you local libsbp repository to pull the tags. This will ensure the correct +version number is generated. + ### Using Docker Before you begin, make sure you have [Docker](https://docs.docker.com/docker-for-mac/install/) installed. -Start [Docker desktop](https://docs.docker.com/docker-for-mac/). +Start [Docker desktop](https://docs.docker.com/docker-for-mac/). #### Fetching the prebuilt image from DockerHub