Skip to content

Commit 0d1023e

Browse files
committed
[squash] Removal of spice message (not needed) Squash into first commit
1 parent 62d7c78 commit 0d1023e

File tree

3 files changed

+2
-10
lines changed

3 files changed

+2
-10
lines changed

src/simulation/communication/linkBudget/linkBudget.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ void LinkBudget::Reset(uint64_t CurrentSimNanos)
7070
if (!this->antennaInPayload_2.isLinked()) {
7171
bskLogger.bskLog(BSK_ERROR, "LinkBudget.antennaInPayload_2 was not linked.");
7272
}
73-
if (!this->spicePlanetStateInMsg.isLinked()) {
74-
bskLogger.bskLog(BSK_ERROR, "LinkBudget.spicePlanetStateInMsg was not linked."); // TODO does this message need to be linked or optional?
75-
}
7673
this->initialization();
7774
}
7875

@@ -160,7 +157,6 @@ void LinkBudget::readMessages()
160157
// read in the input messages
161158
this->antennaIn_1 = this->antennaInPayload_1();
162159
this->antennaIn_2 = this->antennaInPayload_2();
163-
this->spicePlanetStateMsg = this->spicePlanetStateInMsg();
164160
}
165161

166162
void LinkBudget::calculateLinkBudget()

src/simulation/communication/linkBudget/linkBudget.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,16 @@ class LinkBudget: public SysModel {
7676
public:
7777
ReadFunctor<AntennaLogMsgPayload> antennaInPayload_1; //!< antenna output antenna 1
7878
ReadFunctor<AntennaLogMsgPayload> antennaInPayload_2; //!< antenna output antenna 2
79-
ReadFunctor<SpicePlanetStateMsgPayload> spicePlanetStateInMsg; //!< setting antenna to [off / Rx / Tx / RxTx]
8079

8180
// local copies of message buffers
8281
AntennaLogMsgPayload antennaIn_1; //!< local copy of message buffer
8382
AntennaLogMsgPayload antennaIn_2; //!< local copy of message buffer
84-
SpicePlanetStateMsgPayload spicePlanetStateMsg; //!< local copy of message buffer
8583

8684
// Output Messages
87-
Message<LinkBudgetMsgPayload> linkBudgetOutPayload; //!< output msg description
85+
Message<LinkBudgetMsgPayload> linkBudgetOutPayload; //!< output msg description
8886

8987
// Variables to store (output) message data
90-
LinkBudgetMsgPayload linkBudgetOutPayloadBuffer; //!< local copy of message buffer
88+
LinkBudgetMsgPayload linkBudgetOutPayloadBuffer; //!< local copy of message buffer
9189

9290
BSKLogger bskLogger; //!< BSK Logging
9391

src/simulation/communication/linkBudget/linkBudget.i

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@
3737

3838
%include "architecture/msgPayloadDefC/AntennaLogMsgPayload.h"
3939
struct AntennaLogMsg_C;
40-
%include "architecture/msgPayloadDefC/spicePlanetStateMsgPayload.h"
41-
struct spicePlanetStateMsg_C;
4240
%include "architecture/msgPayloadDefC/LinkBudgetMsgPayload.h"
4341
struct LinkBudgetMsg_C;
4442

0 commit comments

Comments
 (0)