From 7fe5c72a4545273d86e7cf77d8e4b9008ea0be13 Mon Sep 17 00:00:00 2001 From: dhineshkumarmcci Date: Tue, 22 Jun 2021 02:11:28 +0530 Subject: [PATCH 1/4] Fix #300: remove unused `virtual void NetSaveSessionState()` --- src/CatenaWingFram2k.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CatenaWingFram2k.h b/src/CatenaWingFram2k.h index eeac8c1..b677287 100644 --- a/src/CatenaWingFram2k.h +++ b/src/CatenaWingFram2k.h @@ -144,9 +144,9 @@ class CatenaWingFram2k::LoRaWAN : public Arduino_LoRaWAN_network, const uint8_t *pExtraInfo, size_t nExtraInfo ) override; - virtual void NetSaveSessionState( + /* virtual void NetSaveSessionState( const SessionState &State - ); + ); */ virtual void NetSaveSessionState( Arduino_LoRaWAN::SessionState const &State ) override; From 696738343c2fbfa176428edd417b2adba444ab76 Mon Sep 17 00:00:00 2001 From: dhineshkumarmcci Date: Tue, 22 Jun 2021 03:21:24 +0530 Subject: [PATCH 2/4] Fix #300: use STM32 architecture for Catena Download --- src/Catena_Download.h | 4 ++++ src/lib/Catena_Download.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/Catena_Download.h b/src/Catena_Download.h index b7d49d5..e393657 100644 --- a/src/Catena_Download.h +++ b/src/Catena_Download.h @@ -24,6 +24,8 @@ Copyright and License: #ifndef _catena_download_h_ #define _catena_download_h_ +#ifdef ARDUINO_STM32 + #include #include #include @@ -284,4 +286,6 @@ class cDownload : public cPollableObject } // McciCatena +#endif // ARDUINO_STM32 + #endif // _catena_download_h_ diff --git a/src/lib/Catena_Download.cpp b/src/lib/Catena_Download.cpp index 347719a..ecfc3ce 100644 --- a/src/lib/Catena_Download.cpp +++ b/src/lib/Catena_Download.cpp @@ -21,6 +21,8 @@ Copyright and License: #include "Catena_Download.h" +#ifdef ARDUINO_STM32 + #include #include #include @@ -590,3 +592,5 @@ cDownload::evStartSerialDownload( // launch the request. return evStart(request); } + +#endif ARDUINO_STM32 From 3a501ab79a6ccc8d887ab9086a00c28edfa58e88 Mon Sep 17 00:00:00 2001 From: dhineshkumarmcci Date: Tue, 22 Jun 2021 03:35:58 +0530 Subject: [PATCH 3/4] This is v0.21.1-1 --- README.md | 4 ++++ src/CatenaBase.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 36d11c5..3126706 100644 --- a/README.md +++ b/README.md @@ -1446,6 +1446,10 @@ This sketch demonstrates the use of the Catena FSM class to implement the `Turns ## Release History +- HEAD includes the following changes. + + - fix [#300](https://github.com/mcci-catena/Catena-Arduino-Platform/issues/300): fix build issues for SAMD21 boards. (version 0.21.1-1) + - v0.21.0 includes the following changes. - fix [#286](https://github.com/mcci-catena/Catena-Arduino-Platform/issues/286): support enhanced state save/restore for Arduino LoRaWAN library. Requires Arduino LoRaWAN v0.9.0-1 or later. diff --git a/src/CatenaBase.h b/src/CatenaBase.h index 9f9cdab..ead01b3 100644 --- a/src/CatenaBase.h +++ b/src/CatenaBase.h @@ -57,7 +57,7 @@ Copyright notice: (((major) << 24u) | ((minor) << 16u) | ((patch) << 8u) | (local)) #define CATENA_ARDUINO_PLATFORM_VERSION \ - CATENA_ARDUINO_PLATFORM_VERSION_CALC(0, 21, 0, 0) /* v0.21.0 */ + CATENA_ARDUINO_PLATFORM_VERSION_CALC(0, 21, 1, 1) /* v0.21.1-1 */ #define CATENA_ARDUINO_PLATFORM_VERSION_GET_MAJOR(v) \ (((v) >> 24u) & 0xFFu) From e9aac162450d75346a75be4f6e5dee85895e7243 Mon Sep 17 00:00:00 2001 From: dhineshkumarmcci Date: Tue, 22 Jun 2021 03:39:26 +0530 Subject: [PATCH 4/4] Fix #300: remove unused virtual void NetSaveSessionState() --- src/CatenaWingFram2k.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/CatenaWingFram2k.h b/src/CatenaWingFram2k.h index b677287..c559b6a 100644 --- a/src/CatenaWingFram2k.h +++ b/src/CatenaWingFram2k.h @@ -144,9 +144,6 @@ class CatenaWingFram2k::LoRaWAN : public Arduino_LoRaWAN_network, const uint8_t *pExtraInfo, size_t nExtraInfo ) override; - /* virtual void NetSaveSessionState( - const SessionState &State - ); */ virtual void NetSaveSessionState( Arduino_LoRaWAN::SessionState const &State ) override;