Release 1.0.3

Cherrypick bakerstu/openmrn#523 Cherrypick bakerstu/openmrn#524 These fix compilation errors with arduino esp32 board support library v1.0.6.
openmrn · Apr 4, 2021 · 2e244d8 · 2e244d8
1 parent 38b33a9
commit 2e244d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/library.json b/library.json
@@ -21,7 +21,7 @@
       "type": "git",
       "url": "https://github.com/openmrn/OpenMRNLite"
     },
-    "version": "1.0.2",
+    "version": "1.0.3",
     "license": "BSD-2-Clause",
     "frameworks": "arduino",
     "platforms": "espressif32",

diff --git a/library.properties b/library.properties
@@ -1,5 +1,5 @@
 name=OpenMRNLite
-version=1.0.2
+version=1.0.3
 author=Stuart Baker, Mike Dunston, Balazs Racz
 maintainer=Mike Dunston <[email protected]>, Balazs Racz <[email protected]>
 includes=OpenMRNLite.h

diff --git a/src/freertos_drivers/esp32/Esp32WiFiManager.cpp b/src/freertos_drivers/esp32/Esp32WiFiManager.cpp
@@ -50,7 +50,7 @@
 
 // ESP-IDF v4+ has a slightly different directory structure to previous
 // versions.
-#ifdef ESP_IDF_VERSION_MAJOR
+#if ESP_IDF_VERSION_MAJOR >= 4
 // ESP-IDF v4+
 #include <esp32/rom/crc.h>
 #include <esp_private/wifi.h>

diff --git a/src/os/os.c b/src/os/os.c
@@ -421,17 +421,15 @@ int __attribute__((weak)) os_thread_create_helper(os_thread_t *thread,
                                                   void *priv)
 {
     HASSERT(thread);
-#if (configSUPPORT_STATIC_ALLOCATION == 1)
+#if (configSUPPORT_DYNAMIC_ALLOCATION == 1)
+    xTaskCreate(os_thread_start, (const char *const)name,
+                stack_size/sizeof(portSTACK_TYPE), priv, priority, thread);
+#elif (configSUPPORT_STATIC_ALLOCATION == 1)
     *thread = xTaskCreateStatic(os_thread_start, (const char *const)name,
                                 stack_size/sizeof(portSTACK_TYPE), priv,
                                 priority,
                                 (StackType_t *)stack_malloc(stack_size),
                                 (StaticTask_t *) malloc(sizeof(StaticTask_t)));
-    task_new->task = *thread;
-    task_new->name = (char*)pcTaskGetTaskName(*thread);
-#elif (configSUPPORT_DYNAMIC_ALLOCATION == 1)
-    xTaskCreate(os_thread_start, (const char *const)name,
-                stack_size/sizeof(portSTACK_TYPE), priv, priority, thread);
 #else
 #error FREERTOS version v9.0.0 or later required
 #endif