Skip to content

Update ESP-IDF to v5.4 #724

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.

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

Merged
merged 3 commits into from
Jan 9, 2025
Merged

Update ESP-IDF to v5.4 #724

merged 3 commits into from
Jan 9, 2025

Conversation

szczys
Copy link
Contributor

@szczys szczys commented Jan 8, 2025

SDK Changes Due to this Update:

  • Guard LOG_COLOR* defines with #ifndef
    • Espressif changed the defines so they no longer exactly match those in the Golioth SDK. They also turned off log color by default, citing that idf.py monitor now handles colorization.
  • Guard IN6_IS_ADDR_V4MAPPED(a) with #ifndef
    • The macro was compared between the header in the Golioth Firmware SDK and the one in the esp-lwip repo and found to be functionally equivalent.

Resolves https://github.com/golioth/firmware-issue-tracker/issues/734

ESP-IDF v5.4 change the formate for log color defines. Add ifndef
statements to golioth_sys.h to avoid redefinition.

Signed-off-by: Mike Szczys <[email protected]>
Copy link

github-actions bot commented Jan 8, 2025

Visit the preview URL for this PR (updated for commit 9a4b01c):

https://golioth-firmware-sdk-doxygen-dev--pr724-szczys-bump-es-rw47zdan.web.app

(expires Thu, 16 Jan 2025 17:03:50 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

Sign: a9993e61697a3983f3479e468bcb0b616f9a0578

Copy link
Contributor

@sam-golioth sam-golioth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @szczys!

@@ -40,9 +40,12 @@ struct in6_pktinfo {
struct in6_addr ipi6_addr; /* src/dst IPv6 address */
unsigned int ipi6_ifindex; /* send/recv interface index */
};

#ifndef IN6_IS_ADDR_V4MAPPED
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I appreciate the explanation in the commit message! I was going to ask why we didn't just remove it. But it looks like you the last bit of the message is missing.

szczys added 2 commits January 9, 2025 11:02
With ESP-IDF v5.4, LWIP was upgraded to v2.2.0. This includes a new
IN6_IS_ADDR_V4MAPPED(a) macro that is defined in lwip/inet.h. It conflicts
with the macro in Golioth's copy of the ESP-IDF port's coap_config_posix.h.

The macro is still present in ESP-IDF's coap_config_posix.h, so instead
of removal, the macro in Golioth's coap_config_posix.h is guarded with
ifndef.

Signed-off-by: Mike Szczys <[email protected]>
@szczys szczys force-pushed the szczys/bump-espidf-5.4 branch from 1ddd2cf to 9a4b01c Compare January 9, 2025 17:02
Copy link

github-actions bot commented Jan 9, 2025

Code Coverage

Code Coverage

Package Line Rate Branch Rate Health
include.golioth 75% 50%
port.linux 62% 34%
port.utils 58% 46%
port.zephyr 58% 25%
src 70% 31%
Summary 69% (2715 / 3944) 31% (1122 / 3621)

Copy link

codecov bot commented Jan 9, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

see 5 files with indirect coverage changes

@szczys szczys merged commit e422340 into main Jan 9, 2025
139 of 140 checks passed
@szczys szczys deleted the szczys/bump-espidf-5.4 branch January 9, 2025 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants