new version 20200522

mini-beieli-node.ino

@@ -9,7 +9,7 @@
 */
 
 // HX711: 0 => compile for hx711, 1 => compile for NAU7802
-#define HX711 1
+#define HX711 0
 
 #include <Catena.h>
 
@@ -253,6 +253,7 @@ void setup_platform(void)
   }
 
   gLoRaWAN.SetReceiveBufferBufferCb(receiveMessage);
+  setTxCycleTime(CATCFG_T_CYCLE_INITIAL, CATCFG_INTERVAL_COUNT_INITIAL);
   gCatena.registerObject(&gLoRaWAN);
 
   /* find the platform */
@@ -502,7 +503,7 @@ uint8_t GetVBatValue(int millivolts)
 void DoDeepSleep(uint32_t sleep_time)
 {
   if (config_data.debug_level > 0) {
-    gCatena.SafePrintf("%010d - now going to deep sleep\n", millis());
+    gCatena.SafePrintf("%010d - DoDeepSleep, now going to deep sleep\n", millis());
   }
 
   // Prepare Deep Sleep
@@ -510,21 +511,14 @@ void DoDeepSleep(uint32_t sleep_time)
     gLed.Set(LedPattern::Off);
   }
 
-  Serial.end();
-  Wire.end();
-  SPI.end();
-  if (fFlash)
-    gSPI2.end();
+  deepSleepPrepare();
 
   // Now sleeping...
   gCatena.Sleep(sleep_time);
 
   // Recover from wakeup...
-  Serial.begin();
-  Wire.begin();
-  SPI.begin();
-  if (fFlash)
-    gSPI2.begin();
+  deepSleepRecovery();
+
   if (config_data.debug_level > 0) {
     gCatena.SafePrintf("%010d - done with deep sleep\n", millis());
   }
@@ -537,7 +531,6 @@ void ReadSensors(SENSOR_data &sensor_data) {
   long w2_0_real;
 
   // vBat
-  gCatena.poll();
   int vbat_mv = (int)(gCatena.ReadVbat() * 1000.0f);
   res.vbat = GetVBatValue(vbat_mv);
   if (config_data.debug_level > 0) {
@@ -551,7 +544,6 @@ void ReadSensors(SENSOR_data &sensor_data) {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("%010d - LoadCell is ready.\n", millis());
     }
-    gCatena.poll();
     if (config_data.cal_w1_0 != NOT_ATTACHED) {
       res.weight1 = (int32_t)ReadScale('A');
       if (config_data.debug_level > 0) {
@@ -564,7 +556,6 @@ void ReadSensors(SENSOR_data &sensor_data) {
         gCatena.SafePrintf("%010d - Load_cell 1 is disabled\n", millis());
       }
     }
-    gCatena.poll();
     if (config_data.cal_w2_0 != NOT_ATTACHED) {
       res.weight2 = (int32_t)ReadScale('B');
       if (config_data.debug_level > 0) {
@@ -585,7 +576,6 @@ void ReadSensors(SENSOR_data &sensor_data) {
   }
 
   // Disable Power
-  gCatena.poll();
   PowerdownScale();
 
   // Gewicht berechnen
@@ -605,11 +595,9 @@ void ReadSensors(SENSOR_data &sensor_data) {
   res.weight = (uint16_t)weight_current32;
 
   if (fBme) {
-    gCatena.poll();
     /* warm up the BME280 by discarding a measurement */
     (void)gBME280.readTemperature();
 
-    gCatena.poll();
     Adafruit_BME280::Measurements m = gBME280.readTemperaturePressureHumidity();
     // temperature is 2 bytes from -0x80.00 to +0x7F.FF degrees C
     // pressure is 2 bytes, hPa * 10.
@@ -695,9 +683,9 @@ void StartNewIteration() {
     if (config_data.debug_level > 0) {
       gCatena.SafePrintf("%010d - startSendingUplink(), my_position: %d, iteration: %d, package_counter: %d\n", millis(), my_position, iteration, package_counter);
     }
-    // the first 12 packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
+    // the first <INIT_PACKETS> packets are "Init-Packets" or each INIT_PACKAGE_INTERVAL ...
     startSendingUplink(next_package_is_init_package);
-    next_package_is_init_package = ((iteration < 12) || ((package_counter % INIT_PACKAGE_INTERVAL) == 0));
+    next_package_is_init_package = ((iteration < INIT_PACKETS) || ((package_counter % INIT_PACKAGE_INTERVAL) == 0));
 
     if (config_data.debug_level > 1) {
       gLed.Set(LedPattern::TwoShort);
@@ -732,8 +720,8 @@ void StartNewIteration() {
     sleep_time_sec = 5;
   }
 
-  // for the first 12 iterations, we set the sleep time to 10 seconds only...
-  if (iteration <= 12) {
+  // for the first <INIT_PACKETS> iterations, we set the sleep time to 10 seconds only...
+  if (iteration <= INIT_PACKETS) {
     sleep_time_sec = 10;
   }
 
@@ -752,10 +740,14 @@ void StartNewIteration() {
 
   if (!fUsbPower) {
     DoDeepSleep(sleep_time_sec);
-    os_setTimedCallback(
-      &iterationJob,
-      os_getTime() + sec2osticks(2),
-      startNewIterationCb);
+    if (! stop_iterations) {
+      StartNewIteration();
+    }
+
+    //os_setTimedCallback(
+    //  &iterationJob,
+    //  os_getTime() + sec2osticks(2),
+    //  startNewIterationCb);
   }
   else {
     if (config_data.debug_level > 0) {
@@ -947,7 +939,7 @@ void doSleepAlert(const bool fDeepSleep)
 
     }
     // sleep and print
-    if (config_data.debug_level > 2) {
+    if (config_data.debug_level > 1) {
       gLed.Set(LedPattern::TwoShort);
     }
 
@@ -1011,6 +1003,10 @@ void doDeepSleep(osjob_t *pJob)
                                    fDeepSleepTest ? CATCFG_T_CYCLE_TEST : gTxCycle
                                  );
 
+  if (config_data.debug_level > 0) {
+    gCatena.SafePrintf("%010d - doDeepSleep, sleepInterval: %d...\n", millis(), sleepInterval);
+  }
+
   /* ok... now it's time for a deep sleep */
   gLed.Set(LedPattern::Off);
   deepSleepPrepare();
@@ -1047,7 +1043,11 @@ void doLightSleep(osjob_t *pJob)
 {
   uint32_t interval = sec2osticks(CATCFG_GetInterval(gTxCycle));
 
+
+  if (config_data.debug_level > 1) {
     gLed.Set(LedPattern::Sleeping);
+    gCatena.SafePrintf("%010d - doLightSleep\n", millis());
+  }
 
   if (gCatena.GetOperatingFlags() &
       static_cast<uint32_t>(gCatena.OPERATING_FLAGS::fQuickLightSleep))
@@ -1055,12 +1055,12 @@ void doLightSleep(osjob_t *pJob)
     interval = 1;
   }
 
-  gLed.Set(LedPattern::Sleeping);
   os_setTimedCallback(
     &iterationJob,
     os_getTime() + interval,
     sleepDoneCb
   );
+
 }
 
 static void sleepDoneCb(osjob_t* pJob)
@@ -1100,6 +1100,9 @@ static void startNewIterationCb(osjob_t* pJob)
 
 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;
   float cal_w1_factor;
@@ -1215,12 +1218,64 @@ static void receiveMessage(void *pContext, uint8_t port, const uint8_t *pMessage
       lora_data_first.cal_w2_factor = config_data.cal_w2_factor;
     }
   }
+
+  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
-cCommandStream::CommandStatus cmdHello(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdHello(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("Hello, world!\n");
 
@@ -1228,7 +1283,7 @@ cCommandStream::CommandStatus cmdHello(cCommandStream *pThis, void *pContext, in
 }
 
 
-cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("{\n");
   pThis->printf("  \"cal_w1_0\": \"%d\",\n", config_data.cal_w1_0);
@@ -1240,7 +1295,7 @@ cCommandStream::CommandStatus cmdGetCalibrationSettings(cCommandStream *pThis, v
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   SENSOR_data temp_sensor_data;
 
@@ -1258,21 +1313,21 @@ cCommandStream::CommandStatus cmdGetSensorReadings(cCommandStream *pThis, void *
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetScale1(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetScale1(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("getscale1\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetScale2(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetScale2(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   pThis->printf("getscale2\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   setup_scales();
   config_data.cal_w1_0 = (int32_t)ReadScale('A');
@@ -1282,7 +1337,7 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleA(cCommandStream *pThis, void
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   setup_scales();
   config_data.cal_w2_0 = (int32_t)ReadScale('B');
@@ -1292,7 +1347,7 @@ cCommandStream::CommandStatus cmdCalibrateZeroScaleB(cCommandStream *pThis, void
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w1_gramm(argv[1]);
   long weight1;
@@ -1314,7 +1369,7 @@ cCommandStream::CommandStatus cmdCalibrateScaleA(cCommandStream *pThis, void *pC
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String w2_gramm(argv[1]);
   long weight2;
@@ -1336,18 +1391,20 @@ cCommandStream::CommandStatus cmdCalibrateScaleB(cCommandStream *pThis, void *pC
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdSetDebugLevel(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdSetDebugLevel(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   String s_debug_level(argv[1]);
   config_data.debug_level = s_debug_level.toInt();
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 
+  SetScalesDebugLevel(config_data.debug_level);
+
   pThis->printf("{ \"msg\": \"set_debug_level was successful\" }\n");
 
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   gCatena.getFram()->saveField(cFramStorage::kAppConf, (const uint8_t *)&config_data, sizeof(config_data));
 
@@ -1356,7 +1413,7 @@ cCommandStream::CommandStatus cmdGetDebugLevel(cCommandStream *pThis, void *pCon
   return cCommandStream::CommandStatus::kSuccess;
 }
 
-cCommandStream::CommandStatus cmdStopIterations(cCommandStream *pThis, void *pContext, int argc, char **argv)
+cCommandStream::CommandStatus cmdStopIterations(cCommandStream * pThis, void *pContext, int argc, char **argv)
 {
   stop_iterations = true;
   return cCommandStream::CommandStatus::kSuccess;

mini_beieli_node.h

@@ -15,10 +15,10 @@ enum {
   // add measurement and broadcast time, but we attempt
   // to compensate for the gross effects below.
   CATCFG_T_CYCLE = 6 * 60,                // every 6 minutes
-  //CATCFG_T_CYCLE = 30, // for Testing
-  CATCFG_T_CYCLE_TEST = 30, // every 10 seconds
+  //CATCFG_T_CYCLE = 30,                  // for Testing (Swisscom Compliance)
+  CATCFG_T_CYCLE_TEST = 30,               // every 30 seconds
   CATCFG_T_CYCLE_INITIAL = 30,            // every 30 seconds initially
-  CATCFG_INTERVAL_COUNT_INITIAL = 30,     // repeat for 15 minutes
+  CATCFG_INTERVAL_COUNT_INITIAL = 10,     // repeat for 5 minutes
   CATCFG_T_REBOOT = 30 * 24 * 60 * 60,    // reboot every 30 days
 };
 
@@ -26,7 +26,7 @@ enum {
 enum {
   CATCFG_T_WARMUP = 1,
   CATCFG_T_SETTLE = 5,
-  CATCFG_T_OVERHEAD = (CATCFG_T_WARMUP + CATCFG_T_SETTLE),
+  CATCFG_T_OVERHEAD = (CATCFG_T_WARMUP + CATCFG_T_SETTLE + 4),
   CATCFG_T_MIN = CATCFG_T_OVERHEAD,
   CATCFG_T_MAX = CATCFG_T_CYCLE < 60 * 60 ? 60 * 60 : CATCFG_T_CYCLE,     // normally one hour max.
   CATCFG_INTERVAL_COUNT = 30,
@@ -56,7 +56,7 @@ enum {
   |
   \****************************************************************************/
 
-static const int32_t fwVersion = 20200513;
+static const int32_t fwVersion = 20200522;
 
 static const byte INIT_PACKAGE_INTERVAL = 100;  // send an init package every 100 packages;
 static const byte MAX_VALUES_TO_SEND = 8;
@@ -66,6 +66,7 @@ static const uint8_t LORA_DATA_VERSION_FIRST_PACKAGE = 128;
 static const uint32_t PRESSURE_OFFSET = 825;
 static const uint16_t SEND_DIFF_THRESHOLD_5GRAMS = 10;   // when weight value drops by 50g, then send data
 static const long NOT_ATTACHED = -2147483648;
+static const byte INIT_PACKETS = 5;
 
 // must be 64 bytes long (size of kAppConf)
 typedef struct {

mini_beieli_node_hx711.h

@@ -11,6 +11,11 @@ Q2HX711 hx711(A1, A0);
 
 byte debug_level;
 
+void SetScalesDebugLevel(byte dbg_level)
+{
+  debug_level = dbg_level;
+}
+
 bool SetupScales(byte dbg_level)
 {
   debug_level = dbg_level;

mini_beieli_node_nau7802.h

@@ -6,7 +6,8 @@
 
 #include "SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.h"
 
-#define SAMPLES 10
+#define SAMPLES 5
+#define IGNORE_READINGS 5
 
 NAU7802 myScale; //Create instance of the NAU7802 class
 
@@ -14,28 +15,46 @@ byte debug_level;
 
 byte interruptPin = A0;
 
+void SetScalesDebugLevel(byte dbg_level)
+{
+  debug_level = dbg_level;
+}
+
 bool SetupScales(byte dbg_level)
 {
   debug_level = dbg_level;
-
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - SetupScales start\n", millis());
+  }
   pinMode(interruptPin, INPUT);
   Wire.begin();
 
   if (!myScale.begin())
   {
-    Serial.println("Scale not detected. Please check wiring. Freezing...");
+    gCatena.SafePrintf("Scale not detected. Please check wiring. Freezing...\n");
     return false;
   }
-  Serial.println("Scale detected!");
+  gCatena.SafePrintf("Scale detected!\n");
 
   myScale.setIntPolarityHigh();
-  delay(500);
+
+  myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
+  myScale.setSampleRate(NAU7802_SPS_80);
+  myScale.setLDO(NAU7802_LDO_3V3);
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - SetupScales done\n", millis());
+  }
 
   return true;
 }
 
 long ReadScale(char channel)
 {
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - ReadScale Start\n", millis());
+  }
+
   uint8_t channelNumber;
   if (channel == 'B') {
     channelNumber = NAU7802_CHANNEL_1;
@@ -44,18 +63,29 @@ long ReadScale(char channel)
   }
   long startTime = millis();
   myScale.setChannel(channelNumber);
-  myScale.clearBit(NAU7802_PGA_PWR_PGA_CAP_EN, NAU7802_PGA_PWR);
-  myScale.setSampleRate(NAU7802_SPS_10);
-  myScale.setLDO(NAU7802_LDO_2V7);
   myScale.calibrateAFE();
-  //delay(500);
 
   long res;
+  long dummy;
+  int const ignore_readings = IGNORE_READINGS; // number of first <n> readings to ignore
   int const num_scale_readings = SAMPLES; // number of instantaneous scale readings to calculate the median
 
-  // we use the median, not the average, see https://community.particle.io/t/boron-gpio-provides-less-current-than-electrons-gpio/46647/13
-  long readings[num_scale_readings];  // create arry to hold readings
+  for (int i = 0; i < ignore_readings; i++) {
+    while (digitalRead(interruptPin) == LOW) {
+      if ((millis() - startTime) > 60000) {
+        if (debug_level > 0) {
+          gCatena.SafePrintf("Timeout while reading scale (dummy values)...\n");
+        }
+        return 0;
+      }
+      delay(1);
+    }
+    dummy = myScale.getReading();
+  }
 
+  // we use the median, not the average, see https://community.particle.io/t/boron-gpio-provides-less-current-than-electrons-gpio/46647/13
+  startTime = millis();
+  long readings[num_scale_readings];  // create arry to hold readings
   for (int i = 0; i < num_scale_readings; i++) {
     while (digitalRead(interruptPin) == LOW) {
       //while(! myScale.available()) {
@@ -85,15 +115,35 @@ long ReadScale(char channel)
     gCatena.SafePrintf("Duration (ms): %d\n", duration);
   }
 
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - ReadScale Done\n", millis());
+  }
+
   return res;
 }
 
 void PowerdownScale()
 {
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerdownScale Start\n", millis());
+  }
   myScale.powerDown();
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerdownScale Done\n", millis());
+  }
 }
 
 void PowerupScale()
 {
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerupScale Start\n", millis());
+  }
   myScale.powerUp(); //Power up scale. This scale takes ~600ms to boot and take reading.
+
+  // we wait 100 ms to give it time to stabilze
+  delay(100);
+
+  if (debug_level > 0) {
+    gCatena.SafePrintf("%010d - PowerupScale Done\n", millis());
+  }
 }