Skip to content

Commit 0690962

Browse files
author
Benjamin Délèze
authored
Merge pull request #6044 from cyberbotics/sync-master-55532ceea
Merge master into develop
2 parents a9f35e6 + 478638f commit 0690962

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

docs/guide/starting-webots.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ Options:
5656
--batch
5757
Prevent Webots from creating blocking pop-up windows.
5858
59+
--clear-cache
60+
Clear the cache of Webots on startup.
61+
5962
--stdout
6063
Redirect the stdout of the controllers to the terminal.
6164

docs/reference/changelog-r2023.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Released on ??
3939
- Field getters sometimes returning an invalid Field object ([#5633](https://github.com/cyberbotics/webots/pull/5633)).
4040
- `Field.enableSFTracking` and `Field.disableSFTracking` which were failing ([#5640](https://github.com/cyberbotics/webots/pull/5640)).
4141
- `Motor.enableForceFeedback` where the `sampling_period` argument was missing ([#5797](https://github.com/cyberbotics/webots/pull/5797)).
42+
- `Motor.setAcceleration` was missing the device tag parameter ([#6036](https://github.com/cyberbotics/webots/pull/6036)).
4243
- Fixed crash resulting from requesting pose tracking of unsuitable nodes ([#5620](https://github.com/cyberbotics/webots/pull/5620)).
4344
- Fixed memory leaks, particularly when in no-rendering mode and spawning/deleting nodes ([#5639](https://github.com/cyberbotics/webots/pull/5639)).
4445
- Fixed crashes resulting from streaming pose, SF field values or contact points after deleting the tracked nodes ([#5638](https://github.com/cyberbotics/webots/pull/5638)).
@@ -66,7 +67,7 @@ Released on ??
6667
- Fixed bug causing Webots to hang when requesting multiple poses while pose-tracking multiple nodes ([#5952](https://github.com/cyberbotics/webots/pull/5952)).
6768
- Fixed physics state updates of [Solid](solid.md) nodes added to a descendant [`Joint.endPoint`](joint.md) during simulation ([#5961](https://github.com/cyberbotics/webots/pull/5961)).
6869
- Fixed unwanted altitude change when reaching a target waypoint in `mavic2pro_patrol.c` ([#5981](https://github.com/cyberbotics/webots/pull/5981)).
69-
- Fixed the extern controller connection to a target Webots instance when a snap one is running. ([#6002](https://github.com/cyberbotics/webots/pull/6002)).
70+
- Fixed the extern controller connection to a target Webots instance when a snap one is running ([#6002](https://github.com/cyberbotics/webots/pull/6002)).
7071

7172
## Webots R2023a
7273
Released on November 29th, 2022.

lib/controller/python/controller/motor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ def target_acceleration(self) -> float:
216216

217217
@target_acceleration.setter
218218
def target_acceleration(self, acceleration: float):
219-
wb.wb_motor_set_acceleration(acceleration)
219+
wb.wb_motor_set_acceleration(self._tag, ctypes.c_double(acceleration))
220220

221221
force = property(fset=setForce)
222222
torque = property(fset=setTorque)

src/webots/gui/WbSingleTaskApplication.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,8 @@ void WbSingleTaskApplication::showHelp() const {
190190
cerr << tr(" Minimize the Webots window on startup.").toUtf8().constData() << endl << endl;
191191
cerr << " --batch" << endl;
192192
cerr << tr(" Prevent Webots from creating blocking pop-up windows.").toUtf8().constData() << endl << endl;
193+
cerr << " --clear-cache" << endl;
194+
cerr << tr(" Clear the cache of Webots on startup.").toUtf8().constData() << endl << endl;
193195
cerr << " --stdout" << endl;
194196
cerr << tr(" Redirect the stdout of the controllers to the terminal.").toUtf8().constData() << endl << endl;
195197
cerr << " --stderr" << endl;

0 commit comments

Comments
 (0)