feat: 添加蓝牙应用逻辑；整理代码

.vscode/settings.json

@@ -3,6 +3,8 @@
         "protocol_user.h": "c",
         "protocol_lib.h": "c",
         "protocol_crc16.h": "c",
-        "gatts_table_creat_demo.h": "c"
+        "gatts_table_creat_demo.h": "c",
+        "app_ble_user.h": "c",
+        "main_user.h": "c"
     }
 }
\ No newline at end of file

qianjiang/main/CMakeLists.txt

@@ -7,5 +7,6 @@ idf_component_register(SRCS "gatts_table_creat_demo.c"
                     "Protocol_User.c"
                     "MCU_Core_Protocol.c"
                     "app_Ble_User.c"
+                    "main_user.c"
                     INCLUDE_DIRS "."
                     EMBED_TXTFILES ${project_dir}/server_certs/ca_cert.pem)

qianjiang/main/MCU_Core_Protocol.c

@@ -5,6 +5,8 @@
 #include "Protocol_User.h"
 #include "gatts_table_creat_demo.h"
 
+#include "app_Ble_User.h"
+
 void Uart_ID10_process(void)
 {
     if(1)
@@ -24,21 +26,17 @@ void Uart_ID01_process(void)
 {
         uint8_t ID01[6] = {0x00,0x00,0x00,0x00,0x00,0x00};
 
-        if(1/*正在导航*/)
-        {
-            ID01[0] = 0x33;
-        }
-        else
-        {
-            ID01[0] = 0x35;//或者直接将收到的蓝牙值赋值过来
-        }
+        if(Ble_Sts_Ctrl.Navi_Updat)
+        {   
+            ID01[0] = Ble_Navi_Data.Navi_Sts;
+            ID01[1] = Ble_Navi_Data.Navi_Turn;//赋值为蓝牙收到的转向编码值
+            ID01[2] = Ble_Navi_Data.Navi_Dte[0];
+            ID01[3] = Ble_Navi_Data.Navi_Dte[1];
+            ID01[4] = Ble_Navi_Data.Navi_Dte[2];
+            ID01[5] = Ble_Navi_Data.Navi_Dte[3];
 
-        ID01[1] = 0x00;//赋值为蓝牙收到的转向编码值
-        Protocol_uint32_t Ble_distance = 0;
-        ID01[2] = Ble_distance >> 24 & 0x11;
-        ID01[3] = Ble_distance >> 16 & 0x11;
-        ID01[4] = Ble_distance >> 8  & 0x11;
-        ID01[5] = Ble_distance >> 0  & 0x11;
+        }
+        
         Protocol_Send(0x01,ID01,6);
 }
 
@@ -46,7 +44,7 @@ void Uart_ID01_process(void)
 void Uart_ID12_process(void)
 {
     uint8_t ID12[2] = {0x00,0x00};
-    ID12[1] =  ble_status;
+    ID12[1] =  Ble_Sts_Ctrl.Ble_Sts;
     Protocol_Send(0x12,ID12,2);
 }
 
@@ -71,7 +69,7 @@ void Uart_ID21_process(void)//底板给ESP32发
 
 void MCU_T_32(void)
 {
-    printf("MCU_T_32!!\r\n");
+    // printf("MCU_T_32!!\r\n");
     Protocol_Service();
     if(ID21_num >= 5)
     {

qianjiang/main/Protocol_User.c

@@ -25,6 +25,7 @@
 #include "driver/gpio.h"
 #include "MCU_Core_Protocol.h"
 #include "Protocol_Lib.h"
+#include "app_Ble_User.h"
 
 #define UART_TX_MAX_DEPTH 1024UL          //(2 * 1024UL)    // 4K
 #define UART_RX_MAX_DEPTH (2 * 1024UL)    // 4K
@@ -137,10 +138,10 @@ void Protocol_Send_Service(void)
         //memcpy(Uart_Data.data, UsartDataBuf, SendLen);
         int i = 0;
         for(i = 0;i < SendLen;i++)
-        printf("data is  %x !!!\r\n",UsartDataBuf[i]);
+        // printf("data is  %x !!!\r\n",UsartDataBuf[i]);
         sendData(TX_TASK_TAG, (const char*)UsartDataBuf,SendLen);
         //UART_Ch1_Send_Multiple_Byte(UsartDataBuf, SendLen);/*ESP32底层*/
-        vTaskDelay(1000 / portTICK_PERIOD_MS);
+        
     }
 }
 
@@ -256,10 +257,18 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
     {
         Uart_ID12_process();//TX
     }
-    else if(pData->CmdID == MCU_TO_BLE_INFO )
+    else if((pData->CmdID & 0x3f) == MCU_TO_BLE_INFO )
     {
+
+        if((pData->CmdID & 0xC0) == 0X40)
+        {
+            if(Wifi_OTA_Request == 0)
+            {
+                Wifi_OTA_Request = 1;
+            }
+        }
         printf("ID21 IS in!!!\r\n");
-        Uart_ID21_process();//RX
+        // Uart_ID21_process();//RX
     }
     else
     {

qianjiang/main/gatts_table_creat_demo.h

@@ -13,25 +13,42 @@ enum
 {
     IDX_SVC,
 
-    // IDX_CHAR_2A29,
-    // IDX_CHAR_VAL_2A29,
-    // IDX_CHAR_CFG_2A29,
+    IDX_CHAR_2A29,
+    IDX_CHAR_VAL_2A29,
+    IDX_CHAR_CFG_2A29,
 
-    // IDX_CHAR_2A24,
-    // IDX_CHAR_VAL_2A24,
-    // IDX_CHAR_CFG_2A24,
+    IDX_CHAR_2A24,
+    IDX_CHAR_VAL_2A24,
+    IDX_CHAR_CFG_2A24,
     
-    IDX_CHAR_A,
-    IDX_CHAR_VAL_A,
-    IDX_CHAR_CFG_A,
+    IDX_CHAR_2A25,
+    IDX_CHAR_VAL_2A25,
+    IDX_CHAR_CFG_2A25,
 
-    // IDX_CHAR_2A27,
-    // IDX_CHAR_VAL_2A27,
-    // IDX_CHAR_CFG_2A27,
+    IDX_CHAR_2A27,
+    IDX_CHAR_VAL_2A27,
+    IDX_CHAR_CFG_2A27,
 
-    // IDX_CHAR_2A26,
-    // IDX_CHAR_VAL_2A26,
-    // IDX_CHAR_CFG_2A26,
+    IDX_CHAR_2A26,
+    IDX_CHAR_VAL_2A26,
+    IDX_CHAR_CFG_2A26,
+
+    IDX_CHAR_2A28,
+    IDX_CHAR_VAL_2A28,
+    IDX_CHAR_CFG_2A28,
+
+    IDX_CHAR_2A23,
+    IDX_CHAR_VAL_2A23,
+    IDX_CHAR_CFG_2A23,
+
+
+    IDX_CHAR_2A2A,
+    IDX_CHAR_VAL_2A2A,
+    IDX_CHAR_CFG_2A2A,
+
+    IDX_CHAR_2A50,
+    IDX_CHAR_VAL_2A50,
+    IDX_CHAR_CFG_2A50,
 
     HRS_IDX_NB,
 };
@@ -51,10 +68,13 @@ enum
     HRS_IDX_NB2,
 };
 
+void bsp_Ble_Init(void);
+void bsp_Uart_Init(void );
+
+int bsp_Ble_Gatts_Send_Indicate(uint8_t len, uint8_t *data);
 
+void simple_ota_service(void);
 
-void bsp_Ble_Gatts_Send_Indicate(uint8_t len, uint8_t *data);
 
-extern uint8_t ble_status;
 extern int sendData(const char* logName, const char* data , unsigned int len);
 #endif
\ No newline at end of file

qianjiang/main/main_user.c

+
+#include "app_Ble_User.h"
+#include "gatts_table_creat_demo.h"
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include "string.h"
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/event_groups.h"
+#include "gatts_table_creat_demo.h"
+#include "main_user.h"
+#include "Protocol_CRC16.h"
+#include "Protocol_User.h"
+
+#define TAG "MAIN_USER"
+
+
+uint32_t Sys_1ms_Cnt;
+
+#define SYS_RUN_TASK_1MS (1) 
+#define SYS_RUN_TASK_10MS (Sys_1ms_Cnt % 10 == 1) 
+#define SYS_RUN_TASK_20MS (Sys_1ms_Cnt % 20 == 2) 
+#define SYS_RUN_TASK_50MS (Sys_1ms_Cnt % 50 == 3) 
+#define SYS_RUN_TASK_100MS (Sys_1ms_Cnt % 100 == 4) 
+#define SYS_RUN_TASK_1000MS (Sys_1ms_Cnt % 1000 == 5) 
+
+
+
+uint32_t testcnt;
+
+static void Sys_Run_Tasks(void *arg)
+{
+    uint8_t i = 0;
+    while(1)
+    {
+        if(Sys_1ms_Cnt < 499)
+        {
+            Sys_1ms_Cnt ++ ;
+        }
+        else
+        {
+            Sys_1ms_Cnt = 0;
+        }
+
+        if(SYS_RUN_TASK_1MS)
+        {
+
+        }
+
+        if(SYS_RUN_TASK_10MS)
+        {
+            Protocol_Send_Service();
+        }
+
+        if(SYS_RUN_TASK_20MS)
+        {
+            
+        }
+
+        if(SYS_RUN_TASK_50MS)
+        {
+            
+        }
+
+        if(SYS_RUN_TASK_100MS)
+        {
+            
+        }
+
+        if(SYS_RUN_TASK_1000MS)
+        {
+            testcnt++;
+            if(testcnt >= 2)
+            {
+                testcnt = 0;
+
+                // printf("Ble_Sts_Ctrl.Ble_Sts = %d\r\n", Ble_Sts_Ctrl.Ble_Sts);
+
+                // printf("Ble_Sts_Ctrl.Navi_Updat = %d\r\n", Ble_Sts_Ctrl.Navi_Updat);
+
+            }
+            simple_ota_service();
+        }
+
+        vTaskDelay(1);
+    }
+    vTaskDelete(NULL);
+}
+
+void app_main(void)
+{
+    Ble_User_Init();
+    bsp_Ble_Init();
+    bsp_Uart_Init();
+
+    xTaskCreatePinnedToCore(Sys_Run_Tasks, "Sys_Run_Tasks", 4096, NULL, 3, NULL, 1);
+}
+
+
+

qianjiang/main/main_user.h

+#ifndef _MAIN_USER_H_
+#define _MAIN_USER_H_
+
+
+
+
+#endif
\ No newline at end of file

qianjiang/sdkconfig

@@ -53,13 +53,14 @@ CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9
 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12
 CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y
 CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y
+CONFIG_SOC_IDCACHE_PER_CORE=y
 CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=5
 CONFIG_SOC_CPU_CORES_NUM=2
 CONFIG_SOC_CPU_INTR_NUM=32
 CONFIG_SOC_CPU_HAS_FPU=y
 CONFIG_SOC_CPU_BREAKPOINTS_NUM=2
 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2
-CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
+CONFIG_SOC_CPU_WATCHPOINT_MAX_REGION_SIZE=64
 CONFIG_SOC_DAC_PERIPH_NUM=2
 CONFIG_SOC_DAC_RESOLUTION=8
 CONFIG_SOC_GPIO_PORT=1
@@ -217,6 +218,14 @@ CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y
 # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set
 # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set
 CONFIG_BOOTLOADER_LOG_LEVEL=3
+
+#
+# Serial Flash Configurations
+#
+# CONFIG_BOOTLOADER_FLASH_DC_AWARE is not set
+CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
+# end of Serial Flash Configurations
+
 # CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y
 # CONFIG_BOOTLOADER_FACTORY_RESET is not set
@@ -231,7 +240,6 @@ CONFIG_BOOTLOADER_WDT_TIME_MS=9000
 # CONFIG_BOOTLOADER_SKIP_VALIDATE_ALWAYS is not set
 CONFIG_BOOTLOADER_RESERVE_RTC_SIZE=0
 # CONFIG_BOOTLOADER_CUSTOM_RESERVE_RTC is not set
-CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y
 # end of Bootloader config
 
 #
@@ -425,8 +433,12 @@ CONFIG_BT_GATT_MAX_SR_ATTRIBUTES=100
 # CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL is not set
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_AUTO=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MODE=0
+# CONFIG_BT_GATTS_ROBUST_CACHING_ENABLED is not set
+# CONFIG_BT_GATTS_DEVICE_NAME_WRITABLE is not set
+# CONFIG_BT_GATTS_APPEARANCE_WRITABLE is not set
 CONFIG_BT_GATTC_ENABLE=y
 CONFIG_BT_GATTC_MAX_CACHE_CHAR=40
+CONFIG_BT_GATTC_NOTIF_REG_MAX=5
 # CONFIG_BT_GATTC_CACHE_NVS_FLASH is not set
 CONFIG_BT_GATTC_CONNECT_RETRY_COUNT=3
 CONFIG_BT_BLE_SMP_ENABLE=y
@@ -612,10 +624,13 @@ CONFIG_BT_MULTI_CONNECTION_ENBALE=y
 # CONFIG_BT_BLE_DYNAMIC_ENV_MEMORY is not set
 # CONFIG_BT_BLE_HOST_QUEUE_CONG_CHECK is not set
 CONFIG_BT_SMP_ENABLE=y
+CONFIG_BT_SMP_MAX_BONDS=15
 # CONFIG_BT_BLE_ACT_SCAN_REP_ADV_SCAN is not set
 CONFIG_BT_BLE_ESTAB_LINK_CONN_TOUT=30
 CONFIG_BT_MAX_DEVICE_NAME_LEN=32
 # CONFIG_BT_BLE_RPA_SUPPORTED is not set
+CONFIG_BT_BLE_RPA_TIMEOUT=900
+# CONFIG_BT_BLE_HIGH_DUTY_ADV_INTERVAL is not set
 # end of Bluedroid Options
 
 #
@@ -750,6 +765,7 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y
 # RMT Configuration
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
+# CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
 # CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of RMT Configuration
@@ -829,6 +845,7 @@ CONFIG_ETH_RMII_CLK_IN_GPIO=0
 CONFIG_ETH_DMA_BUFFER_SIZE=512
 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 is not set
 # CONFIG_ETH_SPI_ETHERNET_W5500 is not set
@@ -924,11 +941,12 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 # Sleep Config
 #
 # CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set
-CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
-# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
 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_GPIO_ENABLE_INTERNAL_RESISTORS=y
 # end of Sleep Config
 
 #
@@ -979,6 +997,7 @@ CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32
 CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120
 CONFIG_ESP_NETIF_TCPIP_LWIP=y
 # CONFIG_ESP_NETIF_LOOPBACK is not set
+# CONFIG_ESP_NETIF_RECEIVE_REPORT_ERRORS is not set
 # CONFIG_ESP_NETIF_L2_TAP is not set
 # CONFIG_ESP_NETIF_BRIDGE_EN is not set
 # end of ESP NETIF Adapter
@@ -1019,9 +1038,9 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0
 # ESP System Settings
 #
 # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y
-# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240 is not set
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160
+# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 is not set
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240
 
 #
 # Memory
@@ -1126,6 +1145,10 @@ CONFIG_ESP32_WIFI_DYNAMIC_RX_BUFFER_NUM=32
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER=y
 CONFIG_ESP32_WIFI_TX_BUFFER_TYPE=1
 CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM=32
+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_ESP32_WIFI_CSI_ENABLED is not set
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED=y
 CONFIG_ESP32_WIFI_TX_BA_WIN=6
@@ -1147,6 +1170,8 @@ CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
 # CONFIG_ESP_WIFI_WPS_PASSPHRASE is not set
+CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
+# CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set
 # end of Wi-Fi
 
 #
@@ -1217,7 +1242,7 @@ CONFIG_FATFS_PER_FILE_CACHE=y
 #
 # CONFIG_FREERTOS_SMP is not set
 # CONFIG_FREERTOS_UNICORE is not set
-CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_HZ=1000
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
 # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
 CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
@@ -1307,6 +1332,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y
 #
 CONFIG_LWIP_LOCAL_HOSTNAME="QJ500-7C"
 # CONFIG_LWIP_NETIF_API is not set
+CONFIG_LWIP_TCPIP_TASK_PRIO=18
 # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set
 # CONFIG_LWIP_CHECK_THREAD_SAFETY is not set
 CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y
@@ -1320,6 +1346,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
@@ -1372,6 +1399,8 @@ CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744
 CONFIG_LWIP_TCP_WND_DEFAULT=5744
 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
+CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
+CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
 # CONFIG_LWIP_TCP_SACK_OUT is not set
 CONFIG_LWIP_TCP_OVERSIZE_MSS=y
 # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set
@@ -1402,6 +1431,8 @@ CONFIG_LWIP_TCPIP_TASK_AFFINITY=0x7FFFFFFF
 # CONFIG_LWIP_PPP_SUPPORT is not set
 CONFIG_LWIP_IPV6_MEMP_NUM_ND6_QUEUE=3
 CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS=5
+CONFIG_LWIP_ND6=y
+# CONFIG_LWIP_FORCE_ROUTER_FORWARDING is not set
 # CONFIG_LWIP_SLIP_SUPPORT is not set
 
 #
@@ -1427,6 +1458,14 @@ CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
 # end of SNTP
 
 CONFIG_LWIP_BRIDGEIF_MAX_PORTS=50
+
+#
+# DNS
+#
+CONFIG_LWIP_DNS_MAX_SERVERS=3
+# CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
+# end of DNS
+
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
 #
@@ -1489,6 +1528,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 is not set
 CONFIG_MBEDTLS_HARDWARE_MPI=y
 CONFIG_MBEDTLS_HARDWARE_SHA=y
 CONFIG_MBEDTLS_ROM_MD5=y
@@ -1569,12 +1609,12 @@ CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED=y
 CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED=y
 CONFIG_MBEDTLS_ECP_NIST_OPTIM=y
+CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_POLY1305_C is not set
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
 # CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
-# CONFIG_MBEDTLS_SECURITY_RISKS is not set
 # end of mbedTLS
 
 #
@@ -1650,6 +1690,27 @@ CONFIG_MMU_PAGE_MODE="64KB"
 CONFIG_MMU_PAGE_SIZE=0x10000
 # end of MMU Config
 
+#
+# Main Flash configuration
+#
+
+#
+# SPI Flash behavior when brownout
+#
+CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
+CONFIG_SPI_FLASH_BROWNOUT_RESET=y
+# end of SPI Flash behavior when brownout
+
+#
+# Optional and Experimental Features (READ DOCS FIRST)
+#
+
+#
+# Features here require specific hardware (READ DOCS FIRST!)
+#
+# end of Optional and Experimental Features (READ DOCS FIRST)
+# end of Main Flash configuration
+
 #
 # SPI Flash driver
 #
@@ -1669,13 +1730,6 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192
 # CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set
 # CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set
 
-#
-# SPI Flash behavior when brownout
-#
-CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y
-CONFIG_SPI_FLASH_BROWNOUT_RESET=y
-# end of SPI Flash behavior when brownout
-
 #
 # Auto-detect flash chips
 #
@@ -1804,7 +1858,6 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
 CONFIG_WPA_MBEDTLS_CRYPTO=y
 CONFIG_WPA_MBEDTLS_TLS_CLIENT=y
 # CONFIG_WPA_WAPI_PSK is not set
-# CONFIG_WPA_SUITE_B_192 is not set
 # CONFIG_WPA_DEBUG_PRINT is not set
 # CONFIG_WPA_TESTING_OPTIONS is not set
 # CONFIG_WPA_WPS_STRICT is not set
@@ -2089,9 +2142,9 @@ CONFIG_ESP32_PHY_MAX_TX_POWER=20
 # CONFIG_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_SPIRAM_SUPPORT is not set
 # CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
-CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y
-# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set
-CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
 CONFIG_TRACEMEM_RESERVE_DRAM=0x0
 # CONFIG_ESP32_PANIC_PRINT_HALT is not set
 CONFIG_ESP32_PANIC_PRINT_REBOOT=y