Skip to content

ESP-IDFv5 : change included headers #2

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

Conversation

llange
Copy link

@llange llange commented May 2, 2023

Cf https://docs.espressif.com/projects/esp-idf/en/v5.0/esp32/migration-guides/release-5.x/system.html#esp-hw-support

The header files soc/cpu.h have been deleted and deprecated CPU util functions have been removed. ESP-IDF developers should include esp_cpu.h instead for equivalent functions.

Cf https://docs.espressif.com/projects/esp-idf/en/v5.0/esp32/migration-guides/release-5.x/peripherals.html#peripheral-clock-gating

...the previous clock gating include path has been changed from driver/periph_ctrl.h to esp_private/periph_ctrl.h.

Fix for stricter compilation errors

/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c: In function 'wolfSSL_X509_VERIFY_PARAM_set1_host':
/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c:26093:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
26093 |     if (nameSz > 0)
      |     ^~
/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c:26096:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
26096 |         pParam->hostName[nameSz] = '\0';
      |         ^~~~~~
cc1: some warnings being treated as errors

@llange llange marked this pull request as draft May 2, 2023 20:10
@llange llange force-pushed the compatibility-esp-idf-5 branch from 046f344 to ca6e5ac Compare May 2, 2023 20:23
@llange llange changed the title ESP-IDFv5 : change CPU header ESP-IDFv5 : change included headers May 2, 2023
llange added 2 commits May 2, 2023 22:41
Fix for:
```
/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c: In function 'wolfSSL_X509_VERIFY_PARAM_set1_host':
/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c:26093:5: error: this 'if' clause does not guard... [-Werror=misleading-indentation]
26093 |     if (nameSz > 0)
      |     ^~
/__w/Open-Vehicle-Monitoring-System-3/Open-Vehicle-Monitoring-System-3/vehicle/OVMS.V3/components/wolfssl/wolfssl/src/ssl.c:26096:9: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the 'if'
26096 |         pParam->hostName[nameSz] = '\0';
      |         ^~~~~~
cc1: some warnings being treated as errors
```

Signed-off-by: Ludovic LANGE <[email protected]>
@llange llange force-pushed the compatibility-esp-idf-5 branch from 258fbde to 5dbfdb4 Compare May 2, 2023 20:41
@llange llange marked this pull request as ready for review May 2, 2023 21:06
@llange llange merged commit 2d5a0cc into openvehicles:v4.7.0-stable-ovms May 11, 2023
@llange llange deleted the compatibility-esp-idf-5 branch May 11, 2023 18:50
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.

1 participant