main/font.c

@@ -18,7 +18,7 @@ const uint8_t font[256][7] = {
 	{0x40,0x00,0x00,0x00,0x00,0x00,0x00}, // .
 	{0x60,0x10,0x08,0x04,0x03,0x00,0x00}, // /
 	{0x7f,0x41,0x41,0x7f,0x00,0x00,0x00}, // 0
-	{0x02,0x03,0x7f,0x00,0x00,0x00,0x00}, // 1
+	{0x01,0x7f,0x00,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

main/https.c

@@ -12,7 +12,7 @@ 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_URL "/bsvagstd/XML_DM_REQUEST?outputFormat=JSON&stateless=1&locationServerActive=1&type_dm=stop&name_dm=\"Freiastr,Braunschweig\"&mode=direct&ptOptionsActive=1&useRealtime=1"
 //#define WEB_SERVER "mustbehax.de"
 //#define WEB_PORT "443"
 //#define WEB_URL "/web/reduced.json"

main/main.c

@@ -54,8 +54,8 @@ static void https_request_task(void *pvparameters){
 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++;
-    while(*ptr != '"' && *ptr != 0) ptr++;
+    while(*ptr != '"') ptr++;
     ptr++;
 
     char *end=ptr;
@@ -77,7 +77,7 @@ static void json_parse_task(void *pvparameters){
 
     uint8_t line = 0;
     char *item = start;
-    char txt[6][50];
+    char txt[5][50];
     while((item = strstr(item+1, "{ \"stopID\":")) != 0){
         char symbol[10];
         get_json_string(item, "symbol", symbol);
@@ -88,14 +88,8 @@ static void json_parse_task(void *pvparameters){
         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);
+            sprintf(txt[line], "                            %.3s", countdown);
             put_line(fb, line, txt[line], 1, 1);
 
             sprintf(txt[line], "     %.20s", direction);
@@ -106,7 +100,7 @@ static void json_parse_task(void *pvparameters){
 
         }
 
-        //sprintf(txt[line], "%.3s\t%.20s\t%.4s", symbol, direction, countdown);
+        sprintf(txt[line], "%.3s\t%.20s\t%.3s", symbol, direction, countdown);
         printf("line = %d: %s\n", line, txt[line]);
         printf("\n");
 
@@ -152,7 +146,6 @@ void app_main(void)
 
     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) {
@@ -216,6 +209,7 @@ void app_main(void)
     //}
 
 
-        vTaskDelay(6000);
+    for (;;) {
+        vTaskDelay(1);
     }
 }

main/text.c

@@ -1,5 +1,4 @@
 #include <stdint.h>
-#include <stdio.h>
 #include "text.h"
 
 uint8_t check_chr_width(const uint8_t chr[]){
@@ -27,7 +26,6 @@ void put_line(uint8_t framebuffer[DISPLAY_HEIGHT][DISPLAY_WIDTH][3], uint8_t lin
         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];

sdkconfig

@@ -43,7 +43,6 @@ 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
@@ -71,7 +70,6 @@ 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
@@ -225,7 +223,6 @@ 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
@@ -323,8 +320,6 @@ 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
@@ -428,6 +423,22 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 #
 
 #
+# Legacy ADC Configuration
+#
+CONFIG_ADC_DISABLE_DAC=y
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+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
+
+#
 # TWAI Configuration
 #
 # CONFIG_TWAI_ISR_IN_IRAM is not set
@@ -439,32 +450,31 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # end of TWAI Configuration
 
 #
-# Legacy ADC Driver Configuration
+# UART Configuration
 #
-CONFIG_ADC_DISABLE_DAC=y
+# CONFIG_UART_ISR_IN_IRAM is not set
-# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+# end of UART Configuration
 
 #
-# Legacy ADC Calibration Configuration
+# Sigma Delta Modulator Configuration
 #
-CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y
+# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
-CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
-CONFIG_ADC_CAL_LUT_ENABLE=y
+# CONFIG_SDM_ENABLE_DEBUG_LOG is not set
-# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Sigma Delta Modulator Configuration
-# end of Legacy ADC Calibration Configuration
-# end of Legacy ADC Driver Configuration
 
 #
-# Legacy MCPWM Driver Configurations
+# LEDC Configuration
 #
-# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
-# end of Legacy MCPWM Driver Configurations
+# end of LEDC Configuration
 
 #
-# Legacy Timer Group Driver Configurations
+# I2C Configuration
 #
-# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
+# CONFIG_I2C_ISR_IRAM_SAFE is not set
-# end of Legacy Timer Group Driver Configurations
+# CONFIG_I2C_ENABLE_DEBUG_LOG is not set
+# end of I2C Configuration
 # end of Driver Configurations
 
 #
@@ -543,17 +553,11 @@ 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
@@ -562,16 +566,11 @@ 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
 
@@ -594,14 +593,6 @@ 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
@@ -611,12 +602,6 @@ 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
@@ -657,7 +642,6 @@ 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
 
 #
@@ -721,7 +705,6 @@ 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
 
 #
@@ -732,7 +715,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_WAIT_FLASH_READY_EXTRA_DELAY=2000
+CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_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
@@ -882,7 +865,6 @@ 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
@@ -927,7 +909,7 @@ CONFIG_ESP_IPC_ISR_ENABLE=y
 # end of IPC (Inter-Processor Call)
 
 #
-# ESP Timer (High Resolution Timer)
+# High resolution timer (esp_timer)
 #
 # CONFIG_ESP_TIMER_PROFILING is not set
 CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
@@ -940,7 +922,7 @@ 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 ESP Timer (High Resolution Timer)
+# end of High resolution timer (esp_timer)
 
 #
 # Wi-Fi
@@ -979,6 +961,7 @@ 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
@@ -1108,7 +1091,6 @@ 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
 
 #
@@ -1138,6 +1120,9 @@ 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
 #
@@ -1181,7 +1166,6 @@ 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
@@ -1236,7 +1220,6 @@ 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
@@ -1294,13 +1277,6 @@ 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
 
@@ -1368,7 +1344,6 @@ 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
@@ -1514,13 +1489,6 @@ 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
 
 #
@@ -1680,6 +1648,11 @@ 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
@@ -1767,7 +1740,6 @@ 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
@@ -1866,6 +1838,7 @@ CONFIG_ESP32_WIFI_RX_IRAM_OPT=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