eTrice 3.2 release
diff --git a/documentation/release/Dave-Integration.html b/documentation/release/Dave-Integration.html
index 1f75516..7a10d79 100644
--- a/documentation/release/Dave-Integration.html
+++ b/documentation/release/Dave-Integration.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/ResourceRequirements.html b/documentation/release/ResourceRequirements.html
index 4b2ea32..26f1679 100644
--- a/documentation/release/ResourceRequirements.html
+++ b/documentation/release/ResourceRequirements.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/developers-reference.html b/documentation/release/developers-reference.html
index 2c38f92..2f3dbe8 100644
--- a/documentation/release/developers-reference.html
+++ b/documentation/release/developers-reference.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/etrice-features.html b/documentation/release/etrice-features.html
index 6500daf..b3788ef 100644
--- a/documentation/release/etrice-features.html
+++ b/documentation/release/etrice-features.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
@@ -1460,6 +1467,71 @@
<p>It is possible to generate a monitor, that can check the contract at runtime. The generator transforms any contract to an ActorClass, which can be placed between the implementing parties to detect any violation of the contract.</p>
<img style="width: 100%;" src="images/050-InterfaceContractMonitor.png">
<p>The generator is called “eTrice Contract Monitor Generator”. The usage is similar to the eTrice source code generators. By default the generated models are placed in the folder ‘model-gen’. The name of the generated ActorClass can be adjusted in the contract annotation <code>@InterfaceContractDefinition</code> using the attribute <code>generatedMontiorName</code>.<br>The generated monitor implements <code>PContractMonitorControl</code>, which can be used to query the violations status or to toggle the propagation of invalid messages. It can be found in the modellib under the namespace <code>etrice.api.contracts.monitors</code>.</p>
+<h2><a href="#interrupt-events" name="interrupt-events"></a>Interrupt Events</h2>
+<p>In eTrice the protocol <code>etrice.api.interrupt.PInterrupt</code> models an <a href="https://en.wikipedia.org/wiki/Interrupt">interrupt</a> event. The protocol consists of two messages <code>fire</code> and <code>event</code>, which have higher priority than other eTrice messages.<br>The flow of an interrupt event is as follows. First, the interrupt handler must create the eTrice message <code>PInterrupt.fire</code>. As soon as the execution returns to the eTrice thread, the eTrice runtime dispatches the <code>PInterrupt.event</code> message immediately before any other queued message. As a result, the interrupt <code>event</code> message will be received by the target state machine at once. The execution is always on the eTrice thread to avoid any concurrency issues from the interrupt context.</p>
+<p>The following examples shows how to connect an interrupt handler to the eTrice application.<br>First there is the simple actor <code>AExternalUSBIsr</code>, which exports the <code>PInterrupt</code> conjugated port to an external function called <code>USB_register_port</code>.</p>
+<pre><code class="room customHighlighted"><span class="keyword">import</span> etrice.api.interrupt.PInterrupt
+
+<span class="keyword">ActorClass</span> AExternalUSBIsr {
+ <span class="keyword">Interface</span> {
+ <span class="keyword">conjugated</span> <span class="keyword">Port</span> isrUSBExported: PInterrupt
+ }
+ <span class="keyword">Structure</span> {
+ <span class="keyword">external</span> <span class="keyword">Port</span> isrUSBExported
+ }
+ <span class="keyword">Behavior</span> {
+ <span class="keyword">StateMachine</span> {
+ <span class="keyword">State</span> state
+ <span class="keyword">Transition</span> init: <span class="keyword">initial</span> -> state {
+ <span class="keyword">action</span> <span class="string">'''
+ // export port isrUSBExported to external function
+ USB_register_port(isrUSBExported.export());
+ '''</span>
+ }
+ }
+ }
+}
+</code></pre>
+<p>The function <code>USB_register_port</code> saves the port handle to <code>usbIsr_port</code>. The interrupt handler can use this handle to trigger the <code>fire</code> message from its interrupt context.</p>
+<pre><code class="c">// #include "etrice/api/interrupt/PInterrupt.h"
+
+static PInterruptConjPort *usbIsr_port = NULL;
+
+// called from eTrice initial transition
+void USB_register_port(PInterruptConjPort *port) {
+ usbIsr_port = port;
+}
+
+// !! interrupt context !!
+void MY_USB_INTERRUPT_HANDLER() {
+ if(usbIsr_port) {
+ PInterruptConjPort_fire(usbIsr_port);
+ }
+}
+</code></pre>
+<p>The event is handled in actor <code>AUSBService</code>, which contains the previous actor <code>AExternalUSBIsr</code>. The port <code>usbIsr</code> is bound to <code>AExternalUSBIsr.externalUsbIsr</code>. If the interrupt handler triggers the <code>fire</code> message, the state machine will finally receive the associated <code>event</code> message on port <code>usbIsr</code>.</p>
+<pre><code class="room customHighlighted"><span class="keyword">ActorClass</span> AUSBService {
+ <span class="keyword">Structure</span> {
+ <span class="keyword">Port</span> usbIsr: PInterrupt
+ <span class="keyword">ActorRef</span> externalUsbIsr: AExternalUSBIsr
+ <span class="keyword">Binding</span> usbIsr <span class="keyword">and</span> externalUsbIsr.isrUSBExported
+ }
+ <span class="keyword">Behavior</span> {
+ <span class="keyword">StateMachine</span> {
+ <span class="keyword">State</span> state
+ <span class="keyword">Transition</span> init: <span class="keyword">initial</span> -> state
+ <span class="keyword">Transition</span> receiveUSB: state -> state {
+ <span class="keyword">triggers</span> {
+ <event: usbIsr>
+ }
+ <span class="keyword">action</span> <span class="string">'''
+ // do something, e.g. read usb buffer
+ '''</span>
+ }
+ }
+ }
+}
+</code></pre>
<hr>
<p><a href="#navbar">back to top</a> <span class="version pull-right">version 3.x</span></p>
</div>
diff --git a/documentation/release/examples.html b/documentation/release/examples.html
index 24ae5ab..3c77291 100644
--- a/documentation/release/examples.html
+++ b/documentation/release/examples.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/feature-reference.html b/documentation/release/feature-reference.html
index c679e70..de85caf 100644
--- a/documentation/release/feature-reference.html
+++ b/documentation/release/feature-reference.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
@@ -4008,7 +4015,7 @@
<hr>
<h2><a href="#msclogging" name="msclogging"></a>MSCLogging</h2>
<p>Runtime logger for event-driven Messages, represented as a Message Sequence Chart.</p>
-<p>The MSCLogging is activated by default, but can be set manually in the <a href="#generationoptions">GenerationOptions</a>. The output file is created upon regular termination of the application. The resulting file can be found in the logging directory and has the name <em>msc.seq</em>, which can be open with the free open source tool <a href="http://trace2uml.stage.tigris.org/">Trace2UML</a>.</p>
+<p>The MSCLogging is activated by default, but can be set manually in the <a href="#generationoptions">GenerationOptions</a>. The output file is created upon regular termination of the application. The resulting file can be found in the logging directory and has the name <em>msc.seq</em>, which can be open with the free open source tool <a href="https://wiki.astade.de/">Trace2UML</a>.</p>
<p><img src="images/300-MSCLogging.png" alt="MSCLogging"></p>
<table style="vertical-align: middle;" class="table">
<thead>
diff --git a/documentation/release/introduction.html b/documentation/release/introduction.html
index ec3e28f..114434b 100644
--- a/documentation/release/introduction.html
+++ b/documentation/release/introduction.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/release-notes.html b/documentation/release/release-notes.html
index ed2e785..b112ebd 100644
--- a/documentation/release/release-notes.html
+++ b/documentation/release/release-notes.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/room-concepts.html b/documentation/release/room-concepts.html
index 46de6b8..6ccb673 100644
--- a/documentation/release/room-concepts.html
+++ b/documentation/release/room-concepts.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/standalone-generators.html b/documentation/release/standalone-generators.html
index 379b85b..8124b35 100644
--- a/documentation/release/standalone-generators.html
+++ b/documentation/release/standalone-generators.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
diff --git a/documentation/release/tutorials.html b/documentation/release/tutorials.html
index cbd5220..409cc1d 100644
--- a/documentation/release/tutorials.html
+++ b/documentation/release/tutorials.html
@@ -574,6 +574,13 @@
+<li><a href="etrice-features.html#interrupt-events">Interrupt Events</a></li>
+
+
+
+
+
+
</ul>
</li>
@@ -1259,10 +1266,10 @@
</ul>
</li>
<li>
- <p>Optional: Install <a href="http://trace2uml.stage.tigris.org/">Trace2UML</a>, an Open Source MSC viewer</p>
+ <p>Optional: Install <a href="https://wiki.astade.de/">Trace2UML</a>, an Open Source MSC viewer</p>
<ul>
- <li><a href="http://trace2uml.tigris.org/servlets/ProjectDocumentList?folderID=6208">Windows download site</a></li>
- <li><a href="http://apt.astade.de/">Linux package</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Windows download site</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Linux package</a></li>
</ul>
</li>
</ul>
@@ -1371,10 +1378,10 @@
</ul>
</li>
<li>
- <p>Optional: Install <a href="http://trace2uml.stage.tigris.org/">Trace2UML</a>, an Open Source MSC viewer</p>
+ <p>Optional: Install <a href="https://wiki.astade.de/">Trace2UML</a>, an Open Source MSC viewer</p>
<ul>
- <li><a href="http://trace2uml.tigris.org/servlets/ProjectDocumentList?folderID=6208">Windows download site</a></li>
- <li><a href="http://apt.astade.de/">Linux package</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Windows download site</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Linux package</a></li>
</ul>
</li>
</ul>
@@ -1441,10 +1448,10 @@
</ul>
</li>
<li>
- <p>Optional: Install <a href="http://trace2uml.stage.tigris.org/">Trace2UML</a>, an Open Source MSC viewer</p>
+ <p>Optional: Install <a href="https://wiki.astade.de/">Trace2UML</a>, an Open Source MSC viewer</p>
<ul>
- <li><a href="http://trace2uml.tigris.org/servlets/ProjectDocumentList?folderID=6208">Windows download site</a></li>
- <li><a href="http://apt.astade.de/">Linux package</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Windows download site</a></li>
+ <li><a href="https://wiki.astade.de/dokuwiki/doku.php?id=download:index">Linux package</a></li>
</ul>
</li>
</ul>
diff --git a/downloads/_index.html b/downloads/_index.html
index db6b507..c3d6139 100644
--- a/downloads/_index.html
+++ b/downloads/_index.html
@@ -11,13 +11,13 @@
Eclipse eTrice requires an Eclipse installation. We recommend to install eTrice on top of the latest Eclipse release.</br>
You can visit the Eclipse release site and download the installer.
</p>
- <p><a class="btn btn-info" target="_blank" href="https://www.eclipse.org/downloads/packages/release/2020-09/r"><i class="fa fa-download"></i> Download Eclipse</a></p>
+ <p><a class="btn btn-info" target="_blank" href="https://www.eclipse.org/downloads/packages/release/2021-06/r"><i class="fa fa-download"></i> Download Eclipse</a></p>
<hr>
<p>eTrice can be installed on top of any pre-packaged Eclipse IDE.
- But there are two Eclipse packages that might be suited in particula for your type of development together with eTrice:</p>
+ But there are two Eclipse packages that might be suited in particular for your type of development together with eTrice:</p>
<ul>
- <li><a target="_blank" href="https://www.eclipse.org/downloads/packages/release/2020-03/r/eclipse-ide-cc-developers">C/C++ Developers</a></li>
- <li><a target="_blank" href="https://www.eclipse.org/downloads/packages/release/2020-03/r/eclipse-ide-java-and-dsl-developers">Java and DSL Developers</a></li>
+ <li><a target="_blank" href="https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-cc-developers">C/C++ Developers</a></li>
+ <li><a target="_blank" href="https://www.eclipse.org/downloads/packages/release/2021-06/r/eclipse-ide-java-and-dsl-developers">Java and DSL Developers</a></li>
</ul>
</div>
<div class="col-md-8 one gs-item">
@@ -52,7 +52,7 @@
<ul class="list-group">
<li class="list-group-item">
<a name="latest-release"></a>
- <h3 style="margin-top: 0px; font-weight: 400;">Release 3.1.0</h3>
+ <h3 style="margin-top: 0px; font-weight: 400;">Release 3.2.0</h3>
<div role="alert" class="alert alert-warning">
It is highly recommended to use Eclipse 2020-09 or later with Java 11+ to avoid any installation issues
</div>
@@ -73,13 +73,13 @@
<tr>
<th>b)</th>
<td>Update Site</td>
- <td><a class="panel" href="https://download.eclipse.org/etrice/3.1.0/updates">https://download.eclipse.org/etrice/3.1.0/updates</a></td>
+ <td><a class="panel" href="https://download.eclipse.org/etrice/3.2.0/updates">https://download.eclipse.org/etrice/3.2.0/updates</a></td>
<td><a title="Installation instructions" href="/etrice/documentation/"><span class="fa fa-support"></span></a></td>
</tr>
<tr class="active">
<th>c)</th>
<td>Zip file </td>
- <td><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.site-3.1.0.zip&r=1">Download zip file</a></td>
+ <td><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.2.0/archives/org.eclipse.etrice.site-3.2.0.zip&r=1">Download zip file</a></td>
<td><a title="Installation instructions" href="/etrice/documentation/"><span class="fa fa-support"></span></a></td>
</tr>
</tbody></table>
@@ -87,10 +87,10 @@
<h4>Standalone Generators</h4>
<div class="container-fluid">
<div class="row">
- <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.generator.java-3.1.0.zip&r=1">Java Generator</a></div>
- <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.generator.c-3.1.0.zip&r=1">C Generator</a></div>
- <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.generator.cpp-3.1.0.zip&r=1">C++ Generator</a></div>
- <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.generator.doc-3.1.0.zip&r=1">Documentation Generator</a></div>
+ <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.2.0/archives/org.eclipse.etrice.generator.java-3.2.0.zip&r=1">Java Generator</a></div>
+ <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.2.0/archives/org.eclipse.etrice.generator.c-3.2.0.zip&r=1">C Generator</a></div>
+ <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.2.0/archives/org.eclipse.etrice.generator.cpp-3.2.0.zip&r=1">C++ Generator</a></div>
+ <div class="col-md-4"><a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.2.0/archives/org.eclipse.etrice.generator.doc-3.2.0.zip&r=1">Documentation Generator</a></div>
</div>
</div>
</ul>
@@ -143,11 +143,19 @@
<h2>Archived Releases</h2>
<!-- ReleaseCheck -->
<ul class="list-group">
+ <li class="list-group-item">Release 3.1.0
+ <ul>
+ <li>Update site: <a href="https://download.eclipse.org/etrice/3.1.0/updates">https://download.eclipse.org/etrice/3.1.0/updates</a>
+ </li>
+ <li>ZIP file: <a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.1.0/archives/org.eclipse.etrice.site-3.1.0.zip&r=1">org.eclipse.etrice.site-3.1.0.zip</a>
+ </li>
+ </ul>
+ </li>
<li class="list-group-item">Release 3.0.3
<ul>
<li>Update site: <a href="https://download.eclipse.org/etrice/3.0.3/updates">https://download.eclipse.org/etrice/3.0.3/updates</a>
</li>
- <li>ZIP file: <a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.0.3/archives/org.eclipse.etrice.site-3.0.3.zip&r=1">org.eclipse.etrice.site-3.0.2.zip</a>
+ <li>ZIP file: <a href="http://www.eclipse.org/downloads/download.php?file=/etrice/3.0.3/archives/org.eclipse.etrice.site-3.0.3.zip&r=1">org.eclipse.etrice.site-3.0.3.zip</a>
</li>
</ul>
</li>
