Merge pull request #350 from cyberman54/development

Timesync fixes & upgrade BOSCH BSCEC 1.4.7.1 -> 1.4.7.3

include/bmesensor.h

@@ -15,15 +15,15 @@ extern bmeStatus_t
     bme_status; // Make struct for storing gps data globally available
 extern TaskHandle_t BmeTask;
 
-// --- Bosch BSEC library configuration ---
+// --- Bosch BSEC v1.4.7.3 library configuration ---
 // 3,3V supply voltage; 3s max time between sensor_control calls; 4 days
 // calibration. Change this const if not applicable for your application (see
 // BME680 datasheet)
 const uint8_t bsec_config_iaq[454] = {
-    1,   7,   4,   1,   61,  0,   0,   0,   0,   0,   0,   0,   174, 1,   0,
+    3,   7,   4,   1,   61,  0,   0,   0,   0,   0,   0,   0,   174, 1,   0,
-    0,   48,  0,   1,   0,   137, 65,  0,   63,  205, 204, 204, 62,  0,   0,
+    0,   48,  0,   1,   0,   0,   192, 168, 71,  64,  49,  119, 76,  0,   0,
-    64,  63,  205, 204, 204, 62,  0,   0,   225, 68,  0,   192, 168, 71,  64,
+    225, 68,  137, 65,  0,   63,  205, 204, 204, 62,  0,   0,   64,  63,  205,
-    49,  119, 76,  0,   0,   0,   0,   0,   80,  5,   95,  0,   0,   0,   0,
+    204, 204, 62,  0,   0,   0,   0,   0,   80,  5,   95,  0,   0,   0,   0,
     0,   0,   0,   0,   28,  0,   2,   0,   0,   244, 1,   225, 0,   25,  0,
     0,   128, 64,  0,   0,   32,  65,  144, 1,   0,   0,   112, 65,  0,   0,
     0,   63,  16,  0,   3,   0,   10,  215, 163, 60,  10,  215, 35,  59,  10,
@@ -50,7 +50,7 @@ const uint8_t bsec_config_iaq[454] = {
     255, 255, 255, 220, 5,   220, 5,   255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
     255, 255, 255, 255, 255, 255, 255, 255, 255, 44,  1,   0,   0,   0,   0,
-    239, 79,  0,   0};
+    253, 65,  0,   0};
 
 // Helper functions declarations
 int bme_init();

lib/Bosch-BSEC/src/inc/bsec_datatypes.h

@@ -87,11 +87,15 @@ extern "C"
 #define BSEC_MAX_WORKBUFFER_SIZE     (2048)    /*!< Maximum size (in bytes) of the work buffer */
 #define BSEC_MAX_PHYSICAL_SENSOR     (8)         /*!< Number of physical sensors that need allocated space before calling bsec_update_subscription() */
 #define BSEC_MAX_PROPERTY_BLOB_SIZE  (454)     /*!< Maximum size (in bytes) of the data blobs returned by bsec_get_configuration() */
-#define BSEC_MAX_STATE_BLOB_SIZE     (134)        /*!< Maximum size (in bytes) of the data blobs returned by bsec_get_state()*/
+#define BSEC_MAX_STATE_BLOB_SIZE     (139)        /*!< Maximum size (in bytes) of the data blobs returned by bsec_get_state()*/
 #define BSEC_SAMPLE_RATE_DISABLED    (65535.0f)      /*!< Sample rate of a disabled sensor */
 #define BSEC_SAMPLE_RATE_ULP         (0.0033333f)           /*!< Sample rate in case of Ultra Low Power Mode */
+#define BSEC_SAMPLE_RATE_CONTINUOUS  (1.0f)    /*!< Sample rate in case of Continuous Mode */ 
 #define BSEC_SAMPLE_RATE_LP          (0.33333f)            /*!< Sample rate in case of Low Power Mode */
 #define BSEC_SAMPLE_RATE_ULP_MEASUREMENT_ON_DEMAND         (0.0f)            /*!< Input value used to trigger an extra measurment (ULP plus) */        
+#define BSEC_SAMPLE_RATE_HIGH_PERFORMANCE         (0.055556f)            /*!< Sample rate in case of high performance */      
+#define SAMPLE_INTVL_CUSTOM_TPH      (0.066667f)            /*!< Sample rate in case of custom TPH mode */ 
+#define SAMPLE_INTVL_CUSTOM_G        (0.016667f)            /*!< Sample rate in case of custom G mode */  
 
 #define BSEC_PROCESS_PRESSURE       (1 << (BSEC_INPUT_PRESSURE-1))      /*!< process_data bitfield constant for pressure @sa bsec_bme_settings_t */
 #define BSEC_PROCESS_TEMPERATURE    (1 << (BSEC_INPUT_TEMPERATURE-1))   /*!< process_data bitfield constant for temperature @sa bsec_bme_settings_t */
@@ -161,6 +165,12 @@ typedef enum
      * Generic heat source 8
      */
 
+    /**                                                                               
+     * @brief Internal input for measure on demand                                    
+     *                                                                                
+     * Value indicates, if a measurement is a mod (measurement on demand)             
+     */                                                                               
+    BSEC_INPUT_IS_MEASUREMENT_ON_DEMAND = 22,     /*!< reserved internal debug input */ 
     
     /**
      * @brief Additional input that disables baseline tracker
@@ -171,6 +181,11 @@ typedef enum
      */
     BSEC_INPUT_DISABLE_BASELINE_TRACKER = 23, 
 
+    /**																								
+     * @brief Additional input that provides information about the state of the profile (1-9)		
+     *																								
+     */																								
+    BSEC_INPUT_PROFILE_PART = 24																	
 } bsec_physical_sensor_t;
 
 /*!

src/irqhandler.cpp

@@ -47,6 +47,7 @@ void irqHandler(void *pvParameters) {
     // is time to be synced?
     if (InterruptStatus & TIMESYNC_IRQ) {
       time_t t = timeProvider();
+      ESP_LOGD(TAG, "Sync time = %d", t);
       if (timeIsValid(t))
         setTime(t);
     }

src/lorawan.cpp

@@ -221,12 +221,7 @@ void onEvent(ev_t ev) {
     // kickoff first send job
     os_setCallback(&sendjob, lora_send);
     // show effective LoRa parameters after join
-    ESP_LOGI(TAG, "ADR=%d, SF=%d, TXPOWER=%d", cfg.adrmode, cfg.lorasf,
+    ESP_LOGI(TAG, "DEVaddr=%08X", LMIC.devaddr);
-             cfg.txpower);
-#if (TIME_SYNC_LORASERVER)
-    // kickoff first time sync
-    send_timesync_req();
-#endif
     break;
 
   case EV_RFU1:
@@ -315,7 +310,6 @@ void onEvent(ev_t ev) {
     if (!(LMIC.opmode & OP_JOINING))
 #if (TIME_SYNC_LORASERVER)
       // if last packet sent was a timesync request, store TX time
-      // if ((LMIC.pendTxPort == TIMEPORT) && timeSyncPending)
       if (LMIC.pendTxPort == TIMEPORT)
         strcpy_P(buff, PSTR("TX TIMESYNC"));
       else

src/main.cpp

@@ -426,16 +426,12 @@ void setup() {
 #endif
 
 #if (TIME_SYNC_LORASERVER)
-  // create time sync task
+  timesync_init(); // create loraserver time sync task
-  timesync_init();
 #endif
 
-  // start pps timepulse
   ESP_LOGI(TAG, "Starting Timekeeper...");
-  assert(timepulse_init()); // setup timepulse
+  assert(timepulse_init()); // setup pps timepulse
-  timepulse_start();
+  timepulse_start();        // starts pps and cyclic time sync
-  timeSync(); // init systime
-  timesyncer.attach(TIME_SYNC_INTERVAL * 60, timeSync);
 
 #endif // TIME_SYNC_INTERVAL
 

src/paxcounter.conf

@@ -66,16 +66,16 @@
 #define RESPONSE_TIMEOUT_MS             60000   // firmware binary server connection timeout [milliseconds]
 
 // settings for syncing time of node with external time source
-#define TIME_SYNC_INTERVAL              0       // sync time attempt each .. minutes from time source (GPS/LORA/RTC) [default = 60], 0 means off
+#define TIME_SYNC_INTERVAL              60      // sync time attempt each .. minutes from time source (GPS/LORA/RTC) [default = 60], 0 means off
-#define TIME_SYNC_INTERVAL_RETRY        0       // retry time sync after lost sync each .. minutes [default = 10], 0 means off
+#define TIME_SYNC_INTERVAL_RETRY        10      // retry time sync after lost sync each .. minutes [default = 10], 0 means off
 #define TIME_SYNC_COMPILEDATE           0       // set to 1 to use compile date to initialize RTC after power outage [default = 0]
 #define TIME_SYNC_LORAWAN               0       // set to 1 to use LORA network as time source, 0 means off [default = 0]
 #define TIME_SYNC_LORASERVER            0       // set to 1 to use LORA timeserver as time source, 0 means off [default = 0]
 
 // settings for syncing time with timeserver applications
-#define TIME_SYNC_SAMPLES               2       // number of time requests for averaging
+#define TIME_SYNC_SAMPLES               1       // number of time requests for averaging
 #define TIME_SYNC_CYCLE                 60      // delay between two time samples [seconds]
-#define TIME_SYNC_TIMEOUT               600     // timeout waiting for timeserver answer [seconds]
+#define TIME_SYNC_TIMEOUT               300     // timeout waiting for timeserver answer [seconds]
 
 // time zone, see https://github.com/JChristensen/Timezone/blob/master/examples/WorldClock/WorldClock.ino
 #define DAYLIGHT_TIME                   {"CEST", Last, Sun, Mar, 2, 120}     // Central European Summer Time

src/timekeeper.cpp

@@ -116,6 +116,10 @@ void timepulse_start(void) {
   timerAttachInterrupt(ppsIRQ, &CLOCKIRQ, true);
   timerAlarmEnable(ppsIRQ);
 #endif
+
+  // start cyclic time sync
+  timeSync(); // init systime by RTC or GPS or LORA
+  timesyncer.attach(TIME_SYNC_INTERVAL * 60, timeSync);
 }
 
 // interrupt service routine triggered by either pps or esp32 hardware timer
@@ -225,13 +229,13 @@ void clock_loop(void *taskparameter) { // ClockTask
                               tx_Ticks(IF482_FRAME_SIZE, HAS_IF482);
 #endif
 
-  // output the next second's pulse after timepulse arrived
+  // output the next second's pulse/telegram after pps arrived
   for (;;) {
 
     // wait for timepulse and store UTC time in seconds got
     xTaskNotifyWait(0x00, ULONG_MAX, &printtime, portMAX_DELAY);
     t = time_t(printtime);
-    
+
     // no confident or no recent time -> suppress clock output
     if ((timeStatus() == timeNotSet) || !(timeIsValid(t)) ||
         (t == last_printtime))

src/timesync.cpp

@@ -33,12 +33,11 @@ static myClock_timepoint time_sync_rx[TIME_SYNC_SAMPLES];
 // send time request message
 void send_timesync_req() {
 
-  // if a timesync handshake is pending or we are not joined then exit
+  // if a timesync handshake is pending then exit
-  if (timeSyncPending || !LMIC.devaddr)
+  if (timeSyncPending)
     return;
   // else unblock timesync task
   else {
-    timeSyncPending = true;
     ESP_LOGI(TAG, "[%0.3f] Timeserver sync request started", millis() / 1000.0);
     xTaskNotifyGive(timeSyncReqTask);
   }
@@ -49,7 +48,7 @@ void process_timesync_req(void *taskparameter) {
 
   uint8_t k;
   uint16_t time_to_set_fraction_msec;
-  uint32_t seq_no, time_to_set;
+  uint32_t seq_no = 0, time_to_set;
   auto time_offset_ms = myClock_msecTick::zero();
 
   while (1) {
@@ -61,6 +60,12 @@ void process_timesync_req(void *taskparameter) {
 
     // wait for kickoff
     ulTaskNotifyTake(pdFALSE, portMAX_DELAY);
+    timeSyncPending = true;
+
+    // wait until we are joined if we are not
+    while (!LMIC.devaddr) {
+      vTaskDelay(5000);
+    }
 
     // collect timestamp samples
     for (uint8_t i = 0; i < TIME_SYNC_SAMPLES; i++) {
@@ -69,43 +74,49 @@ void process_timesync_req(void *taskparameter) {
       payload.addByte(time_sync_seqNo);
       SendPayload(TIMEPORT, prio_high);
 
-      // wait for notification from recv_timesync_ans()
+      // wait for a valid timestamp from recv_timesync_ans()
-      if ((xTaskNotifyWait(0x00, ULONG_MAX, &seq_no,
+      while (seq_no != time_sync_seqNo) {
-                           pdMS_TO_TICKS(TIME_SYNC_TIMEOUT * 1000)) ==
+        if (xTaskNotifyWait(0x00, ULONG_MAX, &seq_no,
-           pdFALSE) ||
+                            pdMS_TO_TICKS(TIME_SYNC_TIMEOUT * 1000)) ==
-          (seq_no != time_sync_seqNo))
+            pdFALSE) {
-        goto error; // no valid sequence received before timeout
+          ESP_LOGW(TAG, "[%0.3f] Timesync handshake error: timeout",
+                   millis() / 1000.0);
+          goto finish; // no valid sequence received before timeout
+        }
+      }
 
       // process answer
-      else {
+      k = seq_no % TIME_SYNC_SAMPLES;
-        k = seq_no % TIME_SYNC_SAMPLES;
 
-        // calculate time diff from collected timestamps
+      // calculate time diff from collected timestamps
-        time_offset_ms += time_point_cast<milliseconds>(time_sync_rx[k]) -
+      time_offset_ms += time_point_cast<milliseconds>(time_sync_rx[k]) -
-                          time_point_cast<milliseconds>(time_sync_tx[k]);
+                        time_point_cast<milliseconds>(time_sync_tx[k]);
 
-        // wrap around seqNo, keeping it in time port range
+      // wrap around seqNo, keeping it in time port range
-        time_sync_seqNo = (time_sync_seqNo < TIMEANSWERPORT_MAX)
+      time_sync_seqNo = (time_sync_seqNo < TIMEANSWERPORT_MAX)
-                              ? time_sync_seqNo + 1
+                            ? time_sync_seqNo + 1
-                              : TIMEANSWERPORT_MIN;
+                            : TIMEANSWERPORT_MIN;
 
-        if (i < TIME_SYNC_SAMPLES - 1) {
+      if (i < TIME_SYNC_SAMPLES - 1) {
-          // wait until next cycle
+        // wait until next cycle
-          vTaskDelay(pdMS_TO_TICKS(TIME_SYNC_CYCLE * 1000));
+        vTaskDelay(pdMS_TO_TICKS(TIME_SYNC_CYCLE * 1000));
-        } else { // before sending last time sample...
+      } else { // before sending last time sample...
-          // ...send flush to open a receive window for last time_sync_answer
+        // ...send flush to open a receive window for last time_sync_answer
-          payload.reset();
+        payload.reset();
-          payload.addByte(0x99);
+        payload.addByte(0x99);
-          SendPayload(RCMDPORT, prio_high);
+        SendPayload(RCMDPORT, prio_high);
-          // ...send a alive open a receive window for last time_sync_answer
+        // ...send a alive open a receive window for last time_sync_answer
-          // LMIC_sendAlive();
+        // LMIC_sendAlive();
-        }
       }
     } // end of for loop to collect timestamp samples
 
     // begin of time critical section: lock app irq's and I2C bus
-    if (!mask_user_IRQ())
+    if (!mask_user_IRQ()) {
-      goto error; // failure
+      ESP_LOGW(TAG,
+               "[%0.3f] Timesync handshake error: irq / i2c masking failed",
+               millis() / 1000.0);
+      goto finish; // failure
+    }
 
     // average time offset over all collected diffs
     time_offset_ms /= TIME_SYNC_SAMPLES;
@@ -127,12 +138,6 @@ void process_timesync_req(void *taskparameter) {
     // end of time critical section: release I2C bus and re-enable app irq's
     unmask_user_IRQ();
 
-    goto finish;
-
-  error:
-    ESP_LOGW(TAG, "[%0.3f] Timeserver error: handshake timed out",
-             millis() / 1000.0);
-
   finish:
     timeSyncPending = false;
 
@@ -142,14 +147,16 @@ void process_timesync_req(void *taskparameter) {
 // called from lorawan.cpp after time_sync_req was sent
 void store_time_sync_req(uint32_t timestamp) {
 
-  if (timeSyncPending) {
+  // if no timesync handshake is pending then exit
+  if (!timeSyncPending)
+    return;
 
-    uint8_t k = time_sync_seqNo % TIME_SYNC_SAMPLES;
+  uint8_t k = time_sync_seqNo % TIME_SYNC_SAMPLES;
-    time_sync_tx[k] += milliseconds(timestamp);
+  time_sync_tx[k] += milliseconds(timestamp);
 
-    ESP_LOGD(TAG, "[%0.3f] Timesync request #%d sent at %d.%03d",
+  ESP_LOGD(TAG, "[%0.3f] Timesync request #%d of %d sent at %d.%03d",
-             millis() / 1000.0, k, timestamp / 1000, timestamp % 1000);
+           millis() / 1000.0, k + 1, TIME_SYNC_SAMPLES, timestamp / 1000,
-  }
+           timestamp % 1000);
 }
 
 // process timeserver timestamp answer, called from lorawan.cpp
@@ -190,8 +197,9 @@ int recv_timesync_ans(uint8_t seq_no, uint8_t buf[], uint8_t buf_len) {
 
     // we guess timepoint is recent if it newer than code compile date
     if (timeIsValid(myClock::to_time_t(time_sync_rx[k]))) {
-      ESP_LOGD(TAG, "[%0.3f] Timesync request #%d rcvd at %d.%03d",
+      ESP_LOGD(TAG, "[%0.3f] Timesync request #%d of %d rcvd at %d.%03d",
-               millis() / 1000.0, k, timestamp_sec, timestamp_msec);
+               millis() / 1000.0, k + 1, TIME_SYNC_SAMPLES, timestamp_sec,
+               timestamp_msec);
 
       // inform processing task
       xTaskNotify(timeSyncReqTask, seq_no, eSetBits);