Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-01-06 15:36:22 +0000
committertjung2012-01-06 15:36:22 +0000
commitabe0b46d7e554b7f977d0277bae4407d88628f98 (patch)
treee67d3e2b06b5b88411e08cf11e3c67dddbf7425b /runtime
parente19e876c6c2d3be75dcfca7fc57f179191aedb3c (diff)
parent2891c8d1b59fe1088dcc2b29de1eeca75e7d35be (diff)
downloadorg.eclipse.etrice-abe0b46d7e554b7f977d0277bae4407d88628f98.tar.gz
org.eclipse.etrice-abe0b46d7e554b7f977d0277bae4407d88628f98.tar.xz
org.eclipse.etrice-abe0b46d7e554b7f977d0277bae4407d88628f98.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.modellib/models/JavaTypes.room13
-rw-r--r--runtime/org.eclipse.etrice.modellib/models/Socket.room2
-rw-r--r--runtime/org.eclipse.etrice.modellib/models/TimingService.room4
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java14
-rw-r--r--runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java14
5 files changed, 19 insertions, 28 deletions
diff --git a/runtime/org.eclipse.etrice.modellib/models/JavaTypes.room b/runtime/org.eclipse.etrice.modellib/models/JavaTypes.room
new file mode 100644
index 000000000..e99bc6ea0
--- /dev/null
+++ b/runtime/org.eclipse.etrice.modellib/models/JavaTypes.room
@@ -0,0 +1,13 @@
+RoomModel room.basic.types.java {
+
+ PrimitiveType boolean -> int32 (Boolean) default "false"
+ PrimitiveType char -> char (Char) default "0"
+ PrimitiveType int8 -> byte (Byte) default "0"
+ PrimitiveType int16 -> short (Short) default "0"
+ PrimitiveType int32 -> int (Integer) default "0"
+ PrimitiveType int64 -> long (Long) default "0"
+ PrimitiveType float32 -> float (Float) default "0"
+ PrimitiveType float64 -> double (Double) default "0"
+ ExternalType string -> String
+
+} \ No newline at end of file
diff --git a/runtime/org.eclipse.etrice.modellib/models/Socket.room b/runtime/org.eclipse.etrice.modellib/models/Socket.room
index 829d21180..885d1d4fe 100644
--- a/runtime/org.eclipse.etrice.modellib/models/Socket.room
+++ b/runtime/org.eclipse.etrice.modellib/models/Socket.room
@@ -1,5 +1,7 @@
RoomModel org.eclipse.etrice.modellib.Socket {
+ import room.basic.types.java.* from "JavaTypes.room"
+
ActorClass SocketClient {
Interface {
Port fct: PSocket
diff --git a/runtime/org.eclipse.etrice.modellib/models/TimingService.room b/runtime/org.eclipse.etrice.modellib/models/TimingService.room
index 73d5dcea3..2498d0947 100644
--- a/runtime/org.eclipse.etrice.modellib/models/TimingService.room
+++ b/runtime/org.eclipse.etrice.modellib/models/TimingService.room
@@ -1,5 +1,9 @@
RoomModel room.basic.service.timing {
+ import room.basic.types.java.* from "JavaTypes.room"
+
+ ExternalType Integer -> Integer
+
ActorClass ATimingService {
Interface {
SPP timer: PTimer
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
index 3d674b9af..69f7d7886 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimeout.java
@@ -193,14 +193,6 @@ public class PTimeout {
}
}
- // interface for port class
- public interface IPTimeoutPort{
- // incoming messages
- public void Start (int time_ms)
- ;
- public void Kill ()
- ;
- }
// port class
static public class PTimeoutConjPort extends PortBase {
@@ -328,10 +320,4 @@ public class PTimeout {
}
}
- // interface for port class
- public interface IPTimeoutConjPort{
- // outgoing messages
- public void timeoutTick ()
- ;
- }
}
diff --git a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
index 2a8c64915..d69c4ba55 100644
--- a/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
+++ b/runtime/org.eclipse.etrice.modellib/src-gen/room/basic/service/timing/PTimer.java
@@ -193,14 +193,6 @@ public class PTimer {
}
}
- // interface for port class
- public interface IPTimerPort{
- // incoming messages
- public void Start (int time_ms)
- ;
- public void Kill ()
- ;
- }
// port class
static public class PTimerConjPort extends PortBase {
@@ -327,10 +319,4 @@ public class PTimer {
}
}
- // interface for port class
- public interface IPTimerConjPort{
- // outgoing messages
- public void timerTick ()
- ;
- }
}

Back to the top