avoid recursion

mini-beieli-node.ino

@@ -110,6 +110,7 @@ long iteration = 0;       // what iteration number do we have, starts with 0
 long package_counter = 0; // sent package counter
 bool send_in_progress = false;
 bool stop_iterations = false;
+bool start_new_iteration = false;
 bool next_package_is_init_package = true;
 uint32_t gRebootMs;
 
@@ -147,11 +148,6 @@ bool fUsbPower;
 static osjob_t iterationJob;
 static osjob_t sendJob;
 
-// the cycle time to use
-unsigned gTxCycle;
-// remaining before we reset to default
-unsigned gTxCycleCount;
-
 void setup(void)
 {
   gCatena.begin();
@@ -251,7 +247,6 @@ void setup_platform(void)
   }
 
   gLoRaWAN.SetReceiveBufferBufferCb(receiveMessage);
-  setTxCycleTime(CATCFG_T_CYCLE_INITIAL, CATCFG_INTERVAL_COUNT_INITIAL);
   gCatena.registerObject(&gLoRaWAN);
 
   /* find the platform */
@@ -346,6 +341,9 @@ void setup_uplink(void)
 
   LMIC_setClockError(1 * 65536 / 100);
 
+  // explicitly enable LinkCheckMode
+  gLoRaWAN.SetLinkCheckMode(true);
+
   /* figure out when to reboot */
   gRebootMs = (CATCFG_T_REBOOT + os_getRndU2() - 32768) * 1000;
 
@@ -377,6 +375,9 @@ void setup_uplink(void)
 void loop()
 {
   gCatena.poll();
+  if (start_new_iteration) {
+    StartNewIteration();
+  }
 }
 
 void ClearLoraData(void)
@@ -501,7 +502,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep\n");
+    gCatena.SafePrintf("DoDeepSleep, now going to deep sleep, millis: %d\n",millis());
   }
 
   // Prepare Deep Sleep
@@ -518,7 +519,7 @@ void DoDeepSleep(uint32_t sleep_time)
   deepSleepRecovery();
 
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("done with deep sleep\n");
+    gCatena.SafePrintf("done with deep sleep, millis: %d\n",millis());
   }
 }
 
@@ -619,6 +620,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
 }
 
 void StartNewIteration() {
+  start_new_iteration = false;
   uint32_t wait_time;
   wait_time = 0;
 
@@ -763,13 +765,14 @@ void StartNewIteration() {
 
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("LMIC.opmode just before Sleeping: %#x\n", LMIC.opmode);
-    gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+    gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+    gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
   }
 
   if (!fUsbPower) {
     DoDeepSleep(sleep_time_sec);
     if (! stop_iterations) {
-      StartNewIteration();
+      start_new_iteration = true;
     }
 
   }
@@ -818,28 +821,33 @@ void startSendingUplink(bool firstTime)
       package_counter++;
       if (config_data.debug_level > 0) {
         gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
-        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
       }
     }
     else {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
-      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
     }
   } else {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer: %#x\n", LMIC.opmode);
-      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
       gCatena.SafePrintf("SendBuffer not firstTime\n");
     }
     if (gLoRaWAN.SendBuffer((uint8_t*)&lora_data, sizeof(LORA_data), sendBufferDoneCb, NULL, fConfirmed, kUplinkPort)) {
       package_counter++;
       if (config_data.debug_level > 0) {
         gCatena.SafePrintf("LMIC.opmode just after SendBuffer (successful): %#x\n", LMIC.opmode);
-        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+        gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+        gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
       }
     } else {
       gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
-      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail );
+      gCatena.SafePrintf("LMIC.globalDutyRate: %d, LMIC.globalDutyAvail: %d, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
     }
   }
 
@@ -925,30 +933,6 @@ void doSleepAlert(const bool fDeepSleep)
 
 }
 
-void updateSleepCounters(void)
-{
-  // update the sleep parameters
-  if (gTxCycleCount > 1)
-  {
-    // values greater than one are decremented and ultimately reset to default.
-    --gTxCycleCount;
-  }
-  else if (gTxCycleCount == 1)
-  {
-    // it's now one (otherwise we couldn't be here.)
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("resetting tx cycle to default: %u\n", CATCFG_T_CYCLE);
-    }
-    gTxCycleCount = 0;
-    gTxCycle = CATCFG_T_CYCLE;
-  }
-  else
-  {
-    // it's zero. Leave it alone.
-  }
-}
-
-
 static void settleDoneCb(
   osjob_t* pSendJob)
 {
@@ -966,9 +950,6 @@ static void settleDoneCb(
 
   doSleepAlert(fDeepSleep);
 
-  /* count what we're up to */
-  updateSleepCounters();
-
   send_in_progress = false;
 }
 
@@ -999,14 +980,12 @@ static void startNewIterationCb(osjob_t* pJob)
   }
 
   if (! stop_iterations) {
-    StartNewIteration();
+    start_new_iteration = true;
   }
 }
 
 static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage, size_t nMessage)
 {
-  unsigned txCycle;
-  unsigned txCount;
 
   long cal_w1_0;
   long cal_w2_0;
@@ -1122,59 +1101,8 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
     }
   }
 
-  if (port == 0)
-  {
-    return;
-  }
-
-  else if (! (port == 1 && 2 <= nMessage && nMessage <= 3))
-  {
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("invalid message port(%02x)/length(%x)\n",
-                         port, nMessage
-                        );
-    }
-    return;
-  }
-
-  txCycle = (pMessage[0] << 8) | pMessage[1];
-
-  if (txCycle < CATCFG_T_MIN || txCycle > CATCFG_T_MAX)
-  {
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("tx cycle time out of range: %u\n", txCycle);
-    }
-    return;
-  }
-
-  // byte [2], if present, is the repeat count.
-  // explicitly sending zero causes it to stick.
-  txCount = CATCFG_INTERVAL_COUNT;
-  if (nMessage >= 3)
-  {
-    txCount = pMessage[2];
-  }
-
-  setTxCycleTime(txCycle, txCount);
-
 }
 
-void setTxCycleTime(unsigned txCycle, unsigned txCount)
-{
-  if (txCount > 0) {
-    if (config_data.debug_level > 0) {
-      gCatena.SafePrintf("message cycle time %u seconds for %u messages\n", txCycle, txCount);
-    }
-  }
-  else if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("message cycle time %u seconds indefinitely\n", txCycle);
-  }
-
-  gTxCycle = txCycle;
-  gTxCycleCount = txCount;
-}
-
-
 /* process "application hello" -- args are ignored */
 // argv[0] is "hello"
 // argv[1..argc-1] are the (ignored) arguments

mini_beieli_node.h

@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200603;
+static const int32_t fwVersion = 20200606;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;