change station to monitor

could be better, but i like it for now

main/CMakeLists.txt

@@ -1,2 +1,3 @@
-idf_component_register(SRCS "main.c" "font.c" "display.c" "text.c" "wlan.c"
-                    INCLUDE_DIRS "")
+idf_component_register(SRCS "main.c" "font.c" "display.c" "text.c" "wlan.c" "https.c" "lwjson/lwjson/src/lwjson/lwjson.c"
+                    REQUIRES esp_driver_gpio esp_wifi nvs_flash esp_timer esp-tls
+                    INCLUDE_DIRS "." "lwjson/lwjson/src/include")

main/display.c

@@ -25,7 +25,7 @@ void latch(){
     gpio_set_level(GPIO_LAT, 1);
 }
 
-void clock(){
+static void clock(){
     gpio_set_level(GPIO_CLK, 1);
     gpio_set_level(GPIO_CLK, 0);
 }

main/display.h

@@ -29,7 +29,6 @@ extern uint8_t fb[64][128][3];
 void write_bits(uint8_t r1, uint8_t g1, uint8_t b1, uint8_t r2, uint8_t g2, uint8_t b2);
 void write_address(uint8_t addr);
 void latch(void);
-void clock(void);
 void display_init(void);
 void display_cycle(void* arg);
 

main/font.c

@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-const uint8_t font[96][7] = {
+const uint8_t font[256][7] = {
 	{0x00,0x00,0x00,0x00,0x00,0x00,0x00}, //  
 	{0x5f,0x00,0x00,0x00,0x00,0x00,0x00}, // !
 	{0x03,0x00,0x03,0x00,0x00,0x00,0x00}, // "
@@ -18,7 +18,7 @@ const uint8_t font[96][7] = {
 	{0x40,0x00,0x00,0x00,0x00,0x00,0x00}, // .
 	{0x60,0x10,0x08,0x04,0x03,0x00,0x00}, // /
 	{0x7f,0x41,0x41,0x7f,0x00,0x00,0x00}, // 0
-	{0x01,0x7f,0x00,0x00,0x00,0x00,0x00}, // 1
+	{0x02,0x03,0x7f,0x00,0x00,0x00,0x00}, // 1
 	{0x7b,0x49,0x49,0x6f,0x00,0x00,0x00}, // 2
 	{0x63,0x49,0x49,0x7f,0x00,0x00,0x00}, // 3
 	{0x0f,0x08,0x08,0x7f,0x00,0x00,0x00}, // 4
@@ -96,6 +96,161 @@ const uint8_t font[96][7] = {
 	{0xff,0x00,0x00,0x00,0x00,0x00,0x00}, // |
 	{0x41,0x3e,0x08,0x00,0x00,0x00,0x00}, // }
 	{0x1c,0x04,0x1c,0x10,0x1c,0x00,0x00}, // ~
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x7d,0x44,0x44,0x7d,0x00,0x00,0x00}, // o
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+	{0x00,0x00,0x00,0x00,0x00,0x00,0x00},
 	{0x00,0x00,0x00,0x00,0x00,0x00,0x00}
 };
 

main/http.c

@@ -0,0 +1,81 @@
+#include "http.h"
+#include "esp_err.h"
+#include "esp_log.h"
+
+#include "lwip/err.h"
+#include "lwip/sockets.h"
+#include "lwip/sys.h"
+#include "lwip/netdb.h"
+#include "lwip/dns.h"
+
+static const char *TAG = "http";
+
+static const char *REQUEST = "GET " WEB_PATH " HTTP/1.0\r\n"
+    "Host: "WEB_SERVER":"WEB_PORT"\r\n"
+    "User-Agent: esp-idf/1.0 esp32\r\n"
+    "\r\n";
+
+esp_err_t http_request(char* buf)
+{
+    const struct addrinfo hints = {
+        .ai_family = AF_INET,
+        .ai_socktype = SOCK_STREAM,
+    };
+    struct addrinfo *res;
+    struct in_addr *addr;
+    int s, r;
+
+    int err = getaddrinfo(WEB_SERVER, WEB_PORT, &hints, &res);
+
+    if(err != 0 || res == NULL) {
+        ESP_LOGE(TAG, "DNS lookup failed err=%d res=%p", err, res);
+        return ESP_ERR_NOT_FOUND;
+    }
+
+    /* Code to print the resolved IP.
+     * Note: inet_ntoa is non-reentrant, look at ipaddr_ntoa_r for "real" code */
+    addr = &((struct sockaddr_in *)res->ai_addr)->sin_addr;
+    ESP_LOGI(TAG, "DNS lookup succeeded. IP=%s", inet_ntoa(*addr));
+
+    s = socket(res->ai_family, res->ai_socktype, 0);
+    if(s < 0) {
+        ESP_LOGE(TAG, "... Failed to allocate socket.");
+        freeaddrinfo(res);
+        return -1;
+    }
+    ESP_LOGI(TAG, "... allocated socket");
+
+    if(connect(s, res->ai_addr, res->ai_addrlen) != 0) {
+        ESP_LOGE(TAG, "... socket connect failed errno=%d", errno);
+        close(s);
+        freeaddrinfo(res);
+        return -1;
+    }
+
+    ESP_LOGI(TAG, "... connected");
+    freeaddrinfo(res);
+
+    if (write(s, REQUEST, strlen(REQUEST)) < 0) {
+        ESP_LOGE(TAG, "... socket send failed");
+        close(s);
+        return -1;
+    }
+    ESP_LOGI(TAG, "... socket send success");
+
+    struct timeval receiving_timeout;
+    receiving_timeout.tv_sec = 5;
+    receiving_timeout.tv_usec = 0;
+    if (setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, &receiving_timeout,
+                sizeof(receiving_timeout)) < 0) {
+        ESP_LOGE(TAG, "... failed to set socket receiving timeout");
+        close(s);
+        return -1;
+    }
+    ESP_LOGI(TAG, "... set socket receiving timeout success");
+
+    /* Read HTTP response */
+    r = read(s, buf, RCV_BUFSIZE);
+    if(r >= RCV_BUFSIZE)
+        return -1;
+    return 0;
+}

main/http.h

@@ -0,0 +1,10 @@
+#include "esp_system.h"
+
+/* Constants that aren't configurable in menuconfig */
+#define WEB_SERVER "mustbehax.de"
+#define WEB_PORT "80"
+#define WEB_PATH "/test"
+
+#define RCV_BUFSIZE 8000 
+
+esp_err_t http_request(char* buf);

main/https.c

@@ -0,0 +1,124 @@
+#include "esp_tls.h"
+#include "esp_log.h"
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include "freertos/FreeRTOS.h"
+
+#include "esp_crt_bundle.h"
+
+static const char *TAG = "https";
+
+#define WEB_SERVER "bsvg.efa.de"
+#define WEB_PORT "443"
+#define WEB_URL "/bsvagstd/XML_DM_REQUEST?outputFormat=JSON&stateless=1&locationServerActive=1&type_dm=stop&name_dm=\"Kaiserstr,Braunschweig\"&mode=direct&ptOptionsActive=1&useRealtime=1"
+//#define WEB_SERVER "mustbehax.de"
+//#define WEB_PORT "443"
+//#define WEB_URL "/web/reduced.json"
+
+static const char REQUEST[] = "GET " WEB_URL " HTTP/1.1\r\n"
+                             "Host: "WEB_SERVER"\r\n"
+                             "User-Agent: esp-idf/1.0 esp32\r\n"
+                             "\r\n";
+
+esp_err_t https_get_request_using_crt_bundle(char* buf, size_t bufsize)
+{
+    memset(buf, 0, bufsize);
+    ESP_LOGI(TAG, "https_request using crt bundle");
+    esp_tls_cfg_t cfg = {
+        .crt_bundle_attach = esp_crt_bundle_attach,
+    };
+    //https_get_request(cfg, "https://"WEB_SERVER""WEB_URL, HOWSMYSSL_REQUEST);
+    //char buf[47000];
+    int ret, len;
+
+    esp_tls_t *tls = esp_tls_init();
+    if (!tls) {
+        ESP_LOGE(TAG, "Failed to allocate esp_tls handle!");
+        return -1;
+    }
+
+    if (esp_tls_conn_http_new_sync("https://"WEB_SERVER""WEB_URL, &cfg, tls) == 1) {
+        ESP_LOGI(TAG, "Connection established...");
+    } else {
+        ESP_LOGE(TAG, "Connection failed...");
+        int esp_tls_code = 0, esp_tls_flags = 0;
+        esp_tls_error_handle_t tls_e = NULL;
+        esp_tls_get_error_handle(tls, &tls_e);
+        /* Try to get TLS stack level error and certificate failure flags, if any */
+        ret = esp_tls_get_and_clear_last_error(tls_e, &esp_tls_code, &esp_tls_flags);
+        if (ret == ESP_OK) {
+            ESP_LOGE(TAG, "TLS error = -0x%x, TLS flags = -0x%x", esp_tls_code, esp_tls_flags);
+        }
+        esp_tls_conn_destroy(tls);
+        return -2;
+    }
+
+#ifdef CONFIG_EXAMPLE_CLIENT_SESSION_TICKETS
+    /* The TLS session is successfully established, now saving the session ctx for reuse */
+    if (save_client_session) {
+        esp_tls_free_client_session(tls_client_session);
+        tls_client_session = esp_tls_get_client_session(tls);
+    }
+#endif
+
+    size_t written_bytes = 0;
+    do {
+        ret = esp_tls_conn_write(tls,
+                                 REQUEST + written_bytes,
+                                 strlen(REQUEST) - written_bytes);
+        if (ret >= 0) {
+            ESP_LOGI(TAG, "%d bytes written", ret);
+            written_bytes += ret;
+        } else if (ret != ESP_TLS_ERR_SSL_WANT_READ  && ret != ESP_TLS_ERR_SSL_WANT_WRITE) {
+            ESP_LOGE(TAG, "esp_tls_conn_write  returned: [0x%02X](%s)", ret, esp_err_to_name(ret));
+            esp_tls_conn_destroy(tls);
+            return -3;
+        }
+    } while (written_bytes < strlen(REQUEST));
+
+    uint32_t write_offset = 0;
+    memset(buf, 0x00, bufsize);
+    ESP_LOGI(TAG, "Reading HTTP response...");
+    do {
+        len = bufsize - write_offset - 1;
+        if(len > 6000)
+            len = 6000;
+
+        ret = esp_tls_conn_read(tls, &buf[write_offset], len);
+
+        if (ret == ESP_TLS_ERR_SSL_WANT_WRITE  || ret == ESP_TLS_ERR_SSL_WANT_READ) {
+            continue;
+        } else if (ret < 0) {
+            ESP_LOGE(TAG, "esp_tls_conn_read  returned [-0x%02X](%s)", -ret, esp_err_to_name(ret));
+            break;
+        } else if (ret == 0) {
+            ESP_LOGI(TAG, "connection closed");
+            break;
+        }
+        write_offset += ret;
+        len = ret;
+        ESP_LOGI(TAG, "%d bytes read", len);
+
+        //if(!strstr(buf, "departureList")){
+        //    ESP_LOGI(TAG,"tossing ... strstr: %ld", (uint32_t)strstr(buf, "departureList")); 
+        //    write_offset=0;
+        //}else
+        //    ESP_LOGI(TAG,"keeping ... strstr: %ld", (uint32_t)strstr(buf, "departureList")); 
+
+    } while (1);
+    buf[write_offset+len+1] = 0;
+
+    esp_tls_conn_destroy(tls);
+    return 0;
+
+    ///* Print response directly to stdout as it is read */
+    //for (int i = 0; i < sizeof(buf); i++) {
+    //    putchar(buf[i]);
+    //    if(i%100 == 0)
+    //        vTaskDelay(1);
+    //}
+    //putchar('\n'); // JSON output doesn't have a newline at end
+
+}

main/https.h

@@ -0,0 +1,4 @@
+#include <stddef.h>
+#include "esp_err.h"
+
+esp_err_t https_get_request_using_crt_bundle(char* buf, size_t bufsize);

main/main.c

@@ -6,17 +6,26 @@
    software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
    CONDITIONS OF ANY KIND, either express or implied.
 */
+#include <stdint.h>
 #include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <sys/types.h>
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
 #include "esp_system.h"
-#include "nvs_flash.h"
 #include "esp_timer.h"
+#include "esp_log.h"
 
 #include "display.h"
 #include "text.h"
 #include "wlan.h"
+#include "https.h"
+
+#include "esp_heap_caps.h"
+
+#include "lwjson/lwjson.h"
 
 #ifdef CONFIG_IDF_TARGET_ESP32
 #define CHIP_NAME "ESP32"
@@ -26,33 +35,187 @@
 #define CHIP_NAME "ESP32-S2 Beta"
 #endif
 
+
 const esp_timer_create_args_t periodic_timer_args = {
     .callback = &display_cycle,
 };
 
+uint8_t buf_ok = 0;
+char bsvg_buf[40000];
+static void https_request_task(void *pvparameters){
+    while(https_get_request_using_crt_bundle(bsvg_buf, sizeof(bsvg_buf)) != 0){
+        ESP_LOGE("bsvg", "Failed to get data from server. Retrying...");
+        vTaskDelay(1);
+    }
+    buf_ok = 1;
+    vTaskDelete(NULL);
+}
+
+void get_json_string(char* buf, char* name, char* dest){
+    char* element = strstr(buf, name);
+    char *ptr= element;
+    while(*ptr != ':' && *ptr != 0) ptr++;
+    while(*ptr != '"' && *ptr != 0) ptr++;
+    ptr++;
+
+    char *end=ptr;
+    while(*end != '"') end++;
+
+    strncpy(dest, ptr, end-ptr);
+    dest[end-ptr]=0;
+}
+
+uint8_t json_ok = 0;
+static void json_parse_task(void *pvparameters){
+    //uint16_t start_ptr = 0;
+    //while(buf[start_ptr] != '{' && start_ptr < sizeof(buf))
+    //    start_ptr++;
+    char *start = strstr(bsvg_buf, "\"departureList\"") + 17;
+    //char *start = strstr(bsvg_buf, "{");
+    ESP_LOGI("bsvg", "start at %ld: \"%.10s\"", (uint32_t)start, start);
+    //departureList = cJSON_Parse(start);
+
+    uint8_t line = 0;
+    char *item = start;
+    char txt[6][50];
+    while((item = strstr(item+1, "{ \"stopID\":")) != 0){
+        char symbol[10];
+        get_json_string(item, "symbol", symbol);
+
+        char direction[50];
+        get_json_string(item, "direction", direction);
+
+        char countdown[10] ;
+        get_json_string(item, "countdown", countdown);
+
+        if(atoi(countdown)>=60){
+            uint8_t h = atoi(countdown) / 60;
+            uint8_t m = atoi(countdown) % 60;
+            sprintf(countdown, "%d:%02d", h, m);
+        }
+
+        if(line < 6){
+            sprintf(txt[line], "                            %.4s", countdown);
+            put_line(fb, line, txt[line], 1, 1);
+
+            sprintf(txt[line], "     %.20s", direction);
+            put_line(fb, line, txt[line], 1, 1);
+
+            sprintf(txt[line], "%.3s", symbol);
+            put_line(fb, line, txt[line], 1, 1);
+
+        }
+
+        //sprintf(txt[line], "%.3s\t%.20s\t%.4s", symbol, direction, countdown);
+        printf("line = %d: %s\n", line, txt[line]);
+        printf("\n");
+
+        line++;
+    }
+
+    //lwjson_init(&lwjson, tokens, LWJSON_ARRAYSIZE(tokens));
+    //if (lwjson_parse(&lwjson, start) == lwjsonOK) {
+    //    const lwjson_token_t* t;
+    //    printf("JSON parsed..\r\n");
+
+    //    /* Find custom key in JSON */
+    //    if ((t = lwjson_find(&lwjson, "stopID")) != NULL) {
+    //        printf("Key found with data type: %d\r\n", (int)t->type);
+    //    }
+
+    //    /* Call this when not used anymore */
+    //    lwjson_free(&lwjson);
+    //}
+    //else{
+    //    ESP_LOGI("bsvg", "parse fail");
+    //}
+
+    json_ok = 1;
+    vTaskDelete(NULL);
+}
+
 void app_main(void)
 {
     printf("Hello world!\n");
+    printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+    ESP_LOGI("bsvg", "display init"); 
     display_init();
 
+    printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
     esp_timer_handle_t periodic_timer;
     ESP_ERROR_CHECK(esp_timer_create(&periodic_timer_args, &periodic_timer));
     ESP_ERROR_CHECK(esp_timer_start_periodic(periodic_timer, 500));
 
-    put_line(fb, 1, "MauMau", 1, 1);
+    put_line(fb, 1, "Moin", 1, 1);
 
-    //Initialize WiFi
-    esp_err_t ret = nvs_flash_init();
-    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
-        ESP_ERROR_CHECK(nvs_flash_erase());
-        ret = nvs_flash_init();
-    }
-    ESP_ERROR_CHECK(ret);
-    wifi_init_sta();
+    wlan_init();
 
     put_line(fb, 2, "wifi", 1, 1);
 
     for (;;) {
+        printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+        xTaskCreate(&https_request_task, "https_get_task", 8192, NULL, 5, NULL);
+        while (!buf_ok) {
             vTaskDelay(1);
         }
+
+        printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+        ESP_LOGI("bsvg", "got from https server:"); 
+        for(uint32_t i=0; i<sizeof(bsvg_buf); i++){
+            putchar(bsvg_buf[i]);
+            if(i%1000==0)
+                vTaskDelay(1);
+        }
+        putchar('\n');
+
+        printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+        put_line(fb, 3, "https", 1, 1);
+
+        xTaskCreate(&json_parse_task, "json_parse_task", 8192, NULL, 5, NULL);
+        ESP_LOGI("bsvg", "Parsing JSON..."); 
+        while (!json_ok) {
+            printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+            vTaskDelay(1);
+        }
+        ESP_LOGI("bsvg", "Done"); 
+
+        //if (departureList == NULL)
+        //{
+        //    ESP_LOGI("bsvg", "did not get list"); 
+        //    const char *error_ptr = cJSON_GetErrorPtr();
+        //    heap_caps_print_heap_info(MALLOC_CAP_DEFAULT);
+        //    if (error_ptr != NULL)
+        //    {
+        //        fprintf(stderr, "Error at %ld: %.10s\n", (uint32_t)error_ptr-(uint32_t)bsvg_buf, error_ptr);
+        //        fprintf(stderr, "%.100s%.100s\n", error_ptr-100, error_ptr);
+        //        fprintf(stderr, "                                                                                                    ^\n");
+        //    }
+        //    else {
+        //        fprintf(stderr, "did not get err ptr\n");
+        //    }
+        //}else{
+        //    ESP_LOGI("bsvg", "got list"); 
+        //    printf("free heap: %d\n", heap_caps_get_free_size( MALLOC_CAP_DEFAULT) );
+        //    ESP_LOGI("bsvg", "type: %d", departureList->type); 
+        //    ESP_LOGI("bsvg", "child: %ld", (uint32_t)departureList->child); 
+        //    if(cJSON_IsArray(departureList)){
+        //        ESP_LOGI("bsvg", "is Array"); 
+        //        const cJSON *departure = NULL;
+        //        cJSON_ArrayForEach(departure, departureList){
+        //            cJSON *number = cJSON_GetObjectItemCaseSensitive(cJSON_GetObjectItemCaseSensitive(departure, "servingLine"), "number");;
+        //            if(number == NULL)
+        //                ESP_LOGI("bsvg", "cant get number");
+        //            else if(cJSON_IsNumber(number))
+        //                ESP_LOGI("bsvg", "number (int): %d\n", number->valueint);
+        //            else if(cJSON_IsString(number))
+        //                ESP_LOGI("bsvg", "number (str): %.3s\n", number->valuestring);
+        //            else 
+        //                ESP_LOGI("bsvg", "cant get number value");
+        //        }
+        //    }
+        //}
+
+
+        vTaskDelay(6000);
+    }
 }

main/text.c

@@ -1,4 +1,5 @@
 #include <stdint.h>
+#include <stdio.h>
 #include "text.h"
 
 uint8_t check_chr_width(const uint8_t chr[]){
@@ -22,8 +23,17 @@ void put_line(uint8_t framebuffer[DISPLAY_HEIGHT][DISPLAY_WIDTH][3], uint8_t lin
     uint8_t pos = 0;
     uint8_t disp_pos = 0;
     while(str[pos] != 0){
-        put_chr(framebuffer, line, disp_pos, font[str[pos]-0x20], size);
-        disp_pos += (check_chr_width(font[str[pos]-0x20]) + 1 + spacing)*size;
+        uint16_t code = 0;
+        if((str[pos]&0xE0) == 0xC0 && (str[pos+1]&0xC0) == 0x80){
+            code = (str[pos] & 0x1F) << 6;
+            code |= (str[pos+1] & 0x3F);
+            printf("mbc: %x\n", font[code][0]);
+            pos++;
+        }else{
+            code = str[pos];
+        }
+        put_chr(framebuffer, line, disp_pos, font[code-0x20], size);
+        disp_pos += (check_chr_width(font[code-0x20]) + 1 + spacing)*size;
         pos++;
     }
 }

main/wlan.c

@@ -1,10 +1,11 @@
 #include "sdkconfig.h"
 #include "esp_system.h"
-#include "esp_wifi.h"
 #include "esp_event.h"
+#include "nvs_flash.h"
 #include "esp_log.h"
+#include "esp_wifi.h"
 
-static const char *TAG = "wifi station";
+static const char *TAG = "wlan";
 
 /* The event group allows multiple bits for each event, but we only care about two events:
  * - we are connected to the AP with an IP
@@ -103,3 +104,12 @@ void wifi_init_sta(void)
     }
 }
 
+void wlan_init(){
+    esp_err_t ret = nvs_flash_init();
+    if (ret == ESP_ERR_NVS_NO_FREE_PAGES || ret == ESP_ERR_NVS_NEW_VERSION_FOUND) {
+        ESP_ERROR_CHECK(nvs_flash_erase());
+        ret = nvs_flash_init();
+    }
+    ESP_ERROR_CHECK(ret);
+    wifi_init_sta();
+}

main/wlan.h

@@ -1 +1 @@
-void wifi_init_sta(void);
+void wlan_init(void);

sdkconfig

@@ -43,6 +43,7 @@ CONFIG_SOC_CLK_TREE_SUPPORTED=y
 CONFIG_SOC_MPU_SUPPORTED=y
 CONFIG_SOC_WDT_SUPPORTED=y
 CONFIG_SOC_SPI_FLASH_SUPPORTED=y
+CONFIG_SOC_RNG_SUPPORTED=y
 CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
 CONFIG_SOC_XTAL_SUPPORT_26M=y
 CONFIG_SOC_XTAL_SUPPORT_40M=y
@@ -70,6 +71,7 @@ CONFIG_SOC_IDCACHE_PER_CORE=y
 CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
+CONFIG_SOC_HP_CPU_HAS_MULTIPLE_CORES=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
@@ -223,6 +225,7 @@ CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
 CONFIG_SOC_BLUFI_SUPPORTED=y
 CONFIG_SOC_ULP_HAS_ADC=y
 CONFIG_SOC_PHY_COMBO_MODULE=y
+CONFIG_SOC_EMAC_RMII_CLK_OUT_INTERNAL_LOOPBACK=y
 CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
@@ -320,6 +323,8 @@ CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y
 CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
 CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y
 CONFIG_ESP_ROM_HAS_SW_FLOAT=y
+CONFIG_ESP_ROM_USB_OTG_NUM=-1
+CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=-1
 
 #
 # Serial flasher config
@@ -423,7 +428,18 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 #
 
 #
-# Legacy ADC Configuration
+# TWAI Configuration
+#
+# CONFIG_TWAI_ISR_IN_IRAM is not set
+CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
+CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
+CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
+CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
+CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
+# end of TWAI Configuration
+
+#
+# Legacy ADC Driver Configuration
 #
 CONFIG_ADC_DISABLE_DAC=y
 # CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
@@ -436,45 +452,19 @@ CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
 CONFIG_ADC_CAL_LUT_ENABLE=y
 # CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
 # end of Legacy ADC Calibration Configuration
-# end of Legacy ADC Configuration
+# end of Legacy ADC Driver Configuration
 
 #
-# TWAI Configuration
+# Legacy MCPWM Driver Configurations
 #
-# CONFIG_TWAI_ISR_IN_IRAM is not set
-CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y
-CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y
-CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y
-CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y
-CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
-# end of TWAI Configuration
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy MCPWM Driver Configurations
 
 #
-# UART Configuration
+# Legacy Timer Group Driver Configurations
 #
-# CONFIG_UART_ISR_IN_IRAM is not set
-# end of UART Configuration
-
-#
-# Sigma Delta Modulator Configuration
-#
-# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
-# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
-# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
-# end of Sigma Delta Modulator Configuration
-
-#
-# LEDC Configuration
-#
-# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
-# end of LEDC Configuration
-
-#
-# I2C Configuration
-#
-# CONFIG_I2C_ISR_IRAM_SAFE is not set
-# CONFIG_I2C_ENABLE_DEBUG_LOG is not set
-# end of I2C Configuration
+# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy Timer Group Driver Configurations
 # end of Driver Configurations
 
 #
@@ -553,11 +543,17 @@ CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
 CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
-# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:GPTimer Configurations
 
 #
+# ESP-Driver:I2C Configurations
+#
+# CONFIG_I2C_ISR_IRAM_SAFE is not set
+# CONFIG_I2C_ENABLE_DEBUG_LOG is not set
+# end of ESP-Driver:I2C Configurations
+
+#
 # ESP-Driver:I2S Configurations
 #
 # CONFIG_I2S_ISR_IRAM_SAFE is not set
@@ -566,11 +562,16 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # end of ESP-Driver:I2S Configurations
 
 #
+# ESP-Driver:LEDC Configurations
+#
+# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
+# end of ESP-Driver:LEDC Configurations
+
+#
 # ESP-Driver:MCPWM Configurations
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
 # CONFIG_MCPWM_CTRL_FUNC_IN_IRAM is not set
-# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:MCPWM Configurations
 
@@ -593,6 +594,14 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # end of ESP-Driver:RMT Configurations
 
 #
+# ESP-Driver:Sigma Delta Modulator Configurations
+#
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
+# end of ESP-Driver:Sigma Delta Modulator Configurations
+
+#
 # ESP-Driver:SPI Configurations
 #
 # CONFIG_SPI_MASTER_IN_IRAM is not set
@@ -602,6 +611,12 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # end of ESP-Driver:SPI Configurations
 
 #
+# ESP-Driver:UART Configurations
+#
+# CONFIG_UART_ISR_IN_IRAM is not set
+# end of ESP-Driver:UART Configurations
+
+#
 # Ethernet
 #
 CONFIG_ETH_ENABLED=y
@@ -642,6 +657,7 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH is not set
 # CONFIG_ESP_HTTP_CLIENT_ENABLE_DIGEST_AUTH is not set
+# CONFIG_ESP_HTTP_CLIENT_ENABLE_CUSTOM_TRANSPORT is not set
 # end of ESP HTTP client
 
 #
@@ -705,6 +721,7 @@ CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y
 CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 # CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set
+# CONFIG_ESP_MAC_USE_CUSTOM_MAC_AS_BASE_MAC is not set
 # end of MAC Config
 
 #
@@ -715,7 +732,7 @@ CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
 # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
-CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY=2000
 # CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
 # CONFIG_ESP_SLEEP_DEBUG is not set
 CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
@@ -854,7 +871,7 @@ CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=50000
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
@@ -865,6 +882,7 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 # CONFIG_ESP_CONSOLE_NONE is not set
 CONFIG_ESP_CONSOLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
+CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
 CONFIG_ESP_INT_WDT=y
 CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
@@ -909,7 +927,7 @@ CONFIG_ESP_IPC_ISR_ENABLE=y
 # end of IPC (Inter-Processor Call)
 
 #
-# High resolution timer (esp_timer)
+# ESP Timer (High Resolution Timer)
 #
 # CONFIG_ESP_TIMER_PROFILING is not set
 CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
@@ -922,27 +940,27 @@ CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y
 CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y
 # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
 CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
-# end of High resolution timer (esp_timer)
+# end of ESP Timer (High Resolution Timer)
 
 #
 # Wi-Fi
 #
 CONFIG_ESP_WIFI_ENABLED=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=4
 # CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set
 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=4
 CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
 # CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
 CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
-CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=1
 # CONFIG_ESP_WIFI_CSI_ENABLED is not set
 CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP_WIFI_TX_BA_WIN=6
+CONFIG_ESP_WIFI_TX_BA_WIN=4
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP_WIFI_RX_BA_WIN=6
+CONFIG_ESP_WIFI_RX_BA_WIN=4
 CONFIG_ESP_WIFI_NVS_ENABLED=y
 # CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set
 CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y
@@ -951,9 +969,7 @@ CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP_WIFI_IRAM_OPT=y
 # CONFIG_ESP_WIFI_EXTRA_IRAM_OPT is not set
 CONFIG_ESP_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
-CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
-CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
 # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
@@ -963,7 +979,6 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
 # CONFIG_ESP_WIFI_NAN_ENABLE is not set
 CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y
-CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 # CONFIG_ESP_WIFI_WAPI_PSK is not set
 # CONFIG_ESP_WIFI_11KV_SUPPORT is not set
 # CONFIG_ESP_WIFI_MBO_SUPPORT is not set
@@ -980,7 +995,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 
 # CONFIG_ESP_WIFI_DEBUG_PRINT is not set
 # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
-CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set
 # end of Wi-Fi
 
 #
@@ -1093,6 +1108,7 @@ CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
 CONFIG_FREERTOS_DEBUG_OCDAWARE=y
 CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
 CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
+CONFIG_FREERTOS_NUMBER_OF_CORES=2
 # end of FreeRTOS
 
 #
@@ -1122,9 +1138,6 @@ CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
-CONFIG_IEEE802154_CCA_THRESHOLD=-60
-CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
-
 #
 # Log output
 #
@@ -1168,6 +1181,7 @@ CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
+CONFIG_LWIP_IP_DEFAULT_TTL=64
 CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
@@ -1222,6 +1236,7 @@ CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5760
 CONFIG_LWIP_TCP_WND_DEFAULT=5760
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
+CONFIG_LWIP_TCP_ACCEPTMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
 CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
 CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
@@ -1279,6 +1294,13 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1
 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
+#
+# DNS
+#
+CONFIG_LWIP_DNS_MAX_SERVERS=3
+# CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
+# end of DNS
+
 CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
@@ -1346,6 +1368,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
 # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
 CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 CONFIG_MBEDTLS_HARDWARE_MPI=y
 CONFIG_MBEDTLS_HARDWARE_SHA=y
 CONFIG_MBEDTLS_ROM_MD5=y
@@ -1491,6 +1514,13 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of Thread Operational Dataset
 
 CONFIG_OPENTHREAD_XTAL_ACCURACY=130
+# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
+CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
+
+#
+# Thread Address Query Config
+#
+# end of Thread Address Query Config
 # end of OpenThread
 
 #
@@ -1650,11 +1680,6 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # end of Unity unit testing library
 
 #
-# Root Hub configuration
-#
-# end of Root Hub configuration
-
-#
 # Virtual file system
 #
 CONFIG_VFS_SUPPORT_IO=y
@@ -1691,7 +1716,7 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # end of Wi-Fi Provisioning Manager
 # end of Component config
 
-# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
 
 # Deprecated options for backward compatibility
 # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set
@@ -1742,6 +1767,7 @@ CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y
 CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4
 # CONFIG_ESP_SYSTEM_PD_FLASH is not set
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y
 CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
 # CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set
@@ -1774,7 +1800,7 @@ CONFIG_ESP32_PANIC_PRINT_REBOOT=y
 # CONFIG_ESP32_PANIC_GDBSTUB is not set
 CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_MAIN_TASK_STACK_SIZE=3584
+CONFIG_MAIN_TASK_STACK_SIZE=50000
 CONFIG_CONSOLE_UART_DEFAULT=y
 # CONFIG_CONSOLE_UART_CUSTOM is not set
 # CONFIG_CONSOLE_UART_NONE is not set
@@ -1818,18 +1844,18 @@ CONFIG_IPC_TASK_STACK_SIZE=1024
 CONFIG_TIMER_TASK_STACK_SIZE=3584
 CONFIG_ESP32_WIFI_ENABLED=y
 CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=4
 # CONFIG_ESP32_WIFI_STATIC_TX_BUFFER is not set
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=4
 # CONFIG_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
-CONFIG_ESP32_WIFI_TX_BA_WIN=6
+CONFIG_ESP32_WIFI_TX_BA_WIN=4
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
-CONFIG_ESP32_WIFI_RX_BA_WIN=6
+CONFIG_ESP32_WIFI_RX_BA_WIN=4
+CONFIG_ESP32_WIFI_RX_BA_WIN=4
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 # CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_0 is not set
 CONFIG_ESP32_WIFI_TASK_PINNED_TO_CORE_1=y
@@ -1837,10 +1863,9 @@ CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_IRAM_OPT=y
 CONFIG_ESP32_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y
+# CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y
 CONFIG_WPA_MBEDTLS_CRYPTO=y
-CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WAPI_PSK is not set
 # CONFIG_WPA_11KV_SUPPORT is not set
 # CONFIG_WPA_MBO_SUPPORT is not set

sdkconfig.old

@@ -615,7 +615,7 @@ CONFIG_ETH_DMA_RX_BUFFER_NUM=10
 CONFIG_ETH_DMA_TX_BUFFER_NUM=10
 # CONFIG_ETH_IRAM_OPTIMIZATION is not set
 CONFIG_ETH_USE_SPI_ETHERNET=y
-CONFIG_ETH_SPI_ETHERNET_DM9051=y
+# CONFIG_ETH_SPI_ETHERNET_DM9051 is not set
 # CONFIG_ETH_SPI_ETHERNET_W5500 is not set
 # CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set
 # CONFIG_ETH_USE_OPENETH is not set
@@ -789,7 +789,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
 # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
 CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
 CONFIG_ESP_PHY_MAX_TX_POWER=20
-CONFIG_ESP_PHY_REDUCE_TX_POWER=y
+# CONFIG_ESP_PHY_REDUCE_TX_POWER is not set
 CONFIG_ESP_PHY_RF_CAL_PARTIAL=y
 # CONFIG_ESP_PHY_RF_CAL_NONE is not set
 # CONFIG_ESP_PHY_RF_CAL_FULL is not set
@@ -854,7 +854,7 @@ CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0
 
 CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32
 CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=2304
-CONFIG_ESP_MAIN_TASK_STACK_SIZE=3584
+CONFIG_ESP_MAIN_TASK_STACK_SIZE=50000
 CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y
 # CONFIG_ESP_MAIN_TASK_AFFINITY_CPU1 is not set
 # CONFIG_ESP_MAIN_TASK_AFFINITY_NO_AFFINITY is not set
@@ -866,11 +866,17 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
 CONFIG_ESP_CONSOLE_UART=y
 CONFIG_ESP_CONSOLE_UART_NUM=0
 CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
-# CONFIG_ESP_INT_WDT is not set
+CONFIG_ESP_INT_WDT=y
+CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
+CONFIG_ESP_INT_WDT_CHECK_CPU1=y
 CONFIG_ESP_TASK_WDT_EN=y
-# CONFIG_ESP_TASK_WDT_INIT is not set
+CONFIG_ESP_TASK_WDT_INIT=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_ESP_PANIC_HANDLER_IRAM is not set
-CONFIG_ESP_DEBUG_STUBS_ENABLE=y
+# CONFIG_ESP_DEBUG_STUBS_ENABLE is not set
 CONFIG_ESP_DEBUG_OCDAWARE=y
 # CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_5 is not set
 CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y
@@ -923,31 +929,29 @@ CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
 #
 CONFIG_ESP_WIFI_ENABLED=y
 CONFIG_ESP_WIFI_STATIC_RX_BUFFER_NUM=10
-CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_DYNAMIC_RX_BUFFER_NUM=4
 # CONFIG_ESP_WIFI_STATIC_TX_BUFFER is not set
 CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP_WIFI_TX_BUFFER_TYPE=1
-CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM=4
 CONFIG_ESP_WIFI_STATIC_RX_MGMT_BUFFER=y
 # CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUFFER is not set
 CONFIG_ESP_WIFI_DYNAMIC_RX_MGMT_BUF=0
-CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=5
+CONFIG_ESP_WIFI_RX_MGMT_BUF_NUM_DEF=1
 # CONFIG_ESP_WIFI_CSI_ENABLED is not set
 CONFIG_ESP_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP_WIFI_TX_BA_WIN=6
 CONFIG_ESP_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP_WIFI_RX_BA_WIN=6
 CONFIG_ESP_WIFI_NVS_ENABLED=y
-CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0=y
-# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1 is not set
+# CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_0 is not set
+CONFIG_ESP_WIFI_TASK_PINNED_TO_CORE_1=y
 CONFIG_ESP_WIFI_SOFTAP_BEACON_MAX_LEN=752
 CONFIG_ESP_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP_WIFI_IRAM_OPT=y
 # CONFIG_ESP_WIFI_EXTRA_IRAM_OPT is not set
 CONFIG_ESP_WIFI_RX_IRAM_OPT=y
-CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=y
-CONFIG_ESP_WIFI_ENABLE_SAE_PK=y
-CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENABLE_WPA3_SAE is not set
 CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_STA=y
 # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
@@ -974,7 +978,7 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 
 # CONFIG_ESP_WIFI_DEBUG_PRINT is not set
 # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
-CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT is not set
 # end of Wi-Fi
 
 #
@@ -1208,13 +1212,13 @@ CONFIG_LWIP_MAX_ACTIVE_TCP=16
 CONFIG_LWIP_MAX_LISTENING_TCP=16
 CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
 CONFIG_LWIP_TCP_MAXRTX=12
-CONFIG_LWIP_TCP_SYNMAXRTX=6
+CONFIG_LWIP_TCP_SYNMAXRTX=12
 CONFIG_LWIP_TCP_MSS=1440
 CONFIG_LWIP_TCP_TMR_INTERVAL=250
 CONFIG_LWIP_TCP_MSL=60000
 CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
-CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
-CONFIG_LWIP_TCP_WND_DEFAULT=5744
+CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5760
+CONFIG_LWIP_TCP_WND_DEFAULT=5760
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
 CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
@@ -1311,6 +1315,7 @@ CONFIG_MBEDTLS_INTERNAL_MEM_ALLOC=y
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=y
 CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN=16384
 CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
+# CONFIG_MBEDTLS_DYNAMIC_BUFFER is not set
 # CONFIG_MBEDTLS_DEBUG is not set
 
 #
@@ -1322,13 +1327,6 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096
 # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set
 CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y
 CONFIG_MBEDTLS_PKCS7_C=y
-
-#
-# DTLS-based configurations
-#
-# CONFIG_MBEDTLS_SSL_DTLS_CONNECTION_ID is not set
-# CONFIG_MBEDTLS_SSL_DTLS_SRTP is not set
-# end of DTLS-based configurations
 # end of mbedTLS v3.x related
 
 #
@@ -1367,10 +1365,7 @@ CONFIG_MBEDTLS_TLS_ENABLED=y
 #
 # TLS Key Exchange Methods
 #
-CONFIG_MBEDTLS_PSK_MODES=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK=y
-CONFIG_MBEDTLS_KEY_EXCHANGE_RSA_PSK=y
+# CONFIG_MBEDTLS_PSK_MODES is not set
 CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y
@@ -1382,7 +1377,7 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y
 CONFIG_MBEDTLS_SSL_RENEGOTIATION=y
 CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y
 # CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set
-CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
+# CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set
 CONFIG_MBEDTLS_SSL_ALPN=y
 CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y
 CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y
@@ -1694,4 +1689,4 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 # end of Wi-Fi Provisioning Manager
 # end of Component config
 
-# CONFIG_IDF_EXPERIMENTAL_FEATURES is not set
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y