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

Fix esp32 CI #386

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Fix esp32 CI #386

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
027dffb
fix: const discard warning
jean-roland Mar 25, 2024
704eb1f
build: fix platformio dependency check
jean-roland Mar 26, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/arduino_esp32.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:

mkdir -p $ARDUINO_BASE
cd $ARDUINO_BASE
platformio init -b esp32thing_plus --project-option="build_flags=-DZ_FEATURE_LINK_BLUETOOTH=1 -DZENOH_DEBUG=3 -DZENOH_COMPILER_GCC"
platformio init -b esp32thing_plus -O "build_flags=-DZ_FEATURE_LINK_BLUETOOTH=1 -DZENOH_DEBUG=3 -DZENOH_COMPILER_GCC" -O "lib_ldf_mode=deep+"

cd $ARDUINO_BASE/lib
ln -s $ZENOH_PICO_BASE
Expand Down
16 changes: 8 additions & 8 deletions include/zenoh-pico/link/config/bt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@
#define BT_CONFIG_TOUT_KEY 0x03
#define BT_CONFIG_TOUT_STR "tout"

#define BT_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[BT_CONFIG_ARGC]; \
args[0]._key = BT_CONFIG_MODE_KEY; \
args[0]._str = BT_CONFIG_MODE_STR; \
args[1]._key = BT_CONFIG_PROFILE_KEY; \
args[1]._str = BT_CONFIG_PROFILE_STR; \
args[2]._key = BT_CONFIG_TOUT_KEY; \
args[2]._str = BT_CONFIG_TOUT_STR;
#define BT_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[BT_CONFIG_ARGC]; \
args[0]._key = BT_CONFIG_MODE_KEY; \
args[0]._str = (char *)BT_CONFIG_MODE_STR; \
args[1]._key = BT_CONFIG_PROFILE_KEY; \
args[1]._str = (char *)BT_CONFIG_PROFILE_STR; \
args[2]._key = BT_CONFIG_TOUT_KEY; \
args[2]._str = (char *)BT_CONFIG_TOUT_STR;

size_t _z_bt_config_strlen(const _z_str_intmap_t *s);

Expand Down
2 changes: 1 addition & 1 deletion include/zenoh-pico/link/config/serial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#define SERIAL_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[SERIAL_CONFIG_ARGC]; \
args[0]._key = SERIAL_CONFIG_BAUDRATE_KEY; \
args[0]._str = SERIAL_CONFIG_BAUDRATE_STR;
args[0]._str = (char *)SERIAL_CONFIG_BAUDRATE_STR;
// args[1]._key = SERIAL_CONFIG_DATABITS_KEY;
// args[1]._str = SERIAL_CONFIG_DATABITS_STR;
// args[2]._key = SERIAL_CONFIG_FLOWCONTROL_KEY;
Expand Down
2 changes: 1 addition & 1 deletion include/zenoh-pico/link/config/tcp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#define TCP_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[TCP_CONFIG_ARGC]; \
args[0]._key = TCP_CONFIG_TOUT_KEY; \
args[0]._str = TCP_CONFIG_TOUT_STR;
args[0]._str = (char *)TCP_CONFIG_TOUT_STR;

size_t _z_tcp_config_strlen(const _z_str_intmap_t *s);

Expand Down
16 changes: 8 additions & 8 deletions include/zenoh-pico/link/config/udp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@
#define UDP_CONFIG_JOIN_STR "join"

#if Z_FEATURE_LINK_UDP_UNICAST == 1 || Z_FEATURE_LINK_UDP_MULTICAST == 1
#define UDP_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[UDP_CONFIG_ARGC]; \
args[0]._key = UDP_CONFIG_IFACE_KEY; \
args[0]._str = UDP_CONFIG_IFACE_STR; \
args[1]._key = UDP_CONFIG_TOUT_KEY; \
args[1]._str = UDP_CONFIG_TOUT_STR; \
args[2]._key = UDP_CONFIG_JOIN_KEY; \
args[2]._str = UDP_CONFIG_JOIN_STR;
#define UDP_CONFIG_MAPPING_BUILD \
_z_str_intmapping_t args[UDP_CONFIG_ARGC]; \
args[0]._key = UDP_CONFIG_IFACE_KEY; \
args[0]._str = (char *)UDP_CONFIG_IFACE_STR; \
args[1]._key = UDP_CONFIG_TOUT_KEY; \
args[1]._str = (char *)UDP_CONFIG_TOUT_STR; \
args[2]._key = UDP_CONFIG_JOIN_KEY; \
args[2]._str = (char *)UDP_CONFIG_JOIN_STR;

size_t _z_udp_config_strlen(const _z_str_intmap_t *s);

Expand Down
6 changes: 3 additions & 3 deletions src/api/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,19 +502,19 @@ int8_t z_scout(z_owned_scouting_config_t *config, z_owned_closure_hello_t *callb

char *opt_as_str = _z_config_get(config->_value, Z_CONFIG_SCOUTING_WHAT_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_SCOUTING_WHAT_DEFAULT;
opt_as_str = (char *)Z_CONFIG_SCOUTING_WHAT_DEFAULT;
}
z_what_t what = strtol(opt_as_str, NULL, 10);

opt_as_str = _z_config_get(config->_value, Z_CONFIG_MULTICAST_LOCATOR_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_MULTICAST_LOCATOR_DEFAULT;
opt_as_str = (char *)Z_CONFIG_MULTICAST_LOCATOR_DEFAULT;
}
char *mcast_locator = opt_as_str;

opt_as_str = _z_config_get(config->_value, Z_CONFIG_SCOUTING_TIMEOUT_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_SCOUTING_TIMEOUT_DEFAULT;
opt_as_str = (char *)Z_CONFIG_SCOUTING_TIMEOUT_DEFAULT;
}
uint32_t timeout = strtoul(opt_as_str, NULL, 10);

Expand Down
6 changes: 3 additions & 3 deletions src/net/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,19 +71,19 @@ int8_t _z_open(_z_session_t *zn, _z_config_t *config) {
if (connect == NULL && listen == NULL) { // Scout if peer is not configured
opt_as_str = _z_config_get(config, Z_CONFIG_SCOUTING_WHAT_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_SCOUTING_WHAT_DEFAULT;
opt_as_str = (char *)Z_CONFIG_SCOUTING_WHAT_DEFAULT;
}
z_what_t what = strtol(opt_as_str, NULL, 10);

opt_as_str = _z_config_get(config, Z_CONFIG_MULTICAST_LOCATOR_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_MULTICAST_LOCATOR_DEFAULT;
opt_as_str = (char *)Z_CONFIG_MULTICAST_LOCATOR_DEFAULT;
}
char *mcast_locator = opt_as_str;

opt_as_str = _z_config_get(config, Z_CONFIG_SCOUTING_TIMEOUT_KEY);
if (opt_as_str == NULL) {
opt_as_str = Z_CONFIG_SCOUTING_TIMEOUT_DEFAULT;
opt_as_str = (char *)Z_CONFIG_SCOUTING_TIMEOUT_DEFAULT;
}
uint32_t timeout = strtoul(opt_as_str, NULL, 10);

Expand Down
Loading