- fixed bug: GOOSE minTime, maxTime are ignored by GOOSE publisher when set by GSEControlBlock_create. Instead default values from stack_config.h are always used

examples/server_example_dynamic/server_example_dynamic.c

@@ -57,6 +57,8 @@ int main(int argc, char** argv) {
     ReportControlBlock_create("events01", lln0, "events01", false, NULL, 1, TRG_OPT_DATA_CHANGED, rptOptions, 50, 0);
     ReportControlBlock_create("events02", lln0, "events02", false, NULL, 1, TRG_OPT_DATA_CHANGED, rptOptions, 50, 0);
 
+    GSEControlBlock_create("gse01", lln0, "events01", "events", 1, false, 200, 3000);
+
     /*********************
      * run server
      ********************/

src/iec61850/server/mms_mapping/mms_goose.c

@@ -305,24 +305,20 @@ MmsGooseControlBlock_checkAndPublish(MmsGooseControlBlock self, uint64_t current
         GoosePublisher_publish(self->publisher, self->dataSetValues);
 
         if (self->retransmissionsLeft > 0) {
-            self->nextPublishTime = currentTime + CONFIG_GOOSE_EVENT_RETRANSMISSION_INTERVAL;
+            self->nextPublishTime = currentTime + self->minTime;
 
 
             if (self->retransmissionsLeft > 1)
-                GoosePublisher_setTimeAllowedToLive(self->publisher,
+                GoosePublisher_setTimeAllowedToLive(self->publisher, self->minTime * 3);
-                        CONFIG_GOOSE_EVENT_RETRANSMISSION_INTERVAL * 3);
             else
-                GoosePublisher_setTimeAllowedToLive(self->publisher,
+                GoosePublisher_setTimeAllowedToLive(self->publisher, self->maxTime * 3);
-                        CONFIG_GOOSE_STABLE_STATE_TRANSMISSION_INTERVAL * 3);
 
             self->retransmissionsLeft--;
         }
         else {
-            GoosePublisher_setTimeAllowedToLive(self->publisher,
+            GoosePublisher_setTimeAllowedToLive(self->publisher, self->maxTime * 3);
-                                CONFIG_GOOSE_STABLE_STATE_TRANSMISSION_INTERVAL * 3);
 
-            self->nextPublishTime = currentTime +
+            self->nextPublishTime = currentTime + self->maxTime;
-                CONFIG_GOOSE_STABLE_STATE_TRANSMISSION_INTERVAL;
         }
 
 #if (CONFIG_MMS_THREADLESS_STACK != 1)
@@ -343,18 +339,14 @@ MmsGooseControlBlock_observedObjectChanged(MmsGooseControlBlock self)
     self->retransmissionsLeft = CONFIG_GOOSE_EVENT_RETRANSMISSION_COUNT;
 
     if (self->retransmissionsLeft > 0) {
-        self->nextPublishTime = currentTime +
+        self->nextPublishTime = currentTime + self->minTime;
-                CONFIG_GOOSE_EVENT_RETRANSMISSION_INTERVAL;
 
-        GoosePublisher_setTimeAllowedToLive(self->publisher,
+        GoosePublisher_setTimeAllowedToLive(self->publisher, self->minTime * 3);
-                           CONFIG_GOOSE_EVENT_RETRANSMISSION_INTERVAL * 3);
     }
     else {
-        self->nextPublishTime = currentTime +
+        self->nextPublishTime = currentTime + self->maxTime;
-            CONFIG_GOOSE_STABLE_STATE_TRANSMISSION_INTERVAL;
 
-        GoosePublisher_setTimeAllowedToLive(self->publisher,
+        GoosePublisher_setTimeAllowedToLive(self->publisher, self->maxTime * 3);
-                           CONFIG_GOOSE_STABLE_STATE_TRANSMISSION_INTERVAL * 3);
     }
 
     GoosePublisher_publish(self->publisher, self->dataSetValues);

src/sampled_values/sv_subscriber.h

@@ -73,6 +73,7 @@ extern "C" {
  *
  * The SV subscriber API can be used independent of the IEC 61850 client API. In order to access the SVCB via MMS you
  * have to use the IEC 61850 client API. Please see \ref ClientSVControlBlock object in section \ref IEC61850_CLIENT_SV.
+ *
  */
 /**@{*/