Set version back to 2.1.5 internally so we can merge

unddef · Jun 10, 2018 · 1569158 · 1569158
1 parent 777a061
commit 1569158
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/examples/header_test/header_test.ino b/examples/header_test/header_test.ino
@@ -18,7 +18,7 @@ Author:
 # define STATIC_ASSERT(e)	\
  void  STATIC_ASSERT__(int MCCIADK_C_ASSERT_x[(e) ? 1: -1])
 
-STATIC_ASSERT(ARDUINO_LMIC_VERSION >= ARDUINO_LMIC_VERSION_CALC(2,2,0,0));
+STATIC_ASSERT(ARDUINO_LMIC_VERSION >= ARDUINO_LMIC_VERSION_CALC(2,1,5,0));
 
 STATIC_ASSERT(ARDUINO_LMIC_VERSION_CALC(1,2,3,4) == 0x01020304);
 

diff --git a/src/lmic/lmic.h b/src/lmic/lmic.h
@@ -102,7 +102,7 @@ extern "C"{
 #define ARDUINO_LMIC_VERSION_CALC(major, minor, patch, local)	\
 	(((major) << 24u) | ((minor) << 16u) | ((patch) << 8u) | (local))
 
-#define	ARDUINO_LMIC_VERSION	ARDUINO_LMIC_VERSION_CALC(2, 2, 0, 0)
+#define	ARDUINO_LMIC_VERSION	ARDUINO_LMIC_VERSION_CALC(2, 1, 5, 0)
 
 #define	ARDUINO_LMIC_VERSION_GET_MAJOR(v)	\
 	(((v) >> 24u) & 0xFFu)