[doc] fixed toc
Change-Id: I9728d2716c548df17c8fffab6b9e7f9f4f671aea
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/etrice-doc.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/etrice-doc.st
index bec5019..d368ba9 100644
--- a/plugins/org.eclipse.etrice.doc/eclipse-help/template/etrice-doc.st
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/etrice-doc.st
@@ -9,7 +9,7 @@
$_content$
<ul>
- $toc:{e | $include/front_toc(name=e.name, url=e.url, entries=e.entries)$}$
+ $toc:{e | $include/front_toc1(name=e.name, url=e.url)$}$
</ul>
$include/footer()$
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc.st
deleted file mode 100644
index 0317f23..0000000
--- a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc.st
+++ /dev/null
@@ -1,17 +0,0 @@
-$if(entries || _contentTocs.(name))$
-<li><a href="$url$">$name$</a>
- <ul>
- $entries:{e | $front_toc(name=e.name, url=e.url, entries=e.entries)$}$
- $_contentTocs.(name):{e | $front_toc(name=e.name, url=e.url, entries=e.entries)$}$
- </ul>
-</li>
-$else$
-<li><a href="$url$">$name$</a></li>
-$endif$
-
-
-
-
-
-
-
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc1.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc1.st
new file mode 100644
index 0000000..e918bd9
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc1.st
@@ -0,0 +1,16 @@
+$if(_contentTocs.(name))$
+<li><a href="$url$">$name$</a>
+ <ul>
+ $_contentTocs.(name):{e | $front_toc2(name=e.name, url=e.url, entries=e.entries)$}$
+ </ul>
+</li>
+$else$
+<li><a href="$url$">$name$</a></li>
+$endif$
+
+
+
+
+
+
+
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc2.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc2.st
new file mode 100644
index 0000000..568bf71
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/front_toc2.st
@@ -0,0 +1,16 @@
+$if(entries)$
+<li><a href="$url$">$name$</a>
+ <ul>
+ $entries:{e | $front_toc2(name=e.name, url=e.url, entries=e.entries)$}$
+ </ul>
+</li>
+$else$
+<li><a href="$url$">$name$</a></li>
+$endif$
+
+
+
+
+
+
+
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic.st
deleted file mode 100644
index f19d1cf..0000000
--- a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic.st
+++ /dev/null
@@ -1,6 +0,0 @@
-<topic href="targets/eclipse-help/$url$" label="$name$">
- $if(entries || _contentTocs.(name))$
- $entries:{e | $toc_topic(name=e.name, url=e.url, entries=e.entries)$}$
- $_contentTocs.(name):{e | $toc_topic(name=e.name, url=e.url, entries=e.entries)$}$
- $endif$
-</topic>
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic1.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic1.st
new file mode 100644
index 0000000..d26a94f
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic1.st
@@ -0,0 +1,5 @@
+<topic href="targets/eclipse-help/$url$" label="$name$">
+ $if(_contentTocs.(name))$
+ $_contentTocs.(name):{e | $toc_topic2(name=e.name, url=e.url, entries=e.entries)$}$
+ $endif$
+</topic>
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic2.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic2.st
new file mode 100644
index 0000000..6077e8a
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/include/toc_topic2.st
@@ -0,0 +1,5 @@
+<topic href="targets/eclipse-help/$url$" label="$name$">
+ $if(entries)$
+ $entries:{e | $toc_topic2(name=e.name, url=e.url, entries=e.entries)$}$
+ $endif$
+</topic>
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/eclipse-help/template/toc-topics.xml.st b/plugins/org.eclipse.etrice.doc/eclipse-help/template/toc-topics.xml.st
index 485b97f..e8619fa 100644
--- a/plugins/org.eclipse.etrice.doc/eclipse-help/template/toc-topics.xml.st
+++ b/plugins/org.eclipse.etrice.doc/eclipse-help/template/toc-topics.xml.st
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<?NLS TYPE="org.eclipse.help.toc"?>
<toc label="eTrice Documentation" topic="targets/eclipse-help/etrice-doc.html">
- $toc:{e | $include/toc_topic(name=e.name, url=e.url, entries=e.entries)$}$
-</toc>
\ No newline at end of file
+ $toc:{e | $include/toc_topic1(name=e.name, url=e.url)$}$
+</toc>
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/featuremodel/etrice.codegenerators.featurizer b/plugins/org.eclipse.etrice.doc/featuremodel/etrice.codegenerators.featurizer
index 20aff02..808cc06 100644
--- a/plugins/org.eclipse.etrice.doc/featuremodel/etrice.codegenerators.featurizer
+++ b/plugins/org.eclipse.etrice.doc/featuremodel/etrice.codegenerators.featurizer
@@ -30,27 +30,8 @@
;
Feature CPPCodeGenerator
shortName '''C++ Code Generator'''
- description '''
- Missing Features:
+ description ''''''
- - memory management of messages (pool + free memory)
-
- - Inheritance
- - Enums, non-primtive datatypes e.g. string, DataClass ...
- - Wait on 'quit' in cmd (atm wait 30sec)
- - getter/setter attributes
-
- TODO:
- - fix free memory on exit (delete of instance tree in runner)
- - remove streams
- - find compiler flags for deactivating exceptions, streams ...
- - includes to generated files
-
- Optimization:
- - for C11 use unordered map
- - reduce use of dynamic_cast and rtti
-
- '''
prototype
;
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/config/Dave-Integration.json b/plugins/org.eclipse.etrice.doc/online-doc/config/Dave-Integration.json
index 37076de..1d3f345 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/config/Dave-Integration.json
+++ b/plugins/org.eclipse.etrice.doc/online-doc/config/Dave-Integration.json
@@ -1,6 +1,7 @@
{
"contentToc" : {
"parentName" : "Dave Integration",
- "toc" : "auto"
+ "toc" : "auto",
+ "toc-level" : "2"
}
}
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json b/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
index a6429d0..45e3464 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
+++ b/plugins/org.eclipse.etrice.doc/online-doc/config/_master.json
@@ -1,13 +1,14 @@
{
"title": "eTrice Documentation",
- "version": "0.5",
+ "version": "1.0",
"xtext-langs" : {
"room" : "xtext_keyword_files/InternalRoom.tokens",
"etconfig" : "xtext_keyword_files/InternalConfig.tokens",
"etphys" : "xtext_keyword_files/InternalETPhys.tokens",
"etmap" : "xtext_keyword_files/InternalETMap.tokens"
},
- "toc" : [{
+ "toc" : [
+ {
"name" : "Introduction",
"url" : "introduction.html"
},
@@ -35,15 +36,14 @@
"name" : "Feature Reference",
"url" : "feature-reference.html"
},
- {
+ {
"name" : "Dave Integration",
"url" : "Dave-Integration.html"
},
-
- {
+ {
"name" : "Resource Requirements",
"url" : "ResourceRequirements.html"
- },
+ },
{
"name" : "Developer's Reference",
"url" : "developers-reference.html"
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md b/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
index a2bb0db..cf173ba 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
+++ b/plugins/org.eclipse.etrice.doc/online-doc/content/feature-reference.md
@@ -285,12 +285,6 @@
</td>
<td>The LogicalModel describes the logical structure and behavior of a ROOM application</td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
</tbody>
</table>
@@ -363,17 +357,6 @@
</td>
<td>A SubSystem is the topmost building block of the executable part of an system</td>
</tr>
-<tr>
- <td rowspan="2" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-<tr>
- <td>[ActorRefPropertyDialog](#actorrefpropertydialog)
- </td>
- <td>A dialog to edit properties of an ActorRef.</td>
-</tr>
</tbody>
</table>
@@ -723,12 +706,6 @@
</td>
<td>A SubSystem is the topmost building block of the executable part of an system</td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
</tbody>
</table>
@@ -1399,12 +1376,6 @@
</td>
<td>A SubSystem is the topmost building block of the executable part of an system</td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
</tbody>
</table>
@@ -1678,17 +1649,6 @@
<td>An actor is the basic structural building block for building systems with ROOM</td>
</tr>
<tr>
- <td rowspan="2" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-<tr>
- <td>[PortPropertyDialog](#portpropertydialog)
- </td>
- <td>A dialog to edit properties of an Port.</td>
-</tr>
-<tr>
<td rowspan="2" style="white-space: nowrap;">Is used by:</td>
<td>[Binding](#binding)
: endpoint1</td>
@@ -2016,12 +1976,6 @@
<td>An actor is the basic structural building block for building systems with ROOM</td>
</tr>
<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-<tr>
<td rowspan="1" style="white-space: nowrap;">Is used by:</td>
<td>[LayerConnection](#layerconnection)
: SAPoint</td>
@@ -2072,12 +2026,6 @@
<td>An actor is the basic structural building block for building systems with ROOM</td>
</tr>
<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[SPPPropertyDialog](#spppropertydialog)
- </td>
- <td>A dialog to edit properties of a SPP.</td>
-</tr>
-<tr>
<td rowspan="2" style="white-space: nowrap;">Is used by:</td>
<td>[LayerConnection](#layerconnection)
: SPPoint</td>
@@ -2174,12 +2122,6 @@
</td>
<td>An actor is the basic structural building block for building systems with ROOM</td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is edited by:</td>
- <td>[GraphicalBehaviorEditor](#graphicalbehavioreditor)
- </td>
- <td>The GraphicalBehaviorEditor allows to edit the ActorClass' StateMachine. It is possible to create (hierarchical) states and transitions to model complex behavior in a convenient way.</td>
-</tr>
</tbody>
</table>
@@ -2600,21 +2542,6 @@
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is contained in:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-</tbody>
-</table>
---
@@ -2645,21 +2572,6 @@
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is contained in:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-</tbody>
-</table>
---
@@ -2690,21 +2602,6 @@
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is contained in:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-</tbody>
-</table>
---
@@ -2720,21 +2617,6 @@
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is contained in:</td>
- <td>[GraphicalStructureEditor](#graphicalstructureeditor)
- </td>
- <td>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</td>
-</tr>
-</tbody>
-</table>
---
@@ -2782,21 +2664,6 @@
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;">Is contained in:</td>
- <td>[TextualROOMEditor](#textualroomeditor)
- </td>
- <td>Textual model editor</td>
-</tr>
-</tbody>
-</table>
---
@@ -2813,7 +2680,7 @@
</thead>
<tbody>
<tr>
- <td rowspan="2" style="white-space: nowrap;">Contains:</td>
+ <td rowspan="3" style="white-space: nowrap;">Contains:</td>
<td>[CCodeGenerator](#ccodegenerator)
</td>
<td></td>
@@ -2823,6 +2690,11 @@
</td>
<td></td>
</tr>
+<tr>
+ <td>[CPPCodeGenerator](#cppcodegenerator)
+ </td>
+ <td></td>
+</tr>
</tbody>
</table>
@@ -2868,19 +2740,19 @@
```room
@DataLogging(pathlist = "/portInstancePath,/portInstancePath,..")
-```
-
+```
+
Where `pathlist` is a string specifying a list of port instances which should be instrumented for data logging:
- the path of a port instance starts with the name of the [LogicalSystem][] and thus consists of at least 4 following segments
-`/portInstancePath` = `/LogicalSystem/SubSystemRef/ActorRef/Port`
+`/portInstancePath` = `/LogicalSystem/SubSystemRef/ActorRef/Port`
- multiple paths are separated through comma (`,`), but avoid any whitespace
- the [Port][] must be conjugated and it´s [ProtocolClass][] has to be data-driven
- only the first Message having primitive or enum typed data is considered
The logging status can be verified in the generation console. It will output an overview of all accepted ports. In the [GenerationOptions][] is possible to (de)activate the data logging and thus ignoring the presence of the annotation.
-At runtime the data values will then be logged
+At runtime the data values will then be logged
- into a file *log/SubSystemRef.data.csv*
- it contains one column for each port instance
@@ -2962,12 +2834,22 @@
[...]
```
-Resulting graph created from generated gnuplot script:
+Resulting graph created from generated gnuplot script:
---
+## CPPCodeGenerator
+
+
+
+
+
+
+---
+
+
## GenerationOptions
Mechanism to adjust the generation.
@@ -3094,6 +2976,12 @@
+[CCodeGenerator]: #ccodegenerator
+[JavaCodeGenerator]: #javacodegenerator
+[CPPCodeGenerator]: #cppcodegenerator
+[GenerationOptions]: #generationoptions
+[MSCLogging]: #msclogging
+[DataLogging]: #datalogging
[AnnotationType]: #annotationtype
[Annotation]: #annotation
[Inheritance]: #inheritance
@@ -3127,17 +3015,3 @@
[SAP]: #sap
[ServiceImplementation]: #serviceimplementation
[SPP]: #spp
-[TextualROOMEditor]: #textualroomeditor
-[OutlineView]: #outlineview
-[GraphicalBehaviorEditor]: #graphicalbehavioreditor
-[GraphicalStructureEditor]: #graphicalstructureeditor
-[StructureEditorPalette]: #structureeditorpalette
-[ActorRefPropertyDialog]: #actorrefpropertydialog
-[PortPropertyDialog]: #portpropertydialog
-[SPPPropertyDialog]: #spppropertydialog
-[CCodeGenerator]: #ccodegenerator
-[JavaCodeGenerator]: #javacodegenerator
-[CPPCodeGenerator]: #cppcodegenerator
-[GenerationOptions]: #generationoptions
-[MSCLogging]: #msclogging
-[DataLogging]: #datalogging
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/content/tutorials.md b/plugins/org.eclipse.etrice.doc/online-doc/content/tutorials.md
index 682028f..4d36afe 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/content/tutorials.md
+++ b/plugins/org.eclipse.etrice.doc/online-doc/content/tutorials.md
@@ -12,7 +12,7 @@
- Hello World - Getting Started C
- Hello World - Getting Started Java
-
+
- Ping Pong
- Traffic Light (Example)
@@ -51,7 +51,7 @@
- Recommended: Activate automatic resource refresh in Eclipse: *Window -> Preferences -> General -> Workspace*
- *Refresh using native hooks or polling*
- *Refresh on access*
-
+
- Optional: Install [Trace2UML](http://trace2uml.stage.tigris.org/), an Open Source MSC viewer
- [Windows download site](http://trace2uml.tigris.org/servlets/ProjectDocumentList?folderID=6208)
- [Linux package](http://apt.astade.de/)
@@ -68,7 +68,7 @@
- our application project *template.c*.
Now open the *TemplateModel.room* in the model folder of *template.c*.
-
+
The model contains an ActorClass *TopActor*, which is currently the only active actor. TopActor has a state machine that is intended to output a simple HelloWorld statement. To inspect its behavior graphically, we can open the behavior diagram by right click on *Outline View -> TopActor -> Edit Behavior*. Alternatively we can place the cursor within the textual notation and press Alt+B.
@@ -91,10 +91,10 @@
This will trigger the build process, carried out by Eclipse CDT and then subsequently start our application.
-| | |
-|:---------------------------------:|:----------------------------------:|
-|  |  |
-| 1. Invoke generator | 2. Build and run application |
+| | |
+|:------------------------------------:|:---------------------------------------------:|
+|  |  |
+| <center>1. Invoke generator</center> | <center>2. Build and run application</center> |
The output of our application is logged in the Console View and it shows the “Hello World”. By typing “quit” on the prompt and pressing enter the application terminates regularly.
@@ -129,7 +129,7 @@
- Recommended: Activate automatic resource refresh in Eclipse: *Window -> Preferences -> General -> Workspace*
- *Refresh using native hooks or polling*
- *Refresh on access*
-
+
- Optional: Install [Trace2UML](http://trace2uml.stage.tigris.org/), an Open Source MSC viewer
- [Windows download site](http://trace2uml.tigris.org/servlets/ProjectDocumentList?folderID=6208)
- [Linux package](http://apt.astade.de/)
@@ -149,7 +149,7 @@
- our application project *template.cpp*.
Now open the *TemplateModel.room* in the model folder of *template.c*.
-
+
The model contains an ActorClass *TopActor*, which is currently the only active actor.
@@ -183,10 +183,10 @@
This will trigger the build process, carried out by Eclipse CDT and then subsequently start our application.
-| | |
-|:-------------------------------------:|:--------------------------------------:|
-|  |  |
-| 1. Invoke generator | 2. Build and run application |
+| | |
+|:-------------------------------------:|:----------------------------------------------:|
+|  |  |
+| <center>1. Invoke generator</center> | <center>2. Build and run application</center> |
The output of our application is logged in the Console View and it shows the “Hello World”.
@@ -260,10 +260,10 @@
This will trigger the build process, carried out by Eclipse JDT and then subsequently start our application.
-| | |
-|:---------------------------------:|:----------------------------------:|
-|  |  |
-| 1. Invoke generator | 2. Build and run application |
+| | |
+|:------------------------------------:|:---------------------------------------------:|
+|  |  |
+| <center>1. Invoke generator</center> | <center>2. Build and run application</center> |
The output of our application is logged in the Console View and it shows the “Hello World”. By typing “quit” on the prompt and pressing enter the application terminates regularly.
@@ -334,7 +334,7 @@
```room
ActorClass Sender {
Interface {
- conjugated Port sendPort:
+ conjugated Port sendPort:
PingPongProtocol
}
Structure {
@@ -346,7 +346,7 @@
<span class="label label-info">Note:</span> The naming *Sender* *Receiver* is based on the first message exchange.
-*Sender* is the first actor supposed to send a message (*ping*) and *Receiver* is the first actor to receive this message.
+*Sender* is the first actor supposed to send a message (*ping*) and *Receiver* is the first actor to receive this message.
Afterwards they change their roles and it is vice-versa for message *pong*.
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/template/_default.st b/plugins/org.eclipse.etrice.doc/online-doc/template/_default.st
index a3dc8e4..55a9622 100644
--- a/plugins/org.eclipse.etrice.doc/online-doc/template/_default.st
+++ b/plugins/org.eclipse.etrice.doc/online-doc/template/_default.st
@@ -5,7 +5,7 @@
<div class="col-sm-3">
<div id="sidebar" role="navigation">
<ul class="nav metismenu" id="sidebarMenu">
- $toc:{e | $include/toc_menu(name=e.name, url=e.url, entries=e.entries)$}$
+ $toc:{e | $include/toc_menu1(name=e.name, url=e.url)$}$
</ul>
</div>
</div>
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu.st b/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu.st
deleted file mode 100644
index 9c313ff..0000000
--- a/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu.st
+++ /dev/null
@@ -1,15 +0,0 @@
-$if(entries || _contentTocs.(name))$
-<li><a href="$url$" aria-expanded="false">$name$ <span class="fa arrow"></span></a>
- <ul class="nav" aria-expanded="false">
- $entries:{e | $toc_menu(name=e.name, url=e.url, entries=e.entries)$}$
- $_contentTocs.(name):{e | $toc_menu(name=e.name, url=e.url, entries=e.entries)$}$
- </ul>
-</li>
-$else$
-<li><a href="$url$">$name$</a></li>
-$endif$
-
-
-
-
-
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu1.st b/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu1.st
new file mode 100644
index 0000000..72597de
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu1.st
@@ -0,0 +1,14 @@
+$if(_contentTocs.(name))$
+<li><a href="$url$" aria-expanded="false">$name$ <span class="fa arrow"></span></a>
+ <ul class="nav" aria-expanded="false">
+ $_contentTocs.(name):{e | $toc_menu2(name=e.name, url=e.url, entries=e.entries)$}$
+ </ul>
+</li>
+$else$
+<li><a href="$url$">$name$</a></li>
+$endif$
+
+
+
+
+
diff --git a/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu2.st b/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu2.st
new file mode 100644
index 0000000..4927da0
--- /dev/null
+++ b/plugins/org.eclipse.etrice.doc/online-doc/template/include/toc_menu2.st
@@ -0,0 +1,14 @@
+$if(entries)$
+<li><a href="$url$" aria-expanded="false">$name$ <span class="fa arrow"></span></a>
+ <ul class="nav" aria-expanded="false">
+ $entries:{e | $toc_menu2(name=e.name, url=e.url, entries=e.entries)$}$
+ </ul>
+</li>
+$else$
+<li><a href="$url$">$name$</a></li>
+$endif$
+
+
+
+
+
diff --git a/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml b/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
index 96598ef..42203b3 100644
--- a/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
+++ b/plugins/org.eclipse.etrice.doc/targets/contextHelp.xml
@@ -12,26 +12,7 @@
</context>
<context id="featureContextHelp_CPPCodeGenerator" title="CPPCodeGenerator">
-<description>Missing Features:
-
-- memory management of messages (pool + free memory)
-
-- Inheritance
-- Enums, non-primtive datatypes e.g. string, DataClass ...
-- Wait on 'quit' in cmd (atm wait 30sec)
-- getter/setter attributes
-
-TODO:
-- fix free memory on exit (delete of instance tree in runner)
-- remove streams
-- find compiler flags for deactivating exceptions, streams ...
-- includes to generated files
-
-Optimization:
-- for C11 use unordered map
-- reduce use of dynamic_cast and rtti
-
-</description>
+<description></description>
<topic href="targets/eclipse-help/feature-reference.html#cppcodegenerator" label="CPPCodeGenerator"/>
</context>
@@ -58,98 +39,6 @@
<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="CCodeGenerator"/>
</context>
-<context id="featureContextHelp_SynatxColoring" title="SynatxColoring">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#synatxcoloring" label="SynatxColoring"/>
-</context>
-
-<context id="featureContextHelp_MarkdownCheatsheet" title="MarkdownCheatsheet">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#markdowncheatsheet" label="MarkdownCheatsheet"/>
-</context>
-
-<context id="featureContextHelp_MarkdownExample" title="MarkdownExample">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#markdownexample" label="MarkdownExample"/>
-</context>
-
-<context id="featureContextHelp_TemplateFeature" title="TemplateFeature">
-<description>Plain text: A ProtocolClass defines the Interface of a Port. It specifies the exchanged messages and data.</description>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="Feature123"/>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="Feature123"/>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="Feature123"/>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="Feature123"/>
-<topic href="targets/eclipse-help/feature-reference.html#templatefeature" label="Feature123"/>
-</context>
-
-<context id="featureContextHelp_Feature123" title="Feature123">
-<description></description>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="Feature123"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-<topic href="targets/eclipse-help/feature-reference.html#feature123" label="TemplateFeature"/>
-</context>
-
-<context id="featureContextHelp_TextualROOMEditor" title="TextualROOMEditor">
-<description>Textual model editor</description>
-<topic href="targets/eclipse-help/feature-reference.html#textualroomeditor" label="TextualROOMEditor"/>
-<topic href="targets/eclipse-help/feature-reference.html#textualroomeditor" label="ROOMLanguage"/>
-</context>
-
-<context id="featureContextHelp_OutlineView" title="OutlineView">
-<description>Displays an overview of all elements in the textual editor.</description>
-<topic href="targets/eclipse-help/feature-reference.html#outlineview" label="OutlineView"/>
-<topic href="targets/eclipse-help/feature-reference.html#outlineview" label="TextualROOMEditor"/>
-</context>
-
-<context id="featureContextHelp_GraphicalBehaviorEditor" title="GraphicalBehaviorEditor">
-<description>The GraphicalBehaviorEditor allows to edit the ActorClass' StateMachine. It is possible to create (hierarchical) states and transitions to model complex behavior in a convenient way.</description>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalbehavioreditor" label="GraphicalBehaviorEditor"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalbehavioreditor" label="StateMachine"/>
-</context>
-
-<context id="featureContextHelp_GraphicalStructureEditor" title="GraphicalStructureEditor">
-<description>The Structure Editor allows to edit the ActorClass' Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</description>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="GraphicalStructureEditor"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="ActorClass"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="ActorRef"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="Port"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="SAP"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="Binding"/>
-<topic href="targets/eclipse-help/feature-reference.html#graphicalstructureeditor" label="LayerConnection"/>
-</context>
-
-<context id="featureContextHelp_StructureEditorPalette" title="StructureEditorPalette">
-<description>The palette creates central structural elements of an ActorClass.</description>
-<topic href="targets/eclipse-help/feature-reference.html#structureeditorpalette" label="StructureEditorPalette"/>
-<topic href="targets/eclipse-help/feature-reference.html#structureeditorpalette" label="GraphicalStructureEditor"/>
-</context>
-
-<context id="featureContextHelp_ActorRefPropertyDialog" title="ActorRefPropertyDialog">
-<description>A dialog to edit properties of an ActorRef.</description>
-<topic href="targets/eclipse-help/feature-reference.html#actorrefpropertydialog" label="ActorRefPropertyDialog"/>
-<topic href="targets/eclipse-help/feature-reference.html#actorrefpropertydialog" label="ActorRef"/>
-<topic href="targets/eclipse-help/feature-reference.html#actorrefpropertydialog" label="GraphicalStructureEditor"/>
-</context>
-
-<context id="featureContextHelp_PortPropertyDialog" title="PortPropertyDialog">
-<description>A dialog to edit properties of an Port.</description>
-<topic href="targets/eclipse-help/feature-reference.html#portpropertydialog" label="PortPropertyDialog"/>
-<topic href="targets/eclipse-help/feature-reference.html#portpropertydialog" label="Port"/>
-<topic href="targets/eclipse-help/feature-reference.html#portpropertydialog" label="GraphicalStructureEditor"/>
-</context>
-
-<context id="featureContextHelp_SPPPropertyDialog" title="SPPPropertyDialog">
-<description>A dialog to edit properties of a SPP.</description>
-<topic href="targets/eclipse-help/feature-reference.html#spppropertydialog" label="SPPPropertyDialog"/>
-<topic href="targets/eclipse-help/feature-reference.html#spppropertydialog" label="SPP"/>
-<topic href="targets/eclipse-help/feature-reference.html#spppropertydialog" label="GraphicalStructureEditor"/>
-</context>
-
<context id="featureContextHelp_AnnotationType" title="AnnotationType">
<description>AnnotationTypes can be used to tag ROOM classes for further custom processing</description>
<topic href="targets/eclipse-help/feature-reference.html#annotationtype" label="AnnotationType"/>
@@ -214,7 +103,6 @@
<description>An actor is the basic structural building block for building systems with ROOM</description>
<topic href="targets/eclipse-help/feature-reference.html#actorclass" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#actorclass" label="Inheritance"/>
-<topic href="targets/eclipse-help/feature-reference.html#actorclass" label="GraphicalStructureEditor"/>
<topic href="targets/eclipse-help/feature-reference.html#actorclass" label="LogicalModel"/>
<topic href="targets/eclipse-help/feature-reference.html#actorclass" label="ActorRef"/>
</context>
@@ -230,7 +118,6 @@
<description>A StateMachine describes the state based, event driven behavior of an ActorClass</description>
<topic href="targets/eclipse-help/feature-reference.html#statemachine" label="StateMachine"/>
<topic href="targets/eclipse-help/feature-reference.html#statemachine" label="Inheritance"/>
-<topic href="targets/eclipse-help/feature-reference.html#statemachine" label="GraphicalBehaviorEditor"/>
<topic href="targets/eclipse-help/feature-reference.html#statemachine" label="ActorClass"/>
</context>
@@ -254,8 +141,6 @@
<topic href="targets/eclipse-help/feature-reference.html#actorref" label="ActorRef"/>
<topic href="targets/eclipse-help/feature-reference.html#actorref" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#actorref" label="Replication"/>
-<topic href="targets/eclipse-help/feature-reference.html#actorref" label="GraphicalStructureEditor"/>
-<topic href="targets/eclipse-help/feature-reference.html#actorref" label="ActorRefPropertyDialog"/>
<topic href="targets/eclipse-help/feature-reference.html#actorref" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#actorref" label="SubSystemClass"/>
</context>
@@ -265,7 +150,6 @@
<topic href="targets/eclipse-help/feature-reference.html#binding" label="Binding"/>
<topic href="targets/eclipse-help/feature-reference.html#binding" label="Port"/>
<topic href="targets/eclipse-help/feature-reference.html#binding" label="Port"/>
-<topic href="targets/eclipse-help/feature-reference.html#binding" label="GraphicalStructureEditor"/>
<topic href="targets/eclipse-help/feature-reference.html#binding" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#binding" label="SubSystemClass"/>
</context>
@@ -275,7 +159,6 @@
<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="LayerConnection"/>
<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="SAP"/>
<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="SPP"/>
-<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="GraphicalStructureEditor"/>
<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#layerconnection" label="SubSystemClass"/>
</context>
@@ -365,8 +248,6 @@
<topic href="targets/eclipse-help/feature-reference.html#port" label="Port"/>
<topic href="targets/eclipse-help/feature-reference.html#port" label="ProtocolClass"/>
<topic href="targets/eclipse-help/feature-reference.html#port" label="Replication"/>
-<topic href="targets/eclipse-help/feature-reference.html#port" label="GraphicalStructureEditor"/>
-<topic href="targets/eclipse-help/feature-reference.html#port" label="PortPropertyDialog"/>
<topic href="targets/eclipse-help/feature-reference.html#port" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#port" label="Binding"/>
<topic href="targets/eclipse-help/feature-reference.html#port" label="Binding"/>
@@ -397,7 +278,6 @@
<description>A Service Access Point is similar to a Port, but uses a LayerConnection for wiring</description>
<topic href="targets/eclipse-help/feature-reference.html#sap" label="SAP"/>
<topic href="targets/eclipse-help/feature-reference.html#sap" label="ProtocolClass"/>
-<topic href="targets/eclipse-help/feature-reference.html#sap" label="GraphicalStructureEditor"/>
<topic href="targets/eclipse-help/feature-reference.html#sap" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#sap" label="LayerConnection"/>
</context>
@@ -413,7 +293,6 @@
<description>A Service Provision Point is the counterpart of a SAP</description>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="SPP"/>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="ProtocolClass"/>
-<topic href="targets/eclipse-help/feature-reference.html#spp" label="SPPPropertyDialog"/>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="ActorClass"/>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="LayerConnection"/>
<topic href="targets/eclipse-help/feature-reference.html#spp" label="ServiceImplementation"/>
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
index 8e66adf..2aaf20a 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/etrice-doc.html
@@ -17,7 +17,7 @@
<div style="text-align:center;">
<p><img src="images/logo/etrice-logo-interim.png"></p>
<h1>eTrice Documentation</h1>
-<p>version 0.5</p>
+<p>version 1.0</p>
</div>
<!-- front page + toc--->
@@ -1095,6 +1095,15 @@
+<li><a href="feature-reference.html#cppcodegenerator">CPPCodeGenerator</a></li>
+
+
+
+
+
+
+
+
<li><a href="feature-reference.html#generationoptions">GenerationOptions</a></li>
@@ -1144,11 +1153,7 @@
<ul>
<li><a href="Dave-Integration.html#dave-etrice-toolchain-tutorial">Dave-eTrice Toolchain Tutorial</a>
<ul>
-<li><a href="Dave-Integration.html#introduction">Introduction</a>
-<ul>
-<li><a href="introduction.html#etrice-overview">eTrice Overview</a>
-<ul>
-<li><a href="introduction.html#what-is-etrice-">What is eTrice?</a></li>
+<li><a href="Dave-Integration.html#introduction">Introduction</a></li>
@@ -1157,7 +1162,7 @@
-<li><a href="introduction.html#reduction-of-complexity">Reduction of Complexity</a></li>
+<li><a href="Dave-Integration.html#getting-started-without-operating-system">Getting Started without Operating System</a></li>
@@ -1166,158 +1171,8 @@
-</ul>
-</li>
-
-
-
-
-
-
-
-<li><a href="introduction.html#introduction-room-language">Introduction ROOM Language</a>
-<ul>
-<li><a href="introduction.html#scope-of-room">Scope of ROOM</a></li>
-
-
-
-
-
-
-
-
-<li><a href="introduction.html#basic-concepts">Basic Concepts</a></li>
-
-
-
-
-
-
-
-
-<li><a href="introduction.html#execution-models">Execution Models</a></li>
-
-
-
-
-
-
-
-
-</ul>
-</li>
-
-
-
-
-
-
-
-</ul>
-</li>
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#getting-started-without-operating-system">Getting Started without Operating System</a>
-<ul>
-<li><a href="Dave-Integration.html#step-1-">Step 1:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-2-">Step 2:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-3-">Step 3:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-4-">Step 4:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-5-">Step 5:</a></li>
-
-
-
-
-
-
-
-
-</ul>
-</li>
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#getting-started-with-freertos">Getting Started with FreeRTOS</a>
-<ul>
-<li><a href="Dave-Integration.html#step-1-">Step 1:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-2-">Step 2:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-3-">Step 3:</a></li>
-
-
-
-
-
-
-
-
-<li><a href="Dave-Integration.html#step-4-">Step 4:</a></li>
-
-
-
-
-
-
-
+<li><a href="Dave-Integration.html#getting-started-with-freertos">Getting Started with FreeRTOS</a></li>
-</ul>
-</li>
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/feature-reference.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/feature-reference.html
index db408d8..e814990 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/feature-reference.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/feature-reference.html
@@ -236,11 +236,6 @@
<td><p><a href="#logicalmodel">LogicalModel</a></p></td>
<td><p>The LogicalModel describes the logical structure and behavior of a ROOM application</p></td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
</tbody>
</table>
<p><strong>Example</strong>:</p>
@@ -302,15 +297,6 @@
<td><p><a href="#subsystemclass">SubSystemClass</a></p></td>
<td><p>A SubSystem is the topmost building block of the executable part of an system</p></td>
</tr>
-<tr>
- <td rowspan="2" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-<tr>
- <td><p><a href="#actorrefpropertydialog">ActorRefPropertyDialog</a></p></td>
- <td><p>A dialog to edit properties of an ActorRef.</p></td>
-</tr>
</tbody>
</table>
<p><strong>Example</strong>:</p>
@@ -592,11 +578,6 @@
<td><p><a href="#subsystemclass">SubSystemClass</a></p></td>
<td><p>A SubSystem is the topmost building block of the executable part of an system</p></td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
</tbody>
</table>
<hr>
@@ -1118,11 +1099,6 @@
<td><p><a href="#subsystemclass">SubSystemClass</a></p></td>
<td><p>A SubSystem is the topmost building block of the executable part of an system</p></td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
</tbody>
</table>
<hr>
@@ -1345,15 +1321,6 @@
<td><p>An actor is the basic structural building block for building systems with ROOM</p></td>
</tr>
<tr>
- <td rowspan="2" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-<tr>
- <td><p><a href="#portpropertydialog">PortPropertyDialog</a></p></td>
- <td><p>A dialog to edit properties of an Port.</p></td>
-</tr>
-<tr>
<td rowspan="2" style="white-space: nowrap;"><p>Is used by:</p></td>
<td><p><a href="#binding">Binding</a><br> : endpoint1</p></td>
<td><p>A Binding connects two Ports with each other</p></td>
@@ -1609,11 +1576,6 @@
<td><p>An actor is the basic structural building block for building systems with ROOM</p></td>
</tr>
<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-<tr>
<td rowspan="1" style="white-space: nowrap;"><p>Is used by:</p></td>
<td><p><a href="#layerconnection">LayerConnection</a><br> : SAPoint</p></td>
<td><p>A LayerConnection associates a SPP to an ActorRef, resulting in an connection of all SAPs on its instance hierarchy</p></td>
@@ -1655,11 +1617,6 @@
<td><p>An actor is the basic structural building block for building systems with ROOM</p></td>
</tr>
<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#spppropertydialog">SPPPropertyDialog</a></p></td>
- <td><p>A dialog to edit properties of a SPP.</p></td>
-</tr>
-<tr>
<td rowspan="2" style="white-space: nowrap;"><p>Is used by:</p></td>
<td><p><a href="#layerconnection">LayerConnection</a><br> : SPPoint</p></td>
<td><p>A LayerConnection associates a SPP to an ActorRef, resulting in an connection of all SAPs on its instance hierarchy</p></td>
@@ -1732,11 +1689,6 @@
<td><p><a href="#actorclass">ActorClass</a></p></td>
<td><p>An actor is the basic structural building block for building systems with ROOM</p></td>
</tr>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is edited by:</p></td>
- <td><p><a href="#graphicalbehavioreditor">GraphicalBehaviorEditor</a></p></td>
- <td><p>The GraphicalBehaviorEditor allows to edit the ActorClass’ StateMachine. It is possible to create (hierarchical) states and transitions to model complex behavior in a convenient way.</p></td>
-</tr>
</tbody>
</table>
<hr>
@@ -2050,20 +2002,6 @@
</tr>
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is contained in:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-</tbody>
-</table>
<hr>
<h3><a href="#portpropertydialog" name="portpropertydialog"></a>PortPropertyDialog</h3>
<p>A dialog to edit properties of an Port.</p>
@@ -2083,20 +2021,6 @@
</tr>
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is contained in:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-</tbody>
-</table>
<hr>
<h3><a href="#spppropertydialog" name="spppropertydialog"></a>SPPPropertyDialog</h3>
<p>A dialog to edit properties of a SPP.</p>
@@ -2116,39 +2040,11 @@
</tr>
</tbody>
</table>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is contained in:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-</tbody>
-</table>
<hr>
<h3><a href="#structureeditorpalette" name="structureeditorpalette"></a>StructureEditorPalette</h3>
<p>The palette creates central structural elements of an ActorClass.</p>
<p>Selecting an entry from the palette and clicking into the diagram, creates the element at the current position.</p>
<p><img src="images/300-StructurePalette.png" alt="StructurePalette"></p>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is contained in:</p></td>
- <td><p><a href="#graphicalstructureeditor">GraphicalStructureEditor</a></p></td>
- <td><p>The Structure Editor allows to edit the ActorClass’ Structure in a convenient way. It is possible to create and arrange actor references and ports and to create bindings and layer connections.</p></td>
-</tr>
-</tbody>
-</table>
<hr>
<h2><a href="#textualroomeditor" name="textualroomeditor"></a>TextualROOMEditor</h2>
<p>Textual model editor</p>
@@ -2177,20 +2073,6 @@
<p>Displays an overview of all elements in the textual editor.</p>
<p>Shows the structure of the current opened model in the textual editor. Select the ‘Link with Editor’ option to synchronize the selection of elements between editor and outline view. This enables a convenient navigation.</p>
<p><img src="images/300-OutlineView.png" alt="OutlineView"></p>
-<table style="vertical-align: middle;" class="table">
-<thead>
-<tr>
- <th colspan="3">Feature Usage</th>
-</tr>
-</thead>
-<tbody>
-<tr>
- <td rowspan="1" style="white-space: nowrap;"><p>Is contained in:</p></td>
- <td><p><a href="#textualroomeditor">TextualROOMEditor</a></p></td>
- <td><p>Textual model editor</p></td>
-</tr>
-</tbody>
-</table>
<hr>
<h1><a href="#codegenerators" name="codegenerators"></a>CodeGenerators</h1>
<table style="vertical-align: middle;" class="table">
@@ -2201,7 +2083,7 @@
</thead>
<tbody>
<tr>
- <td rowspan="2" style="white-space: nowrap;"><p>Contains:</p></td>
+ <td rowspan="3" style="white-space: nowrap;"><p>Contains:</p></td>
<td><p><a href="#ccodegenerator">CCodeGenerator</a></p></td>
<td></td>
</tr>
@@ -2209,6 +2091,10 @@
<td><p><a href="#javacodegenerator">JavaCodeGenerator</a></p></td>
<td></td>
</tr>
+<tr>
+ <td><p><a href="#cppcodegenerator">CPPCodeGenerator</a></p></td>
+ <td></td>
+</tr>
</tbody>
</table>
<h2><a href="#ccodegenerator" name="ccodegenerator"></a>CCodeGenerator</h2>
@@ -2248,7 +2134,7 @@
<li>only the first Message having primitive or enum typed data is considered</li>
</ul>
<p>The logging status can be verified in the generation console. It will output an overview of all accepted ports. In the <a href="#generationoptions">GenerationOptions</a> is possible to (de)activate the data logging and thus ignoring the presence of the annotation.</p>
-<p>At runtime the data values will then be logged </p>
+<p>At runtime the data values will then be logged</p>
<ul>
<li>into a file <em>log/SubSystemRef.data.csv</em></li>
<li>it contains one column for each port instance</li>
@@ -2322,6 +2208,8 @@
</code></pre>
<p>Resulting graph created from generated gnuplot script:<br><img src="images/300-Gnuplot.png" alt="Gnuplot example"></p>
<hr>
+<h2><a href="#cppcodegenerator" name="cppcodegenerator"></a>CPPCodeGenerator</h2>
+<hr>
<h2><a href="#generationoptions" name="generationoptions"></a>GenerationOptions</h2>
<p>Mechanism to adjust the generation.</p>
<p>Options for generation are configured in the launch configuration or in case of standalone generation via command line.<br>A list of available options:</p>
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
index 9dd734d..c3e6e36 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/toc-topics.xml.html
@@ -138,6 +138,7 @@
<topic href="targets/eclipse-help/feature-reference.html#ccodegenerator" label="CCodeGenerator">
<topic href="targets/eclipse-help/feature-reference.html#datalogging" label="DataLogging">
</topic>
+</topic><topic href="targets/eclipse-help/feature-reference.html#cppcodegenerator" label="CPPCodeGenerator">
</topic><topic href="targets/eclipse-help/feature-reference.html#generationoptions" label="GenerationOptions">
</topic><topic href="targets/eclipse-help/feature-reference.html#javacodegenerator" label="JavaCodeGenerator">
</topic><topic href="targets/eclipse-help/feature-reference.html#msclogging" label="MSCLogging">
@@ -146,29 +147,8 @@
</topic><topic href="targets/eclipse-help/Dave-Integration.html" label="Dave Integration">
<topic href="targets/eclipse-help/Dave-Integration.html#dave-etrice-toolchain-tutorial" label="Dave-eTrice Toolchain Tutorial">
<topic href="targets/eclipse-help/Dave-Integration.html#introduction" label="Introduction">
-<topic href="targets/eclipse-help/introduction.html#etrice-overview" label="eTrice Overview">
-<topic href="targets/eclipse-help/introduction.html#what-is-etrice-" label="What is eTrice?">
-</topic><topic href="targets/eclipse-help/introduction.html#reduction-of-complexity" label="Reduction of Complexity">
-</topic>
-</topic><topic href="targets/eclipse-help/introduction.html#introduction-room-language" label="Introduction ROOM Language">
-<topic href="targets/eclipse-help/introduction.html#scope-of-room" label="Scope of ROOM">
-</topic><topic href="targets/eclipse-help/introduction.html#basic-concepts" label="Basic Concepts">
-</topic><topic href="targets/eclipse-help/introduction.html#execution-models" label="Execution Models">
-</topic>
-</topic>
</topic><topic href="targets/eclipse-help/Dave-Integration.html#getting-started-without-operating-system" label="Getting Started without Operating System">
-<topic href="targets/eclipse-help/Dave-Integration.html#step-1-" label="Step 1:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-2-" label="Step 2:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-3-" label="Step 3:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-4-" label="Step 4:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-5-" label="Step 5:">
-</topic>
</topic><topic href="targets/eclipse-help/Dave-Integration.html#getting-started-with-freertos" label="Getting Started with FreeRTOS">
-<topic href="targets/eclipse-help/Dave-Integration.html#step-1-" label="Step 1:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-2-" label="Step 2:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-3-" label="Step 3:">
-</topic><topic href="targets/eclipse-help/Dave-Integration.html#step-4-" label="Step 4:">
-</topic>
</topic>
</topic>
</topic><topic href="targets/eclipse-help/ResourceRequirements.html" label="Resource Requirements">
@@ -188,5 +168,5 @@
</topic>
</topic>
</topic>
-</topic>
-</toc>
\ No newline at end of file
+</topic>
+</toc>
\ No newline at end of file
diff --git a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/tutorials.html b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/tutorials.html
index 123b314..99173d6 100644
--- a/plugins/org.eclipse.etrice.doc/targets/eclipse-help/tutorials.html
+++ b/plugins/org.eclipse.etrice.doc/targets/eclipse-help/tutorials.html
@@ -104,12 +104,8 @@
<td align="center"><img src="images/014-build_run.png" alt="image"></td>
</tr>
<tr>
- <td align="center"><ol>
- <li>Invoke generator</li>
-</ol></td>
- <td align="center"><ol>
- <li>Build and run application</li>
-</ol></td>
+ <td align="center"><center>1. Invoke generator</center></td>
+ <td align="center"><center>2. Build and run application</center></td>
</tr>
</tbody>
</table>
@@ -183,12 +179,8 @@
<td align="center"><img src="images/014-build_run-cpp.png" alt="image"></td>
</tr>
<tr>
- <td align="center"><ol>
- <li>Invoke generator</li>
-</ol></td>
- <td align="center"><ol>
- <li>Build and run application</li>
-</ol></td>
+ <td align="center"><center>1. Invoke generator</center></td>
+ <td align="center"><center>2. Build and run application</center></td>
</tr>
</tbody>
</table>
@@ -250,12 +242,8 @@
<td align="center"><img src="images/014-build_run.png" alt="image"></td>
</tr>
<tr>
- <td align="center"><ol>
- <li>Invoke generator</li>
-</ol></td>
- <td align="center"><ol>
- <li>Build and run application</li>
-</ol></td>
+ <td align="center"><center>1. Invoke generator</center></td>
+ <td align="center"><center>2. Build and run application</center></td>
</tr>
</tbody>
</table>
@@ -304,7 +292,7 @@
</code></pre>
<pre><code class="room customHighlighted"><span class="keyword">ActorClass</span> Sender {
<span class="keyword">Interface</span> {
- <span class="keyword">conjugated</span> <span class="keyword">Port</span> sendPort:
+ <span class="keyword">conjugated</span> <span class="keyword">Port</span> sendPort:
PingPongProtocol
}
<span class="keyword">Structure</span> {
