From 2dc4961063ba73aabc9335dfe91e7a22e3ef4e05 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Fri, 9 Jul 2021 11:12:13 +0530 Subject: [PATCH 1/2] Nimble: Add fix for crash in esp_timer deletion Added change in nimble submodule to handle crash in case of non-started timer is attempted to be deleted. --- components/bt/host/nimble/nimble | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/host/nimble/nimble b/components/bt/host/nimble/nimble index a90d8e46b8..aef55bbf63 160000 --- a/components/bt/host/nimble/nimble +++ b/components/bt/host/nimble/nimble @@ -1 +1 @@ -Subproject commit a90d8e46b87ea026182b97d8311dafc15c577714 +Subproject commit aef55bbf636ed580d4d6408a5c2e75d1f70a875e From 758fc73efef0ecab60e9c428ee786aed748f6332 Mon Sep 17 00:00:00 2001 From: Rahul Tank Date: Mon, 12 Jul 2021 10:36:57 +0530 Subject: [PATCH 2/2] system : Add defination of ESP_ERROR_CHECK_WITHOUT_ABORT under CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT flag --- components/esp_common/include/esp_err.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_common/include/esp_err.h b/components/esp_common/include/esp_err.h index 28f98c9207..af1f2d6d34 100644 --- a/components/esp_common/include/esp_err.h +++ b/components/esp_common/include/esp_err.h @@ -129,7 +129,7 @@ void _esp_error_check_failed_without_abort(esp_err_t rc, const char *file, int l * serial output. * In comparison with ESP_ERROR_CHECK(), this prints the same error message but isn't terminating the program. */ -#ifdef NDEBUG +#if defined NDEBUG || defined CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT #define ESP_ERROR_CHECK_WITHOUT_ABORT(x) ({ \ esp_err_t __err_rc = (x); \ __err_rc; \