From 665eb46aefd27982fde3b4d634165c3eccde8742 Mon Sep 17 00:00:00 2001
From: Daniela Genius <genius@debussy.soc.lip6.fr>
Date: Fri, 2 Jun 2017 15:57:00 +0200
Subject: [PATCH] segment numbering
---
.../toSoclib/TasksAndMainGenerator.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
index e135fc8a2d..618014ac67 100755
--- a/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
+++ b/src/ddtranslatorSoclib/toSoclib/TasksAndMainGenerator.java
@@ -212,9 +212,10 @@ public class TasksAndMainGenerator {
mainFile.appendToMainCode("/* Synchronous channels */" + CR);
for(AvatarRelation ar: avspec.getRelations()) {
-
+ k=0;
if (!ar.isAsynchronous()) {
-k= ar.nbOfSignals()-1;
+ //k=0;
+ //k= ar.nbOfSignals()-1; //DG 2.6.
for(i=0; i<ar.nbOfSignals() ; i++) {
ar.setId(i);
@@ -268,8 +269,8 @@ if(sig.isIn()){//DG 19.05. sig est deja declare (sig1 du block :-)
mainFile.appendToBeforeMainCode("uint8_t "+getChannelName(ar, i) +"_data[32] CHANNEL"+k+";" + CR);
mainFile.appendToBeforeMainCode("struct mwmr_s "+getChannelName(ar, i) +" CHANNEL"+k+";" + CR2);
-
- k--;//DG 24.05.
+ k++;
+ //k--;//DG 24.05.//DG 2.6.
}
}
}
@@ -337,7 +338,8 @@ if(sig.isIn()){//DG 19.05. sig est deja declare (sig1 du block :-)
mainFile.appendToBeforeMainCode("uint8_t "+getChannelName(ar, i) +"_data[32] CHANNEL"+k+";" + CR);
mainFile.appendToBeforeMainCode("struct mwmr_s "+getChannelName(ar, i) +" CHANNEL"+k+";" + CR2);
- k--;
+ //k--;
+ k++;//DG 2.6.
}
}
}
--
GitLab