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

Jump to bottom

Initial porting for mbed #6

Merged
merged 2 commits into from
Oct 16, 2021
Merged

Initial porting for mbed #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b2096a
Initial (bit rough) porting to Mbed environment.
Oct 10, 2021
a3f1acc
Modification to compile with Mbed online compiler.
Oct 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 9 additions & 0 deletions include/rtps/ThreadPool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ Author: i11 - Embedded Software, RWTH Aachen University
#ifndef RTPS_THREADPOOL_H
#define RTPS_THREADPOOL_H

#ifdef __MBED__
#ifdef __cplusplus
extern "C" {
#endif
void sys_msleep(unsigned int ms);
#ifdef __cplusplus
}
#endif
#endif /* __MBED__ */
#include "lwip/sys.h"
#include "rtps/communication/PacketInfo.h"
#include "rtps/communication/UdpDriver.h"
Expand Down
1 change: 1 addition & 0 deletions include/rtps/common/Locator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ struct Locator {
ucdr_serialize_array_uint8_t(&buffer, reinterpret_cast<uint8_t *>(this),
sizeof(Locator));
}
return true;
}

ip4_addr_t getIp4Address() const {
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/Micro-CDR/include/ucdr/microcdr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ extern "C" {

#include <ucdr/common.h>
#include <ucdr/types/basic.h>
#include <ucdr/types/string.h>
#include <ucdr/types/cdr_string.h>
#include <ucdr/types/array.h>
#include <ucdr/types/sequence.h>

Expand Down
0 ...rty/Micro-CDR/include/ucdr/types/string.h → ...Micro-CDR/include/ucdr/types/cdr_string.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion thirdparty/Micro-CDR/src/c/types/string.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include <ucdr/types/string.h>
#include <ucdr/types/cdr_string.h>
#include <ucdr/types/sequence.h>

#include <string.h>
Expand Down