Wip

build/esp32/Makefile

@@ -7,6 +7,8 @@ UPDIR=$(realpath $(TOPDIR)/..)
 
 CONFIG += -DBITS32
 CONFIG += -DFLOATING -DMORE_FP
+
+
 LIBS += -lm
 
 CFLAGS += -m32

build/esp32/sdk_build/main/interface.c

@@ -9,6 +9,9 @@ typedef int cell;
 #include "freertos/event_groups.h"
 #include "esp_system.h"
 #include "esp_wifi.h"
+
+#include "esp_wifi_types.h"
+
 #include "esp_event_loop.h"
 #include "esp_log.h"
 #include "esp_event.h"
@@ -66,6 +69,19 @@ void init_uart(void)
     uart_driver_install(uart_num, BUF_SIZE * 2, 0, 0, NULL, 0);
 }
 
+cell my_uart_param_config(int uart_num, int baud, int bits, int par, int stop, int flow)
+{
+    uart_config_t uart_config = {
+       .baud_rate = baud,
+       .data_bits = bits-5,
+       .parity = par,
+       .stop_bits = stop,
+       .flow_ctrl = flow,
+       .rx_flow_ctrl_thresh = 122,
+    };
+   return uart_param_config(uart_num, &uart_config);
+}
+
 // Routines for the ccalls[] table in textend.c.  Add new ones
 // as necessary.
 
@@ -304,19 +320,66 @@ cell wifi_open(cell timeout, char *password, char *ssid)
     return 0;
 }
 
+static esp_err_t esp_now_event_handler(void *ctx, system_event_t *event)
+{
+    switch(event->event_id) {
+    case SYSTEM_EVENT_STA_START:
+//         printf ("%s \n", "WiFi for ESP-NOW started");
+        break;
+    default:
+        break;
+    }
+    return ESP_OK;
+}
+
+//  esp_now_open and wifi_open can not both be used at the same time!
+
+cell esp_now_open(int channel)
+{
+    tcpip_adapter_init();
+    if ( esp_event_loop_init(esp_now_event_handler, NULL)) return -1;
+    wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
+    esp_wifi_init(&cfg);
+    esp_wifi_set_storage(WIFI_STORAGE_RAM);
+    if ( esp_wifi_set_mode(WIFI_MODE_STA) ) return -2;
+    if ( esp_wifi_start()) return -3;
+    if ( esp_wifi_set_channel(channel,WIFI_SECOND_CHAN_NONE)) return -4;
+    return 0;
+}
+
 cell get_wifi_mode(void)
 {
     wifi_mode_t mode;
     esp_wifi_get_mode(&mode);
     return mode;
 }
 
+static DRAM_ATTR portMUX_TYPE global_int_mux = portMUX_INITIALIZER_UNLOCKED;
+
+void IRAM_ATTR interrupt_disable()
+{
+    if (xPortInIsrContext()) {
+        portENTER_CRITICAL_ISR(&global_int_mux);
+    } else {
+        portENTER_CRITICAL(&global_int_mux);
+    }
+}
+
+void IRAM_ATTR interrupt_restore()
+{
+    if (xPortInIsrContext()) {
+        portEXIT_CRITICAL_ISR(&global_int_mux);
+    } else {
+        portEXIT_CRITICAL(&global_int_mux);
+    }
+}
+
 void set_log_level(char *component, int level)
 {
     esp_log_level_set(component, level);
 }
 
-int stream_connect(char *host, char *portstr, int timeout_msecs)
+int client_socket(char *host, char *portstr, cell protocol)
 {
     struct addrinfo hints, *res, *res0;
     int error;
@@ -325,7 +388,7 @@ int stream_connect(char *host, char *portstr, int timeout_msecs)
 
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = AF_UNSPEC;
-    hints.ai_socktype = SOCK_STREAM;
+    hints.ai_socktype = protocol;
 
     error = getaddrinfo(host, portstr, &hints, &res0);
     if (error) {
@@ -339,7 +402,6 @@ int stream_connect(char *host, char *portstr, int timeout_msecs)
             cause = "socket";
             continue;
         }
-
         if (connect(s, res->ai_addr, res->ai_addrlen) < 0) {
             cause = "connect";
             close(s);
@@ -354,6 +416,22 @@ int stream_connect(char *host, char *portstr, int timeout_msecs)
         return -2;
     }
 
+    return s;
+}
+
+cell udp_client(char *host, char *portstr)
+{
+    return client_socket(host, portstr, SOCK_DGRAM);
+}
+
+int stream_connect(char *host, char *portstr, int timeout_msecs)
+{
+    int s = client_socket(host, portstr, SOCK_STREAM);
+    int error;
+    if (s < 0) {
+        return s;
+    }
+
     struct timeval recv_timeout;
     recv_timeout.tv_sec = timeout_msecs / 1000;
     recv_timeout.tv_usec = (timeout_msecs % 1000) * 1000;
@@ -508,7 +586,28 @@ void restart(void)
 }
 
 #include <rom/ets_sys.h>
-void us(cell us)
+void IRAM_ATTR us(cell us)
 {
     ets_delay_us(us);
 }
+
+int IRAM_ATTR time_t_now()
+{
+struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+         gettimeofday(&tv, NULL);
+return tv.tv_sec*(uint64_t)1000000+tv.tv_usec;
+}
+
+int IRAM_ATTR time_t_ms()
+{
+struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+         gettimeofday(&tv, NULL);
+return tv.tv_sec*(uint64_t)1000+tv.tv_usec/1000;
+}
+
+int IRAM_ATTR time_t_sec()
+{
+struct timeval tv = { .tv_sec = 0, .tv_usec = 0 };
+         gettimeofday(&tv, NULL);
+return tv.tv_sec;
+}

build/esp32/sdk_build/sdkconfig

@@ -15,11 +15,11 @@ CONFIG_MAKE_WARN_UNDEFINED_VARIABLES=y
 #
 CONFIG_LOG_BOOTLOADER_LEVEL_NONE=
 CONFIG_LOG_BOOTLOADER_LEVEL_ERROR=
-CONFIG_LOG_BOOTLOADER_LEVEL_WARN=y
-CONFIG_LOG_BOOTLOADER_LEVEL_INFO=
+CONFIG_LOG_BOOTLOADER_LEVEL_WARN=
+CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
 CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG=
 CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE=
-CONFIG_LOG_BOOTLOADER_LEVEL=2
+CONFIG_LOG_BOOTLOADER_LEVEL=3
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V=
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 CONFIG_BOOTLOADER_FACTORY_RESET=
@@ -35,7 +35,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="COM27"
+CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
 CONFIG_ESPTOOLPY_BAUD_115200B=y
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=
@@ -554,11 +554,11 @@ CONFIG_HEAP_TRACING=
 #
 CONFIG_LOG_DEFAULT_LEVEL_NONE=
 CONFIG_LOG_DEFAULT_LEVEL_ERROR=
-CONFIG_LOG_DEFAULT_LEVEL_WARN=
-CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+CONFIG_LOG_DEFAULT_LEVEL_WARN=y
+CONFIG_LOG_DEFAULT_LEVEL_INFO=
 CONFIG_LOG_DEFAULT_LEVEL_DEBUG=
 CONFIG_LOG_DEFAULT_LEVEL_VERBOSE=
-CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_DEFAULT_LEVEL=2
 CONFIG_LOG_COLORS=y
 
 #