fix #270: Sigfox configure support

mcci-catena · Feb 9, 2021 · fd2fc6b · fd2fc6b
1 parent ccdce72
commit fd2fc6b
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 23 deletions.
diff --git a/src/CatenaBase.h b/src/CatenaBase.h
@@ -47,7 +47,6 @@ Copyright notice:
 
 #include <Arduino_LoRaWAN.h>
 
-#include <MCCI_Sigfox.h>
 #include <Catena_Sigfox_wapper.h>
 
 #if ! (defined(ARDUINO_LORAWAN_VERSION) && ARDUINO_LORAWAN_VERSION >= ARDUINO_LORAWAN_VERSION_CALC(0,6,0,20))

diff --git a/src/CatenaFeatherM0.h b/src/CatenaFeatherM0.h
@@ -24,7 +24,6 @@ Copyright notice:
 
 #include <Arduino_LoRaWAN_network.h>
 
-#include <MCCI_Sigfox.h>
 #include <Catena_Sigfox_wapper.h>
 
 namespace McciCatena {
@@ -126,7 +125,7 @@ class CatenaFeatherM0::Sigfox : public MCCI_Catena_Sigfox,
                                  public cPollableObject
 	{
 public:
-	using Super = MCCI_Sigfox;
+        using Super = MCCI_Catena_Sigfox;
 
 	/*
 	|| the constructor.
@@ -140,7 +139,7 @@ class CatenaFeatherM0::Sigfox : public MCCI_Catena_Sigfox,
 	*/
 	virtual bool begin(CatenaFeatherM0 *pCatena);
 
-	virtual void poll() { sigfox_loop(); };
+        virtual void poll() { this->Super::loop(); };
 
 protected:
 	/*

diff --git a/src/CatenaStm32L0.h b/src/CatenaStm32L0.h
@@ -32,7 +32,6 @@ Copyright notice:
 
 #include <Arduino_LoRaWAN_network.h>
 
-#include <MCCI_Sigfox.h>
 #include <Catena_Sigfox_wapper.h>
 
 namespace McciCatena {
@@ -181,7 +180,7 @@ class CatenaStm32L0::Sigfox : public MCCI_Catena_Sigfox,
         */
         virtual bool begin(CatenaStm32L0 *pCatena);
 
-        virtual void poll() { sigfox_loop(); };
+        virtual void poll() { this->Super::loop(); };
 
 protected:
         /*

diff --git a/src/lib/CatenaBase_GetSigfoxConfiguringInfo.cpp b/src/lib/CatenaBase_GetSigfoxConfiguringInfo.cpp
@@ -143,15 +143,8 @@ CatenaBase::GetSigfoxConfiguringInfo(
 	framDevID.get(pInfo->DevID, sizeof(pInfo->DevID));
 	framPAC.get(pInfo->PAC, sizeof(pInfo->PAC));
 	framKey.get(pInfo->Key, sizeof(pInfo->Key));
-	framRegion.get(pInfo->Region, sizeof(pInfo->Region));
-	framEncryption.get(pInfo->Encryption, sizeof(pInfo->Encryption));
-
-	/* copy the data */
-	/* framSigfoxCredentials.get(pInfo->AppKey, sizeof(pInfo->AppKey));
-	framSigfoxCredentials.get(pInfo->DevEUI, sizeof(pInfo->DevEUI));
-	framSigfoxCredentials.get(pInfo->AppEUI, sizeof(pInfo->AppEUI));
-	framSigfoxCredentials.get(pInfo->DevEUI, sizeof(pInfo->DevEUI));
-	framSigfoxCredentials.get(pInfo->AppEUI, sizeof(pInfo->AppEUI)); */
+	framRegion.get(&pInfo->Region, sizeof(pInfo->Region));
+	framEncryption.get(&pInfo->Encryption, sizeof(pInfo->Encryption));
 
 	return true;
 	}

diff --git a/src/lib/CatenaBase_addSigfoxCommands.cpp b/src/lib/CatenaBase_addSigfoxCommands.cpp
@@ -15,7 +15,6 @@ Copyright notice:
 
 #include "CatenaBase.h"
 
-#include <MCCI_Sigfox.h>
 #include <Catena_Sigfox_wapper.h>
 
 #include "Catena_Log.h"

diff --git a/src/lib/samd/catenawingfram2k/CatenaWingFram2k_Sigfox_begin.cpp b/src/lib/samd/catenawingfram2k/CatenaWingFram2k_Sigfox_begin.cpp
@@ -48,15 +48,14 @@ CatenaWingFram2k::Sigfox::begin(
 	)
 	{
 	gLog.printf(gLog.kTrace, "+CatenaWingFram2k::Sigfox::begin()\n");
-	MCCI_Sigfox m_Sigfox;
 
 	this->m_pCatena = pParent;
 
         /* first set up command processor -- just in case begin() failed */
         pParent->addSigfoxCommands();
 
 	/* call the base begin */
-	if (! m_Sigfox.isReady())
+	if (! this->MCCI_Catena_Sigfox::begin())
 		{
 		gLog.printf(
 			gLog.kError,

diff --git a/src/lib/samd/featherm0/catenafeatherm0_sigfox_begin.cpp b/src/lib/samd/featherm0/catenafeatherm0_sigfox_begin.cpp
@@ -62,12 +62,11 @@ bool CatenaFeatherM0::Sigfox::begin(
 	)
 	{
 	gLog.printf(gLog.kTrace, "+CatenaFeatherM0::Sigfox::begin()\n");
-	MCCI_Sigfox m_Sigfox;
 
 	this->m_pCatena = pParent;
 
 	/* first call the base begin */
-	if (! m_Sigfox.isReady())
+	if (! this->MCCI_Catena_Sigfox::begin())
                 {
                 gLog.printf(
                         gLog.kBug,

diff --git a/src/lib/stm32/stm32l0/CatenaStm32L0_Sigfox_begin.cpp b/src/lib/stm32/stm32l0/CatenaStm32L0_Sigfox_begin.cpp
@@ -61,20 +61,19 @@ bool CatenaStm32L0::Sigfox::begin(
 	)
 	{
 	gLog.printf(gLog.kTrace, "+CatenaStm32L0::Sigfox::begin()\n");
-	MCCI_Sigfox m_Sigfox;
 
 	this->m_pCatena = pParent;
 
         /* first set up command processor -- just in case begin() failed */
         pParent->addSigfoxCommands();
 
 	/* call the base begin */
-	if (! m_Sigfox.isReady())
+	if (! this->MCCI_Catena_Sigfox::begin())
 		{
 		gLog.printf(
 			gLog.kError,
 			"?CatenaStm32L0::Sigfox::begin:"
-			" MCCI_Sigfox:begin failed\n"
+			" MCCI_Catena_Sigfox:begin failed\n"
 			);
 		return false;
 		}