Merge remote branch 'refs/remotes/origin/master'

Conflicts:
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
	plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
	plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java

1 files changed, 0 insertions, 30 deletions

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

-}