Skip to content

Commit 34fd8b4

Browse files
author
watney
committed
In the fprime backend, rename SMEvents to SMSignals
1 parent 4106b4a commit 34fd8b4

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎autocoder/fprime_backend/fprimeImplTemplates.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ def componentHdrFile(self, smname: str, namespace: str, component: str, funcList
4545
#ifndef _SIGNAL_GEN_HPP_
4646
#define _SIGNAL_GEN_HPP_
4747
48-
\#include "Fw/Types/SMEventsSerializableAc.hpp"
48+
\#include "Fw/Types/SMSignalsSerializableAc.hpp"
4949
\#include "$(smname).hpp"
5050
5151
namespace $(namespace) {

‎autocoder/fprime_backend/fprimeUnitTestTemplates.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def sendEventFile(self, smname, component, namespace, implHdr, triggerList):
3434
\#include <assert.h>
3535
\#include <string.h>
3636
\#include "sendEvent.h"
37-
\#include "Fw/Types/SMEventsSerializableAc.hpp"
37+
\#include "Fw/Types/SMSignalsSerializableAc.hpp"
3838
\#include "$(implHdr)"
3939
\#include "$(smname).hpp"
4040
@@ -43,7 +43,7 @@ def sendEventFile(self, smname, component, namespace, implHdr, triggerList):
4343
4444
void sendEvent_send(unsigned int signal) {
4545
// Instantiate an event
46-
Fw::SMEvents event;
46+
Fw::SMSignals event;
4747
char signalName[100];
4848
4949
switch (signal) {

‎autocoder/fprime_backend/fprimetemplates.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def guardSignature(self, smname: str, action: str, args: str) -> str:
4444
if args == "":
4545
template = Template("""bool $(smname)_$(action)()""")
4646
elif args == "e":
47-
template = Template("""bool $(smname)_$(action)(const Fw::SMEvents *e)""")
47+
template = Template("""bool $(smname)_$(action)(const Fw::SMSignals *e)""")
4848
elif args.isdigit():
4949
template = Template("""bool $(smname)_$(action)(int arg)""")
5050
else:
@@ -62,7 +62,7 @@ def guardDef(self, smname: str, action: str, component: str, args: str, namespac
6262
if args == "":
6363
template = Template("""bool $(namespace)::$(component)::$(smname)_$(action)()""")
6464
elif args == "e":
65-
template = Template("""bool $($namespace)::$(component)::$(smname)_$(action)(const Fw::SMEvents *e)""")
65+
template = Template("""bool $($namespace)::$(component)::$(smname)_$(action)(const Fw::SMSignals *e)""")
6666
elif args.isdigit():
6767
template = Template("""bool $(namespace)::$(component)::$(smname)_$(action)(int arg)""")
6868
else:
@@ -96,7 +96,7 @@ def actionSignature(self, smname: str, action: str, args: str) -> str:
9696
if args == "":
9797
template = Template("""void $(smname)_$(action)()""")
9898
elif args == "e":
99-
template = Template("""void $(smname)_$(action)(const Fw::SMEvents *e)""")
99+
template = Template("""void $(smname)_$(action)(const Fw::SMSignals *e)""")
100100
elif args.isdigit():
101101
template = Template("""void $(smname)_$(action)(int arg)""")
102102
else:
@@ -115,7 +115,7 @@ def actionDef(self, smname: str, action: str, component: str, args: str, namespa
115115
if args == "":
116116
template = Template("""void $(namespace)::$(component)::$(smname)_$(action)()""")
117117
elif args == "e":
118-
template = Template("""void $(namespace)::$(component)::$(smname)_$(action)(const Fw::SMEvents *e)""")
118+
template = Template("""void $(namespace)::$(component)::$(smname)_$(action)(const Fw::SMSignals *e)""")
119119
elif args.isdigit():
120120
template = Template("""void $(namespace)::$(component)::$(smname)_$(action)(int arg)""")
121121
else:
@@ -157,7 +157,7 @@ def fileHeader(self, smname: str, stateList: List[str], eventList: List[str], na
157157
#define $(smname.upper())_H_
158158
159159
namespace Fw {
160-
class SMEvents;
160+
class SMSignals;
161161
}
162162
163163
namespace $(namespace) {
@@ -196,7 +196,7 @@ class $(smname) {
196196
void * extension;
197197
198198
void init();
199-
void update(const Fw::SMEvents *e);
199+
void update(const Fw::SMSignals *e);
200200
201201
};
202202
@@ -227,7 +227,7 @@ def stateMachineInit(self, smname: str, transition: str, namespace: str) -> str:
227227
228228
\#include "stdio.h"
229229
\#include "assert.h"
230-
\#include "Fw/Types/SMEventsSerializableAc.hpp"
230+
\#include "Fw/Types/SMSignalsSerializableAc.hpp"
231231
\#include "$(smname).hpp"
232232
233233
@@ -237,7 +237,7 @@ def stateMachineInit(self, smname: str, transition: str, namespace: str) -> str:
237237
}
238238
239239
240-
void $(namespace)::$(smname)::update(const Fw::SMEvents *e)
240+
void $(namespace)::$(smname)::update(const Fw::SMSignals *e)
241241
{
242242
switch (this->state) {
243243
""")
@@ -343,7 +343,7 @@ class $(component)SmBase : public $(componentBase)
343343
void sendEvent(U32 eventSignal, StateMachine::SmId id);
344344
345345
// Internal Interface handler for sendEvents
346-
void sendEvents_internalInterfaceHandler(const Fw::SMEvents& ev);
346+
void sendEvents_internalInterfaceHandler(const Fw::SMSignals& ev);
347347
348348
// Instantiate the state machines
349349
#for $state in $state_machines
@@ -416,13 +416,13 @@ def smBaseCpp(self,
416416
417417
void $(nameSpace)::$(component)SmBase:: sendEvent(U32 eventSignal, StateMachine::SmId id) {
418418
419-
Fw::SMEvents event;
419+
Fw::SMSignals event;
420420
event.seteventSignal(eventSignal);
421421
event.setsmId(id);
422422
sendEvents_internalInterfaceInvoke(event);
423423
}
424424
425-
void $(nameSpace)::$(component)SmBase::sendEvents_internalInterfaceHandler(const Fw::SMEvents& ev)
425+
void $(nameSpace)::$(component)SmBase::sendEvents_internalInterfaceHandler(const Fw::SMSignals& ev)
426426
{
427427
U16 id = ev.getsmId();
428428
switch (id) {
@@ -449,16 +449,16 @@ def smBaseCpp(self,
449449
return str(template)
450450

451451
# -------------------------------------------------------------------------------
452-
# smEvents
452+
# smSignals
453453
# -------------------------------------------------------------------------------
454-
def smEvents(self) -> str:
454+
def smSignalss(self) -> str:
455455

456456
template = Template("""
457457
# This is an Auto generate file from the STARS Autocoder
458458
459459
module Fw {
460460
461-
struct SMEvents {
461+
struct SMSignals {
462462
smId : U32
463463
eventSignal: U32
464464
payload: [128] U8
@@ -479,7 +479,7 @@ def internalQ(self, state_machines) -> str:
479479
# This is an Auto generate file from the STARS Autocoder
480480
481481
@ internal port for handling state-machine Events
482-
internal port sendEvents(ev: Fw.SMEvents)
482+
internal port sendEvents(ev: Fw.SMSignals)
483483
484484
#for $state in $state_machines
485485
include "$(state.stateName).fppi"

models/TestModels/Fw/Types/SMEventsSerializableAc.hpp renamed to models/TestModels/Fw/Types/SMSignalsSerializableAc.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SMEvents.hpp
2+
* SMSignals.hpp
33
*
44
* Created on: Thursday, 06 January 2022
55
* Author: watney
@@ -13,7 +13,7 @@ typedef unsigned int U32;
1313
typedef int NATIVE_INT_TYPE;
1414

1515
namespace Fw {
16-
class SMEvents {
16+
class SMSignals {
1717

1818

1919
public:
@@ -22,21 +22,21 @@ class SMEvents {
2222
SERIALIZED_SIZE =
2323
sizeof(U32) +
2424
sizeof(U8)*128
25-
}; //!< serializable size of SMEvents
25+
}; //!< serializable size of SMSignals
2626

27-
SMEvents() {
27+
SMSignals() {
2828
this->m_eventSignal = 0;
2929
for (NATIVE_INT_TYPE _mem = 0; _mem < 128; _mem++) {
3030
this->m_payload[_mem] = 0;
3131
}
3232
}
3333

34-
SMEvents(const SMEvents* src); //!< pointer copy constructor
35-
SMEvents(const SMEvents& src); //!< reference copy constructor
36-
SMEvents(U32 eventSignal, const U8* payload, NATIVE_INT_TYPE payloadSize); //!< constructor with arguments
37-
SMEvents(U32 eventSignal, const U8 payload); //!< constructor with arguments with scalars for array arguments
38-
SMEvents& operator=(const SMEvents& src); //!< equal operator
39-
bool operator==(const SMEvents& src) const; //!< equality operator
34+
SMSignals(const SMSignals* src); //!< pointer copy constructor
35+
SMSignals(const SMSignals& src); //!< reference copy constructor
36+
SMSignals(U32 eventSignal, const U8* payload, NATIVE_INT_TYPE payloadSize); //!< constructor with arguments
37+
SMSignals(U32 eventSignal, const U8 payload); //!< constructor with arguments with scalars for array arguments
38+
SMSignals& operator=(const SMSignals& src); //!< equal operator
39+
bool operator==(const SMSignals& src) const; //!< equality operator
4040

4141
void set(U32 eventSignal, const U8* payload, NATIVE_INT_TYPE payloadSize); //!< set values
4242

0 commit comments

Comments
 (0)