change to unicore (because of stability issues in multicore)

Author: marcelkottmann

components/esp32-javascript/esp32-javascript.cpp

@@ -59,6 +59,9 @@ bool flag = false;
 bool spiramAvailable = false;
 duk_context *ctx = NULL;
 
+// only for debug purposes
+bool DISABLE_EVENTS = false;
+
 void log(log_level_t level, const char *msg, ...)
 {
     char *my_string;
@@ -148,14 +151,21 @@ void IRAM_ATTR el_add_event(js_eventlist_t *events, js_event_t *event)
 
 void IRAM_ATTR el_fire_events(js_eventlist_t *events)
 {
-    if (events->events_len > 0)
+    if (DISABLE_EVENTS)
+    {
+        log(WARN, "Events are disabled. They will never be fired.\n");
+    }
+    else
     {
-        log(DEBUG, "Send %d events to queue...\n", events->events_len);
-        int ret = xQueueSendFromISR(el_event_queue, events, NULL);
-        if (ret != pdTRUE)
+        if (events->events_len > 0)
         {
-            log(ERROR, "Event queue is full...aborting.\n");
-            abort();
+            log(DEBUG, "Send %d events to queue...\n", events->events_len);
+            int ret = xQueueSendFromISR(el_event_queue, events, NULL);
+            if (ret != pdTRUE)
+            {
+                log(ERROR, "Event queue is full... is something blocking the event loop?...aborting.\n");
+                abort();
+            }
         }
     }
 }

components/esp32-javascript/include/esp32-javascript.h

@@ -29,6 +29,8 @@ SOFTWARE.
 #include <duktape.h>
 #include "esp32-javascript-config.h"
 
+extern bool DISABLE_EVENTS;
+
 typedef struct
 {
     int type;

components/esp32-javascript/modules/esp32-javascript/eventloop.js

@@ -78,7 +78,8 @@ try {
                     }
                 }
                 if (!nextTimer) {
-                    throw Error('UNKNOWN TIMER HANDLE!!!');
+                    //throw Error('UNKNOWN TIMER HANDLE!!!');
+                    console.warn('UNKNOWN TIMER HANDLE:' + JSON.stringify(evt) + ';' + JSON.stringify(timers));
                 }
             } else {
                 var eventHandled = false;

components/socket-events/socket-events.cpp

@@ -865,5 +865,5 @@ void initSocketFunctions(duk_context *ctx)
 
     xSemaphore = xSemaphoreCreateBinary();
 
-    xTaskCreatePinnedToCore(&select_task, "select_task", 12 * 1024, NULL, 5, &stask, 1);
+    xTaskCreatePinnedToCore(&select_task, "select_task", 12 * 1024, NULL, 5, &stask, 0);
 }

sdkconfig

@@ -122,7 +122,6 @@ CONFIG_ESP32_REV_MIN_1=y
 # CONFIG_ESP32_REV_MIN_2 is not set
 # CONFIG_ESP32_REV_MIN_3 is not set
 CONFIG_ESP32_REV_MIN=1
-CONFIG_ESP32_DPORT_WORKAROUND=y
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -196,6 +195,7 @@ CONFIG_ESP32_XTAL_FREQ=0
 # CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set
 # CONFIG_ESP32_NO_BLOBS is not set
 # CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set
+# CONFIG_ESP32_RTCDATA_IN_FAST_MEM is not set
 # CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set
 CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 # CONFIG_PM_ENABLE is not set
@@ -218,12 +218,10 @@ CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
-CONFIG_ESP_INT_WDT_CHECK_CPU1=y
 CONFIG_ESP_TASK_WDT=y
 # CONFIG_ESP_TASK_WDT_PANIC is not set
 CONFIG_ESP_TASK_WDT_TIMEOUT_S=5
 CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
-CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
 CONFIG_ETH_USE_ESP32_EMAC=y
 CONFIG_ETH_PHY_INTERFACE_RMII=y
 # CONFIG_ETH_PHY_INTERFACE_MII is not set
@@ -264,8 +262,6 @@ CONFIG_ESP32_WIFI_TX_BA_WIN=6
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=6
 # CONFIG_ESP32_WIFI_NVS_ENABLED is not set
-# CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 is not set
-CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 # CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE is not set
@@ -322,7 +318,7 @@ CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20
 CONFIG_FMB_TIMER_PORT_ENABLED=y
 CONFIG_FMB_TIMER_GROUP=0
 CONFIG_FMB_TIMER_INDEX=0
-# CONFIG_FREERTOS_UNICORE is not set
+CONFIG_FREERTOS_UNICORE=y
 CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF
 CONFIG_FREERTOS_CORETIMER_0=y
 # CONFIG_FREERTOS_CORETIMER_1 is not set
@@ -371,7 +367,7 @@ CONFIG_LOG_DEFAULT_LEVEL=4
 CONFIG_LOG_COLORS=y
 CONFIG_LWIP_LOCAL_HOSTNAME="espressif"
 # CONFIG_LWIP_L2_TO_L3_COPY is not set
-# CONFIG_LWIP_IRAM_OPTIMIZATION is not set
+CONFIG_LWIP_IRAM_OPTIMIZATION=y
 CONFIG_LWIP_TIMERS_ONDEMAND=y
 CONFIG_LWIP_MAX_SOCKETS=10
 # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
@@ -411,7 +407,6 @@ CONFIG_LWIP_UDP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_LWIP_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU0 is not set
-# CONFIG_LWIP_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 # CONFIG_LWIP_MULTICAST_PING is not set
@@ -515,9 +510,6 @@ CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
 CONFIG_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_PTHREAD_STACK_MIN=768
-CONFIG_PTHREAD_DEFAULT_CORE_NO_AFFINITY=y
-# CONFIG_PTHREAD_DEFAULT_CORE_0 is not set
-# CONFIG_PTHREAD_DEFAULT_CORE_1 is not set
 CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread"
 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set
@@ -650,12 +642,10 @@ CONFIG_CONSOLE_UART_NUM=0
 CONFIG_CONSOLE_UART_BAUDRATE=115200
 CONFIG_INT_WDT=y
 CONFIG_INT_WDT_TIMEOUT_MS=300
-CONFIG_INT_WDT_CHECK_CPU1=y
 CONFIG_TASK_WDT=y
 # CONFIG_TASK_WDT_PANIC is not set
 CONFIG_TASK_WDT_TIMEOUT_S=5
 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y
-CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y
 # CONFIG_EVENT_LOOP_PROFILING is not set
 CONFIG_POST_EVENTS_FROM_ISR=y
 CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
@@ -699,15 +689,11 @@ CONFIG_UDP_RECVMBOX_SIZE=6
 CONFIG_TCPIP_TASK_STACK_SIZE=2560
 CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y
 # CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set
-# CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set
 CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_PPP_SUPPORT is not set
 CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5
 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072
 CONFIG_ESP32_PTHREAD_STACK_MIN=768
-CONFIG_ESP32_DEFAULT_PTHREAD_CORE_NO_AFFINITY=y
-# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_0 is not set
-# CONFIG_ESP32_DEFAULT_PTHREAD_CORE_1 is not set
 CONFIG_ESP32_PTHREAD_TASK_CORE_DEFAULT=-1
 CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread"
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y