From 7d44a406ee733a1abbab7452abd35ba3e8af6749 Mon Sep 17 00:00:00 2001 From: JP Meijers Date: Tue, 15 Oct 2019 17:11:48 +0200 Subject: [PATCH 1/2] Changes so that library can be included locally from a src/ directory --- examples/ttn-otaa/ttn-otaa.ino | 4 ++-- src/hal/getpinmap_catena4420.cpp | 2 +- src/hal/getpinmap_feather32u4lora.cpp | 2 +- src/hal/getpinmap_featherm0lora.cpp | 2 +- src/hal/getpinmap_thisboard.cpp | 2 +- src/hal/getpinmap_ttgo_lora32_v1.cpp | 2 +- src/hal/hal.h | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/ttn-otaa/ttn-otaa.ino b/examples/ttn-otaa/ttn-otaa.ino index 69eef295..ac63ff35 100644 --- a/examples/ttn-otaa/ttn-otaa.ino +++ b/examples/ttn-otaa/ttn-otaa.ino @@ -31,8 +31,8 @@ * *******************************************************************************/ -#include -#include +#include "../../src/lmic.h" +#include "../../src/hal/hal.h" #include // diff --git a/src/hal/getpinmap_catena4420.cpp b/src/hal/getpinmap_catena4420.cpp index 9b985864..ed82de31 100644 --- a/src/hal/getpinmap_catena4420.cpp +++ b/src/hal/getpinmap_catena4420.cpp @@ -13,7 +13,7 @@ Copyright & License: */ -#include +#include "../arduino_lmic_hal_boards.h" #include #include "../lmic/oslmic.h" diff --git a/src/hal/getpinmap_feather32u4lora.cpp b/src/hal/getpinmap_feather32u4lora.cpp index 62ef53a5..90094586 100644 --- a/src/hal/getpinmap_feather32u4lora.cpp +++ b/src/hal/getpinmap_feather32u4lora.cpp @@ -13,7 +13,7 @@ Copyright & License: */ -#include +#include "../arduino_lmic_hal_boards.h" #include #include "../lmic/oslmic.h" diff --git a/src/hal/getpinmap_featherm0lora.cpp b/src/hal/getpinmap_featherm0lora.cpp index 2fc31d04..6c764241 100644 --- a/src/hal/getpinmap_featherm0lora.cpp +++ b/src/hal/getpinmap_featherm0lora.cpp @@ -13,7 +13,7 @@ Copyright & License: */ -#include +#include "../arduino_lmic_hal_boards.h" #include #include "../lmic/oslmic.h" diff --git a/src/hal/getpinmap_thisboard.cpp b/src/hal/getpinmap_thisboard.cpp index b975b08e..8d708500 100644 --- a/src/hal/getpinmap_thisboard.cpp +++ b/src/hal/getpinmap_thisboard.cpp @@ -13,7 +13,7 @@ Copyright & License: */ -#include +#include "../arduino_lmic_hal_boards.h" namespace Arduino_LMIC { diff --git a/src/hal/getpinmap_ttgo_lora32_v1.cpp b/src/hal/getpinmap_ttgo_lora32_v1.cpp index 7a05e7b8..214a88fd 100644 --- a/src/hal/getpinmap_ttgo_lora32_v1.cpp +++ b/src/hal/getpinmap_ttgo_lora32_v1.cpp @@ -13,7 +13,7 @@ Copyright & License: */ -#include +#include "../arduino_lmic_hal_boards.h" #include #include "../lmic/oslmic.h" diff --git a/src/hal/hal.h b/src/hal/hal.h index f831c1ec..9d62dc1b 100644 --- a/src/hal/hal.h +++ b/src/hal/hal.h @@ -12,7 +12,7 @@ #ifndef _hal_hal_h_ #define _hal_hal_h_ -#include "arduino_lmic_hal_configuration.h" +#include "../arduino_lmic_hal_configuration.h" // for compatbility reasons, we need to disclose the configuration // structure as global type lmic_pinmap. From e8ca9be65c32eba262ff24db1fb8fc4f2a74e95a Mon Sep 17 00:00:00 2001 From: JP Meijers Date: Sat, 26 Oct 2019 17:34:33 +0200 Subject: [PATCH 2/2] Revert unintended change to example --- examples/ttn-otaa/ttn-otaa.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/ttn-otaa/ttn-otaa.ino b/examples/ttn-otaa/ttn-otaa.ino index ac63ff35..69eef295 100644 --- a/examples/ttn-otaa/ttn-otaa.ino +++ b/examples/ttn-otaa/ttn-otaa.ino @@ -31,8 +31,8 @@ * *******************************************************************************/ -#include "../../src/lmic.h" -#include "../../src/hal/hal.h" +#include +#include #include //