Skip to content

Commit e5e0b0c

Browse files
Wenzler, NilsKonradBkd
authored andcommitted
-- docs fix some minor issues (#684)
* -- docs fix some minor issues * -- docs removed legacy note forbidding mixed sync operation --------- Co-authored-by: Breitsprecher, Konrad <[email protected]>
1 parent 3095e17 commit e5e0b0c

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

docs/CHANGELOG.rst

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@ Fixed
2020
~~~~~
2121

2222
- Fixed misbehavior of the sil-kit-system-controller in interactive mode on user input:
23+
2324
- The sil-kit-system-controller now triggers a Stop() in SystemState::Running or SystemState::Paused.
2425
- The sil-kit-system-controller only triggers AbortSimulation when not SystemState::Running, SystemState::Paused, SystemState::Shutdown or SystemState::Aborting.
2526

2627
Changed
2728
~~~~~~~
2829

29-
- Performance improvement of the interal serialization
30+
- Performance improvement of the internal serialization
3031
- The final state handling of the sil-kit-system-controller in interactive mode on user input has changed:
32+
3133
- Old: The sil-kit-system-controller triggered AbortSimulation if the finalState was not received after 5s.
3234
- New: The sil-kit-system-controller retries receiving the finalState 3x5s. If this fails, the sil-kit-system-controller triggers AbortSimulation (if not already happened) and tries receiving the finalState 3x5s again. If this fails, the sil-kit-system-controller just terminates.
3335

@@ -50,7 +52,7 @@ Fixed
5052

5153
- Ensured that calling ``ISystemController::AbortSimulation()`` does not lead to the system controller terminating
5254
prior to other participants receiving its abort message.
53-
- Ensure that userContext field for external CanFrameTransmitEvents is allways null.
55+
- Ensure that userContext field for external CanFrameTransmitEvents is always null.
5456
- Fixed warning in VS2017 (x86) build
5557

5658
[4.0.34] - 2023-08-21
@@ -140,6 +142,7 @@ Added
140142
~~~~~
141143

142144
- Improved Lifecycle and TimeSyncService features:
145+
143146
- Full support for Operation Mode Autonomous with TimeSyncService including hopping onto / leaving a running simulation
144147
- Abort simulation in case Coordinated participants want to join a running simulation
145148
- Abort simulation in case an Autonomous with TimeSyncService sees an incompatible participant

docs/api/pubsub.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The interfaces for the publish/subscribe mechanism can be instantiated from an |
140140
// Participant1 (Publisher)
141141
// ------------------------
142142
SilKit::Services::PubSub::PubSubSpec pubDataSpec{"Topic1", "application/json"};
143-
pubDataSpec.AddLabel("KeyA", "ValA");
143+
pubDataSpec.AddLabel("KeyA", "ValA", SilKit::Services::MatchingLabel::Kind::Optional);
144144
auto* publisher = participant->CreateDataPublisher("PubCtrl1", pubDataSpec, 1);
145145
publisher->Publish(user_data);
146146

docs/simulation/simulation.rst

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,6 @@ The following first gives a general overview of a simulation run using the |Prod
202202
Afterwards, possibilities to configure the simulation step length of a simulation step and to define the simulation step that is being executed are introduced.
203203
The last part details what time information |ProductName| clients provide, depending on their synchronization mode.
204204

205-
.. admonition:: Note
206-
207-
A mixed operation mode, where some participants operate synchronized and some unsynchronized,
208-
is not supported. Therefore, all participants of a simulation must either be synchronized or unsynchronized.
209-
210205
.. _subsec:sim-overview:
211206

212207
Simulation Overview

0 commit comments

Comments
 (0)