Merge pull request #200 from mcci-catena/issue199

Fix #199: Add wrapper for the config headers
mcci-catena · Nov 29, 2018 · 23e6d5e · 23e6d5e
2 parents c208277 + dc9fd37
commit 23e6d5e
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ The [MCCI arduino-lorawan](https://github.com/mcci-catena/arduino-lorawan) libra
 This library requires Arduino IDE version 1.6.6 or above, since it
 requires C99 mode to be enabled by default.
 
-[![GitHub release](https://img.shields.io/github/release/mcci-catena/arduino-lmic.svg)](https://github.com/mcci-catena/arduino-lmic/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/mcci-catena/arduino-lmic/latest.svg)](https://github.com/mcci-catena/arduino-lmic/compare/v2.3.0...master) [![Build Status](https://travis-ci.com/mcci-catena/arduino-lmic.svg?branch=master)](https://travis-ci.com/mcci-catena/arduino-lmic)
+[![GitHub release](https://img.shields.io/github/release/mcci-catena/arduino-lmic.svg)](https://github.com/mcci-catena/arduino-lmic/releases/latest) [![GitHub commits](https://img.shields.io/github/commits-since/mcci-catena/arduino-lmic/latest.svg)](https://github.com/mcci-catena/arduino-lmic/compare/v2.3.1...master) [![Build Status](https://travis-ci.com/mcci-catena/arduino-lmic.svg?branch=master)](https://travis-ci.com/mcci-catena/arduino-lmic)
 
 **Contents:**
 
@@ -1009,6 +1009,8 @@ function uflt122f(rawUflt12)
 
 ## Release History
 
+- v2.3.1 is a patch release. It adds `<arduino_lmic_user_configuration.h>`, which loads the pre-proceesor LMIC configuration variables into scope (issue [#199](https://github.com/mcci-catena/arduino-lmic/issues/199)).
+
 - v2.3.0 introduces two important changes.
 
     1. The pinmap is extended with an additional field `pConfig`, pointing to a C++ class instance. This instance, if provided, has extra methods for dealing with TCXO control and other fine details of operating the radio. It also gives a natural way for us to extend the behavior of the HAL.

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=MCCI LoRaWAN LMIC library
-version=2.3.0
+version=2.3.1
 author=IBM, Matthis Kooijman, Terry Moore, ChaeHee Won, Frank Rose
 maintainer=Terry Moore <tmm@mcci.com>
 sentence=Arduino port of the LMIC (LoraWAN-MAC-in-C) framework provided by IBM.

diff --git a/src/arduino_lmic_user_configuration.h b/src/arduino_lmic_user_configuration.h
@@ -0,0 +1,30 @@
+/*
+
+Module:  arduino_lmic_user_configuration.h
+
+Function:
+        Get the Arduino-LMIC configuration into scope
+
+Copyright & License:
+        See accompanying LICENSE file.
+
+Author:
+        Terry Moore, MCCI       November 2018
+
+*/
+#pragma once
+
+#ifndef _arduino_lmic_user_configuration_h_
+# define _arduino_lmic_user_configuration_h_
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
+# include "lmic/lmic_config_preconditions.h"
+
+# ifdef __cplusplus
+}
+# endif
+
+#endif /* _arduino_lmic_user_configuration_h_ */
diff --git a/src/lmic/lmic.h b/src/lmic/lmic.h
@@ -105,7 +105,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, 3, 0, 0)	/* v2.3.0 */
+#define	ARDUINO_LMIC_VERSION	ARDUINO_LMIC_VERSION_CALC(2, 3, 1, 0)	/* v2.3.1 */
 
 #define	ARDUINO_LMIC_VERSION_GET_MAJOR(v)	\
 	(((v) >> 24u) & 0xFFu)