From 5cbc65b670ac84cc4c46a6992ed16deb172702be Mon Sep 17 00:00:00 2001
From: Colin Hogben <colin@infinnovation.co.uk>
Date: Thu, 20 Oct 2016 22:04:20 +0100
Subject: [PATCH 1/2] Add mbed-os version macros

Allow compile-time tests on the version of mbed-os to cope with
e.g. API changes across versions.
---
 mbed.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/mbed.h b/mbed.h
index baabacb2584..3a42cb5d62b 100644
--- a/mbed.h
+++ b/mbed.h
@@ -18,6 +18,14 @@
 
 #define MBED_LIBRARY_VERSION 128
 
+#define MBED_MAJOR_VERSION 5
+#define MBED_MINOR_VERSION 2
+#define MBED_PATCH_VERSION 0
+
+#define MBED_ENCODE_VERSION(major,minor,patch) ((major)*10000 + (minor)*100 + (patch))
+
+#define MBED_VERSION MBED_ENCODE_VERSION(MBED_MAJOR_VERSION,MBED_MINOR_VERSION,MBED_PATCH_VERSION)
+
 #if MBED_CONF_RTOS_PRESENT
 #include "rtos/rtos.h"
 #endif

From 935d0f82426c44c944a327f8748f5c90c2609e82 Mon Sep 17 00:00:00 2001
From: Martin Kojtal <c0170@rocketmail.com>
Date: Thu, 3 Nov 2016 14:29:39 +0000
Subject: [PATCH 2/2] version macros - define it for mbed OS 5 and mbed OS 2

To distinguish between those 2 versions, we use MBED_CONF_RTOS_PRESENT macro.
Note: mbed OS 2 versioning is 2.0.MBED_LIBRARY_VERSION
---
 mbed.h | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/mbed.h b/mbed.h
index 3a42cb5d62b..43ab4827fcc 100644
--- a/mbed.h
+++ b/mbed.h
@@ -18,13 +18,22 @@
 
 #define MBED_LIBRARY_VERSION 128
 
+#if MBED_CONF_RTOS_PRESENT
+// RTOS present, this is valid only for mbed OS 5
 #define MBED_MAJOR_VERSION 5
 #define MBED_MINOR_VERSION 2
-#define MBED_PATCH_VERSION 0
+#define MBED_PATCH_VERSION 1
+
+#else
+// mbed 2
+#define MBED_MAJOR_VERSION 2
+#define MBED_MINOR_VERSION 0
+#define MBED_PATCH_VERSION MBED_LIBRARY_VERSION
+#endif
 
-#define MBED_ENCODE_VERSION(major,minor,patch) ((major)*10000 + (minor)*100 + (patch))
+#define MBED_ENCODE_VERSION(major, minor, patch) ((major)*10000 + (minor)*100 + (patch))
 
-#define MBED_VERSION MBED_ENCODE_VERSION(MBED_MAJOR_VERSION,MBED_MINOR_VERSION,MBED_PATCH_VERSION)
+#define MBED_VERSION MBED_ENCODE_VERSION(MBED_MAJOR_VERSION, MBED_MINOR_VERSION, MBED_PATCH_VERSION)
 
 #if MBED_CONF_RTOS_PRESENT
 #include "rtos/rtos.h"