From 91b6314d97e6b297ca21dd080518291f2a112a56 Mon Sep 17 00:00:00 2001 From: Paolo Fittipaldi Date: Thu, 20 Jun 2024 14:54:35 +0000 Subject: [PATCH] Miscellaneous corrections: Queue gates made @loose to enable substitution with a GatedQueue in satellite nodes without omnetpp complaining --- quisp/modules/Common/GatedQueue.h | 2 +- quisp/modules/Common/GatedQueue.ned | 2 +- quisp/modules/Common/Queue.ned | 6 +++--- quisp/modules/Satellite/PointingSystem.ned | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/quisp/modules/Common/GatedQueue.h b/quisp/modules/Common/GatedQueue.h index 7925e2ff67..09ab2bad37 100644 --- a/quisp/modules/Common/GatedQueue.h +++ b/quisp/modules/Common/GatedQueue.h @@ -33,7 +33,7 @@ class GatedQueue : public Queue { private: bool pending_vcr = false; }; - +Define_Module(GatedQueue); } // namespace quisp::modules #endif diff --git a/quisp/modules/Common/GatedQueue.ned b/quisp/modules/Common/GatedQueue.ned index 528dbeab8a..73caf29051 100644 --- a/quisp/modules/Common/GatedQueue.ned +++ b/quisp/modules/Common/GatedQueue.ned @@ -1,5 +1,5 @@ - package modules.Common; +@namespace(quisp::modules); simple GatedQueue extends Queue { diff --git a/quisp/modules/Common/Queue.ned b/quisp/modules/Common/Queue.ned index 6dcd007590..200fdc7e11 100644 --- a/quisp/modules/Common/Queue.ned +++ b/quisp/modules/Common/Queue.ned @@ -26,7 +26,7 @@ simple Queue // @statistic[txBytes](title="transmitting packet byte length"; unit=bytes; record=vector?,count,sum,histogram; interpolationmode=none); // @statistic[rxBytes](title="received packet byte length"; unit=bytes; record=vector?,count,sum,histogram; interpolationmode=none); gates: - input in; - output out; - inout line; + input in @loose; + output out @loose; + inout line @loose; } diff --git a/quisp/modules/Satellite/PointingSystem.ned b/quisp/modules/Satellite/PointingSystem.ned index 4c1e2b1216..9e6c9be382 100644 --- a/quisp/modules/Satellite/PointingSystem.ned +++ b/quisp/modules/Satellite/PointingSystem.ned @@ -7,9 +7,9 @@ simple PointingSystem { parameters: string name = "VisChecker"; - double orbital_period @unit(s);// = default(6s); - double vis_start_coeff; - double vis_end_coeff; + double orbital_period @unit(s) = default(1d); +// double vis_start_coeff = default(0); +// double vis_end_coeff = default(1); @class(PointingSystem); gates: input req;