diff options
author | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
---|---|---|
committer | Thomas Schuetz | 2013-07-12 08:40:15 +0000 |
commit | 12cda553738ca88662624b6f47066b5564549648 (patch) | |
tree | bfa65b6c38aa566a5f1cc98395da6546a6c6e282 /examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys | |
parent | 3447749b1a453735ac54fc09ea7680acdbb19b69 (diff) | |
parent | d65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff) | |
download | org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip |
Merge remote-tracking branch 'origin/master'
Conflicts:
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys')
-rw-r--r-- | examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys b/examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys index 60389f95e..ad56b99a3 100644 --- a/examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys +++ b/examples/org.eclipse.etrice.generator.c.reference/model/cGenRef.etphys @@ -1,34 +1,34 @@ -PhysicalModel cGenRef {
-
- PhysicalSystem Sys {
- NodeRef node1: PC
-// NodeRef node2: PC
- }
-
- NodeClass PC {
- runtime = PC
- priomin = 1
- priomax = 5
-
- DefaultThread PhysicalThread1 {
- execmode = mixed
- interval = 100 ms
- prio = 5
- stacksize = 1024
- msgblocksize = 32
- msgpoolsize = 5
- }
-
-// Thread PhysicalThread2 {
-// execmode = blocked
-// prio = 5
-// stacksize = 1024
-// msgblocksize = 64
-// msgpoolsize = 3
-// }
- }
-
- RuntimeClass PC {
- model = multiThreaded
- }
+PhysicalModel cGenRef { + + PhysicalSystem Sys { + NodeRef node1: PC +// NodeRef node2: PC + } + + NodeClass PC { + runtime = PC + priomin = 1 + priomax = 5 + + DefaultThread PhysicalThread1 { + execmode = mixed + interval = 100 ms + prio = 5 + stacksize = 1024 + msgblocksize = 32 + msgpoolsize = 5 + } + +// Thread PhysicalThread2 { +// execmode = blocked +// prio = 5 +// stacksize = 1024 +// msgblocksize = 64 +// msgpoolsize = 3 +// } + } + + RuntimeClass PC { + model = multiThreaded + } }
\ No newline at end of file |