Skip to content

Commit 23e6d5e

Browse files
authored
Merge pull request #200 from mcci-catena/issue199
Fix #199: Add wrapper for the config headers
2 parents c208277 + dc9fd37 commit 23e6d5e

File tree

4 files changed

+35
-3
lines changed

4 files changed

+35
-3
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ The [MCCI arduino-lorawan](https://github.com/mcci-catena/arduino-lorawan) libra
1515
This library requires Arduino IDE version 1.6.6 or above, since it
1616
requires C99 mode to be enabled by default.
1717

18-
[![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)
18+
[![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)
1919

2020
**Contents:**
2121

@@ -1009,6 +1009,8 @@ function uflt122f(rawUflt12)
10091009

10101010
## Release History
10111011

1012+
- 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)).
1013+
10121014
- v2.3.0 introduces two important changes.
10131015

10141016
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.

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=MCCI LoRaWAN LMIC library
2-
version=2.3.0
2+
version=2.3.1
33
author=IBM, Matthis Kooijman, Terry Moore, ChaeHee Won, Frank Rose
44
maintainer=Terry Moore <[email protected]>
55
sentence=Arduino port of the LMIC (LoraWAN-MAC-in-C) framework provided by IBM.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
/*
2+
3+
Module: arduino_lmic_user_configuration.h
4+
5+
Function:
6+
Get the Arduino-LMIC configuration into scope
7+
8+
Copyright & License:
9+
See accompanying LICENSE file.
10+
11+
Author:
12+
Terry Moore, MCCI November 2018
13+
14+
*/
15+
#pragma once
16+
17+
#ifndef _arduino_lmic_user_configuration_h_
18+
# define _arduino_lmic_user_configuration_h_
19+
20+
# ifdef __cplusplus
21+
extern "C" {
22+
# endif
23+
24+
# include "lmic/lmic_config_preconditions.h"
25+
26+
# ifdef __cplusplus
27+
}
28+
# endif
29+
30+
#endif /* _arduino_lmic_user_configuration_h_ */

src/lmic/lmic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ extern "C"{
105105
#define ARDUINO_LMIC_VERSION_CALC(major, minor, patch, local) \
106106
(((major) << 24u) | ((minor) << 16u) | ((patch) << 8u) | (local))
107107

108-
#define ARDUINO_LMIC_VERSION ARDUINO_LMIC_VERSION_CALC(2, 3, 0, 0) /* v2.3.0 */
108+
#define ARDUINO_LMIC_VERSION ARDUINO_LMIC_VERSION_CALC(2, 3, 1, 0) /* v2.3.1 */
109109

110110
#define ARDUINO_LMIC_VERSION_GET_MAJOR(v) \
111111
(((v) >> 24u) & 0xFFu)

0 commit comments

Comments
 (0)