Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge master into develop #5501

Merged
merged 1 commit into from
Nov 15, 2022
Merged

Merge master into develop #5501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions docs/reference/device.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ The `wb_device_get_model` function returns the model string of the device corres

This function returns NULL if the WbDeviceTag does not match a valid device, or returns an empty string if the device is not a solid device (i.e. does not have a `model` field).

> **Note** [C, C++]: The returned string is a pointer to the internal values managed by the [Device](#device) node, therefore it is illegal to free this pointer.

---

#### `wb_device_get_name`
Expand Down Expand Up @@ -175,6 +177,8 @@ The `wb_device_get_name` function converts the WbDeviceTag given as parameter (`

This function returns NULL if the WbDeviceTag does not match a valid device.

> **Note** [C, C++]: The returned string is a pointer to the internal values managed by the [Device](#device) node, therefore it is illegal to free this pointer.

---

#### `wb_device_get_node_type`
Expand Down
2 changes: 1 addition & 1 deletion src/controller/c/robot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ void robot_read_answer(WbDevice *d, WbRequest *r) {
}
}

// Protected funtions available from other files of the client library
// Protected functions available from other files of the client library

const char *robot_get_device_name(WbDeviceTag tag) {
if (tag < robot.n_device)
Expand Down