From 6685cdb3f0feae9efe025f589a483f22cb597942 Mon Sep 17 00:00:00 2001 From: Thomas Schuetz Date: Wed, 22 Feb 2012 10:13:44 +0100 Subject: [generator.c.reference] ignore src-gen --- .../.gitignore | 2 + .../src-gen/cGenRef/CommunicationProtocol.c | 74 ---------------------- .../src-gen/cGenRef/CommunicationProtocol.h | 60 ------------------ .../src-gen/cGenRef/DataClass1.c | 31 --------- .../src-gen/cGenRef/DataClass1.h | 40 ------------ .../src-gen/cGenRef/DataClass2.c | 25 -------- .../src-gen/cGenRef/DataClass2.h | 32 ---------- .../src-gen/cGenRef/ReceiverManual.c | 28 -------- .../src-gen/cGenRef/ReceiverManual.h | 40 ------------ .../src-gen/cGenRef/SenderManual.c | 27 -------- .../src-gen/cGenRef/SenderManual.h | 41 ------------ .../src-gen/cGenRef/SubSys.c | 74 ---------------------- .../src-gen/cGenRef/SubSys.h | 27 -------- .../src-gen/cGenRef/SubSys_Disp.h | 30 --------- .../src-gen/cGenRef/SubSys_Inst.h | 58 ----------------- .../src-gen/cGenRef/SubSys_Runner.c | 41 ------------ 16 files changed, 2 insertions(+), 628 deletions(-) delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.c delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Disp.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Inst.h delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Runner.c diff --git a/examples/org.eclipse.etrice.generator.c.reference/.gitignore b/examples/org.eclipse.etrice.generator.c.reference/.gitignore index 76b025ad1..bb84fd7b6 100644 --- a/examples/org.eclipse.etrice.generator.c.reference/.gitignore +++ b/examples/org.eclipse.etrice.generator.c.reference/.gitignore @@ -1,2 +1,4 @@ Debug Release +src-gen/* +!src-gen/readme.txt diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.c deleted file mode 100644 index 8dc2b76bf..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.c +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of ProtocolClass CommunicationProtocol - * - */ - -#include "CommunicationProtocol.h" - -#include "etMSCLogger.h" - -/*--------------------- port classes */ - -void CommunicationProtocolPort_outMessage1(const CommunicationProtocolPort* self){ - ET_MSC_LOGGER_SYNC_ENTRY("CommunicationProtocolPort", "outMessage1") - etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage)); - msg->address = self->peerAddress; - msg->evtID = CommunicationProtocol_OUT_outMessage1; - etMessageService_pushMessage(self->msgService, msg); - ET_MSC_LOGGER_SYNC_EXIT -} -void CommunicationProtocolPort_outMessage2(const CommunicationProtocolPort* self){ - ET_MSC_LOGGER_SYNC_ENTRY("CommunicationProtocolPort", "outMessage2") - etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage)); - msg->address = self->peerAddress; - msg->evtID = CommunicationProtocol_OUT_outMessage2; - etMessageService_pushMessage(self->msgService, msg); - ET_MSC_LOGGER_SYNC_EXIT -} -void CommunicationProtocolPort_outMessage123456789(const CommunicationProtocolPort* self){ - ET_MSC_LOGGER_SYNC_ENTRY("CommunicationProtocolPort", "outMessage123456789") - etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage)); - msg->address = self->peerAddress; - msg->evtID = CommunicationProtocol_OUT_outMessage123456789; - etMessageService_pushMessage(self->msgService, msg); - ET_MSC_LOGGER_SYNC_EXIT -} - - - -void CommunicationProtocolConjPort_inMessage1(const CommunicationProtocolConjPort* self){ - ET_MSC_LOGGER_SYNC_ENTRY("CommunicationProtocolConjPort", "inMessage1") - etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage)); - msg->address = self->peerAddress; - msg->evtID = CommunicationProtocol_IN_inMessage1; - etMessageService_pushMessage(self->msgService, msg); - ET_MSC_LOGGER_SYNC_EXIT -} -void CommunicationProtocolConjPort_inMessage2(const CommunicationProtocolConjPort* self){ - ET_MSC_LOGGER_SYNC_ENTRY("CommunicationProtocolConjPort", "inMessage2") - etMessage* msg = etMessageService_getMessageBuffer(self->msgService, sizeof(etMessage)); - msg->address = self->peerAddress; - msg->evtID = CommunicationProtocol_IN_inMessage2; - etMessageService_pushMessage(self->msgService, msg); - ET_MSC_LOGGER_SYNC_EXIT -} - - - -/*--------------------- debug helpers */ - -/* TODO: make this optional or different for smaller footprint */ -/* message names as strings for debugging (generate MSC) */ -static const char* CommunicationProtocol_messageStrings[] = {"MIN", "outMessage1","outMessage2","outMessage123456789","inMessage1", "inMessage2", "MAX"}; - -const char* CommunicationProtocol_getMessageString(int msg_id) { - if (msg_idCommunicationProtocol_MSG_MAX+1){ - /* id out of range */ - return "Message ID out of range"; - } - else{ - return CommunicationProtocol_messageStrings[msg_id]; - } -} diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.h deleted file mode 100644 index 607dbb894..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/CommunicationProtocol.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of ProtocolClass CommunicationProtocol - * - */ - -#ifndef _COMMUNICATIONPROTOCOL_H_ -#define _COMMUNICATIONPROTOCOL_H_ - -#include "etDatatypes.h" -#include "etPort.h" - - -#include "DataClass1.h" - -/* message IDs */ -enum { - CommunicationProtocol_MSG_MIN = 0, - /* IDs for outgoing messages */ - CommunicationProtocol_OUT_outMessage1 = 1, - CommunicationProtocol_OUT_outMessage2 = 2, - CommunicationProtocol_OUT_outMessage123456789 = 3, - /* IDs for incoming messages */ - CommunicationProtocol_IN_inMessage1 = 4, - CommunicationProtocol_IN_inMessage2 = 5, - /* error if msgID >= MSG_MAX */ - CommunicationProtocol_MSG_MAX = 6 -}; - -/*--------------------- port classes */ - -typedef etPort CommunicationProtocolPort; - -void CommunicationProtocolPort_outMessage1(const CommunicationProtocolPort* self); -void CommunicationProtocolPort_outMessage2(const CommunicationProtocolPort* self); -void CommunicationProtocolPort_outMessage123456789(const CommunicationProtocolPort* self); - - - - - -typedef etPort CommunicationProtocolConjPort; - -void CommunicationProtocolConjPort_inMessage1(const CommunicationProtocolConjPort* self); -void CommunicationProtocolConjPort_inMessage2(const CommunicationProtocolConjPort* self); - - - - - -/*--------------------- debug helpers */ - -/* get message string for message id */ -const char* CommunicationProtocol_getMessageString(int msg_id); - - - -#endif /* _COMMUNICATIONPROTOCOL_H_ */ - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.c deleted file mode 100644 index d66aaaae4..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.c +++ /dev/null @@ -1,31 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of DataClass DataClass1 - * - */ - -#include "DataClass1.h" - -#include - -//--------------------- begin user code - // usercode3 -//--------------------- end user code - -// TODO: do we need setters and getters for C and C++ ? - -//--------------------- operations -int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value) { - return self->Attr1*value; -} -float32 DataClass1_MultiplyWithAttr3(DataClass1* self, float32 value) { - return self->Attr3*value; -} - -// deep copy -void DataClass1_deepCopy(DataClass1* source, DataClass1* target) { - memcpy(target, source, sizeof(DataClass1)); -} - - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.h deleted file mode 100644 index c9ffdba2b..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass1.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of DataClass DataClass1 - * - */ - -#ifndef _DATACLASS1_H_ -#define _DATACLASS1_H_ - -#include "etDatatypes.h" - -/* TODO: includes only for used DataClasses, also for other models */ -#include "DataClass2.h" - -//--------------------- begin user code - // usercode1 -//--------------------- end user code - -typedef struct { - //--------------------- begin user code - // usercode2 - //--------------------- end user code - //--------------------- attributes - int32 Attr1; - DataClass2 ComplexAttr; - float32 Attr3; -} DataClass1; - -// TODO: do we need setters and getters for C and C++ ? - -//--------------------- operations -int32 DataClass1_MultiplyWithAttr1(DataClass1* self, int32 value); -float32 DataClass1_MultiplyWithAttr3(DataClass1* self, float32 value); - -// deep copy -void DataClass1_deepCopy(DataClass1* source, DataClass1* target); - -#endif /* _DATACLASS1_H_ */ - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.c deleted file mode 100644 index 6445aa75a..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.c +++ /dev/null @@ -1,25 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of DataClass DataClass2 - * - */ - -#include "DataClass2.h" - -#include - - -// TODO: do we need setters and getters for C and C++ ? - -//--------------------- operations -void DataClass2_Operation1(DataClass2* self) { - /*nothing to do*/ -} - -// deep copy -void DataClass2_deepCopy(DataClass2* source, DataClass2* target) { - memcpy(target, source, sizeof(DataClass2)); -} - - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.h deleted file mode 100644 index dc3dd8c7c..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/DataClass2.h +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of DataClass DataClass2 - * - */ - -#ifndef _DATACLASS2_H_ -#define _DATACLASS2_H_ - -#include "etDatatypes.h" - -/* TODO: includes only for used DataClasses, also for other models */ - - -typedef struct { - //--------------------- attributes - int32 Attr1; - float32 Attr2; - int32 Attr3; -} DataClass2; - -// TODO: do we need setters and getters for C and C++ ? - -//--------------------- operations -void DataClass2_Operation1(DataClass2* self); - -// deep copy -void DataClass2_deepCopy(DataClass2* source, DataClass2* target); - -#endif /* _DATACLASS2_H_ */ - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.c deleted file mode 100644 index 398f681a9..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.c +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of ActorClass ReceiverManual - * - */ - -#include "ReceiverManual.h" - -#include "etLogger.h" - -#include "etMSCLogger.h" - - -void ReceiverManual_init(ReceiverManual* self){ - ET_MSC_LOGGER_SYNC_ENTRY("ReceiverManual", "init") - CommunicationProtocolPort_outMessage1(&self->constData->dataIn); - CommunicationProtocolPort_outMessage2(&self->constData->dataIn); - CommunicationProtocolPort_outMessage123456789(&self->constData->dataIn); - ET_MSC_LOGGER_SYNC_EXIT -} - - -void ReceiverManual_ReceiveMessage(void* self, etInt16 localId, const etMessage* msg){ - ET_MSC_LOGGER_SYNC_ENTRY("ReceiverManual", "ReceiveMessage") - ET_MSC_LOGGER_SYNC_EXIT -} - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.h deleted file mode 100644 index aea6fc331..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/ReceiverManual.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of ActorClass ReceiverManual - * - */ - -#ifndef _RECEIVERMANUAL_H_ -#define _RECEIVERMANUAL_H_ - -#include "etDatatypes.h" - - -#include "CommunicationProtocol.h" - - -typedef struct ReceiverManual ReceiverManual; - -/* const part of ActorClass (ROM) */ -typedef struct ReceiverManual_const { - const ReceiverManual* actor; - /* Ports */ - const CommunicationProtocolPort dataIn; - -} ReceiverManual_const; - -/* variable part of ActorClass (RAM) */ -struct ReceiverManual { - const ReceiverManual_const* constData; -}; - -void ReceiverManual_init(ReceiverManual* self); - -void ReceiverManual_ReceiveMessage(void* self, etInt16 localId, const etMessage* msg); - - - - -#endif /* _RECEIVERMANUAL_H_ */ - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.c deleted file mode 100644 index 5c3b7cae0..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.c +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of ActorClass SenderManual - * - */ - -#include "SenderManual.h" - -#include "etLogger.h" - -#include "etMSCLogger.h" - - -void SenderManual_init(SenderManual* self){ - ET_MSC_LOGGER_SYNC_ENTRY("SenderManual", "init") - CommunicationProtocolConjPort_inMessage1(&self->constData->dataOut); - CommunicationProtocolConjPort_inMessage2(&self->constData->dataOut); - ET_MSC_LOGGER_SYNC_EXIT -} - - -void SenderManual_ReceiveMessage(void* self, etInt16 localId, const etMessage* msg){ - ET_MSC_LOGGER_SYNC_ENTRY("SenderManual", "ReceiveMessage") - ET_MSC_LOGGER_SYNC_EXIT -} - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.h deleted file mode 100644 index b3980e4bb..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SenderManual.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of ActorClass SenderManual - * - */ - -#ifndef _SENDERMANUAL_H_ -#define _SENDERMANUAL_H_ - -#include "etDatatypes.h" - -#include "DataClass1.h" - -#include "CommunicationProtocol.h" - - -typedef struct SenderManual SenderManual; - -/* const part of ActorClass (ROM) */ -typedef struct SenderManual_const { - const SenderManual* actor; - /* Ports */ - const CommunicationProtocolConjPort dataOut; - -} SenderManual_const; - -/* variable part of ActorClass (RAM) */ -struct SenderManual { - const SenderManual_const* constData; -}; - -void SenderManual_init(SenderManual* self); - -void SenderManual_ReceiveMessage(void* self, etInt16 localId, const etMessage* msg); - - - - -#endif /* _SENDERMANUAL_H_ */ - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.c deleted file mode 100644 index 91daf5c31..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.c +++ /dev/null @@ -1,74 +0,0 @@ -/** - * @author generated by eTrice - * - * Source File of SubSystemClass SubSys - * - */ - -#include "SubSys.h" - -/* include instances for all classes */ -#include "SubSys_Inst.h" -#include "SubSys_Disp.h" - -#include "etLogger.h" -#include "etMSCLogger.h" - - -/* data for SubSysten SubSys */ -typedef struct SubSys { - char *name; -} SubSys; - -static SubSys SubSysInst = {"SubSys"}; - -void SubSys_initActorInstances(void); - -void SubSys_init(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "init") - etLogger_logInfoF("%s_init", SubSysInst.name); - - /* initialization of all message services */ - etMessageService_init(&msgService_Thread1, msgBuffer_Thread1, MESSAGE_POOL_MAX, MESSAGE_BLOCK_SIZE, MsgDispatcher_Thread1_receiveMessage); - - /* init all actors */ - SubSys_initActorInstances(); - - ET_MSC_LOGGER_SYNC_EXIT -} - -void SubSys_start(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "start") - etLogger_logInfoF("%s_start", SubSysInst.name); - ET_MSC_LOGGER_SYNC_EXIT -} - -void SubSys_run(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "run") - int32 i; - for (i=0; i<100; i++){ - etLogger_logInfoF("%s Scheduler tick %d", SubSysInst.name, i); - etMessageService_execute(&msgService_Thread1); - } - ET_MSC_LOGGER_SYNC_EXIT -} - -void SubSys_stop(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "stop") - etLogger_logInfoF("%s_stop", SubSysInst.name); - ET_MSC_LOGGER_SYNC_EXIT -} - -void SubSys_destroy(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "destroy") - etLogger_logInfoF("%s_destroy", SubSysInst.name); - ET_MSC_LOGGER_SYNC_EXIT -} - -void SubSys_initActorInstances(void){ - ET_MSC_LOGGER_SYNC_ENTRY("SubSys", "initActorInstances") - ReceiverManual_init(&_SubSys_Receiver); - SenderManual_init(&_SubSys_Sender); - ET_MSC_LOGGER_SYNC_EXIT -} - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.h deleted file mode 100644 index eee116929..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys.h +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @author generated by eTrice - * - * Header File of SubSystemClass SubSys - * - */ - -#ifndef _SUBSYS_H_ -#define _SUBSYS_H_ - - -/* lifecycle functions - * init -> start -> run (loop) -> stop -> destroy - */ - -void SubSys_init(void); /* lifecycle init */ -void SubSys_start(void); /* lifecycle start */ - -void SubSys_run(void); /* lifecycle run */ - -void SubSys_stop(void); /* lifecycle stop */ -void SubSys_destroy(void); /* lifecycle destroy */ - - -#endif /* _SUBSYS_H_ */ - - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Disp.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Disp.h deleted file mode 100644 index c6a09aa28..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Disp.h +++ /dev/null @@ -1,30 +0,0 @@ -/** - * @author generated by eTrice - * - * Dispatcher File of SubSystemClass SubSys - * - one generated dispatcher for each MessageService (Thread) - */ - -#include "etMessageReceiver.h" -#include "etLogger.h" -#include "etMSCLogger.h" - -static void MsgDispatcher_Thread1_receiveMessage(const etMessage* msg){ - ET_MSC_LOGGER_SYNC_ENTRY("MsgDispatcher_Thread1", "receiveMessage") - switch(msg->address){ - - /* interface items of /SubSys/Receiver */ - case 102: - etPort_receive(&_SubSys_Receiver_const.dataIn, msg); - break; - /* interface items of /SubSys/Sender */ - case 104: - etPort_receive(&_SubSys_Sender_const.dataOut, msg); - break; - - default: - etLogger_logErrorF("MessageService_Thread1_ReceiveMessage: address %d does not exist ", msg->address); - break; - } - ET_MSC_LOGGER_SYNC_EXIT -} diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Inst.h b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Inst.h deleted file mode 100644 index 9cc7e3586..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Inst.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @author generated by eTrice - * - * Instance File of SubSystemClass SubSys - * - instantiation of all actor instances and port instances - * - configuration of data and connection of ports - */ - -#include "etMessageService.h" - -/* instantiation of message services */ -#define MESSAGE_POOL_MAX 10 -#define MESSAGE_BLOCK_SIZE 32 -/* MessageService for Thread1 */ -uint8 msgBuffer_Thread1[MESSAGE_POOL_MAX*MESSAGE_BLOCK_SIZE]; -etMessageService msgService_Thread1; - - -/* include all used ActorClasses */ -/* TODO: only include used Actor Classes for current SubSystem */ -#include "SenderManual.h" -#include "ReceiverManual.h" - -/* include all used ProtcolClasses */ -#include "CommunicationProtocol.h" - - -/* declarations of all ActorClass instances (const and variable structs) */ - -/* forward declaration of variable actor structs */ -static ReceiverManual _SubSys_Receiver; -static SenderManual _SubSys_Sender; - - -/* instance _SubSys_Receiver */ -static const ReceiverManual_const _SubSys_Receiver_const = { - &_SubSys_Receiver, - /* Ports: {myActor, etReceiveMessage, msgService, peerAddress, localId} */ - /* TODO: not robust if not connected and not implemented for replication */ - {&_SubSys_Receiver, ReceiverManual_ReceiveMessage, &msgService_Thread1, 104, 123} /* Port dataIn */ - -}; -static ReceiverManual _SubSys_Receiver = {&_SubSys_Receiver_const}; - -/* instance _SubSys_Sender */ -static const SenderManual_const _SubSys_Sender_const = { - &_SubSys_Sender, - /* Ports: {myActor, etReceiveMessage, msgService, peerAddress, localId} */ - /* TODO: not robust if not connected and not implemented for replication */ - {&_SubSys_Sender, SenderManual_ReceiveMessage, &msgService_Thread1, 102, 123} /* Port dataOut */ - -}; -static SenderManual _SubSys_Sender = {&_SubSys_Sender_const}; - - - - - diff --git a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Runner.c b/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Runner.c deleted file mode 100644 index b0b586b8b..000000000 --- a/examples/org.eclipse.etrice.generator.c.reference/src-gen/cGenRef/SubSys_Runner.c +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @author generated by eTrice - * - * this class contains the main function running component SubSys - * it instantiates SubSys and starts and ends the lifecycle - */ - - -#include "SubSys.h" - -#include "etLogger.h" -#include "etMSCLogger.h" - - -/** - * main function - * creates component and starts and stops the lifecycle - */ - -int main(void) { - - etLogger_logInfo("*** T H E B E G I N ***"); - ET_MSC_LOGGER_OPEN("main"); - - /* startup sequence of lifecycle */ - SubSys_init(); /* lifecycle init */ - SubSys_start(); /* lifecycle start */ - - /* run Scheduler */ - SubSys_run(); - - /* shutdown sequence of lifecycle */ - SubSys_stop(); /* lifecycle stop */ - SubSys_destroy(); /* lifecycle destroy */ - - ET_MSC_LOGGER_CLOSE - etLogger_logInfo("*** T H E E N D ***"); - - return 0; -} - -- cgit v1.2.3 From ee668a71dbbf0730df6fc70df5db9328e3e7057d Mon Sep 17 00:00:00 2001 From: Thomas Schuetz Date: Fri, 24 Feb 2012 15:44:03 +0100 Subject: [generator.c.reference] added example for tests --- .../Henrik-Test.launch | 10 ++ .../model/diagrams/generic_fsm_gen.AC.behavior | 106 +++++++++++++++++++++ .../model/generic_fsm_gen.room | 81 ++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 examples/org.eclipse.etrice.generator.c.reference/Henrik-Test.launch create mode 100644 examples/org.eclipse.etrice.generator.c.reference/model/diagrams/generic_fsm_gen.AC.behavior create mode 100644 examples/org.eclipse.etrice.generator.c.reference/model/generic_fsm_gen.room diff --git a/examples/org.eclipse.etrice.generator.c.reference/Henrik-Test.launch b/examples/org.eclipse.etrice.generator.c.reference/Henrik-Test.launch new file mode 100644 index 000000000..55fb35877 --- /dev/null +++ b/examples/org.eclipse.etrice.generator.c.reference/Henrik-Test.launch @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/generic_fsm_gen.AC.behavior b/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/generic_fsm_gen.AC.behavior new file mode 100644 index 000000000..ef3d064c9 --- /dev/null +++ b/examples/org.eclipse.etrice.generator.c.reference/model/diagrams/generic_fsm_gen.AC.behavior @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/examples/org.eclipse.etrice.generator.c.reference/model/generic_fsm_gen.room b/examples/org.eclipse.etrice.generator.c.reference/model/generic_fsm_gen.room new file mode 100644 index 000000000..0222ae5ec --- /dev/null +++ b/examples/org.eclipse.etrice.generator.c.reference/model/generic_fsm_gen.room @@ -0,0 +1,81 @@ +RoomModel generic_fsm_gen { + + SubSystemClass Main { + ActorRef sys: AC + ActorRef peer: Peer + Binding sys.fct and peer.fct + } + + ActorClass Peer { + Interface { + conjugated Port fct: PC + } + Structure { + external Port fct + } + Behavior { + StateMachine { + Transition init: initial -> state0 { + action { + "PCConjPort_m1(&self->constData->fct);" + } + } + Transition tr0: state0 -> state0 { + triggers { + + } + action { + "printf(\"Peer\\n\");" + "PCConjPort_m1(&self->constData->fct);" + } + } + State state0 + } + } + } + + ActorClass AC { + Interface { + Port fct: PC + } + Structure { + external Port fct + } + Behavior { + StateMachine { + Transition init: initial -> state0 { } + Transition tr0: state0 -> state0 { + triggers { + + } + action { + "printf(\"AC\\n\");" + "static int32 counter = 0;" + "if (++counter < 3){" + "\tPCPort_m2(&self->constData->fct);" + "}" + } + } + State state0 + } + } + } + + ProtocolClass PC { + incoming { + Message m1() + } + outgoing { + Message m2() + } + } + + DataClass DC { + Attribute ival: int32 + Operation mult(a: int32, b: int32): int32 { + "return a*b;" + } + } + + PrimitiveType int32 -> int (Integer) default "0" +} \ No newline at end of file -- cgit v1.2.3 From afc4b117aab39c0f6f726c4efdaa83f441faf61c Mon Sep 17 00:00:00 2001 From: Thomas Schuetz Date: Sun, 26 Feb 2012 15:58:40 +0100 Subject: [runtime.c] reorganized runtime.c for separation of common and platform specific parts, adapted include pathes, C-generator and tests --- .../.cproject | 15 +- .../gen_cGenRef.launch | 10 + .../manualCGenLaunch.launch | 13 - .../model/cGenRef.room | 46 +- .../model/diagrams/cGenRef.Broadcast.behavior | 851 ++++---- .../model/diagrams/cGenRef.Receiver.behavior | 135 ++ .../model/diagrams/cGenRef.SubSys.structure | 40 +- .../src/test/experiments/MSCLogTest.c | 4 +- .../src/test/experiments/SubSystem.c | 2 +- .../tmp/msc.seq | 1470 +++++++------- .../etrice/generator/c/gen/ActorClassGen.xtend | 8 +- .../etrice/generator/c/gen/DataClassGen.xtend | 4 +- .../etrice/generator/c/gen/ProtocolClassGen.xtend | 4 +- .../etrice/generator/c/gen/SubSystemClassGen.xtend | 12 +- .../generator/c/gen/SubSystemRunnerGen.xtend | 4 +- .../etrice/generator/c/gen/ActorClassGen.java | 922 ++++----- .../etrice/generator/c/gen/CExtensions.java | 406 ++-- .../etrice/generator/c/gen/DataClassGen.java | 466 ++--- .../eclipse/etrice/generator/c/gen/MainGen.java | 122 +- .../etrice/generator/c/gen/ProtocolClassGen.java | 1136 +++++------ .../etrice/generator/c/gen/StateMachineGen.java | 158 +- .../etrice/generator/c/gen/SubSystemClassGen.java | 1988 +++++++++---------- .../etrice/generator/c/gen/SubSystemRunnerGen.java | 308 +-- .../eclipse/etrice/generator/doc/gen/DocGen.java | 1338 ++++++------- .../generator/doc/gen/InstanceDiagramGen.java | 268 +-- .../eclipse/etrice/generator/doc/gen/MainGen.java | 82 +- .../etrice/generator/java/gen/ActorClassGen.java | 988 ++++----- .../etrice/generator/java/gen/DataClassGen.java | 832 ++++---- .../etrice/generator/java/gen/JavaExtensions.java | 220 +- .../eclipse/etrice/generator/java/gen/MainGen.java | 122 +- .../generator/java/gen/ProtocolClassGen.java | 1660 ++++++++-------- .../etrice/generator/java/gen/StateMachineGen.java | 152 +- .../generator/java/gen/SubSystemClassGen.java | 1266 ++++++------ .../generator/java/gen/SubSystemRunnerGen.java | 304 +-- .../generator/extensions/PrepareFileSystem.java | 170 +- .../generator/extensions/RoomExtensions.java | 1940 +++++++++--------- .../generic/GenericActorClassGenerator.java | 186 +- .../generic/GenericProtocolClassGenerator.java | 258 +-- .../generic/GenericStateMachineGenerator.java | 2098 ++++++++++---------- .../etrice/generator/generic/ProcedureHelpers.java | 1060 +++++----- .../etrice/generator/generic/TypeHelpers.java | 130 +- .../bin/log4j.properties | 7 + runtime/org.eclipse.etrice.runtime.c/.cproject | 17 +- .../Debug/liborg.eclipse.etrice.runtime.c.a | Bin 144882 -> 147408 bytes .../src/common/debugging/etLogger.h | 48 + .../src/common/debugging/etMSCLogger.c | 57 + .../src/common/debugging/etMSCLogger.h | 56 + .../src/common/etUnit/etUnit.c | 334 ++++ .../src/common/etUnit/etUnit.h | 69 + .../src/common/messaging/etMessage.c | 25 + .../src/common/messaging/etMessage.h | 26 + .../src/common/messaging/etMessageQueue.c | 99 + .../src/common/messaging/etMessageQueue.h | 45 + .../src/common/messaging/etMessageReceiver.h | 23 + .../src/common/messaging/etMessageService.c | 103 + .../src/common/messaging/etMessageService.h | 50 + .../src/common/modelbase/etActor.c | 18 + .../src/common/modelbase/etActor.h | 24 + .../src/common/modelbase/etPort.c | 30 + .../src/common/modelbase/etPort.h | 62 + runtime/org.eclipse.etrice.runtime.c/src/etActor.c | 18 - runtime/org.eclipse.etrice.runtime.c/src/etActor.h | 24 - .../org.eclipse.etrice.runtime.c/src/etDatatypes.h | 72 - .../org.eclipse.etrice.runtime.c/src/etLogger.c | 78 - .../org.eclipse.etrice.runtime.c/src/etLogger.h | 48 - .../org.eclipse.etrice.runtime.c/src/etMSCLogger.c | 57 - .../org.eclipse.etrice.runtime.c/src/etMSCLogger.h | 56 - .../org.eclipse.etrice.runtime.c/src/etMessage.c | 25 - .../org.eclipse.etrice.runtime.c/src/etMessage.h | 26 - .../src/etMessageQueue.c | 99 - .../src/etMessageQueue.h | 45 - .../src/etMessageReceiver.h | 23 - .../src/etMessageService.c | 103 - .../src/etMessageService.h | 50 - runtime/org.eclipse.etrice.runtime.c/src/etPort.c | 30 - runtime/org.eclipse.etrice.runtime.c/src/etPort.h | 62 - runtime/org.eclipse.etrice.runtime.c/src/etUnit.c | 338 ---- runtime/org.eclipse.etrice.runtime.c/src/etUnit.h | 70 - .../src/platforms/MSP430/etDatatypes.h | 75 + .../src/platforms/generic/etDatatypes.h | 72 + .../src/platforms/generic/etGlobalFlags.h | 17 + .../src/platforms/generic/etLogger.c | 78 + .../src/platforms/generic/info.txt | 2 + .../org.eclipse.etrice.generator.c.tests/.cproject | 15 +- .../src-gen/cGenRef/DataClass1.c | 7 +- .../src-gen/cGenRef/DataClass1.h | 19 +- .../src-gen/cGenRef/DataClass2.c | 3 +- .../src-gen/cGenRef/DataClass2.h | 9 +- .../src/RunAllTestcases.c | 2 +- .../src/test/generator/RunCGeneratorTestcases.c | 4 +- .../src/test/generator/TestDataClass.c | 2 +- .../src/test/runtime/RunCRuntimeTestcases.c | 2 +- .../src/test/runtime/TestEtMessage.c | 4 +- .../src/test/runtime/TestEtMessageQueue.c | 4 +- .../src/test/runtime/TestEtMessageService.c | 4 +- .../src/test/runtime/TestEtMessageService.h | 2 +- .../src/test/runtime/TestEtUnit.c | 4 +- .../tmp/testlog/TestCRuntime.xml | 2 +- 98 files changed, 11963 insertions(+), 11879 deletions(-) create mode 100644 examples/org.eclipse.etrice.generator.c.reference/gen_cGenRef.launch delete mode 100644 examples/org.eclipse.etrice.generator.c.reference/manualCGenLaunch.launch create mode 100644 examples/org.eclipse.etrice.generator.c.reference/model/diagrams/cGenRef.Receiver.behavior create mode 100644 plugins/org.eclipse.etrice.logging/bin/log4j.properties create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etLogger.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etMSCLogger.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/etUnit/etUnit.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessage.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessage.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageQueue.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageQueue.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageReceiver.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/messaging/etMessageService.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etActor.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/common/modelbase/etPort.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etActor.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etActor.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etDatatypes.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etLogger.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etLogger.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMSCLogger.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMSCLogger.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessage.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessage.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessageQueue.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessageService.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etMessageService.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etPort.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etPort.h delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etUnit.c delete mode 100644 runtime/org.eclipse.etrice.runtime.c/src/etUnit.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/platforms/MSP430/etDatatypes.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etDatatypes.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etGlobalFlags.h create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/etLogger.c create mode 100644 runtime/org.eclipse.etrice.runtime.c/src/platforms/generic/info.txt diff --git a/examples/org.eclipse.etrice.generator.c.reference/.cproject b/examples/org.eclipse.etrice.generator.c.reference/.cproject index f04d98017..f0ae9433f 100644 --- a/examples/org.eclipse.etrice.generator.c.reference/.cproject +++ b/examples/org.eclipse.etrice.generator.c.reference/.cproject @@ -20,7 +20,9 @@ - @@ -32,7 +34,8 @@