Skip to content

Q
QJ_500-7c
Commit 6cb28612 authored by 王金亮's avatar 王金亮
Browse files
Options

feat：增加串口解包的部分代码，修改无法发0的bug

parent e5a7083d
Hide whitespace changes
Inline Side-by-side
Showing with 191 additions and 121 deletions
qianjiang/main/MCU_Core_Protocol.c
View file @ 6cb28612
#include "MCU_Core_Protocol.h"
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "Protocol_User.h"
#include "gatts_table_creat_demo.h"
void Uart_ID10_process(void)
{
if(1)
{
uint8_t ID10[2] = {0xFF,0xFF};
Protocol_Send(0x10,ID10,2);
uint8_t ID10[2] = {0x00,0x01};
Protocol_Send(0x21,ID10,2);
}
else
{
uint8_t ID10[2] = {0x01,0x01};
uint8_t ID10[2] = {0x00,0x01};
Protocol_Send(0x10,ID10,2);
}
}
void Uart_ID01_process(void)
{
uint8_t ID01[6] = {0x00,0x00,0x00,0x00,0x00,0x00};
if(1/*正在导航*/)
{
ID01[0] = 0x33;
}
else
{
ID01[0] = 0x35;//或者直接将收到的蓝牙值赋值过来
}
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);
}
void Uart_ID12_process(void)
{
uint8_t ID12[2] = {0x00,0x00};
ID12[1] = ble_status;
Protocol_Send(0x12,ID12,2);
}
void Uart_ID20_process(void)
{
//开始正式通信
}
unsigned char ID21_num = 0;
void Uart_ID21_process(void)//底板给ESP32发
{
if (1)
{
ID21_num++;
}
printf("ID21 IS %d!!!\r\n",ID21_num);
}
void MCU_T_32(void)
{
printf("MCU_T_32!!\r\n");
Protocol_Service();
if(ID21_num >= 5)
{
ID21_num = 0;
//ESP32需要升级
}
}
qianjiang/main/MCU_Core_Protocol.h
View file @ 6cb28612
#ifndef _MCU_CORE_PROTOCOL_H_
#define _MCU_CORE_PROTOCOL_H_
typedef union
{
unsigned char data[9];
struct
{
unsigned char hear_1;
unsigned char hear_2;
unsigned char length;
unsigned char counter;
unsigned char Uart_ID;
unsigned char data_content;
unsigned char crc_hight;
unsigned char crc_low;
unsigned char end_bit;
}data_uart;
}_Uart_Data;
extern void Uart_ID10_process(void);
extern void Uart_ID01_process(void);
extern void Uart_ID12_process(void);
extern void Uart_ID21_process(void);
extern void Uart_ID20_process(void);
extern void MCU_T_32(void);
#endif
qianjiang/main/Protocol_Lib.c
View file @ 6cb28612
......@@ -11,6 +11,7 @@
#include <stdio.h>
#include <string.h>
#include "Protocol_CRC16.h"
#include "gatts_table_creat_demo.h"
static UARTOpen UARTOpen_Cbk;
static UARTSend UARTSend_Cbk;
static UARTRead UARTRead_Cbk;
......
qianjiang/main/Protocol_User.c
View file @ 6cb28612
......@@ -24,6 +24,7 @@
#include "string.h"
#include "driver/gpio.h"
#include "MCU_Core_Protocol.h"
#include "Protocol_Lib.h"
#define UART_TX_MAX_DEPTH 1024UL //(2 * 1024UL) // 4K
#define UART_RX_MAX_DEPTH (2 * 1024UL) // 4K
......@@ -71,8 +72,30 @@ void Protocol_KL30_Wakeup_Init(void)
Protocol_Init(mDataBufPtr, UART_DATA_BUF_LEN, &pFunc);
}
void Send_UartID(Protocol_uint8_t ID)
{
switch (ID)
{
case BLE_START_STA:
Uart_ID10_process();
break;
case BLE_NAVIGATION:
Uart_ID01_process();
break;
case BLE_STA:
Uart_ID12_process();
break;
default:
break;
}
}
void Protocol_Send_Service(void)
{
Protocol_uint8_t ID = BLE_START_STA;
Send_UartID(ID);
Protocol_uint32_t i = 0u;
Protocol_uint32_t DataLen = 0u;
Protocol_uint32_t SendLen = 0u;
......@@ -114,8 +137,8 @@ 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]);
sendData(TX_TASK_TAG, (const char*)UsartDataBuf);
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);
}
......@@ -202,26 +225,41 @@ static Protocol_uint32_t Protocol_UartSend(const Protocol_uint8_t *pData, Protoc
return 0;
}
uint8_t Ble_connect_flag = 0;
static void Protocol_UartHandle(const Protocol_Data_t *pData)
{
if ( pData->CmdID == 10 )
printf("ProcParse success22222222222!!\r\n");
Ble_connect_flag = 0;
if ( pData->CmdID == BLE_START_STA )
{
Uart_ID10_process();
//Core_Startup_Handle(pData->PowerSts); //数据位使用不当，原电源位，现未使用，看情况是否更改
Uart_ID10_process();//TX
}
else if ( pData->CmdID == 1 )
else if ( pData->CmdID == MCU_REPLY )
{
// Core_Heart_Handle(pData->Data, pData->DataLen);1
// SOC_HeartBeat();
Uart_ID20_process();
Ble_connect_flag = 1;
}
else if(pData->CmdID == 1 )
else if(pData->CmdID == BLE_NAVIGATION )
{
// Core_OTA_PDU_REC(pData->Data, pData->DataLen);//收到有效PDU，拼接01 FF 02 [PDU]
// OTA_IC_To_Master( pData->DataLen);//CAN发送出去
Uart_ID01_process();//TX
}
else if(pData->CmdID == 1 )
else if(pData->CmdID == BLE_WEATHER )
{
/// Core_OTA_PDU_RESPON(pData->Data, pData->DataLen);//确认应答并终止重发机制
}
else if(pData->CmdID == BLE_LOCATION )
{
}
else if(pData->CmdID == BLE_STA )
{
Uart_ID12_process();//TX
}
else if(pData->CmdID == MCU_TO_BLE_INFO )
{
printf("ID21 IS in!!!\r\n");
Uart_ID21_process();//RX
}
else
{
......@@ -231,19 +269,19 @@ static void Protocol_UartHandle(const Protocol_Data_t *pData)
void UART_Put(Protocol_uint16_t Data)
{
// Protocol_uint32_t nextPos = 0u;
//
// nextPos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH;
//
// if ( nextPos == UARTRxBuf.read_pos )
// {
// //队列已满，无法插入队列
// }
// else
// {
// UARTRxBuf.Rx_Buffer [ UARTRxBuf.write_pos ] = Data;
// UARTRxBuf.write_pos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH;
// }
Protocol_uint32_t nextPos = 0u;
nextPos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH;
if ( nextPos == UARTRxBuf.read_pos )
{
//队列已满，无法插入队列
}
else
{
UARTRxBuf.Rx_Buffer [ UARTRxBuf.write_pos ] = Data;
UARTRxBuf.write_pos = (UARTRxBuf.write_pos + 1) % UART_RX_MAX_DEPTH;
}
printf("into UARTRxBuf!!!!\r\n");
return;
}
qianjiang/main/Protocol_User.h
View file @ 6cb28612
......@@ -4,7 +4,13 @@
#include "Protocol_Lib.h"
#define BLE_START_STA 0x10
#define MCU_REPLY 0x20
#define BLE_NAVIGATION 0x01
#define BLE_WEATHER 0x02
#define BLE_LOCATION 0x03
#define BLE_STA 0x12
#define MCU_TO_BLE_INFO 0x21
void Protocol_KL30_Wakeup_Init(void);
......
qianjiang/main/gatts_table_creat_demo.c
View file @ 6cb28612
......@@ -44,6 +44,7 @@
#include "Protocol_CRC16.h"
#include "Protocol_Lib.h"
#include "Protocol_User.h"
#include "MCU_Core_Protocol.h"
typedef unsigned char uint8_t;
......@@ -54,6 +55,15 @@ static const int RX_BUF_SIZE = 1024;
#define TXD_PIN (GPIO_NUM_22)
#define RXD_PIN (GPIO_NUM_26)
typedef struct
{
uint16_t Rxlen;
uint8_t Rxbuff[255];
} _QJ_UART_Ctrl;
_QJ_UART_Ctrl QJ_UARTRX;
uint8_t ble_status;
void init_U(void) {
const uart_config_t uart_config = {
.baud_rate = 115200,
......@@ -69,11 +79,11 @@ void init_U(void) {
uart_set_pin(UART_NUM_1, TXD_PIN, RXD_PIN, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
}
int sendData(const char* logName, const char* data)
int sendData(const char* logName, const char* data , unsigned int len)
{
const int len = strlen(data);
// const int len = strlen(data);
const int txBytes = uart_write_bytes(UART_NUM_1, data, len);
// ESP_LOGI(logName, "Wrote %d bytes", txBytes);
ESP_LOGI(logName, "Wrote %d bytes", txBytes);
return txBytes;
}
......@@ -95,12 +105,24 @@ static void rx_task(void *arg)
esp_log_level_set(RX_TASK_TAG, ESP_LOG_INFO);
uint8_t* data = (uint8_t*) malloc(RX_BUF_SIZE+1);
while (1) {
const int rxBytes = uart_read_bytes(UART_NUM_1, data, RX_BUF_SIZE, 1000 / portTICK_PERIOD_MS);
const int rxBytes = uart_read_bytes(UART_NUM_1, data, RX_BUF_SIZE, 10 / portTICK_PERIOD_MS);
if (rxBytes < 255)
{
QJ_UARTRX.Rxlen = rxBytes;
printf("CPY!!\r\n");
memcpy(QJ_UARTRX.Rxbuff, data, rxBytes);
}
for (uint16_t i = 0; i < QJ_UARTRX.Rxlen; i++)
{
UART_Put(QJ_UARTRX.Rxbuff[i]);
}
if (rxBytes > 0) {
data[rxBytes] = 0;
ESP_LOGI(RX_TASK_TAG, "Read %d bytes: '%s'", rxBytes, data);
ESP_LOG_BUFFER_HEXDUMP(RX_TASK_TAG, data, rxBytes, ESP_LOG_INFO);
}
MCU_T_32();
}
free(data);
}
......@@ -647,12 +669,12 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_
conn_params.timeout = 400; // timeout = 400*10ms = 4000ms
//start sent the update connection parameters to the peer device.
esp_ble_gap_update_conn_params(&conn_params);
flag_u = 1;
ble_status = 1;
break;
case ESP_GATTS_DISCONNECT_EVT:
ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_DISCONNECT_EVT, reason = 0x%x", param->disconnect.reason);
esp_ble_gap_start_advertising(&adv_params);
flag_u = 0;
ble_status = 0;
break;
case ESP_GATTS_CREAT_ATTR_TAB_EVT:{
if(create_tab1 == false) {
......
qianjiang/main/gatts_table_creat_demo.h
View file @ 6cb28612
......@@ -33,3 +33,7 @@ enum
HRS_IDX_NB2,
};
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/sdkconfig
View file @ 6cb28612
......@@ -53,14 +53,13 @@ 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_MAX_REGION_SIZE=64
CONFIG_SOC_CPU_WATCHPOINT_SIZE=64
CONFIG_SOC_DAC_PERIPH_NUM=2
CONFIG_SOC_DAC_RESOLUTION=8
CONFIG_SOC_GPIO_PORT=1
......@@ -218,14 +217,6 @@ 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
......@@ -240,6 +231,7 @@ 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
#
......@@ -433,12 +425,8 @@ 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
......@@ -624,13 +612,10 @@ 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
#
......@@ -765,7 +750,6 @@ 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
......@@ -845,7 +829,6 @@ 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
......@@ -941,12 +924,11 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
# Sleep Config
#
# CONFIG_ESP_SLEEP_POWER_DOWN_FLASH 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_FLASH_LEAKAGE_WORKAROUND=y
# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
# end of Sleep Config
#
......@@ -997,7 +979,6 @@ 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
......@@ -1145,10 +1126,6 @@ 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
......@@ -1170,8 +1147,6 @@ 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
#
......@@ -1332,7 +1307,6 @@ 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
......@@ -1346,7 +1320,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
......@@ -1399,8 +1372,6 @@ 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
......@@ -1431,8 +1402,6 @@ 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
#
......@@ -1458,14 +1427,6 @@ 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
#
......@@ -1528,7 +1489,6 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
# CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
# CONFIG_MBEDTLS_CMAC_C is not set
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
......@@ -1609,12 +1569,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
#
......@@ -1690,27 +1650,6 @@ 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
#
......@@ -1730,6 +1669,13 @@ 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
#
......@@ -1858,6 +1804,7 @@ 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment