diff options
Diffstat (limited to 'examples')
11 files changed, 153 insertions, 161 deletions
diff --git a/examples/org.eclipse.etrice.tutorials.java/gen_org.eclipse.etrice.tutorials.java.launch b/examples/org.eclipse.etrice.tutorials.java/gen_org.eclipse.etrice.tutorials.java.launch index 70aa84691..f741d7640 100644 --- a/examples/org.eclipse.etrice.tutorials.java/gen_org.eclipse.etrice.tutorials.java.launch +++ b/examples/org.eclipse.etrice.tutorials.java/gen_org.eclipse.etrice.tutorials.java.launch @@ -2,13 +2,14 @@ <launchConfiguration type="org.eclipse.etrice.generator.launch.java.launchConfigurationType">
<booleanAttribute key="GenInstanceDiagram" value="false"/>
<stringAttribute key="GenModelPath" value=""/>
+<booleanAttribute key="Lib" value="false"/>
<listAttribute key="ModelFiles">
-<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/scratch/PingPong.room}"/>
-<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/Blinky/Blinky.room}"/>
-<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/PedLightsController/PedLightsController.room}"/>
-<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/SendingData/SendingData.room}"/>
-<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials/model/HelloWorld/HelloWorld.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials.java/model/scratch/PingPong.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials.java/model/Blinky/Blinky.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials.java/model/PedLightsController/PedLightsController.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials.java/model/SendingData/SendingData.room}"/>
+<listEntry value="${workspace_loc:/org.eclipse.etrice.tutorials.java/model/HelloWorld/HelloWorld.room}"/>
</listAttribute>
<booleanAttribute key="SaveGenModel" value="false"/>
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
</launchConfiguration>
diff --git a/examples/org.eclipse.etrice.tutorials.java/model/Blinky/Blinky.room b/examples/org.eclipse.etrice.tutorials.java/model/Blinky/Blinky.room index 2b301a7ce..67bba4bbc 100644 --- a/examples/org.eclipse.etrice.tutorials.java/model/Blinky/Blinky.room +++ b/examples/org.eclipse.etrice.tutorials.java/model/Blinky/Blinky.room @@ -10,7 +10,6 @@ RoomModel Blinky { ActorRef application: BlinkyTop
ActorRef timingService: ATimingService
LayerConnection ref application satisfied_by timingService.timer
- LayerConnection ref application satisfied_by timingService.timeout
}
ActorClass BlinkyTop {
@@ -36,7 +35,7 @@ RoomModel Blinky { "private TrafficLight2 pedLights;"
}
external Port ControlPort
- SAP timer: PTimeout
+ SAP timer: PTimer
}
Behavior {
Operation ~Blinky() {
@@ -61,7 +60,7 @@ RoomModel Blinky { <stop: ControlPort>
}
action {
- "timer.Kill();"
+ "timer.kill();"
"carLights.setState(TrafficLight3.OFF);"
}
}
@@ -71,25 +70,25 @@ RoomModel Blinky { Transition tr0: my tp0 -> on
Transition tr1: on -> off {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
}
Transition tr2: off -> on {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
}
Transition init: initial -> on { }
EntryPoint tp0
State on {
entry {
- "timer.Start(1000);"
+ "timer.startTimeout(1000);"
"carLights.setState(TrafficLight3.YELLOW);"
}
}
State off {
entry {
- "timer.Start(1000);"
+ "timer.startTimeout(1000);"
"carLights.setState(TrafficLight3.OFF);"
}
}
@@ -105,32 +104,32 @@ RoomModel Blinky { }
Structure {
external Port ControlPort
- SAP timer: PTimeout
+ SAP timer: PTimer
}
Behavior {
StateMachine {
Transition init: initial -> on {
action {
- "timer.Start(5000);"
+ "timer.startTimeout(5000);"
"ControlPort.start();"
}
}
Transition goOff: on -> off {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"ControlPort.stop();"
- "timer.Start(5000);"
+ "timer.startTimeout(5000);"
}
}
Transition goOn: off -> on {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"ControlPort.start();"
- "timer.Start(5000);"
+ "timer.startTimeout(5000);"
}
}
State on
diff --git a/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/PedLightsController.room b/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/PedLightsController.room index 8bdc71684..d66496cfc 100644 --- a/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/PedLightsController.room +++ b/examples/org.eclipse.etrice.tutorials.java/model/PedLightsController/PedLightsController.room @@ -11,7 +11,6 @@ RoomModel PedLightsController { ActorRef PedLightsTopRef: PedLightsTop
ActorRef timingService: ATimingService
LayerConnection ref PedLightsTopRef satisfied_by timingService.timer
- LayerConnection ref PedLightsTopRef satisfied_by timingService.timeout
}
ActorClass PedLightsTop {
@@ -82,7 +81,7 @@ RoomModel PedLightsController { "import org.eclipse.etrice.tutorials.PedLightGUI.*;"
}
external Port ControlPort
- SAP timer: PTimeout
+ SAP timer: PTimer
}
Behavior {
StateMachine {
@@ -92,54 +91,54 @@ RoomModel PedLightsController { <start: ControlPort>
}
action {
- "timer.Start(700);"
+ "timer.startTimeout(700);"
"ControlPort.setCarLights(TrafficLight3.GREEN);"
"ControlPort.setPedLights(TrafficLight2.RED);"
}
}
Transition tr1: carsGreen -> carsYellow {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
- "timer.Start(700);"
+ "timer.startTimeout(700);"
"ControlPort.setCarLights(TrafficLight3.YELLOW);"
"ControlPort.setPedLights(TrafficLight2.RED);"
}
}
Transition tr2: carsYellow -> carsRed {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
- "timer.Start(1500);"
+ "timer.startTimeout(1500);"
"ControlPort.setCarLights(TrafficLight3.RED);"
"ControlPort.setPedLights(TrafficLight2.GREEN);"
}
}
Transition tr3: carsRed -> carsYellowRed {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
- "timer.Start(700);"
+ "timer.startTimeout(700);"
"ControlPort.setCarLights(TrafficLight3.YELLOW_RED);"
"ControlPort.setPedLights(TrafficLight2.RED);"
}
}
Transition tr4: carsYellowRed -> carsGreen2 {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
- "timer.Start(700);"
+ "timer.startTimeout(700);"
"ControlPort.setCarLights(TrafficLight3.GREEN);"
"ControlPort.setPedLights(TrafficLight2.RED);"
}
}
Transition tr5: carsGreen2 -> off {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"ControlPort.setCarLights(TrafficLight3.OFF);"
diff --git a/examples/org.eclipse.etrice.tutorials.java/model/scratch/PingPong.room b/examples/org.eclipse.etrice.tutorials.java/model/scratch/PingPong.room index 4d7e6465d..ebbb39ed7 100644 --- a/examples/org.eclipse.etrice.tutorials.java/model/scratch/PingPong.room +++ b/examples/org.eclipse.etrice.tutorials.java/model/scratch/PingPong.room @@ -10,7 +10,6 @@ RoomModel PingPong { ActorRef application: PingPongTop
ActorRef services: ATimingService
LayerConnection ref application satisfied_by services.timer
- LayerConnection ref application satisfied_by services.timeout
LogicalThread mrPingThread prio=5 {application.MrPing}
LogicalThread mrPong1Thread prio=5 {application.MrPong1}
// LogicalThread mrPong2Thread prio=5 {application.MrPong2}
@@ -32,18 +31,18 @@ RoomModel PingPong { }
Structure {
external Port PingPongPort
- SAP timer: PTimeout
+ SAP timer: PTimer
}
Behavior {
StateMachine {
Transition tr0: initial -> waitForTimer {
action {
- "timer.Start(1000);"
+ "timer.startTimeout(1000);"
}
}
Transition tr1: waitForTimer -> waitForPong {
triggers {
- <timeoutTick: timer>
+ <timeout: timer>
}
action {
"PingPongPort.ping();"
@@ -54,7 +53,7 @@ RoomModel PingPong { <pong: PingPongPort>
}
action {
- "timer.Start(1000);"
+ "timer.startTimeout(1000);"
}
}
State waitForTimer { }
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/Blinky.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/Blinky.java index 848702cdf..331df6094 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/Blinky.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/Blinky.java @@ -12,7 +12,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*; import room.basic.service.timing.*;
import Blinky.BlinkyControlProtocoll.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
/*--------------------- begin user code ---------------------*/
import org.eclipse.etrice.tutorials.PedLightGUI.*;
@@ -32,7 +32,7 @@ public class Blinky extends ActorClassBase { protected BlinkyControlProtocollPort ControlPort = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -58,7 +58,7 @@ public class Blinky extends ActorClassBase { ControlPort = new BlinkyControlProtocollPort(this, "ControlPort", IFITEM_ControlPort, 0, port_addr[IFITEM_ControlPort][0], peer_addr[IFITEM_ControlPort][0]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -71,7 +71,7 @@ public class Blinky extends ActorClassBase { public BlinkyControlProtocollPort getControlPort (){
return this.ControlPort;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -104,14 +104,14 @@ public class Blinky extends ActorClassBase { public static final int CHAIN_TRANS_tr0_FROM_off_TO_blinking_tp0_BY_startControlPort = 2;
public static final int CHAIN_TRANS_tr1_FROM_blinking_TO_off_BY_stopControlPort = 3;
public static final int CHAIN_blinking_TRANS_INITIAL_TO__on = 4;
- public static final int CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeoutTicktimer = 5;
- public static final int CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeoutTicktimer = 6;
+ public static final int CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeouttimer = 5;
+ public static final int CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeouttimer = 6;
/* triggers */
public static final int POLLING = 0;
public static final int TRIG_ControlPort__start = IFITEM_ControlPort + EVT_SHIFT*BlinkyControlProtocoll.IN_start;
public static final int TRIG_ControlPort__stop = IFITEM_ControlPort + EVT_SHIFT*BlinkyControlProtocoll.IN_stop;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","blinking",
@@ -133,11 +133,11 @@ public class Blinky extends ActorClassBase { /* Entry and Exit Codes */
protected void entry_blinking_on() {
- timer.Start(1000);
+ timer.startTimer(1000);
carLights.setState(TrafficLight3.YELLOW);
}
protected void entry_blinking_off() {
- timer.Start(1000);
+ timer.startTimeout(1000);
carLights.setState(TrafficLight3.OFF);
}
@@ -149,7 +149,7 @@ public class Blinky extends ActorClassBase { pedLights.setState(TrafficLight2.OFF);
}
protected void action_TRANS_tr1_FROM_blinking_TO_off_BY_stopControlPort(InterfaceItemBase ifitem) {
- timer.Kill();
+ timer.kill();
carLights.setState(TrafficLight3.OFF);
}
@@ -206,11 +206,11 @@ public class Blinky extends ActorClassBase { action_TRANS_tr1_FROM_blinking_TO_off_BY_stopControlPort(ifitem);
return STATE_off;
}
- case CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeoutTicktimer:
+ case CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeouttimer:
{
return STATE_blinking_off;
}
- case CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeoutTicktimer:
+ case CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeouttimer:
{
return STATE_blinking_on;
}
@@ -290,9 +290,9 @@ public class Blinky extends ActorClassBase { break;
case STATE_blinking_on:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeoutTicktimer;
+ chain = CHAIN_blinking_TRANS_tr1_FROM_on_TO_off_BY_timeouttimer;
catching_state = STATE_blinking;
}
break;
@@ -306,9 +306,9 @@ public class Blinky extends ActorClassBase { break;
case STATE_blinking_off:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeoutTicktimer;
+ chain = CHAIN_blinking_TRANS_tr2_FROM_off_TO_on_BY_timeouttimer;
catching_state = STATE_blinking;
}
break;
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/BlinkyController.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/BlinkyController.java index d1bbb6484..dedc5d3d0 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/BlinkyController.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/BlinkyController.java @@ -12,7 +12,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*; import room.basic.service.timing.*;
import Blinky.BlinkyControlProtocoll.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
@@ -24,7 +24,7 @@ public class BlinkyController extends ActorClassBase { protected BlinkyControlProtocollConjPort ControlPort = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -47,7 +47,7 @@ public class BlinkyController extends ActorClassBase { ControlPort = new BlinkyControlProtocollConjPort(this, "ControlPort", IFITEM_ControlPort, 0, port_addr[IFITEM_ControlPort][0], peer_addr[IFITEM_ControlPort][0]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -60,7 +60,7 @@ public class BlinkyController extends ActorClassBase { public BlinkyControlProtocollConjPort getControlPort (){
return this.ControlPort;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -87,12 +87,12 @@ public class BlinkyController extends ActorClassBase { /* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__on = 1;
- public static final int CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeoutTicktimer = 2;
- public static final int CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeoutTicktimer = 3;
+ public static final int CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeouttimer = 2;
+ public static final int CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeouttimer = 3;
/* triggers */
public static final int POLLING = 0;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","on",
@@ -114,16 +114,16 @@ public class BlinkyController extends ActorClassBase { /* Action Codes */
protected void action_TRANS_INITIAL_TO__on() {
- timer.Start(5000);
+ timer.startTimeout(5000);
ControlPort.start();
}
- protected void action_TRANS_goOff_FROM_on_TO_off_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_goOff_FROM_on_TO_off_BY_timeouttimer(InterfaceItemBase ifitem) {
ControlPort.stop();
- timer.Start(5000);
+ timer.startTimeout(5000);
}
- protected void action_TRANS_goOn_FROM_off_TO_on_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_goOn_FROM_off_TO_on_BY_timeouttimer(InterfaceItemBase ifitem) {
ControlPort.start();
- timer.Start(5000);
+ timer.startTimeout(5000);
}
/**
@@ -162,14 +162,14 @@ public class BlinkyController extends ActorClassBase { action_TRANS_INITIAL_TO__on();
return STATE_on;
}
- case CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeoutTicktimer:
+ case CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeouttimer:
{
- action_TRANS_goOff_FROM_on_TO_off_BY_timeoutTicktimer(ifitem);
+ action_TRANS_goOff_FROM_on_TO_off_BY_timeouttimer(ifitem);
return STATE_off;
}
- case CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeoutTicktimer:
+ case CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeouttimer:
{
- action_TRANS_goOn_FROM_off_TO_on_BY_timeoutTicktimer(ifitem);
+ action_TRANS_goOn_FROM_off_TO_on_BY_timeouttimer(ifitem);
return STATE_on;
}
}
@@ -219,9 +219,9 @@ public class BlinkyController extends ActorClassBase { switch (this.state) {
case STATE_on:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_goOff_FROM_on_TO_off_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
@@ -229,9 +229,9 @@ public class BlinkyController extends ActorClassBase { break;
case STATE_off:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_goOn_FROM_off_TO_on_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/SubSystem_Blinky.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/SubSystem_Blinky.java index db65462b8..356f12b00 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/SubSystem_Blinky.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/Blinky/SubSystem_Blinky.java @@ -35,10 +35,10 @@ public class SubSystem_Blinky extends SubSystemClassBase{ // all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,112);
- Address addr_item_SystemPort_1 = new Address(0,0,113);
- Address addr_item_SystemPort_2 = new Address(0,0,114);
- Address addr_item_SystemPort_3 = new Address(0,0,115);
+ Address addr_item_SystemPort_0 = new Address(0,0,111);
+ Address addr_item_SystemPort_1 = new Address(0,0,112);
+ Address addr_item_SystemPort_2 = new Address(0,0,113);
+ Address addr_item_SystemPort_3 = new Address(0,0,114);
// actor instance /SubSystem_Blinky/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -60,8 +60,8 @@ public class SubSystem_Blinky extends SubSystemClassBase{ // TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
Address addr_item__SubSystem_Blinky_timingService = new Address(0,0,108);
// interface items of /SubSystem_Blinky/timingService
- Address addr_item__SubSystem_Blinky_timingService_timeout_0 = new Address(0,0,109);
- Address addr_item__SubSystem_Blinky_timingService_timeout_1 = new Address(0,0,110);
+ Address addr_item__SubSystem_Blinky_timingService_timer_0 = new Address(0,0,109);
+ Address addr_item__SubSystem_Blinky_timingService_timer_1 = new Address(0,0,110);
// instantiate all actor instances
instances = new ActorClassBase[4];
@@ -93,7 +93,7 @@ public class SubSystem_Blinky extends SubSystemClassBase{ addr_item__SubSystem_Blinky_application_controller_ControlPort
},
{
- addr_item__SubSystem_Blinky_timingService_timeout_0
+ addr_item__SubSystem_Blinky_timingService_timer_0
}
}
);
@@ -115,7 +115,7 @@ public class SubSystem_Blinky extends SubSystemClassBase{ addr_item__SubSystem_Blinky_application_blinky_ControlPort
},
{
- addr_item__SubSystem_Blinky_timingService_timeout_1
+ addr_item__SubSystem_Blinky_timingService_timer_1
}
}
);
@@ -125,18 +125,16 @@ public class SubSystem_Blinky extends SubSystemClassBase{ // own interface item addresses
new Address[][] {{addr_item__SubSystem_Blinky_timingService},
{
- addr_item__SubSystem_Blinky_timingService_timeout_0,
- addr_item__SubSystem_Blinky_timingService_timeout_1
- },
- null
+ addr_item__SubSystem_Blinky_timingService_timer_0,
+ addr_item__SubSystem_Blinky_timingService_timer_1
+ }
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_3},
{
addr_item__SubSystem_Blinky_application_blinky_timer,
addr_item__SubSystem_Blinky_application_controller_timer
- },
- null
+ }
}
);
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/Controller.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/Controller.java index 10769b07e..fd2eaee18 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/Controller.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/Controller.java @@ -11,7 +11,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*; import room.basic.service.timing.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
import PedLightsController.PedControlProtocol.*;
/*--------------------- begin user code ---------------------*/
@@ -27,7 +27,7 @@ public class Controller extends ActorClassBase { protected PedControlProtocolPort ControlPort = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -50,7 +50,7 @@ public class Controller extends ActorClassBase { ControlPort = new PedControlProtocolPort(this, "ControlPort", IFITEM_ControlPort, 0, port_addr[IFITEM_ControlPort][0], peer_addr[IFITEM_ControlPort][0]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -63,7 +63,7 @@ public class Controller extends ActorClassBase { public PedControlProtocolPort getControlPort (){
return this.ControlPort;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -95,16 +95,16 @@ public class Controller extends ActorClassBase { /* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__off = 1;
public static final int CHAIN_TRANS_tr0_FROM_off_TO_carsGreen_BY_startControlPort = 2;
- public static final int CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeoutTicktimer = 3;
- public static final int CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeoutTicktimer = 4;
- public static final int CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeoutTicktimer = 5;
- public static final int CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeoutTicktimer = 6;
- public static final int CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeoutTicktimer = 7;
+ public static final int CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeouttimer = 3;
+ public static final int CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeouttimer = 4;
+ public static final int CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeouttimer = 5;
+ public static final int CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeouttimer = 6;
+ public static final int CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeouttimer = 7;
/* triggers */
public static final int POLLING = 0;
public static final int TRIG_ControlPort__start = IFITEM_ControlPort + EVT_SHIFT*PedControlProtocol.IN_start;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","off",
@@ -130,31 +130,31 @@ public class Controller extends ActorClassBase { /* Action Codes */
protected void action_TRANS_tr0_FROM_off_TO_carsGreen_BY_startControlPort(InterfaceItemBase ifitem) {
- timer.Start(700);
+ timer.startTimeout(700);
ControlPort.setCarLights(TrafficLight3.GREEN);
ControlPort.setPedLights(TrafficLight2.RED);
}
- protected void action_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
- timer.Start(700);
+ protected void action_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeouttimer(InterfaceItemBase ifitem) {
+ timer.startTimeout(700);
ControlPort.setCarLights(TrafficLight3.YELLOW);
ControlPort.setPedLights(TrafficLight2.RED);
}
- protected void action_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
- timer.Start(1500);
+ protected void action_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeouttimer(InterfaceItemBase ifitem) {
+ timer.startTimeout(1500);
ControlPort.setCarLights(TrafficLight3.RED);
ControlPort.setPedLights(TrafficLight2.GREEN);
}
- protected void action_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
- timer.Start(700);
+ protected void action_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeouttimer(InterfaceItemBase ifitem) {
+ timer.startTimeout(700);
ControlPort.setCarLights(TrafficLight3.YELLOW_RED);
ControlPort.setPedLights(TrafficLight2.RED);
}
- protected void action_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
- timer.Start(700);
+ protected void action_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeouttimer(InterfaceItemBase ifitem) {
+ timer.startTimeout(700);
ControlPort.setCarLights(TrafficLight3.GREEN);
ControlPort.setPedLights(TrafficLight2.RED);
}
- protected void action_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeouttimer(InterfaceItemBase ifitem) {
ControlPort.setCarLights(TrafficLight3.OFF);
ControlPort.setPedLights(TrafficLight2.OFF);
}
@@ -215,29 +215,29 @@ public class Controller extends ActorClassBase { action_TRANS_tr0_FROM_off_TO_carsGreen_BY_startControlPort(ifitem);
return STATE_carsGreen;
}
- case CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeouttimer:
{
- action_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeouttimer(ifitem);
return STATE_carsYellow;
}
- case CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeouttimer:
{
- action_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeouttimer(ifitem);
return STATE_carsRed;
}
- case CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeouttimer:
{
- action_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeouttimer(ifitem);
return STATE_carsYellowRed;
}
- case CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeouttimer:
{
- action_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeouttimer(ifitem);
return STATE_carsGreen2;
}
- case CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeouttimer:
{
- action_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeouttimer(ifitem);
return STATE_off;
}
}
@@ -309,9 +309,9 @@ public class Controller extends ActorClassBase { break;
case STATE_carsGreen:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr1_FROM_carsGreen_TO_carsYellow_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
@@ -319,9 +319,9 @@ public class Controller extends ActorClassBase { break;
case STATE_carsYellow:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr2_FROM_carsYellow_TO_carsRed_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
@@ -329,9 +329,9 @@ public class Controller extends ActorClassBase { break;
case STATE_carsRed:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr3_FROM_carsRed_TO_carsYellowRed_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
@@ -339,9 +339,9 @@ public class Controller extends ActorClassBase { break;
case STATE_carsYellowRed:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr4_FROM_carsYellowRed_TO_carsGreen2_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
@@ -349,9 +349,9 @@ public class Controller extends ActorClassBase { break;
case STATE_carsGreen2:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr5_FROM_carsGreen2_TO_off_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/SubSys_PedLights.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/SubSys_PedLights.java index 69d45f21f..a6c79eabd 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/SubSys_PedLights.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/PedLightsController/SubSys_PedLights.java @@ -35,10 +35,10 @@ public class SubSys_PedLights extends SubSystemClassBase{ // all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,110);
- Address addr_item_SystemPort_1 = new Address(0,0,111);
- Address addr_item_SystemPort_2 = new Address(0,0,112);
- Address addr_item_SystemPort_3 = new Address(0,0,113);
+ Address addr_item_SystemPort_0 = new Address(0,0,109);
+ Address addr_item_SystemPort_1 = new Address(0,0,110);
+ Address addr_item_SystemPort_2 = new Address(0,0,111);
+ Address addr_item_SystemPort_3 = new Address(0,0,112);
// actor instance /SubSys_PedLights/PedLightsTopRef itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -59,7 +59,7 @@ public class SubSys_PedLights extends SubSystemClassBase{ // TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
Address addr_item__SubSys_PedLights_timingService = new Address(0,0,107);
// interface items of /SubSys_PedLights/timingService
- Address addr_item__SubSys_PedLights_timingService_timeout_0 = new Address(0,0,108);
+ Address addr_item__SubSys_PedLights_timingService_timer_0 = new Address(0,0,108);
// instantiate all actor instances
instances = new ActorClassBase[4];
@@ -107,7 +107,7 @@ public class SubSys_PedLights extends SubSystemClassBase{ addr_item__SubSys_PedLights_PedLightsTopRef_adapter_ControlPort
},
{
- addr_item__SubSys_PedLights_timingService_timeout_0
+ addr_item__SubSys_PedLights_timingService_timer_0
}
}
);
@@ -117,16 +117,14 @@ public class SubSys_PedLights extends SubSystemClassBase{ // own interface item addresses
new Address[][] {{addr_item__SubSys_PedLights_timingService},
{
- addr_item__SubSys_PedLights_timingService_timeout_0
- },
- null
+ addr_item__SubSys_PedLights_timingService_timer_0
+ }
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_3},
{
addr_item__SubSys_PedLights_PedLightsTopRef_controller_timer
- },
- null
+ }
}
);
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/MrPingActor.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/MrPingActor.java index 33ce21e3f..1ecb9be67 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/MrPingActor.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/MrPingActor.java @@ -11,7 +11,7 @@ import static org.eclipse.etrice.runtime.java.etunit.EtUnit.*; import room.basic.service.timing.*;
-import room.basic.service.timing.PTimeout.*;
+import room.basic.service.timing.PTimer.*;
import PingPong.PingPongProtocol.*;
@@ -24,7 +24,7 @@ public class MrPingActor extends ActorClassBase { protected PingPongProtocolConjReplPort PingPongPort = null;
//--------------------- saps
- protected PTimeoutConjPort timer = null;
+ protected PTimerConjPort timer = null;
//--------------------- services
@@ -47,7 +47,7 @@ public class MrPingActor extends ActorClassBase { PingPongPort = new PingPongProtocolConjReplPort(this, "PingPongPort", IFITEM_PingPongPort, port_addr[IFITEM_PingPongPort], peer_addr[IFITEM_PingPongPort]);
// own saps
- timer = new PTimeoutConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
+ timer = new PTimerConjPort(this, "timer", IFITEM_timer, 0, port_addr[IFITEM_timer][0], peer_addr[IFITEM_timer][0]);
// own service implementations
}
@@ -60,7 +60,7 @@ public class MrPingActor extends ActorClassBase { public PingPongProtocolConjReplPort getPingPongPort (){
return this.PingPongPort;
}
- public PTimeoutConjPort getTimer (){
+ public PTimerConjPort getTimer (){
return this.timer;
}
@@ -87,13 +87,13 @@ public class MrPingActor extends ActorClassBase { /* transition chains */
public static final int CHAIN_TRANS_INITIAL_TO__waitForTimer = 1;
- public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer = 2;
+ public static final int CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer = 2;
public static final int CHAIN_TRANS_tr2_FROM_waitForPong_TO_waitForTimer_BY_pongPingPongPort = 3;
/* triggers */
public static final int POLLING = 0;
public static final int TRIG_PingPongPort__pong = IFITEM_PingPongPort + EVT_SHIFT*PingPongProtocol.OUT_pong;
- public static final int TRIG_timer__timeoutTick = IFITEM_timer + EVT_SHIFT*PTimeout.OUT_timeoutTick;
+ public static final int TRIG_timer__timeout = IFITEM_timer + EVT_SHIFT*PTimer.OUT_timeout;
// state names
protected static final String stateStrings[] = {"<no state>","<top>","waitForTimer",
@@ -115,13 +115,13 @@ public class MrPingActor extends ActorClassBase { /* Action Codes */
protected void action_TRANS_INITIAL_TO__waitForTimer() {
- timer.Start(1000);
+ timer.startTimeout(1000);
}
- protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(InterfaceItemBase ifitem) {
+ protected void action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(InterfaceItemBase ifitem) {
PingPongPort.ping();
}
protected void action_TRANS_tr2_FROM_waitForPong_TO_waitForTimer_BY_pongPingPongPort(InterfaceItemBase ifitem) {
- timer.Start(1000);
+ timer.startTimeout(1000);
}
/**
@@ -160,9 +160,9 @@ public class MrPingActor extends ActorClassBase { action_TRANS_INITIAL_TO__waitForTimer();
return STATE_waitForTimer;
}
- case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer:
+ case CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer:
{
- action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer(ifitem);
+ action_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer(ifitem);
return STATE_waitForPong;
}
case CHAIN_TRANS_tr2_FROM_waitForPong_TO_waitForTimer_BY_pongPingPongPort:
@@ -217,9 +217,9 @@ public class MrPingActor extends ActorClassBase { switch (this.state) {
case STATE_waitForTimer:
switch(trigger) {
- case TRIG_timer__timeoutTick:
+ case TRIG_timer__timeout:
{
- chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeoutTicktimer;
+ chain = CHAIN_TRANS_tr1_FROM_waitForTimer_TO_waitForPong_BY_timeouttimer;
catching_state = STATE_TOP;
}
break;
diff --git a/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/SubSystem_PingPong.java b/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/SubSystem_PingPong.java index 4f18feb9b..8bd22ccb4 100644 --- a/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/SubSystem_PingPong.java +++ b/examples/org.eclipse.etrice.tutorials.java/src-gen/PingPong/SubSystem_PingPong.java @@ -37,10 +37,10 @@ public class SubSystem_PingPong extends SubSystemClassBase{ // all addresses
// Addresses for the Subsystem Systemport
- Address addr_item_SystemPort_0 = new Address(0,0,111);
- Address addr_item_SystemPort_1 = new Address(0,0,112);
- Address addr_item_SystemPort_2 = new Address(0,0,113);
- Address addr_item_SystemPort_3 = new Address(0,0,114);
+ Address addr_item_SystemPort_0 = new Address(0,0,110);
+ Address addr_item_SystemPort_1 = new Address(0,0,111);
+ Address addr_item_SystemPort_2 = new Address(0,0,112);
+ Address addr_item_SystemPort_3 = new Address(0,0,113);
// actor instance /SubSystem_PingPong/application itself => Systemport Address
// TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
@@ -61,7 +61,7 @@ public class SubSystem_PingPong extends SubSystemClassBase{ // TODOTJ: For each Actor, multiple addresses should be generated (actor?, systemport, debugport)
Address addr_item__SubSystem_PingPong_services = new Address(0,0,108);
// interface items of /SubSystem_PingPong/services
- Address addr_item__SubSystem_PingPong_services_timeout_0 = new Address(0,0,109);
+ Address addr_item__SubSystem_PingPong_services_timer_0 = new Address(0,0,109);
// instantiate all actor instances
instances = new ActorClassBase[4];
@@ -93,7 +93,7 @@ public class SubSystem_PingPong extends SubSystemClassBase{ addr_item__SubSystem_PingPong_application_MrPong1_PingPongPort
},
{
- addr_item__SubSystem_PingPong_services_timeout_0
+ addr_item__SubSystem_PingPong_services_timer_0
}
}
);
@@ -119,16 +119,14 @@ public class SubSystem_PingPong extends SubSystemClassBase{ // own interface item addresses
new Address[][] {{addr_item__SubSystem_PingPong_services},
{
- addr_item__SubSystem_PingPong_services_timeout_0
- },
- null
+ addr_item__SubSystem_PingPong_services_timer_0
+ }
},
// peer interface item addresses
new Address[][] {{addr_item_SystemPort_3},
{
addr_item__SubSystem_PingPong_application_MrPing_timer
- },
- null
+ }
}
);
|