提交 78f2c6f3 编写于 作者: M me-no-dev

update IDF libs

上级 ada57f36
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
#define CONFIG_ULP_COPROC_ENABLED 1 #define CONFIG_ULP_COPROC_ENABLED 1
#define CONFIG_DMA_RX_BUF_NUM 10 #define CONFIG_DMA_RX_BUF_NUM 10
#define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1 #define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1
#define CONFIG_TCP_SYNMAXRTX 6
#define CONFIG_PYTHON "python" #define CONFIG_PYTHON "python"
#define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1 #define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1
#define CONFIG_ESPTOOLPY_COMPRESSED 1 #define CONFIG_ESPTOOLPY_COMPRESSED 1
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
#define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200 #define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
#define CONFIG_ENABLE_ARDUINO_DEPENDS 1 #define CONFIG_ENABLE_ARDUINO_DEPENDS 1
#define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1 #define CONFIG_ESP32_DEFAULT_CPU_FREQ_240 1
#define CONFIG_TCP_MAXRTX 12
#define CONFIG_ESPTOOLPY_AFTER "hard_reset" #define CONFIG_ESPTOOLPY_AFTER "hard_reset"
#define CONFIG_LWIP_SO_REUSE 1 #define CONFIG_LWIP_SO_REUSE 1
#define CONFIG_DMA_TX_BUF_NUM 10 #define CONFIG_DMA_TX_BUF_NUM 10
...@@ -83,6 +85,6 @@ ...@@ -83,6 +85,6 @@
#define CONFIG_LWIP_SO_RCVBUF 1 #define CONFIG_LWIP_SO_RCVBUF 1
#define CONFIG_MBEDTLS_HARDWARE_MPI 1 #define CONFIG_MBEDTLS_HARDWARE_MPI 1
#define CONFIG_MONITOR_BAUD_OTHER_VAL 115200 #define CONFIG_MONITOR_BAUD_OTHER_VAL 115200
#define CONFIG_ESPTOOLPY_PORT "/dev/cu.usbserial-0040121AB" #define CONFIG_ESPTOOLPY_PORT "/dev/cu.usbserial-0030121AB"
#define CONFIG_ESP32_PANIC_PRINT_HALT 1 #define CONFIG_ESP32_PANIC_PRINT_HALT 1
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1 #define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
...@@ -124,7 +124,12 @@ esp_err_t system_efuse_read_mac(uint8_t mac[6]) __attribute__ ((deprecated)); ...@@ -124,7 +124,12 @@ esp_err_t system_efuse_read_mac(uint8_t mac[6]) __attribute__ ((deprecated));
*/ */
const char* system_get_sdk_version(void) __attribute__ ((deprecated)); const char* system_get_sdk_version(void) __attribute__ ((deprecated));
/**
* Get IDF version
*
* @return constant string from IDF_VER
*/
const char* esp_get_idf_version(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
......
...@@ -90,10 +90,6 @@ ...@@ -90,10 +90,6 @@
#define XT_TIMER_INDEX 0 #define XT_TIMER_INDEX 0
#elif CONFIG_FREERTOS_CORETIMER_1 #elif CONFIG_FREERTOS_CORETIMER_1
#define XT_TIMER_INDEX 1 #define XT_TIMER_INDEX 1
#elif CONFIG_FREERTOS_CORETIMER_2
#define XT_TIMER_INDEX 2
#elif CONFIG_FREERTOS_CORETIMER_3
#define XT_TIMER_INDEX 3
#endif #endif
#define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS #define configNUM_THREAD_LOCAL_STORAGE_POINTERS CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS
......
...@@ -288,12 +288,12 @@ ...@@ -288,12 +288,12 @@
/** /**
* TCP_MAXRTX: Maximum number of retransmissions of data segments. * TCP_MAXRTX: Maximum number of retransmissions of data segments.
*/ */
#define TCP_MAXRTX 12 //(*(volatile uint32*)0x600011E8) #define TCP_MAXRTX CONFIG_TCP_MAXRTX
/** /**
* TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments. * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
*/ */
#define TCP_SYNMAXRTX 6 //(*(volatile uint32*)0x600011E4) #define TCP_SYNMAXRTX CONFIG_TCP_SYNMAXRTX
/** /**
* TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb. * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
......
...@@ -288,12 +288,12 @@ ...@@ -288,12 +288,12 @@
/** /**
* TCP_MAXRTX: Maximum number of retransmissions of data segments. * TCP_MAXRTX: Maximum number of retransmissions of data segments.
*/ */
#define TCP_MAXRTX 12 //(*(volatile uint32*)0x600011E8) #define TCP_MAXRTX CONFIG_TCP_MAXRTX
/** /**
* TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments. * TCP_SYNMAXRTX: Maximum number of retransmissions of SYN segments.
*/ */
#define TCP_SYNMAXRTX 6 //(*(volatile uint32*)0x600011E4) #define TCP_SYNMAXRTX CONFIG_TCP_SYNMAXRTX
/** /**
* TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb. * TCP_LISTEN_BACKLOG: Enable the backlog option for tcp listen pcb.
......
...@@ -11,7 +11,7 @@ extern "C" { ...@@ -11,7 +11,7 @@ extern "C" {
#undef assert #undef assert
#ifdef NDEBUG /* required by ANSI standard */ #ifdef NDEBUG /* required by ANSI standard */
# define assert(__e) ((void)0) # define assert(__e) ((void) sizeof(__e))
#else #else
# define assert(__e) ((__e) ? (void)0 : __assert_func (__FILE__, __LINE__, \ # define assert(__e) ((__e) ? (void)0 : __assert_func (__FILE__, __LINE__, \
__ASSERT_FUNC, #__e)) __ASSERT_FUNC, #__e))
......
...@@ -84,6 +84,7 @@ SECTIONS ...@@ -84,6 +84,7 @@ SECTIONS
*librtc.a:(.literal .text .literal.* .text.*) *librtc.a:(.literal .text .literal.* .text.*)
*libpp.a:(.literal .text .literal.* .text.*) *libpp.a:(.literal .text .literal.* .text.*)
*libhal.a:(.literal .text .literal.* .text.*) *libhal.a:(.literal .text .literal.* .text.*)
*libcoexist.a:(.literal .text .literal.* .text.*)
_iram_text_end = ABSOLUTE(.); _iram_text_end = ABSOLUTE(.);
} > iram0_0_seg } > iram0_0_seg
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册