Skip to content

Modify PlatformIO FreeRTOS include path, settings.h #7413

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

Merged
JacobBarthelmeh merged 1 commit into from
Apr 12, 2024
Merged

Modify PlatformIO FreeRTOS include path, settings.h #7413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9696,7 +9696,12 @@ ProtocolVersion MakeDTLSv1_3(void)

#elif defined(FREERTOS)

#include "task.h"
#ifdef PLATFORMIO
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#else
#include "task.h"
#endif

unsigned int LowResTimer(void)
{
Expand Down
8 changes: 7 additions & 1 deletion wolfcrypt/benchmark/benchmark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12801,7 +12801,13 @@ void bench_sphincsKeySign(byte level, byte optim)

#elif defined(FREERTOS)

#include "task.h"
#ifdef PLATFORMIO
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#else
#include "task.h"
#endif

#if defined(WOLFSSL_ESPIDF)
/* prototype definition */
int construct_argv();
Expand Down
27 changes: 25 additions & 2 deletions wolfssl/wolfcrypt/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,23 @@
/* Uncomment next line if using MAXQ108x */
/* #define WOLFSSL_MAXQ108X */

/* Check PLATFORMIO first, as it may define other known environments. */
#ifdef PLATFORMIO
#ifdef ESP_PLATFORM
/* Turn on the wolfSSL ESPIDF flag for the PlatformIO ESP-IDF detect */
#define WOLFSSL_ESPIDF
#endif /* ESP_PLATFORM */

/* Ensure all PlatformIO boards have the wolfSSL user_setting.h enabled. */
#ifndef WOLFSSL_USER_SETTINGS
#define WOLFSSL_USER_SETTINGS
#endif /* WOLFSSL_USER_SETTINGS */

/* Similar to Arduino we have limited build control, so suppress warning */
#undef WOLFSSL_IGNORE_FILE_WARN
#define WOLFSSL_IGNORE_FILE_WARN
#endif

#if defined(ARDUINO)
/* Due to limited build control, we'll ignore file warnings. */
/* See https://github.com/arduino/arduino-cli/issues/631 */
Expand Down Expand Up @@ -1034,8 +1051,14 @@ extern void uITRON4_free(void *p) ;


#ifdef FREERTOS
#include "FreeRTOS.h"
#include <task.h>

#ifdef PLATFORMIO
#include <freertos/FreeRTOS.h>
#include <freertos/task.h>
#else
#include "FreeRTOS.h"
#include <task.h>
#endif

#if !defined(XMALLOC_USER) && !defined(NO_WOLFSSL_MEMORY) && \
!defined(WOLFSSL_STATIC_MEMORY) && !defined(WOLFSSL_TRACK_MEMORY)
Expand Down