do not go to deep sleep if we do a stop_iterations

README.md

@@ -22,7 +22,7 @@ Das sind die verwendeten Libraries [1]:
 | https://github.com/mcci-catena/Adafruit_Sensor.git  | f2af6f4 | Tue, 1 Sep 2015 15:57:59 +0200  |
 | https://github.com/mcci-catena/arduino-lmic.git  | 6fe04ec | Tue, 12 May 2020 09:16:47 -0400  |
 | https://github.com/mcci-catena/arduino-lorawan.git  | 4bc0d48 | Sat, 9 May 2020 12:38:28 -0400  |
-| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | 92019ca | Tue, 12 May 2020 01:34:08 -0400  |
+| https://github.com/mcci-catena/Catena-Arduino-Platform.git  | cdbb111 | Thu, 11 Jun 2020 14:56:40 +0530  |
 | https://github.com/mcci-catena/Catena-mcciadk.git  | a428006 | Sat, 21 Dec 2019 20:45:26 -0500  |
 | https://github.com/mcci-catena/MCCI_FRAM_I2C.git  | f0a5ea5 | Sat, 21 Dec 2019 16:17:01 -0500  |
 | https://github.com/tatobari/Q2-HX711-Arduino-Library.git  | ccda8d8 | Wed, 13 Mar 2019 12:41:44 -0300  |
@@ -31,5 +31,24 @@ Das sind die verwendeten Libraries [1]:
 | https://github.com/mcci-catena/SHT1x.git  | be7042c | Tue, 20 Sep 2011 13:56:23 +1000  |
 
 
+Patch arduino-lmic, so initial SF12 is used initially:
+
+`
+[joerg@cinnamon src]$ git diff
+diff --git a/src/lmic/lmic_bandplan_eu868.h b/src/lmic/lmic_bandplan_eu868.h
+index efff7d5..74efb37 100644
+--- a/src/lmic/lmic_bandplan_eu868.h
++++ b/src/lmic/lmic_bandplan_eu868.h
+@@ -61,7 +61,7 @@ LMICeu868_isValidBeacon1(const uint8_t *d) {
+ #undef LMICbandplan_isFSK
+ #define LMICbandplan_isFSK()    (/* RX datarate */LMIC.dndr == EU868_DR_FSK)
+ 
+-#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF7)
++#define LMICbandplan_getInitialDrJoin() (EU868_DR_SF12)
+ 
+ void LMICeu868_setBcnRxParams(void);
+ #define LMICbandplan_setBcnRxParams()   LMICeu868_setBcnRxParams()
+`
+
 `[1]:
 [joerg@cinnamon libraries]$ for i in Adafruit_BME280_Library Adafruit_Sensor arduino-lmic arduino-lorawan Catena-Arduino-Platform Catena-mcciadk MCCI_FRAM_I2C Q2-HX711-Arduino-Library SparkFun_Qwiic_Scale_NAU7802_Arduino_Library OneWire SHT1x ; do cd $i; echo "| $(git remote -v |grep fetch |awk '{print $2}' |tr '\n' ' ') | $(git log --pretty=format:'%h | %cD ' -n 1) |" ; cd ..; done`

mini-beieli-node.ino

@@ -60,6 +60,7 @@ cCommandStream::CommandFn cmdGetScaleA;
 cCommandStream::CommandFn cmdGetScaleB;
 cCommandStream::CommandFn cmdCalibrateZeroScaleA;
 cCommandStream::CommandFn cmdCalibrateZeroScaleB;
+cCommandStream::CommandFn cmdCalibrateScales;
 cCommandStream::CommandFn cmdCalibrateScaleA;
 cCommandStream::CommandFn cmdCalibrateScaleB;
 cCommandStream::CommandFn cmdSetDebugLevel;
@@ -72,6 +73,7 @@ static const cCommandStream::cEntry sMyExtraCommmands[] =
   { "hello", cmdHello },
   { "get_calibration_settings", cmdGetCalibrationSettings },
   { "get_sensor_readings", cmdGetSensorReadings },
+  { "calibrate_scales", cmdCalibrateScales },
   { "calibrate_zero_scale_a", cmdCalibrateZeroScaleA },
   { "calibrate_zero_scale_b", cmdCalibrateZeroScaleB },
   { "calibrate_scale_a", cmdCalibrateScaleA },
@@ -110,6 +112,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 +150,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 +249,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 +343,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 +377,9 @@ void setup_uplink(void)
 void loop()
 {
   gCatena.poll();
+  if (start_new_iteration) {
+    StartNewIteration();
+  }
 }
 
 void ClearLoraData(void)
@@ -501,7 +504,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 +521,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 +622,7 @@ void ReadSensors(SENSOR_data &sensor_data) {
 }
 
 void StartNewIteration() {
+  start_new_iteration = false;
   uint32_t wait_time;
   wait_time = 0;
 
@@ -675,7 +679,7 @@ void StartNewIteration() {
   // we send data the first time the system is started, when the array is full
   // or when the weight has fallen more than threshold or the first measurement is
   // more than one hour old (which should not happen :-) )
-  if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || (abs(last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS) || ((millis() - timer_pos0) > 3600000)) {
+  if ( (next_package_is_init_package) || (my_position >= MAX_VALUES_TO_SEND) || ((my_position > 1) && (abs(last_sensor_reading.weight - current_sensor_reading.weight) > SEND_DIFF_THRESHOLD_5GRAMS)) || ((millis() - timer_pos0) > 3600000)) {
     lora_data.offset_last_reading = (uint8_t)((millis() - timer_pos0) / 1000 / 60);
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", my_position, iteration, package_counter);
@@ -706,7 +710,7 @@ void StartNewIteration() {
       LMIC_clrTxData();
       // we sleep 10 seconds...
       start_time = millis();
-      while (send_in_progress && ((millis() - start_time) < 10000))
+      while ((millis() - start_time) < 10000)
       {
         gCatena.poll();
         yield();
@@ -763,12 +767,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, 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) {
+  if (!fUsbPower && !stop_iterations)  {
     DoDeepSleep(sleep_time_sec);
     if (! stop_iterations) {
-      StartNewIteration();
+      start_new_iteration = true;
     }
 
   }
@@ -817,22 +823,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);
-      } else {
-        gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
+        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, 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, 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);
-      } else {
-        gCatena.SafePrintf("LMIC.opmode just before SendBuffer (failed): %#x\n", LMIC.opmode);
+        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, os_getTime: %d\n", LMIC.globalDutyRate, LMIC.globalDutyAvail, os_getTime());
+      gCatena.SafePrintf("LMIC.seqnoUp: %d, LMIC.seqnoDn: %d\n",LMIC.seqnoUp, LMIC.seqnoDn);
     }
   }
 
@@ -918,30 +935,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)
 {
@@ -959,9 +952,6 @@ static void settleDoneCb(
 
   doSleepAlert(fDeepSleep);
 
-  /* count what we're up to */
-  updateSleepCounters();
-
   send_in_progress = false;
 }
 
@@ -992,14 +982,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;
@@ -1115,59 +1103,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
@@ -1178,7 +1115,6 @@ cCommandStream::CommandStatus cmdHello(cCommandStream * pThis, void *pContext, i
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-
 cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("{\n");
@@ -1243,6 +1179,25 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream * pThis, voi
   return cCommandStream::CommandStatus::kSuccess;
 }
 
+cCommandStream::CommandStatus cmdCalibrateScales(cCommandStream * pThis, void *pContext, int argc, char **argv)
+{
+  String s_cal_w1_0(argv[1]);
+  String s_cal_w1_factor(argv[2]);
+  String s_cal_w2_0(argv[3]);
+  String s_cal_w2_factor(argv[4]);
+  
+  config_data.cal_w1_0 = s_cal_w1_0.toInt();
+  config_data.cal_w1_factor = s_cal_w1_factor.toFloat();
+  config_data.cal_w2_0 = s_cal_w2_0.toInt();
+  config_data.cal_w2_factor = s_cal_w2_factor.toFloat();
+
+  gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
+
+  pThis->printf("{ \"msg\": \"calibrate_scales was successful\" }\n");
+
+  return cCommandStream::CommandStatus::kSuccess;
+}
+
 cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w1_gramm(argv[1]);

mini_beieli_node.h

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