Merge pull request #301 from mcci-catena/issue300

Fix #300: fix SAMD build issues with latest release
mcci-catena · Jun 30, 2021 · dcac894 · dcac894
2 parents 315a775 + e9aac16
commit dcac894
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git 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
@@ -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)

diff --git 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;

diff --git 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 <cstdarg>
 #include <Catena_BootloaderApi.h>
 #include <Catena_Flash.h>
@@ -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
@@ -21,6 +21,8 @@ Copyright and License:
 
 #include "Catena_Download.h"
 
+#ifdef ARDUINO_STM32
+
 #include <Catena_BootloaderApi.h>
 #include <Catena_Flash.h>
 #include <Catena_Log.h>
@@ -590,3 +592,5 @@ cDownload::evStartSerialDownload(
     // launch the request.
     return evStart(request);
     }
+
+#endif ARDUINO_STM32