espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-31 11:18:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/remove_legacy_freertos_types_usage' into 'master'

Browse Source 
Client: Remove usage of legacy FreeRTOS types

See merge request espressif/esp-mqtt!120
This commit is contained in:
David Čermák
2022-01-17 11:32:20 +00:00
parent 026253d802 c28a56ddb0
commit b021fc8e30
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.gitlab-ci.yml
View File

@ -51,28 +51,18 @@ build_with_idf_v4:
tags: tags:
- build - build
dependencies: [] dependencies: []
artifacts:
when: always
paths:
- tidybuild/*
expire_in: 1 day
variables: variables:
PYTHON_VER: 3.6.13 PYTHON_VER: 3.6.13
script: script:
- git clone "${IDF_REPO}" - git clone "${IDF_REPO}"
- source /opt/pyenv/activate && pyenv global $PYTHON_VER - source /opt/pyenv/activate && pyenv global $PYTHON_VER
- $MQTT_PATH/ci/set_idf.sh master
- cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
- $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
# capture compile commands/flags for static analysis
- cd $IDF_PATH/examples/protocols/mqtt/tcp
- mkdir -p tidybuild && cd tidybuild
- cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
- mv $IDF_PATH/examples/protocols/mqtt/tcp/tidybuild $CI_PROJECT_DIR/tidybuild
# enable pedantic flags for compilation # enable pedantic flags for compilation
- export PEDANTIC_CFLAGS="-Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function" - export PEDANTIC_CFLAGS="-Werror -Werror=deprecated-declarations -Werror=unused-variable -Werror=unused-but-set-variable -Werror=unused-function"
- export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS} - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS} && export EXTRA_CXXFLAGS=${EXTRA_CFLAGS}
# build other examples # rebuild with IDFv4.4
- $MQTT_PATH/ci/set_idf.sh release/v4.4
- cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
- $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
- $MQTT_PATH/ci/build_examples.sh - $MQTT_PATH/ci/build_examples.sh
# rebuild with IDFv4.3 # rebuild with IDFv4.3
- $MQTT_PATH/ci/set_idf.sh release/v4.3 - $MQTT_PATH/ci/set_idf.sh release/v4.3
@ -113,7 +103,7 @@ build_and_test_qemu:
- git clone "${IDF_REPO}" - git clone "${IDF_REPO}"
- source /opt/pyenv/activate && pyenv global $PYTHON_VER - source /opt/pyenv/activate && pyenv global $PYTHON_VER
# switch to IDF and setup the tools # switch to IDF and setup the tools
- $MQTT_PATH/ci/set_idf.sh master - $MQTT_PATH/ci/set_idf.sh release/v4.4
- cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)" - cd $IDF_PATH && tools/idf_tools.py --non-interactive install && eval "$(tools/idf_tools.py --non-interactive export)"
- $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA - $MQTT_PATH/ci/set_mqtt.sh $CI_COMMIT_SHA
# build publish-connect stress test, setup test parameters # build publish-connect stress test, setup test parameters

2
mqtt_client.c
View File

@ -1526,7 +1526,7 @@ static void esp_mqtt_task(void *pv)
} }
MQTT_API_UNLOCK(client); MQTT_API_UNLOCK(client);
xEventGroupWaitBits(client->status_bits, RECONNECT_BIT, false, true, xEventGroupWaitBits(client->status_bits, RECONNECT_BIT, false, true,
client->wait_timeout_ms / 2 / portTICK_RATE_MS); client->wait_timeout_ms / 2 / portTICK_PERIOD_MS);
// continue the while loop instead of break, as the mutex is unlocked // continue the while loop instead of break, as the mutex is unlocked
continue; continue;
default: default: