Skip to content

Commit 1a2f0ec

Browse files
committed
Pre-commit formatting
1 parent fed0729 commit 1a2f0ec

File tree

13 files changed

+57
-52
lines changed

13 files changed

+57
-52
lines changed

ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2_ros/mpconfigboard.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#pragma once
88

99
// Micropython setup
10-
1110
#define MICROPY_HW_BOARD_NAME "ESP32-S3-DevKitC-1-N8R2 (ROS version)"
1211
#define MICROPY_HW_MCU_NAME "ESP32S3"
1312

ports/espressif/boards/espressif_esp32s3_devkitc_1_n8r2_ros/sdkconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
# end of Component config
1313

14-
# end of Espressif IoT Development Framework Configuration
14+
# end of Espressif IoT Development Framework Configuration

ports/espressif/common-hal/rclcpy/Node.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "esp_log.h"
1111

12+
1213
void common_hal_rclcpy_node_construct(rclcpy_node_obj_t *self,
1314
const char *node_name, const char *node_namespace) {
1415

@@ -19,16 +20,16 @@ void common_hal_rclcpy_node_construct(rclcpy_node_obj_t *self,
1920
self->deinited = false;
2021
}
2122

22-
bool common_hal_rclcpy_node_deinited(rclcpy_node_obj_t * self) {
23+
bool common_hal_rclcpy_node_deinited(rclcpy_node_obj_t *self) {
2324
return self->deinited;
2425
}
2526

26-
void common_hal_rclcpy_node_deinit(rclcpy_node_obj_t * self) {
27+
void common_hal_rclcpy_node_deinit(rclcpy_node_obj_t *self) {
2728
if (common_hal_rclcpy_node_deinited(self)) {
2829
return;
2930
}
3031
rcl_ret_t ret = rcl_node_fini(&self->rcl_node);
31-
if (ret != RCL_RET_OK || !rcl_node_is_valid(&self->rcl_node)) {
32+
if (ret != RCL_RET_OK || !rcl_node_is_valid(&self->rcl_node)) {
3233
ESP_LOGW("RCLCPY", "Node cleanup error: %d", ret);
3334
}
3435
self->deinited = true;

ports/espressif/common-hal/rclcpy/Node.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <rclc/rclc.h>
1616
#include <stdio.h>
1717

18+
1819
typedef struct {
1920
mp_obj_base_t base;
2021
bool deinited;
2122
rcl_node_t rcl_node;
2223
} rclcpy_node_obj_t;
23-

ports/espressif/common-hal/rclcpy/Publisher.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88

99
#include "esp_log.h"
1010

11-
void common_hal_rclcpy_publisher_construct(rclcpy_publisher_obj_t *self, rclcpy_node_obj_t * node,
11+
12+
void common_hal_rclcpy_publisher_construct(rclcpy_publisher_obj_t *self, rclcpy_node_obj_t *node,
1213
const char *topic_name) {
1314

1415
// Create Int32 type object
1516
// TODO: support other message types through class imports
16-
const rosidl_message_type_support_t * type_support = ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, Int32);
17+
const rosidl_message_type_support_t *type_support = ROSIDL_GET_MSG_TYPE_SUPPORT(std_msgs, msg, Int32);
1718

1819
// Creates a reliable Int32 publisher
1920
rcl_ret_t rc = rclc_publisher_init_default(
20-
&self->rcl_publisher, &node->rcl_node,
21-
type_support, topic_name);
21+
&self->rcl_publisher, &node->rcl_node,
22+
type_support, topic_name);
2223
if (RCL_RET_OK != rc) {
2324
mp_raise_RuntimeError(MP_ERROR_TEXT("ROS topic failed to initialize"));
2425
}
@@ -35,13 +36,13 @@ void common_hal_rclcpy_publisher_deinit(rclcpy_publisher_obj_t *self) {
3536
return;
3637
}
3738
rcl_ret_t ret = rcl_publisher_fini(&self->rcl_publisher, &self->node->rcl_node);
38-
if (ret != RCL_RET_OK || !rcl_publisher_is_valid(&self->rcl_publisher)) {
39+
if (ret != RCL_RET_OK || !rcl_publisher_is_valid(&self->rcl_publisher)) {
3940
ESP_LOGW("RCLCPY", "Publisher cleanup warning: %d", ret);
4041
}
4142
self->node = NULL;
4243
}
4344

44-
void common_hal_rclcpy_publisher_publish_int32(rclcpy_publisher_obj_t * self, int32_t data) {
45+
void common_hal_rclcpy_publisher_publish_int32(rclcpy_publisher_obj_t *self, int32_t data) {
4546
// Int32 message object
4647
std_msgs__msg__Int32 msg;
4748

@@ -57,4 +58,4 @@ void common_hal_rclcpy_publisher_publish_int32(rclcpy_publisher_obj_t * self, in
5758

5859
const char * common_hal_rclcpy_publisher_get_topic_name(rclcpy_publisher_obj_t *self) {
5960
return rcl_publisher_get_topic_name(&self->rcl_publisher);
60-
}
61+
}

ports/espressif/common-hal/rclcpy/Publisher.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616
#include <rclc/executor.h>
1717
#include <rclc/rclc.h>
1818
#include <stdio.h>
19-
2019
#include <std_msgs/msg/int32.h>
2120

2221

2322
typedef struct {
2423
mp_obj_base_t base;
25-
rclcpy_node_obj_t * node;
24+
rclcpy_node_obj_t *node;
2625
rcl_publisher_t rcl_publisher;
2726
} rclcpy_publisher_obj_t;

ports/espressif/common-hal/rclcpy/__init__.c

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,30 @@
88

99
#include "esp_log.h"
1010

11+
1112
rclcpy_context_t rclcpy_default_context = {
1213
.initialized = false,
1314
};
1415

15-
static void* microros_allocate(size_t size, void* state) {
16-
(void) state;
16+
static void * microros_allocate(size_t size, void *state) {
17+
(void)state;
1718
return m_malloc(size);
1819
}
1920

20-
static void microros_deallocate(void* pointer, void* state) {
21-
(void) state;
21+
static void microros_deallocate(void *pointer, void *state) {
22+
(void)state;
2223
m_free(pointer);
2324
}
2425

25-
static void* microros_reallocate(void* pointer, size_t size, void* state) {
26-
(void) state;
26+
static void * microros_reallocate(void *pointer, size_t size, void *state) {
27+
(void)state;
2728
return m_realloc(pointer, size);
2829
}
2930

30-
static void* microros_zero_allocate(size_t number_of_elements, size_t size_of_element, void* state) {
31-
(void) state;
31+
static void * microros_zero_allocate(size_t number_of_elements, size_t size_of_element, void *state) {
32+
(void)state;
3233
size_t total_size = number_of_elements * size_of_element;
33-
void* ptr = m_malloc(total_size);
34+
void *ptr = m_malloc(total_size);
3435
if (ptr != NULL) {
3536
memset(ptr, 0, total_size);
3637
}
@@ -65,7 +66,7 @@ void common_hal_rclcpy_init(const char *agent_ip, const char *agent_port, int16_
6566
custom_allocator.allocate = microros_allocate;
6667
custom_allocator.deallocate = microros_deallocate;
6768
custom_allocator.reallocate = microros_reallocate;
68-
custom_allocator.zero_allocate = microros_zero_allocate;
69+
custom_allocator.zero_allocate = microros_zero_allocate;
6970
// Set custom allocator as default
7071
if (!rcutils_set_default_allocator(&custom_allocator)) {
7172
ESP_LOGW("RCLCPY", "allocator failure");
@@ -77,31 +78,31 @@ void common_hal_rclcpy_init(const char *agent_ip, const char *agent_port, int16_
7778

7879
// Options Init
7980
rclcpy_default_context.init_options = rcl_get_zero_initialized_init_options();
80-
ret = rcl_init_options_init(&rclcpy_default_context.init_options, rclcpy_default_context.rcl_allocator);
81+
ret = rcl_init_options_init(&rclcpy_default_context.init_options, rclcpy_default_context.rcl_allocator);
8182
if (ret != RCL_RET_OK) {
8283
ESP_LOGW("RCLCPY", "Options init failure: %d", ret);
8384
}
8485
if (domain_id < 0) {
8586
mp_raise_RuntimeError(MP_ERROR_TEXT("Invalid ROS domain ID"));
8687
}
87-
ret = rcl_init_options_set_domain_id(&rclcpy_default_context.init_options, domain_id);
88+
ret = rcl_init_options_set_domain_id(&rclcpy_default_context.init_options, domain_id);
8889
if (ret != RCL_RET_OK) {
8990
ESP_LOGW("RCLCPY", "Options domain failure: %d", ret);
9091
}
9192

9293
// Set up Agent
9394
rclcpy_default_context.rmw_options = rcl_init_options_get_rmw_init_options(&rclcpy_default_context.init_options);
94-
ret = rmw_uros_options_set_udp_address(agent_ip, agent_port, rclcpy_default_context.rmw_options);
95+
ret = rmw_uros_options_set_udp_address(agent_ip, agent_port, rclcpy_default_context.rmw_options);
9596
if (ret != RCL_RET_OK) {
9697
ESP_LOGW("RCLCPY", "Agent options failure: %d", ret);
9798
}
9899

99100
// Support Init
100101
ret = rclc_support_init_with_options(&rclcpy_default_context.rcl_support,
101-
0,
102-
NULL,
103-
&rclcpy_default_context.init_options,
104-
&rclcpy_default_context.rcl_allocator);
102+
0,
103+
NULL,
104+
&rclcpy_default_context.init_options,
105+
&rclcpy_default_context.rcl_allocator);
105106
if (ret != RCL_RET_OK) {
106107
ESP_LOGW("RCLCPY", "Initialization failure: %d", ret);
107108
mp_raise_RuntimeError(MP_ERROR_TEXT("ROS failed to initialize. Is agent connected?"));

ports/espressif/common-hal/rclcpy/__init__.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,14 @@
1616
#include <rclc/executor.h>
1717
#include <rmw_microros/rmw_microros.h>
1818

19+
1920
typedef struct {
2021
bool initialized;
2122
rcl_allocator_t rcl_allocator;
2223
rclc_support_t rcl_support;
2324
rcl_init_options_t init_options;
24-
rmw_init_options_t* rmw_options;
25+
rmw_init_options_t *rmw_options;
2526
} rclcpy_context_t;
2627

2728
extern rclcpy_context_t rclcpy_default_context;
28-
void rclcpy_reset(void);
29+
void rclcpy_reset(void);

shared-bindings/rclcpy/Node.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "py/objtype.h"
1313
#include "py/runtime.h"
1414

15+
1516
//| class Node:
1617
//| """A ROS2 Node"""
1718
//|
@@ -88,7 +89,7 @@ static mp_obj_t rclcpy_node_create_publisher(mp_obj_t self_in, mp_obj_t topic) {
8889
const char *topic_name = mp_obj_str_get_str(topic);
8990

9091
rclcpy_publisher_obj_t *publisher = mp_obj_malloc_with_finaliser(rclcpy_publisher_obj_t, &rclcpy_publisher_type);
91-
common_hal_rclcpy_publisher_construct(publisher, self,topic_name);
92+
common_hal_rclcpy_publisher_construct(publisher, self, topic_name);
9293
return (mp_obj_t)publisher;
9394
}
9495
static MP_DEFINE_CONST_FUN_OBJ_2(rclcpy_node_create_publisher_obj, rclcpy_node_create_publisher);
@@ -104,8 +105,8 @@ static MP_DEFINE_CONST_FUN_OBJ_2(rclcpy_node_create_publisher_obj, rclcpy_node_c
104105
static mp_obj_t rclcpy_node_get_name(mp_obj_t self_in) {
105106
rclcpy_node_obj_t *self = MP_OBJ_TO_PTR(self_in);
106107
check_for_deinit(self);
107-
const char * name_str = common_hal_rclcpy_node_get_name(self);
108-
return mp_obj_new_str(name_str,strlen(name_str));
108+
const char *name_str = common_hal_rclcpy_node_get_name(self);
109+
return mp_obj_new_str(name_str, strlen(name_str));
109110
}
110111
static MP_DEFINE_CONST_FUN_OBJ_1(rclcpy_node_get_name_obj, rclcpy_node_get_name);
111112

@@ -120,8 +121,8 @@ static MP_DEFINE_CONST_FUN_OBJ_1(rclcpy_node_get_name_obj, rclcpy_node_get_name)
120121
static mp_obj_t rclcpy_node_get_namespace(mp_obj_t self_in) {
121122
rclcpy_node_obj_t *self = MP_OBJ_TO_PTR(self_in);
122123
check_for_deinit(self);
123-
const char * namespace_str = common_hal_rclcpy_node_get_namespace(self);
124-
return mp_obj_new_str(namespace_str,strlen(namespace_str));
124+
const char *namespace_str = common_hal_rclcpy_node_get_namespace(self);
125+
return mp_obj_new_str(namespace_str, strlen(namespace_str));
125126
}
126127
static MP_DEFINE_CONST_FUN_OBJ_1(rclcpy_node_get_namespace_obj, rclcpy_node_get_namespace);
127128

@@ -141,4 +142,4 @@ MP_DEFINE_CONST_OBJ_TYPE(
141142
MP_TYPE_FLAG_HAS_SPECIAL_ACCESSORS,
142143
make_new, rclcpy_node_make_new,
143144
locals_dict, &rclcpy_node_locals_dict
144-
);
145+
);

shared-bindings/rclcpy/Node.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
#pragma once
88
#include "common-hal/rclcpy/Node.h"
99

10+
1011
extern const mp_obj_type_t rclcpy_node_type;
1112

1213
void common_hal_rclcpy_node_construct(rclcpy_node_obj_t *self,
1314
const char *node_name, const char *namespace);
14-
bool common_hal_rclcpy_node_deinited(rclcpy_node_obj_t * self);
15-
void common_hal_rclcpy_node_deinit(rclcpy_node_obj_t * self);
15+
bool common_hal_rclcpy_node_deinited(rclcpy_node_obj_t *self);
16+
void common_hal_rclcpy_node_deinit(rclcpy_node_obj_t *self);
1617
const char * common_hal_rclcpy_node_get_name(rclcpy_node_obj_t *self);
17-
const char * common_hal_rclcpy_node_get_namespace(rclcpy_node_obj_t *self);
18+
const char * common_hal_rclcpy_node_get_namespace(rclcpy_node_obj_t *self);

0 commit comments

Comments
 (0)