Fix #21: change AppEUI and rejoin

mcci-catena · Jul 1, 2021 · 8f98697 · terrillmoore · Jul 2, 2021 · dhineshkumarmcci
1 parent 70ba2fb
commit 8f98697
Show file tree

Hide file tree

Showing 2 changed files with 68 additions and 0 deletions.
diff --git a/examples/Catena4430_Sensor/Catena4430_cMeasurementLoop.h b/examples/Catena4430_Sensor/Catena4430_cMeasurementLoop.h
@@ -382,6 +382,9 @@ class cMeasurementLoop : public McciCatena::cPollableObject
     bool handleSdFirmwareUpdate();
     bool handleSdFirmwareUpdateCardUp();
     bool updateFromSd(const char *sFile, McciCatena::cDownload::DownloadRq_t rq);
+    bool handleSdTTNv3MigrateCardUp();
+    bool updateFramAppEui();
+    void reJoinNetwork();
     void sdPowerUp(bool fOn);
     void sdPrep();
 

diff --git a/examples/Catena4430_Sensor/Catena4430_cMeasurementLoop_SDcard.cpp b/examples/Catena4430_Sensor/Catena4430_cMeasurementLoop_SDcard.cpp
@@ -19,6 +19,10 @@ Module: Catena4430_cMeasurementLoop_SDcard.cpp
 
 #include <Catena_Download.h>
 
+#include <Catena_Fram.h>
+
+#include <Arduino_LoRaWAN_lmic.h>
+
 #include <SD.h>
 #include <mcciadk_baselib.h>
 
@@ -363,6 +367,20 @@ cMeasurementLoop::handleSdFirmwareUpdate(
     if (fResult)
         {
         fResult = this->handleSdFirmwareUpdateCardUp();
+
+#if ARDUINO_LMIC_CFG_NETWORK_TTN
+        bool fMigrate = this->handleSdTTNv3MigrateCardUp();
 case State::stTryToUpdate: 
     if (this->handleSdFirmwareUpdate()) 
         newState = State::stRebootForUpdate; 
     else 
         newState = State::stSleeping; 
     this->handleSdTTNv3Migrate(); 
     break; 
 case State::stTryToUpdate: 
     if (this->handleSdFirmwareUpdate()) 
         newState = State::stRebootForUpdate; 
     else 
         newState = State::stSleeping; 
     this->handleSdTTNv3Migrate(); 
     break; 
+
+        if (fMigrate)
+            {
+            bool fFramUpdate = this->updateFramAppEui();
+
+            if (fFramUpdate)
+                this->reJoinNetwork();
+            else
+                gLog.printf(gLog.kBug, "cFramStorage::kAppEUI: not updated\n");
+            }
+#endif
         }
     this->sdFinish();
     return fResult;
@@ -571,4 +589,51 @@ cMeasurementLoop::updateFromSd(
         }
     }
 
+bool
+cMeasurementLoop::handleSdTTNv3MigrateCardUp(
+    void
+    )
+    {
+    static const char * const sMigrate[] = { "MIGRATE.V3" };
+    bool result;
+
+    for (auto s : sMigrate)
+        {
+        if (! gSD.exists(s))
+            {
+            if (gLog.isEnabled(gLog.kTrace))
+                gLog.printf(gLog.kAlways, "%s: not found: %s\n", FUNCTION, s);
+
+            result = false;
+            return result;
+            }
+        result = true;
+        return result;
+        }
+    }
+
+bool
+cMeasurementLoop::updateFramAppEui(
+    void
+    )
+    {
+    auto const pFram = gCatena.getFram();
+    uint8_t AppEUI[] = { 1, 0, 0, 0, 0, 0, 0, 0 };
+
+    if (pFram == nullptr)
+        return false;
+
+    pFram->saveField(cFramStorage::kAppEUI, AppEUI);
+    return true;
+    }
+
+void
+cMeasurementLoop::reJoinNetwork(
+    void
+    )
+    {
+    LMIC_unjoin();
+    LMIC_startJoining();
+    }
+
 #undef FUNCTION