diff --git a/components/app_trace/sys_view/esp/SEGGER_RTT_esp.c b/components/app_trace/sys_view/esp/SEGGER_RTT_esp.c index f6b46d6dfe..a2098d38a2 100644 --- a/components/app_trace/sys_view/esp/SEGGER_RTT_esp.c +++ b/components/app_trace/sys_view/esp/SEGGER_RTT_esp.c @@ -72,13 +72,13 @@ void SEGGER_RTT_ESP_FlushNoLock(unsigned long min_sz, unsigned long tmo) if (s_events_buf_filled > 0) { res = esp_apptrace_write(ESP_APPTRACE_DEST_SYSVIEW, s_events_buf, s_events_buf_filled, tmo); if (res != ESP_OK) { - ESP_LOGE(TAG, "Failed to flush buffered events (%d)!\n", res); + ESP_LOGE(TAG, "Failed to flush buffered events (%d)!", res); } } // flush even if we failed to write buffered events, because no new events will be sent after STOP res = esp_apptrace_flush_nolock(ESP_APPTRACE_DEST_SYSVIEW, min_sz, tmo); if (res != ESP_OK) { - ESP_LOGE(TAG, "Failed to flush apptrace data (%d)!\n", res); + ESP_LOGE(TAG, "Failed to flush apptrace data (%d)!", res); } s_events_buf_filled = 0; } diff --git a/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c b/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c index d6f650d1f8..71f499351c 100644 --- a/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c +++ b/components/bootloader_support/src/esp32s3/bootloader_esp32s3.c @@ -78,7 +78,7 @@ static void wdt_reset_info_dump(int cpu) lsaddr = REG_READ(ASSIST_DEBUG_CORE_1_RCD_PDEBUGLS0ADDR_REG); lsdata = REG_READ(ASSIST_DEBUG_CORE_1_RCD_PDEBUGLS0DATA_REG); #else - ESP_LOGE(TAG, "WDT reset info: %s CPU not support!\n", cpu_name); + ESP_LOGE(TAG, "WDT reset info: %s CPU not support!", cpu_name); return; #endif } diff --git a/components/bootloader_support/src/secure_boot_v2/secure_boot_rsa_signature.c b/components/bootloader_support/src/secure_boot_v2/secure_boot_rsa_signature.c index 5da355d289..f2f3bc916e 100644 --- a/components/bootloader_support/src/secure_boot_v2/secure_boot_rsa_signature.c +++ b/components/bootloader_support/src/secure_boot_v2/secure_boot_rsa_signature.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -41,7 +41,7 @@ esp_err_t verify_rsa_signature_block(const ets_secure_boot_signature_t *sig_bloc mbedtls_ctr_drbg_init(&ctr_drbg); ret = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, NULL, 0); if (ret != 0) { - ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned -0x%04x\n", ret); + ESP_LOGE(TAG, "mbedtls_ctr_drbg_seed returned -0x%04x", ret); goto exit_outer; } diff --git a/components/bt/common/btc/profile/esp/blufi/nimble_host/esp_blufi.c b/components/bt/common/btc/profile/esp/blufi/nimble_host/esp_blufi.c index 82c49c8b66..67a83951f0 100644 --- a/components/bt/common/btc/profile/esp/blufi/nimble_host/esp_blufi.c +++ b/components/bt/common/btc/profile/esp/blufi/nimble_host/esp_blufi.c @@ -82,7 +82,7 @@ void esp_blufi_gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *a char buf[BLE_UUID_STR_LEN]; switch (ctxt->op) { case BLE_GATT_REGISTER_OP_SVC: - ESP_LOGI(TAG, "registered service %s with handle=%d\n", + ESP_LOGI(TAG, "registered service %s with handle=%d", ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), ctxt->svc.handle); break; @@ -96,7 +96,7 @@ void esp_blufi_gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *a break; case BLE_GATT_REGISTER_OP_DSC: - ESP_LOGI(TAG, "registering descriptor %s with handle=%d\n", + ESP_LOGI(TAG, "registering descriptor %s with handle=%d", ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), ctxt->dsc.handle); break; @@ -245,7 +245,7 @@ esp_blufi_gap_event(struct ble_gap_event *event, void *arg) switch (event->type) { case BLE_GAP_EVENT_CONNECT: /* A new connection was established or a connection attempt failed. */ - ESP_LOGI(TAG, "connection %s; status=%d\n", + ESP_LOGI(TAG, "connection %s; status=%d", event->connect.status == 0 ? "established" : "failed", event->connect.status); if (event->connect.status == 0) { @@ -273,7 +273,7 @@ esp_blufi_gap_event(struct ble_gap_event *event, void *arg) } return 0; case BLE_GAP_EVENT_DISCONNECT: - ESP_LOGI(TAG, "disconnect; reason=%d\n", event->disconnect.reason); + ESP_LOGI(TAG, "disconnect; reason=%d", event->disconnect.reason); memcpy(blufi_env.remote_bda, event->disconnect.conn.peer_id_addr.val, ESP_BLUFI_BD_ADDR_LEN); blufi_env.is_connected = false; blufi_env.recv_seq = blufi_env.send_seq = 0; @@ -297,7 +297,7 @@ esp_blufi_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_CONN_UPDATE: /* The central has updated the connection parameters. */ - ESP_LOGI(TAG, "connection updated; status=%d\n", + ESP_LOGI(TAG, "connection updated; status=%d", event->conn_update.status); return 0; @@ -320,7 +320,7 @@ esp_blufi_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_MTU: - ESP_LOGI(TAG, "mtu update event; conn_handle=%d cid=%d mtu=%d\n", + ESP_LOGI(TAG, "mtu update event; conn_handle=%d cid=%d mtu=%d", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value); @@ -390,7 +390,7 @@ void esp_blufi_adv_start(void) fields.uuids16_is_complete = 1; rc = ble_gap_adv_set_fields(&fields); if (rc != 0) { - ESP_LOGE(TAG, "error setting advertisement data; rc=%d\n", rc); + ESP_LOGE(TAG, "error setting advertisement data; rc=%d", rc); return; } @@ -401,7 +401,7 @@ void esp_blufi_adv_start(void) rc = ble_gap_adv_start(own_addr_type, NULL, BLE_HS_FOREVER, &adv_params, esp_blufi_gap_event, NULL); if (rc != 0) { - ESP_LOGE(TAG, "error enabling advertisement; rc=%d\n", rc); + ESP_LOGE(TAG, "error enabling advertisement; rc=%d", rc); return; } } diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index f74cc613c6..87f250a9b6 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -459,7 +459,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg) } esp_err_t err = esp_timer_start_once(s_ble_sleep_timer, us_to_sleep - BTDM_MIN_TIMER_UNCERTAINTY_US); if (err != ESP_OK) { - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed"); return; } } @@ -501,7 +501,7 @@ esp_err_t controller_sleep_init(void) { esp_err_t rc = 0; #ifdef CONFIG_BT_LE_SLEEP_ENABLE - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled"); r_ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0, 500 + BLE_RTC_DELAY_US); #ifdef CONFIG_PM_ENABLE diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c index db9c2fbf1c..e9cc1c5776 100644 --- a/components/bt/controller/esp32c3/bt.c +++ b/components/bt/controller/esp32c3/bt.c @@ -656,7 +656,7 @@ static void *malloc_internal_wrapper(size_t size) static int IRAM_ATTR read_mac_wrapper(uint8_t mac[6]) { int ret = esp_read_mac(mac, ESP_MAC_BT); - ESP_LOGI(BT_LOG_TAG, "Bluetooth MAC: %02x:%02x:%02x:%02x:%02x:%02x\n", + ESP_LOGI(BT_LOG_TAG, "Bluetooth MAC: %02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); return ret; diff --git a/components/bt/controller/esp32c6/bt.c b/components/bt/controller/esp32c6/bt.c index fe3565ee71..ca338f7781 100644 --- a/components/bt/controller/esp32c6/bt.c +++ b/components/bt/controller/esp32c6/bt.c @@ -449,7 +449,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg) esp_err_t err = esp_timer_start_once(s_ble_sleep_timer, us_to_sleep - BTDM_MIN_TIMER_UNCERTAINTY_US); if (err != ESP_OK) { - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed"); return; } } @@ -495,7 +495,7 @@ esp_err_t controller_sleep_init(void) esp_err_t rc = 0; #ifdef CONFIG_BT_LE_SLEEP_ENABLE - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled"); ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0, 500 + BLE_RTC_DELAY_US); diff --git a/components/bt/controller/esp32h2/bt.c b/components/bt/controller/esp32h2/bt.c index 9d7fcc6a30..70645bf393 100644 --- a/components/bt/controller/esp32h2/bt.c +++ b/components/bt/controller/esp32h2/bt.c @@ -449,7 +449,7 @@ IRAM_ATTR void controller_sleep_cb(uint32_t enable_tick, void *arg) esp_err_t err = esp_timer_start_once(s_ble_sleep_timer, us_to_sleep - BTDM_MIN_TIMER_UNCERTAINTY_US); if (err != ESP_OK) { - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ESP timer start failed"); return; } } @@ -495,7 +495,7 @@ esp_err_t controller_sleep_init(void) esp_err_t rc = 0; #ifdef CONFIG_BT_LE_SLEEP_ENABLE - ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled\n"); + ESP_LOGW(NIMBLE_PORT_LOG_TAG, "BLE modem sleep is enabled"); ble_lll_rfmgmt_set_sleep_cb(controller_sleep_cb, controller_wakeup_cb, 0, 0, 500 + BLE_RTC_DELAY_US); diff --git a/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c b/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c index 4196ba4f2e..de7ec9ffce 100644 --- a/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c +++ b/components/bt/host/nimble/esp-hci/src/esp_nimble_hci.c @@ -151,7 +151,7 @@ static void ble_hci_rx_acl(uint8_t *data, uint16_t len) m = ble_transport_alloc_acl_from_ll(); if (!m) { - ESP_LOGD(TAG,"Failed to allocate buffer, retrying \n"); + ESP_LOGD(TAG,"Failed to allocate buffer, retrying "); /* Give some time to free buffer and try again */ vTaskDelay(1); } diff --git a/components/cxx/test_apps/general/main/test_cxx_general.cpp b/components/cxx/test_apps/general/main/test_cxx_general.cpp index eb1a544775..b170bdaf63 100644 --- a/components/cxx/test_apps/general/main/test_cxx_general.cpp +++ b/components/cxx/test_apps/general/main/test_cxx_general.cpp @@ -63,20 +63,20 @@ class SlowInit { public: SlowInit(int arg) { - ESP_LOGD(TAG, "init obj=%d start, arg=%d\n", obj, arg); + ESP_LOGD(TAG, "init obj=%d start, arg=%d", obj, arg); vTaskDelay(300/portTICK_PERIOD_MS); TEST_ASSERT_EQUAL(-1, mInitBy); TEST_ASSERT_EQUAL(0, mInitCount); mInitBy = arg; ++mInitCount; - ESP_LOGD(TAG, "init obj=%d done\n", obj); + ESP_LOGD(TAG, "init obj=%d done", obj); } static void task(void* arg) { int taskId = reinterpret_cast(arg); - ESP_LOGD(TAG, "obj=%d before static init, task=%d\n", obj, taskId); + ESP_LOGD(TAG, "obj=%d before static init, task=%d", obj, taskId); static SlowInit slowinit(taskId); - ESP_LOGD(TAG, "obj=%d after static init, task=%d\n", obj, taskId); + ESP_LOGD(TAG, "obj=%d after static init, task=%d", obj, taskId); xSemaphoreGive(s_slow_init_sem); vTaskDelete(NULL); } diff --git a/components/driver/dac/dac_continuous.c b/components/driver/dac/dac_continuous.c index 09b25d2136..ac5f581e83 100644 --- a/components/driver/dac/dac_continuous.c +++ b/components/driver/dac/dac_continuous.c @@ -134,7 +134,7 @@ static esp_err_t s_dac_alloc_dma_desc(dac_continuous_handle_t handle) /* Allocate DMA descriptor */ handle->desc[cnt] = &descs[cnt]; ESP_GOTO_ON_FALSE(handle->desc[cnt], ESP_ERR_NO_MEM, err, TAG, "failed to allocate dma descriptor"); - ESP_LOGD(TAG, "desc[%d] %p\n", cnt, handle->desc[cnt]); + ESP_LOGD(TAG, "desc[%d] %p", cnt, handle->desc[cnt]); /* Allocate DMA buffer */ handle->bufs[cnt] = (uint8_t *) heap_caps_calloc(1, handle->cfg.buf_size, DAC_DMA_ALLOC_CAPS); ESP_GOTO_ON_FALSE(handle->bufs[cnt], ESP_ERR_NO_MEM, err, TAG, "failed to allocate dma buffer"); diff --git a/components/driver/deprecated/adc_i2s_deprecated.c b/components/driver/deprecated/adc_i2s_deprecated.c index b6fbaf6b27..0e7a6f84d5 100644 --- a/components/driver/deprecated/adc_i2s_deprecated.c +++ b/components/driver/deprecated/adc_i2s_deprecated.c @@ -28,7 +28,7 @@ static __attribute__((unused)) const char *ADC_TAG = "ADC"; #define ADC_CHECK_RET(fun_ret) ({ \ if (fun_ret != ESP_OK) { \ - ESP_LOGE(ADC_TAG,"%s:%d\n",__FUNCTION__,__LINE__); \ + ESP_LOGE(ADC_TAG,"%s:%d",__FUNCTION__,__LINE__); \ return ESP_FAIL; \ } \ }) diff --git a/components/driver/ledc/ledc.c b/components/driver/ledc/ledc.c index 15b5f96a3a..737e5c3241 100644 --- a/components/driver/ledc/ledc.c +++ b/components/driver/ledc/ledc.c @@ -347,7 +347,7 @@ static inline uint32_t ledc_auto_global_clk_divisor(int freq_hz, uint32_t precis /* Before calculating the divisor, we need to have the RC_FAST frequency. * If it hasn't been measured yet, try calibrating it now. */ if (s_glb_clks[i] == LEDC_SLOW_CLK_RC_FAST && s_ledc_slow_clk_rc_fast_freq == 0 && !ledc_slow_clk_calibrate()) { - ESP_LOGD(LEDC_TAG, "Unable to retrieve RC_FAST clock frequency, skipping it\n"); + ESP_LOGD(LEDC_TAG, "Unable to retrieve RC_FAST clock frequency, skipping it"); continue; } @@ -1069,7 +1069,7 @@ static esp_err_t _ledc_set_fade_with_step(ledc_mode_t speed_mode, ledc_channel_t portENTER_CRITICAL(&ledc_spinlock); ledc_duty_config(speed_mode, channel, LEDC_VAL_NO_CHANGE, duty_cur, dir, step_num, cycle_num, scale); portEXIT_CRITICAL(&ledc_spinlock); - ESP_LOGD(LEDC_TAG, "cur duty: %"PRIu32"; target: %"PRIu32", step: %d, cycle: %d; scale: %d; dir: %d\n", + ESP_LOGD(LEDC_TAG, "cur duty: %"PRIu32"; target: %"PRIu32", step: %d, cycle: %d; scale: %d; dir: %d", duty_cur, target_duty, step_num, cycle_num, scale, dir); } else { portENTER_CRITICAL(&ledc_spinlock); diff --git a/components/driver/test_apps/i2s_test_apps/i2s_tdm/main/test_i2s_tdm_full_duplex.c b/components/driver/test_apps/i2s_test_apps/i2s_tdm/main/test_i2s_tdm_full_duplex.c index 28a8a7124b..3af9830e49 100644 --- a/components/driver/test_apps/i2s_test_apps/i2s_tdm/main/test_i2s_tdm_full_duplex.c +++ b/components/driver/test_apps/i2s_test_apps/i2s_tdm/main/test_i2s_tdm_full_duplex.c @@ -160,7 +160,7 @@ static void test_i2s_tdm_master(uint32_t sample_rate, i2s_data_bit_width_t bit_w is_start = true; } } else if (is_start) { - ESP_LOGE(TAG, "Failed at index: %d real: %"PRIu32" expect: %"PRIu32"\n", i, rx_buffer[i], count); + ESP_LOGE(TAG, "Failed at index: %d real: %" PRIu32 " expect: %" PRIu32, i, rx_buffer[i], count); is_start = false; count = 1; fail_cnt++; diff --git a/components/driver/test_apps/legacy_adc_driver/main/test_legacy_adc.c b/components/driver/test_apps/legacy_adc_driver/main/test_legacy_adc.c index c1ff8d66f7..455ec7c5d0 100644 --- a/components/driver/test_apps/legacy_adc_driver/main/test_legacy_adc.c +++ b/components/driver/test_apps/legacy_adc_driver/main/test_legacy_adc.c @@ -118,23 +118,23 @@ TEST_CASE("Legacy ADC oneshot high/low test", "[legacy_adc_oneshot]") test_adc_set_io_level(ADC_UNIT_1, (adc1_channel_t)ADC1_TEST_CHAN0, 0); adc_raw = adc1_get_raw(ADC1_TEST_CHAN0); - ESP_LOGI(TAG, "ADC%d Channel %d raw: %d\n", ADC_UNIT_1, ADC1_TEST_CHAN0, adc_raw); + ESP_LOGI(TAG, "ADC%d Channel %d raw: %d", ADC_UNIT_1, ADC1_TEST_CHAN0, adc_raw); TEST_ASSERT_INT_WITHIN(ADC_TEST_LOW_THRESH, ADC_TEST_LOW_VAL, adc_raw); test_adc_set_io_level(ADC_UNIT_1, (adc1_channel_t)ADC1_TEST_CHAN0, 1); adc_raw = adc1_get_raw(ADC1_TEST_CHAN0); - ESP_LOGI(TAG, "ADC%d Channel %d raw: %d\n", ADC_UNIT_1, ADC1_TEST_CHAN0, adc_raw); + ESP_LOGI(TAG, "ADC%d Channel %d raw: %d", ADC_UNIT_1, ADC1_TEST_CHAN0, adc_raw); TEST_ASSERT_INT_WITHIN(ADC_TEST_HIGH_THRESH, ADC_TEST_HIGH_VAL, adc_raw); #if ADC_TEST_ADC2 test_adc_set_io_level(ADC_UNIT_2, (adc2_channel_t)ADC2_TEST_CHAN0, 0); TEST_ESP_OK(adc2_get_raw(ADC2_TEST_CHAN0, ADC_WIDTH_BIT_DEFAULT, &adc_raw)); - ESP_LOGI(TAG, "ADC%d Channel %d raw: %d\n", ADC_UNIT_2, ADC2_TEST_CHAN0, adc_raw); + ESP_LOGI(TAG, "ADC%d Channel %d raw: %d", ADC_UNIT_2, ADC2_TEST_CHAN0, adc_raw); TEST_ASSERT_INT_WITHIN(ADC_TEST_LOW_THRESH, ADC_TEST_LOW_VAL, adc_raw); test_adc_set_io_level(ADC_UNIT_2, (adc2_channel_t)ADC2_TEST_CHAN0, 1); TEST_ESP_OK(adc2_get_raw(ADC2_TEST_CHAN0, ADC_WIDTH_BIT_DEFAULT, &adc_raw)); - ESP_LOGI(TAG, "ADC%d Channel %d raw: %d\n", ADC_UNIT_2, ADC2_TEST_CHAN0, adc_raw); + ESP_LOGI(TAG, "ADC%d Channel %d raw: %d", ADC_UNIT_2, ADC2_TEST_CHAN0, adc_raw); TEST_ASSERT_INT_WITHIN(ADC_TEST_HIGH_THRESH, ADC_TEST_HIGH_VAL, adc_raw); #endif } diff --git a/components/driver/test_apps/sdio/main/test_sdio.c b/components/driver/test_apps/sdio/main/test_sdio.c index 063bb6ef54..ecd4172119 100644 --- a/components/driver/test_apps/sdio/main/test_sdio.c +++ b/components/driver/test_apps/sdio/main/test_sdio.c @@ -161,14 +161,14 @@ static void init_essl(essl_handle_t *out_handle, const sdio_test_config_t *conf) switch (conf->sdio_mode) { case SDIO_4BIT: - ESP_LOGI(MASTER_TAG, "Probe using SD 4-bit...\n"); + ESP_LOGI(MASTER_TAG, "Probe using SD 4-bit..."); config = (sdmmc_host_t)SDMMC_HOST_DEFAULT(); config.flags = SDMMC_HOST_FLAG_4BIT; config.max_freq_khz = conf->freq; init_sdmmc_host(); break; case SDIO_1BIT: - ESP_LOGI(MASTER_TAG, "Probe using SD 1-bit...\n"); + ESP_LOGI(MASTER_TAG, "Probe using SD 1-bit..."); config = (sdmmc_host_t)SDMMC_HOST_DEFAULT(); config.flags = SDMMC_HOST_FLAG_1BIT; config.max_freq_khz = conf->freq; @@ -199,7 +199,7 @@ static void init_essl(essl_handle_t *out_handle, const sdio_test_config_t *conf) err = sdspi_host_init_device(&device_config, &sdspi_handle); TEST_ESP_OK(err); - ESP_LOGI(MASTER_TAG, "Probe using SPI...\n"); + ESP_LOGI(MASTER_TAG, "Probe using SPI..."); config = (sdmmc_host_t)SDSPI_HOST_DEFAULT(); config.slot = sdspi_handle; diff --git a/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c b/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c index c8da4316d4..67734bcda4 100644 --- a/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c +++ b/components/driver/test_apps/spi/slave_hd/main/test_spi_slave_hd.c @@ -255,7 +255,7 @@ void test_wrdma(testhd_context_t* ctx, const spitest_param_set_t *cfg, spi_devic if (pos+len > TEST_DMA_MAX_SIZE) len = TEST_DMA_MAX_SIZE - pos; int test_seg_size = len;//TEST_SEG_SIZE; - ESP_LOGW("test_wrdma", "len: %d, seg_size: %d\n", len, test_seg_size); + ESP_LOGW("test_wrdma", "len: %d, seg_size: %d", len, test_seg_size); TEST_ESP_OK(essl_spi_wrdma(spi, &ctx->master_wrdma_buf[pos], len, test_seg_size, get_hd_flags())); spi_slave_hd_data_t* ret_trans; @@ -284,7 +284,7 @@ void test_rddma(testhd_context_t* ctx, const spitest_param_set_t* cfg, spi_devic len = ctx->tx_data.len; test_seg_size = TEST_SEG_SIZE; - ESP_LOGW("test_rddma", "pos: %d, len: %d, slave_tx: %d, seg_size: %d\n", data_expected - ctx->slave_rddma_buf, len, ctx->tx_data.len, test_seg_size); + ESP_LOGW("test_rddma", "pos: %d, len: %d, slave_tx: %d, seg_size: %d", data_expected - ctx->slave_rddma_buf, len, ctx->tx_data.len, test_seg_size); TEST_ESP_OK(essl_spi_rddma(spi, ctx->master_rddma_buf, len, test_seg_size, get_hd_flags())); diff --git a/components/driver/test_apps/touch_sensor_v2/main/test_touch_v2.c b/components/driver/test_apps/touch_sensor_v2/main/test_touch_v2.c index 928cb09971..e46e8048db 100644 --- a/components/driver/test_apps/touch_sensor_v2/main/test_touch_v2.c +++ b/components/driver/test_apps/touch_sensor_v2/main/test_touch_v2.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -210,7 +210,7 @@ esp_err_t test_touch_sw_read(void) uint32_t touch_push[TEST_TOUCH_CHANNEL] = {0}; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); TEST_ESP_OK( touch_pad_init() ); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_config(touch_list[i]) ); @@ -273,7 +273,7 @@ esp_err_t test_touch_timer_read(void) uint32_t touch_push[TEST_TOUCH_CHANNEL] = {0}; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); TEST_ESP_OK( touch_pad_init() ); /* Set different slope for channels to test slope function. */ printf("Set slope for channel: "); @@ -340,7 +340,7 @@ esp_err_t test_touch_filtered_read(void) uint32_t touch_value[TEST_TOUCH_CHANNEL] = {0}; uint32_t touch_temp[TEST_TOUCH_CHANNEL] = {0}; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); TEST_ESP_OK( touch_pad_init() ); for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { TEST_ESP_OK( touch_pad_config(touch_list[i]) ); @@ -425,7 +425,7 @@ int test_touch_base_parameter(touch_pad_t pad_num, int meas_time, int slp_time, uint64_t val_sum = 0; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); TEST_ESP_OK( touch_pad_init() ); /* Note: init all channel, but test one channel. */ for (int i = 0; i < TEST_TOUCH_CHANNEL; i++) { @@ -795,7 +795,7 @@ esp_err_t test_touch_interrupt(void) uint32_t touch_value, smooth; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -859,7 +859,7 @@ esp_err_t test_touch_interrupt(void) */ esp_err_t test_touch_scan_done_interrupt(void) { - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); uint32_t touch_value, smooth; int test_cnt = TEST_TOUCH_COUNT_NUM; @@ -927,7 +927,7 @@ esp_err_t test_touch_scan_done_interrupt(void) */ esp_err_t test_touch_timeout_interrupt(void) { - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); uint32_t touch_value, smooth; if (que_touch == NULL) { @@ -1031,7 +1031,7 @@ esp_err_t test_touch_filter_parameter_debounce(int deb_cnt) uint32_t touch_value; int test_cnt = 2; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1095,7 +1095,7 @@ esp_err_t test_touch_filter_parameter_reset(int reset_cnt) { uint32_t touch_value, base_value; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1209,7 +1209,7 @@ esp_err_t test_touch_filter_parameter_jitter(int jitter_step) { uint32_t touch_value, base_value = 0; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1308,8 +1308,8 @@ esp_err_t test_touch_denoise(uint32_t out_val[], uint32_t *denoise_val, touch_pa { uint32_t touch_value; - ESP_LOGI(TAG, " >> %s << \n", __func__); - ESP_LOGI(TAG, "Denoise level (%d), cap level (%d) \n", grade, cap); + ESP_LOGI(TAG, " >> %s <<", __func__); + ESP_LOGI(TAG, "Denoise level (%d), cap level (%d) ", grade, cap); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1423,7 +1423,7 @@ esp_err_t test_touch_waterproof(void) uint32_t touch_value; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1498,7 +1498,7 @@ TEST_CASE("Touch Sensor waterproof guard test", "[touch]") esp_err_t test_touch_proximity(int meas_num) { - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); uint32_t touch_value; if (que_touch == NULL) { @@ -1606,7 +1606,7 @@ esp_err_t test_touch_sleep_reading_stable(touch_pad_t sleep_pad) uint32_t touch_value, smooth, ret_val; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1705,7 +1705,7 @@ uint32_t test_touch_sleep_pad_proximity(touch_pad_t sleep_pad, bool is_proximity uint32_t touch_thres; int test_cnt = TEST_TOUCH_COUNT_NUM; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -1851,7 +1851,7 @@ esp_err_t test_touch_sleep_pad_interrupt_wakeup_deep_sleep(touch_pad_t sleep_pad { uint32_t touch_value, smooth, raw; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ @@ -2012,7 +2012,7 @@ void test_touch_slope_debug(int pad_num) touch_event_t evt; uint32_t touch_value, smooth; - ESP_LOGI(TAG, " >> %s << \n", __func__); + ESP_LOGI(TAG, " >> %s <<", __func__); if (que_touch == NULL) { que_touch = xQueueCreate(TEST_TOUCH_CHANNEL, sizeof(touch_event_t)); /* Should register once. */ diff --git a/components/driver/test_apps/uart/main/test_uart.c b/components/driver/test_apps/uart/main/test_uart.c index e8c1eee187..ccf2fc7ff7 100644 --- a/components/driver/test_apps/uart/main/test_uart.c +++ b/components/driver/test_apps/uart/main/test_uart.c @@ -120,7 +120,7 @@ TEST_CASE("test uart get baud-rate", "[uart]") TEST_ASSERT_UINT32_WITHIN(UART_BAUD_115200 * TOLERANCE, UART_BAUD_115200, baud_rate2); uart_driver_delete(UART_NUM1); - ESP_LOGI(UART_TAG, "get baud-rate test passed ....\n"); + ESP_LOGI(UART_TAG, "get baud-rate test passed ...."); } TEST_CASE("test uart tx data with break", "[uart]") diff --git a/components/esp-tls/esp_tls_mbedtls.c b/components/esp-tls/esp_tls_mbedtls.c index e84173abe9..9168012f45 100644 --- a/components/esp-tls/esp_tls_mbedtls.c +++ b/components/esp-tls/esp_tls_mbedtls.c @@ -76,7 +76,7 @@ esp_err_t esp_create_mbedtls_handle(const char *hostname, size_t hostlen, const #ifdef CONFIG_MBEDTLS_SSL_PROTO_TLS1_3 psa_status_t status = psa_crypto_init(); if (status != PSA_SUCCESS) { - ESP_LOGE(TAG, "Failed to initialize PSA crypto, returned %d\n", (int) status); + ESP_LOGE(TAG, "Failed to initialize PSA crypto, returned %d", (int) status); return esp_ret; } #endif // CONFIG_MBEDTLS_SSL_PROTO_TLS1_3 diff --git a/components/esp-tls/esp_tls_wolfssl.c b/components/esp-tls/esp_tls_wolfssl.c index d4ce3c577f..05c017003c 100644 --- a/components/esp-tls/esp_tls_wolfssl.c +++ b/components/esp-tls/esp_tls_wolfssl.c @@ -265,7 +265,7 @@ static esp_err_t set_client_config(const char *hostname, size_t hostlen, esp_tls return ESP_ERR_WOLFSSL_CERT_VERIFY_SETUP_FAILED; } } else if (cfg->clientcert_buf != NULL || cfg->clientkey_buf != NULL) { - ESP_LOGE(TAG, "You have to provide both clientcert_buf and clientkey_buf for mutual authentication\n\n"); + ESP_LOGE(TAG, "You have to provide both clientcert_buf and clientkey_buf for mutual authentication"); return ESP_FAIL; } diff --git a/components/esp_adc/adc_cali_curve_fitting.c b/components/esp_adc/adc_cali_curve_fitting.c index b401536871..6686ae8c57 100644 --- a/components/esp_adc/adc_cali_curve_fitting.c +++ b/components/esp_adc/adc_cali_curve_fitting.c @@ -180,7 +180,7 @@ static void calc_first_step_coefficients(const adc_calib_info_t *parsed_data, ca { ctx->chars_first_step.coeff_a = coeff_a_scaling * parsed_data->ref_data.ver1.voltage / parsed_data->ref_data.ver1.digi; ctx->chars_first_step.coeff_b = 0; - ESP_LOGV(TAG, "Calib V1, Cal Voltage = %"PRId32", Digi out = %"PRId32", Coef_a = %"PRId32"\n", parsed_data->ref_data.ver1.voltage, parsed_data->ref_data.ver1.digi, ctx->chars_first_step.coeff_a); + ESP_LOGV(TAG, "Calib V1, Cal Voltage = %" PRId32 ", Digi out = %" PRId32 ", Coef_a = %" PRId32, parsed_data->ref_data.ver1.voltage, parsed_data->ref_data.ver1.digi, ctx->chars_first_step.coeff_a); } static void calc_second_step_coefficients(const adc_cali_curve_fitting_config_t *config, cali_chars_curve_fitting_t *ctx) diff --git a/components/esp_adc/deprecated/esp32s2/esp_adc_cal_legacy.c b/components/esp_adc/deprecated/esp32s2/esp_adc_cal_legacy.c index dd007d10a6..e995541c96 100644 --- a/components/esp_adc/deprecated/esp32s2/esp_adc_cal_legacy.c +++ b/components/esp_adc/deprecated/esp32s2/esp_adc_cal_legacy.c @@ -127,14 +127,14 @@ static bool calculate_characterization_coefficients(const adc_calib_parsed_info { switch (parsed_data->version_num) { case 1: - ESP_LOGD(LOG_TAG, "Calib V1, low%dmV, high%dmV\n", parsed_data->efuse_data.ver1.adc_calib_low, parsed_data->efuse_data.ver1.adc_calib_high); + ESP_LOGD(LOG_TAG, "Calib V1, low%dmV, high%dmV", parsed_data->efuse_data.ver1.adc_calib_low, parsed_data->efuse_data.ver1.adc_calib_high); characterize_using_two_point(parsed_data->adc_num, parsed_data->atten_level, parsed_data->efuse_data.ver1.adc_calib_high, parsed_data->efuse_data.ver1.adc_calib_low, &(chars->coeff_a), &(chars->coeff_b)); break; case 2: - ESP_LOGD(LOG_TAG, "Calib V2, volt%dmV\n", parsed_data->efuse_data.ver2.adc_calib_high); + ESP_LOGD(LOG_TAG, "Calib V2, volt%dmV", parsed_data->efuse_data.ver2.adc_calib_high); chars->coeff_a = coeff_a_scaling * parsed_data->efuse_data.ver2.adc_calib_high_voltage / parsed_data->efuse_data.ver2.adc_calib_high; chars->coeff_b = 0; @@ -178,7 +178,7 @@ esp_adc_cal_value_t esp_adc_cal_characterize(adc_unit_t adc_num, assert(res); res = calculate_characterization_coefficients(&efuse_parsed_data, chars); assert(res); - ESP_LOGD(LOG_TAG, "adc%d (atten leven %d) calibration done: A:%"PRId32" B:%"PRId32"\n", adc_num, atten, chars->coeff_a, chars->coeff_b); + ESP_LOGD(LOG_TAG, "adc%d (atten leven %d) calibration done: A:%" PRId32 " B:%" PRId32, adc_num, atten, chars->coeff_a, chars->coeff_b); // Initialize remaining fields chars->adc_num = adc_num; diff --git a/components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c b/components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c index 53122d8507..0c6945d813 100644 --- a/components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c +++ b/components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c @@ -121,7 +121,7 @@ static void calculate_characterization_coefficients(const adc_calib_info_t *pars { chars->coeff_a = coeff_a_scaling * parsed_data->ref_data.ver1.voltage / parsed_data->ref_data.ver1.digi; chars->coeff_b = 0; - ESP_LOGV(LOG_TAG, "Calib V1, Cal Voltage = %"PRId32", Digi out = %"PRId32", Coef_a = %"PRId32"\n", parsed_data->ref_data.ver1.voltage, parsed_data->ref_data.ver1.digi, chars->coeff_a); + ESP_LOGV(LOG_TAG, "Calib V1, Cal Voltage = %" PRId32 ", Digi out = %" PRId32 ", Coef_a = %" PRId32, parsed_data->ref_data.ver1.voltage, parsed_data->ref_data.ver1.digi, chars->coeff_a); } esp_adc_cal_value_t esp_adc_cal_characterize(adc_unit_t adc_num, diff --git a/components/esp_adc/esp32c2/adc_cali_line_fitting.c b/components/esp_adc/esp32c2/adc_cali_line_fitting.c index dde0ebe40f..036b49f8a7 100644 --- a/components/esp_adc/esp32c2/adc_cali_line_fitting.c +++ b/components/esp_adc/esp32c2/adc_cali_line_fitting.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -80,7 +80,7 @@ esp_err_t adc_cali_create_scheme_line_fitting(const adc_cali_line_fitting_config assert(ret == ESP_OK); chars->coeff_a = coeff_a_scaling * voltage_mv / digi_val; chars->coeff_b = 0; - ESP_LOGV(TAG, "Calib V1, Cal Voltage = %"PRId32", Digi out = %"PRId32", Coef_a = %"PRId32"\n", voltage_mv, digi_val, chars->coeff_a); + ESP_LOGV(TAG, "Calib V1, Cal Voltage = %" PRId32 ", Digi out = %" PRId32 ", Coef_a = %" PRId32, voltage_mv, digi_val, chars->coeff_a); *ret_handle = scheme; diff --git a/components/esp_adc/esp32s2/adc_cali_line_fitting.c b/components/esp_adc/esp32s2/adc_cali_line_fitting.c index 9826b73860..a14e912353 100644 --- a/components/esp_adc/esp32s2/adc_cali_line_fitting.c +++ b/components/esp_adc/esp32s2/adc_cali_line_fitting.c @@ -114,7 +114,7 @@ esp_err_t adc_cali_create_scheme_line_fitting(const adc_cali_line_fitting_config assert(success); success = calculate_characterization_coefficients(&efuse_parsed_data, chars); assert(success); - ESP_LOGD(TAG, "adc%d (atten leven %d) calibration done: A:%"PRId32" B:%"PRId32"\n", config->unit_id, config->atten, chars->coeff_a, chars->coeff_b); + ESP_LOGD(TAG, "adc%d (atten leven %d) calibration done: A:%" PRId32" B:%" PRId32, config->unit_id, config->atten, chars->coeff_a, chars->coeff_b); chars->unit_id = config->unit_id; chars->atten = config->atten; @@ -235,14 +235,14 @@ static bool calculate_characterization_coefficients(const adc_calib_parsed_info_ { switch (parsed_data->version_num) { case 1: - ESP_LOGD(TAG, "Calib V1, low%dmV, high%dmV\n", parsed_data->efuse_data.ver1.adc_calib_low, parsed_data->efuse_data.ver1.adc_calib_high); + ESP_LOGD(TAG, "Calib V1, low%dmV, high%dmV", parsed_data->efuse_data.ver1.adc_calib_low, parsed_data->efuse_data.ver1.adc_calib_high); characterize_using_two_point(parsed_data->unit_id, parsed_data->atten_level, parsed_data->efuse_data.ver1.adc_calib_high, parsed_data->efuse_data.ver1.adc_calib_low, &(ctx->coeff_a), &(ctx->coeff_b)); break; case 2: - ESP_LOGD(TAG, "Calib V2, volt%dmV\n", parsed_data->efuse_data.ver2.adc_calib_high); + ESP_LOGD(TAG, "Calib V2, volt%dmV", parsed_data->efuse_data.ver2.adc_calib_high); ctx->coeff_a = coeff_a_scaling * parsed_data->efuse_data.ver2.adc_calib_high_voltage / parsed_data->efuse_data.ver2.adc_calib_high; ctx->coeff_b = 0; diff --git a/components/esp_adc/test_apps/adc/main/test_adc.c b/components/esp_adc/test_apps/adc/main/test_adc.c index a24db449c9..2fedff2b08 100644 --- a/components/esp_adc/test_apps/adc/main/test_adc.c +++ b/components/esp_adc/test_apps/adc/main/test_adc.c @@ -232,7 +232,7 @@ static void s_adc_oneshot_with_sleep(adc_unit_t unit_id, adc_channel_t channel) for (int i = 0; i < TEST_REGI2C_ANA_CALI_BYTE_NUM; i++) { TEST_ASSERT_EQUAL(regi2c_cali_val_before[i], regi2c_cali_val_after[i]); } - ESP_LOGI(TAG, "Cali register settings unchanged\n"); + ESP_LOGI(TAG, "Cali register settings unchanged"); } TEST_ESP_OK(adc_oneshot_del_unit(adc_handle)); diff --git a/components/esp_adc/test_apps/adc/main/test_adc2_wifi.c b/components/esp_adc/test_apps/adc/main/test_adc2_wifi.c index 8a25812526..eb3f7278c8 100644 --- a/components/esp_adc/test_apps/adc/main/test_adc2_wifi.c +++ b/components/esp_adc/test_apps/adc/main/test_adc2_wifi.c @@ -74,7 +74,7 @@ static void ip_event_handler(void* arg, esp_event_base_t event_base, case IP_EVENT_STA_GOT_IP: event = (ip_event_got_ip_t*)event_data; ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP"); - ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip)); break; default: break; diff --git a/components/esp_adc/test_apps/adc/main/test_adc_performance.c b/components/esp_adc/test_apps/adc/main/test_adc_performance.c index db9b7294c8..d255bb7061 100644 --- a/components/esp_adc/test_apps/adc/main/test_adc_performance.c +++ b/components/esp_adc/test_apps/adc/main/test_adc_performance.c @@ -326,7 +326,7 @@ static float test_adc_oneshot_std(adc_atten_t atten, bool is_performance_test) adc_cali_handle_t cali_handle = NULL; do_calibration = test_adc_calibration_init(ADC_UNIT_1, channel, atten, ADC_BITWIDTH_DEFAULT, &cali_handle); if (!do_calibration) { - ESP_LOGW(TAG, "calibration fail, jump calibration\n"); + ESP_LOGW(TAG, "calibration fail, jump calibration"); } //-------------ADC1 Channel Config---------------// diff --git a/components/esp_coex/src/coexist.c b/components/esp_coex/src/coexist.c index f90aaf7108..82402dbd2e 100644 --- a/components/esp_coex/src/coexist.c +++ b/components/esp_coex/src/coexist.c @@ -229,7 +229,7 @@ esp_err_t esp_enable_extern_coex_gpio_pin(external_coex_wire_t wire_type, esp_ex #if SOC_EXTERNAL_COEX_ADVANCE if(false == is_legal_external_coex_gpio(wire_type, gpio_pin)) { - ESP_LOGE(TAG, "Configure external coex with unexpected gpio pin!!!\n"); + ESP_LOGE(TAG, "Configure external coex with unexpected gpio pin!!!"); return ESP_ERR_INVALID_ARG; } phy_coex_force_rx_ant(); diff --git a/components/esp_http_client/lib/http_auth.c b/components/esp_http_client/lib/http_auth.c index a79d563b16..6b8e092402 100644 --- a/components/esp_http_client/lib/http_auth.c +++ b/components/esp_http_client/lib/http_auth.c @@ -88,7 +88,7 @@ char *http_auth_digest(const char *username, const char *password, esp_http_auth goto _digest_exit; } - ESP_LOGD(TAG, "%s %s %s %s\r\n", "Digest", username, auth_data->realm, password); + ESP_LOGD(TAG, "%s %s %s %s", "Digest", username, auth_data->realm, password); if (strcasecmp(auth_data->algorithm, "md5-sess") == 0) { if (md5_printf(ha1, "%s:%s:%016llx", ha1, auth_data->nonce, auth_data->cnonce) <= 0) { goto _digest_exit; diff --git a/components/esp_netif/lwip/esp_netif_lwip.c b/components/esp_netif/lwip/esp_netif_lwip.c index de78a68b3d..d084c64188 100644 --- a/components/esp_netif/lwip/esp_netif_lwip.c +++ b/components/esp_netif/lwip/esp_netif_lwip.c @@ -241,7 +241,7 @@ static void esp_netif_api_cb(void *api_msg) static inline esp_err_t esp_netif_lwip_ipc_call_msg(esp_netif_api_msg_t *msg) { if (!sys_thread_tcpip(LWIP_CORE_LOCK_QUERY_HOLDER)) { - ESP_LOGD(TAG, "check: remote, if=%p fn=%p\n", msg->esp_netif, msg->api_fn); + ESP_LOGD(TAG, "check: remote, if=%p fn=%p", msg->esp_netif, msg->api_fn); #if LWIP_TCPIP_CORE_LOCKING tcpip_send_msg_wait_sem((tcpip_callback_fn)esp_netif_api_cb, msg, NULL); #else @@ -251,7 +251,7 @@ static inline esp_err_t esp_netif_lwip_ipc_call_msg(esp_netif_api_msg_t *msg) #endif /* LWIP_TCPIP_CORE_LOCKING */ return msg->ret; } - ESP_LOGD(TAG, "check: local, if=%p fn=%p\n", msg->esp_netif, msg->api_fn); + ESP_LOGD(TAG, "check: local, if=%p fn=%p", msg->esp_netif, msg->api_fn); return msg->api_fn(msg); } diff --git a/components/esp_partition/host_test/partition_api_test/main/partition_api_test.c b/components/esp_partition/host_test/partition_api_test/main/partition_api_test.c index a82952c26b..b49b3a3bf0 100644 --- a/components/esp_partition/host_test/partition_api_test/main/partition_api_test.c +++ b/components/esp_partition/host_test/partition_api_test/main/partition_api_test.c @@ -524,7 +524,7 @@ void dispose_stats(t_stats *p_stats) void print_stats(const t_stats *p_stats) { - ESP_LOGI(TAG, "read_ops:%06lu write_ops:%06lu erase_ops:%06lu read_bytes:%06lu write_bytes:%06lu total_time:%06lu\n", + ESP_LOGI(TAG, "read_ops:%06lu write_ops:%06lu erase_ops:%06lu read_bytes:%06lu write_bytes:%06lu total_time:%06lu", p_stats->read_ops, p_stats->write_ops, p_stats->erase_ops, diff --git a/components/esp_phy/src/phy_init.c b/components/esp_phy/src/phy_init.c index 83ff6ab809..d3a02732a4 100644 --- a/components/esp_phy/src/phy_init.c +++ b/components/esp_phy/src/phy_init.c @@ -650,7 +650,7 @@ static esp_err_t load_cal_data_from_nvs_handle(nvs_handle_t handle, return err; } uint32_t cal_format_version = phy_get_rf_cal_version() & (~BIT(16)); - ESP_LOGV(TAG, "phy_get_rf_cal_version: %" PRId32 "\n", cal_format_version); + ESP_LOGV(TAG, "phy_get_rf_cal_version: %" PRId32, cal_format_version); if (cal_data_version != cal_format_version) { ESP_LOGD(TAG, "%s: expected calibration data format %" PRId32 ", found %" PRId32 "", __func__, cal_format_version, cal_data_version); @@ -695,7 +695,7 @@ static esp_err_t store_cal_data_to_nvs_handle(nvs_handle_t handle, err = nvs_set_blob(handle, PHY_CAL_DATA_KEY, cal_data, sizeof(*cal_data)); if (err != ESP_OK) { - ESP_LOGE(TAG, "%s: store calibration data failed(0x%x)\n", __func__, err); + ESP_LOGE(TAG, "%s: store calibration data failed(0x%x)", __func__, err); return err; } @@ -703,21 +703,21 @@ static esp_err_t store_cal_data_to_nvs_handle(nvs_handle_t handle, ESP_ERROR_CHECK(esp_efuse_mac_get_default(sta_mac)); err = nvs_set_blob(handle, PHY_CAL_MAC_KEY, sta_mac, sizeof(sta_mac)); if (err != ESP_OK) { - ESP_LOGE(TAG, "%s: store calibration mac failed(0x%x)\n", __func__, err); + ESP_LOGE(TAG, "%s: store calibration mac failed(0x%x)", __func__, err); return err; } uint32_t cal_format_version = phy_get_rf_cal_version() & (~BIT(16)); - ESP_LOGV(TAG, "phy_get_rf_cal_version: %" PRId32 "\n", cal_format_version); + ESP_LOGV(TAG, "phy_get_rf_cal_version: %" PRId32 "", cal_format_version); err = nvs_set_u32(handle, PHY_CAL_VERSION_KEY, cal_format_version); if (err != ESP_OK) { - ESP_LOGE(TAG, "%s: store calibration version failed(0x%x)\n", __func__, err); + ESP_LOGE(TAG, "%s: store calibration version failed(0x%x)", __func__, err); return err; } err = nvs_commit(handle); if (err != ESP_OK) { - ESP_LOGE(TAG, "%s: store calibration nvs commit failed(0x%x)\n", __func__, err); + ESP_LOGE(TAG, "%s: store calibration nvs commit failed(0x%x)", __func__, err); } return err; @@ -845,7 +845,7 @@ static uint8_t phy_find_bin_type_according_country(const char* country) { if (!memcmp(country, s_country_code_map_type_table[i].cc, sizeof(s_phy_current_country))) { phy_init_data_type = s_country_code_map_type_table[i].type; - ESP_LOGD(TAG, "Current country is %c%c, PHY init data type is %s\n", s_country_code_map_type_table[i].cc[0], + ESP_LOGD(TAG, "Current country is %c%c, PHY init data type is %s", s_country_code_map_type_table[i].cc[0], s_country_code_map_type_table[i].cc[1], s_phy_type[s_country_code_map_type_table[i].type]); break; } diff --git a/components/esp_psram/test_apps/psram/main/test_4mpsram.c b/components/esp_psram/test_apps/psram/main/test_4mpsram.c index ef1f0838aa..3994f59f0f 100644 --- a/components/esp_psram/test_apps/psram/main/test_4mpsram.c +++ b/components/esp_psram/test_apps/psram/main/test_4mpsram.c @@ -33,7 +33,7 @@ static void test_psram_content(void) } } if (errct) { - ESP_LOGE(TAG, "SPI SRAM memory test fail. %d/%d writes failed, first @ %p\n", errct, s/32, initial_err+test_area); + ESP_LOGE(TAG, "SPI SRAM memory test fail. %d/%d writes failed, first @ %p", errct, s/32, initial_err+test_area); TEST_FAIL(); } else { ESP_LOGI(TAG, "SPI SRAM memory test OK"); diff --git a/components/esp_psram/test_apps/psram/main/test_psram.c b/components/esp_psram/test_apps/psram/main/test_psram.c index edc7682ca7..133a58c77c 100644 --- a/components/esp_psram/test_apps/psram/main/test_psram.c +++ b/components/esp_psram/test_apps/psram/main/test_psram.c @@ -183,7 +183,7 @@ TEST_CASE("test psram unaligned access", "[psram]") ESP_LOGV(TAG, "i is %d, j is %d, expected_val_16bit val is 0x%"PRIx16, i, j, expected_val_16bit); TEST_ASSERT(val_16bit == expected_val_16bit); uint32_t expected_val_32bit = (fourth_byte << 24) | (third_byte << 16) | (second_byte << 8) | first_byte; - ESP_LOGV(TAG, "i is %d, j is %d, expected_val_32bit val is 0x%"PRIx32"\n", i, j, expected_val_32bit); + ESP_LOGV(TAG, "i is %d, j is %d, expected_val_32bit val is 0x%" PRIx32, i, j, expected_val_32bit); TEST_ASSERT(val_32bit == expected_val_32bit); } } diff --git a/components/esp_wifi/src/smartconfig.c b/components/esp_wifi/src/smartconfig.c index 992d31bd98..bcbfcd9db8 100644 --- a/components/esp_wifi/src/smartconfig.c +++ b/components/esp_wifi/src/smartconfig.c @@ -1,16 +1,8 @@ -// Copyright 2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include @@ -39,7 +31,7 @@ static void handler_got_ssid_passwd(void *arg, esp_event_base_t base, int32_t ev ESP_LOGD(TAG, "SSID:%s", ssid); ESP_LOGD(TAG, "PASSWORD:%s", password); - ESP_LOGD(TAG, "Phone ip: %d.%d.%d.%d\n", cellphone_ip[0], cellphone_ip[1], cellphone_ip[2], cellphone_ip[3]); + ESP_LOGD(TAG, "Phone ip: %d.%d.%d.%d", cellphone_ip[0], cellphone_ip[1], cellphone_ip[2], cellphone_ip[3]); err = sc_send_ack_start(evt->type, evt->token, evt->cellphone_ip); if (err != ESP_OK) { diff --git a/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c b/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c index 991a03df47..0b88bddc19 100644 --- a/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c +++ b/components/esp_wifi/test_apps/wifi_connect/main/test_wifi_conn.c @@ -96,7 +96,7 @@ static void ip_event_handler(void* arg, esp_event_base_t event_base, case IP_EVENT_STA_GOT_IP: event = (ip_event_got_ip_t*)event_data; ESP_LOGI(TAG, "IP_EVENT_STA_GOT_IP"); - ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip)); if (wifi_events) { xEventGroupSetBits(wifi_events, GOT_IP_EVENT); } diff --git a/components/fatfs/diskio/diskio_wl.c b/components/fatfs/diskio/diskio_wl.c index 31bb7d25e5..849c6b98a7 100644 --- a/components/fatfs/diskio/diskio_wl.c +++ b/components/fatfs/diskio/diskio_wl.c @@ -31,7 +31,7 @@ DSTATUS ff_wl_status (BYTE pdrv) DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count) { - ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i\n", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); + ESP_LOGV(TAG, "ff_wl_read - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); wl_handle_t wl_handle = ff_wl_handles[pdrv]; assert(wl_handle + 1); esp_err_t err = wl_read(wl_handle, sector * wl_sector_size(wl_handle), buff, count * wl_sector_size(wl_handle)); @@ -44,7 +44,7 @@ DRESULT ff_wl_read (BYTE pdrv, BYTE *buff, DWORD sector, UINT count) DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count) { - ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i\n", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); + ESP_LOGV(TAG, "ff_wl_write - pdrv=%i, sector=%i, count=%i", (unsigned int)pdrv, (unsigned int)sector, (unsigned int)count); wl_handle_t wl_handle = ff_wl_handles[pdrv]; assert(wl_handle + 1); esp_err_t err = wl_erase_range(wl_handle, sector * wl_sector_size(wl_handle), count * wl_sector_size(wl_handle)); @@ -63,7 +63,7 @@ DRESULT ff_wl_write (BYTE pdrv, const BYTE *buff, DWORD sector, UINT count) DRESULT ff_wl_ioctl (BYTE pdrv, BYTE cmd, void *buff) { wl_handle_t wl_handle = ff_wl_handles[pdrv]; - ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i\n", cmd); + ESP_LOGV(TAG, "ff_wl_ioctl: cmd=%i", cmd); assert(wl_handle + 1); switch (cmd) { case CTRL_SYNC: diff --git a/components/heap/test_apps/heap_tests/main/test_allocator_timings.c b/components/heap/test_apps/heap_tests/main/test_allocator_timings.c index 1f3ce5b41b..b67d793e98 100644 --- a/components/heap/test_apps/heap_tests/main/test_allocator_timings.c +++ b/components/heap/test_apps/heap_tests/main/test_allocator_timings.c @@ -46,7 +46,7 @@ TEST_CASE("Heap many random allocations timings", "[heap]") void *new_p = heap_caps_realloc(p[n], new_size, MALLOC_CAP_DEFAULT); realloc_time_average = esp_cpu_get_cycle_count() - cycles_before; - ESP_LOGD(TAG, "realloc %p -> %p (%zu -> %zu) time spent cycles: %lld \n", p[n], new_p, s[n], new_size, realloc_time_average); + ESP_LOGD(TAG, "realloc %p -> %p (%zu -> %zu) time spent cycles: %lld", p[n], new_p, s[n], new_size, realloc_time_average); heap_caps_check_integrity(MALLOC_CAP_DEFAULT, true); if (new_size == 0 || new_p != NULL) { p[n] = new_p; @@ -71,7 +71,7 @@ TEST_CASE("Heap many random allocations timings", "[heap]") heap_caps_free(p[n]); free_time_average = esp_cpu_get_cycle_count() - cycles_before; - ESP_LOGD(TAG, "freed %p (%zu) time spent cycles: %lld\n", p[n], s[n], free_time_average); + ESP_LOGD(TAG, "freed %p (%zu) time spent cycles: %lld", p[n], s[n], free_time_average); if (!heap_caps_check_integrity(MALLOC_CAP_DEFAULT, true)) { printf("FAILED iteration %d after freeing %p\n", i, p[n]); @@ -86,7 +86,7 @@ TEST_CASE("Heap many random allocations timings", "[heap]") p[n] = heap_caps_malloc(s[n], MALLOC_CAP_DEFAULT); alloc_time_average = esp_cpu_get_cycle_count() - cycles_before; - ESP_LOGD(TAG, "malloc %p (%zu) time spent cycles: %lld \n", p[n], s[n], alloc_time_average); + ESP_LOGD(TAG, "malloc %p (%zu) time spent cycles: %lld", p[n], s[n], alloc_time_average); if (!heap_caps_check_integrity(MALLOC_CAP_DEFAULT, true)) { printf("FAILED iteration %d after mallocing %p (%zu bytes)\n", i, p[n], s[n]); diff --git a/components/ieee802154/test_apps/test_ieee802154/main/src/ieee802154_cmd.c b/components/ieee802154/test_apps/test_ieee802154/main/src/ieee802154_cmd.c index bf714b5a84..a798f75983 100644 --- a/components/ieee802154/test_apps/test_ieee802154/main/src/ieee802154_cmd.c +++ b/components/ieee802154/test_apps/test_ieee802154/main/src/ieee802154_cmd.c @@ -651,7 +651,7 @@ static int process_free(int argc, char **argv) } esp_get_free_heap_size(); - ESP_LOGI(TAG, "heap size: %"PRIu32"\n", esp_get_free_heap_size()); + ESP_LOGI(TAG, "heap size: %" PRIu32, esp_get_free_heap_size()); return 0; } diff --git a/components/lwip/port/freertos/sys_arch.c b/components/lwip/port/freertos/sys_arch.c index 91291f0dc8..46478434c7 100644 --- a/components/lwip/port/freertos/sys_arch.c +++ b/components/lwip/port/freertos/sys_arch.c @@ -422,7 +422,7 @@ sys_init(void) { if (!g_lwip_protect_mutex) { if (ERR_OK != sys_mutex_new(&g_lwip_protect_mutex)) { - ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex\n"); + ESP_LOGE(TAG, "sys_init: failed to init lwip protect mutex"); } } diff --git a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c index a4b0af46a5..777af0425b 100644 --- a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c +++ b/components/mbedtls/test_apps/main/test_esp_crt_bundle.c @@ -252,7 +252,7 @@ esp_err_t client_setup(mbedtls_endpoint_t *client) mbedtls_ssl_conf_rng(&client->conf, mbedtls_ctr_drbg_random, &client->ctr_drbg); if ((ret = mbedtls_ssl_setup(&client->ssl, &client->conf)) != 0) { - ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x\n\n", -ret); + ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x", -ret); return ESP_FAIL; } diff --git a/components/nvs_flash/src/nvs_api.cpp b/components/nvs_flash/src/nvs_api.cpp index 587f531352..701b09c4cd 100644 --- a/components/nvs_flash/src/nvs_api.cpp +++ b/components/nvs_flash/src/nvs_api.cpp @@ -309,7 +309,7 @@ extern "C" void nvs_close(nvs_handle_t handle) extern "C" esp_err_t nvs_erase_key(nvs_handle_t c_handle, const char* key) { Lock lock; - ESP_LOGD(TAG, "%s %s\r\n", __func__, key); + ESP_LOGD(TAG, "%s %s", __func__, key); NVSHandleSimple *handle; auto err = nvs_find_ns_handle(c_handle, &handle); if (err != ESP_OK) { @@ -322,7 +322,7 @@ extern "C" esp_err_t nvs_erase_key(nvs_handle_t c_handle, const char* key) extern "C" esp_err_t nvs_erase_all(nvs_handle_t c_handle) { Lock lock; - ESP_LOGD(TAG, "%s\r\n", __func__); + ESP_LOGD(TAG, "%s", __func__); NVSHandleSimple *handle; auto err = nvs_find_ns_handle(c_handle, &handle); if (err != ESP_OK) { diff --git a/components/openthread/src/esp_openthread_dns64.c b/components/openthread/src/esp_openthread_dns64.c index cdece8334a..1f7d5a2386 100644 --- a/components/openthread/src/esp_openthread_dns64.c +++ b/components/openthread/src/esp_openthread_dns64.c @@ -87,7 +87,7 @@ int lwip_hook_netconn_external_resolve(const char *name, ip_addr_t *addr, u8_t a ip6_addr_t nat64_prefix; if (esp_openthread_get_nat64_prefix(&nat64_prefix) != ESP_OK) { - ESP_LOGE(TAG, "Cannot find NAT64 prefix\n"); + ESP_LOGE(TAG, "Cannot find NAT64 prefix"); *err = ERR_ABRT; return 1; } diff --git a/components/openthread/src/port/esp_spi_spinel_interface.cpp b/components/openthread/src/port/esp_spi_spinel_interface.cpp index afcf36f6c3..45a2f5ea1e 100644 --- a/components/openthread/src/port/esp_spi_spinel_interface.cpp +++ b/components/openthread/src/port/esp_spi_spinel_interface.cpp @@ -227,9 +227,9 @@ otError SpiSpinelInterface::WaitForFrame(uint64_t timeout_us) int ret = select(m_event_fd + 1, &read_fds, NULL, &error_fds, &timeout); if (ret <= 0 || !FD_ISSET(m_event_fd, &read_fds)) { if (FD_ISSET(m_event_fd, &error_fds)) { - ESP_LOGW(OT_PLAT_LOG_TAG, "FD error!\n"); + ESP_LOGW(OT_PLAT_LOG_TAG, "FD error!"); } - ESP_LOGW(OT_PLAT_LOG_TAG, "SPI transaction timeout for %llu us, result %d\n", timeout_us, ret); + ESP_LOGW(OT_PLAT_LOG_TAG, "SPI transaction timeout for %llu us, result %d", timeout_us, ret); return OT_ERROR_RESPONSE_TIMEOUT; } read(m_event_fd, &event, sizeof(event)); diff --git a/components/protocomm/src/transports/protocomm_console.c b/components/protocomm/src/transports/protocomm_console.c index e4721217a3..d09386f0ea 100644 --- a/components/protocomm/src/transports/protocomm_console.c +++ b/components/protocomm/src/transports/protocomm_console.c @@ -112,7 +112,7 @@ static void protocomm_console_task(void *arg) } ret = esp_console_run((char *) linebuf, &cmd_ret); if (ret < 0) { - ESP_LOGE(TAG, "Console dispatcher error\n"); + ESP_LOGE(TAG, "Console dispatcher error"); break; } } diff --git a/components/protocomm/src/transports/protocomm_nimble.c b/components/protocomm/src/transports/protocomm_nimble.c index 9cb524b30b..2d3dee3fc4 100644 --- a/components/protocomm/src/transports/protocomm_nimble.c +++ b/components/protocomm/src/transports/protocomm_nimble.c @@ -256,7 +256,7 @@ simple_ble_gap_event(struct ble_gap_event *event, void *arg) return 0; case BLE_GAP_EVENT_MTU: - ESP_LOGI(TAG, "mtu update event; conn_handle=%d cid=%d mtu=%d\n", + ESP_LOGI(TAG, "mtu update event; conn_handle=%d cid=%d mtu=%d", event->mtu.conn_handle, event->mtu.channel_id, event->mtu.value); @@ -453,7 +453,7 @@ gatt_svr_init(const simple_ble_cfg_t *config) static void simple_ble_on_reset(int reason) { - ESP_LOGE(TAG, "Resetting state; reason=%d\n", reason); + ESP_LOGE(TAG, "Resetting state; reason=%d", reason); } static void @@ -470,7 +470,7 @@ simple_ble_on_sync(void) /* Figure out address to use while advertising (no privacy for now) */ rc = ble_hs_id_infer_auto(0, &own_addr_type); if (rc != 0) { - ESP_LOGE(TAG, "error determining address type; rc=%d\n", rc); + ESP_LOGE(TAG, "error determining address type; rc=%d", rc); return; } diff --git a/components/sdmmc/sdmmc_mmc.c b/components/sdmmc/sdmmc_mmc.c index 4f726ea90a..2ccb2c1f93 100644 --- a/components/sdmmc/sdmmc_mmc.c +++ b/components/sdmmc/sdmmc_mmc.c @@ -191,7 +191,7 @@ esp_err_t sdmmc_mmc_decode_csd(sdmmc_response_t response, sdmmc_csd_t* out_csd) out_csd->capacity = MMC_CSD_CAPACITY(response); out_csd->read_block_len = MMC_CSD_READ_BL_LEN(response); } else { - ESP_LOGE(TAG, "unknown MMC CSD structure version 0x%x\n", out_csd->csd_ver); + ESP_LOGE(TAG, "unknown MMC CSD structure version 0x%x", out_csd->csd_ver); return 1; } int read_bl_size = 1 << out_csd->read_block_len; diff --git a/components/sdmmc/test/test_sdio.c b/components/sdmmc/test/test_sdio.c index a71d1f440a..953aba7c35 100644 --- a/components/sdmmc/test/test_sdio.c +++ b/components/sdmmc/test/test_sdio.c @@ -64,7 +64,7 @@ static const char* TAG = "sdio_test"; static esp_err_t slave_slchost_reg_read(sdmmc_card_t* card, uint32_t addr, uint32_t* out_val) { if ((addr & DR_REG_SLCHOST_MASK) != DR_REG_SLCHOST_BASE) { - ESP_LOGW(TAG, "%s: invalid addr 0x%08x\n", __func__, addr); + ESP_LOGW(TAG, "%s: invalid addr 0x%08x", __func__, addr); return ESP_ERR_INVALID_ARG; } return sdmmc_io_read_bytes(card, 1, addr & (~DR_REG_SLCHOST_MASK), out_val, sizeof(*out_val)); @@ -73,7 +73,7 @@ static esp_err_t slave_slchost_reg_read(sdmmc_card_t* card, uint32_t addr, uint3 static esp_err_t slave_slchost_reg_write(sdmmc_card_t* card, uint32_t addr, uint32_t val) { if ((addr & DR_REG_SLCHOST_MASK) != DR_REG_SLCHOST_BASE) { - ESP_LOGW(TAG, "%s: invalid addr 0x%08x\n", __func__, addr); + ESP_LOGW(TAG, "%s: invalid addr 0x%08x", __func__, addr); return ESP_ERR_INVALID_ARG; } return sdmmc_io_write_bytes(card, 1, addr & (~DR_REG_SLCHOST_MASK), &val, sizeof(val)); @@ -82,7 +82,7 @@ static esp_err_t slave_slchost_reg_write(sdmmc_card_t* card, uint32_t addr, uint static esp_err_t slave_slc_reg_read(sdmmc_card_t* card, uint32_t addr, uint32_t* val) { if ((addr & DR_REG_SLC_MASK) != DR_REG_SLC_BASE) { - ESP_LOGW(TAG, "%s: invalid addr 0x%08x\n", __func__, addr); + ESP_LOGW(TAG, "%s: invalid addr 0x%08x", __func__, addr); return ESP_ERR_INVALID_ARG; } uint32_t word = (addr - DR_REG_SLC_BASE) / 4; @@ -102,7 +102,7 @@ static esp_err_t slave_slc_reg_read(sdmmc_card_t* card, uint32_t addr, uint32_t* static esp_err_t slave_slc_reg_write(sdmmc_card_t* card, uint32_t addr, uint32_t val) { if ((addr & DR_REG_SLC_MASK) != DR_REG_SLC_BASE) { - ESP_LOGW(TAG, "%s: invalid addr 0x%08x\n", __func__, addr); + ESP_LOGW(TAG, "%s: invalid addr 0x%08x", __func__, addr); return ESP_ERR_INVALID_ARG; } uint32_t word = (addr - DR_REG_SLC_BASE) / 4; diff --git a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c index 079e677529..033976c7e6 100644 --- a/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c +++ b/components/spi_flash/test_apps/esp_flash/main/test_esp_flash_drv.c @@ -61,12 +61,12 @@ static void get_chip_host(esp_flash_t* chip, spi_host_device_t* out_host_id, int static void setup_bus(spi_host_device_t host_id) { if (host_id == SPI1_HOST) { - ESP_LOGI(TAG, "setup flash on SPI1 CS1...\n"); + ESP_LOGI(TAG, "setup flash on SPI1 CS1..."); //no need to initialize the bus, however the CLK may need one more output if it's on the usual place of PSRAM esp_rom_gpio_connect_out_signal(EXTRA_SPI1_CLK_IO, SPICLK_OUT_IDX, 0, 0); //currently the SPI bus for main flash chip is initialized through GPIO matrix } else if (host_id == SPI2_HOST) { - ESP_LOGI(TAG, "setup flash on SPI%u (HSPI) CS0...\n", host_id + 1); + ESP_LOGI(TAG, "setup flash on SPI%u (HSPI) CS0...", host_id + 1); spi_bus_config_t hspi_bus_cfg = { .mosi_io_num = HSPI_PIN_NUM_MOSI, .miso_io_num = HSPI_PIN_NUM_MISO, @@ -78,7 +78,7 @@ static void setup_bus(spi_host_device_t host_id) esp_err_t ret = spi_bus_initialize(host_id, &hspi_bus_cfg, 0); TEST_ESP_OK(ret); } else if (host_id == SPI3_HOST) { - ESP_LOGI(TAG, "setup flash on SPI%u (VSPI) CS0...\n", host_id + 1); + ESP_LOGI(TAG, "setup flash on SPI%u (VSPI) CS0...", host_id + 1); spi_bus_config_t vspi_bus_cfg = { .mosi_io_num = VSPI_PIN_NUM_MOSI, .miso_io_num = VSPI_PIN_NUM_MISO, @@ -97,7 +97,7 @@ static void setup_bus(spi_host_device_t host_id) static void setup_bus(spi_host_device_t host_id) { if (host_id == SPI1_HOST) { - ESP_LOGI(TAG, "setup flash on SPI1 CS1...\n"); + ESP_LOGI(TAG, "setup flash on SPI1 CS1..."); #if !CONFIG_ESPTOOLPY_FLASHMODE_QIO && !CONFIG_ESPTOOLPY_FLASHMODE_QOUT //Initialize the WP and HD pins, which are not automatically initialized on ESP32-S2. int wp_pin = spi_periph_signal[host_id].spiwp_iomux_pin; @@ -109,7 +109,7 @@ static void setup_bus(spi_host_device_t host_id) #endif //CONFIG_ESPTOOLPY_FLASHMODE_QIO || CONFIG_ESPTOOLPY_FLASHMODE_QOUT //currently the SPI bus for main flash chip is initialized through GPIO matrix } else if (host_id == SPI2_HOST) { - ESP_LOGI(TAG, "setup flash on SPI%u (FSPI) CS0...\n", host_id + 1); + ESP_LOGI(TAG, "setup flash on SPI%u (FSPI) CS0...", host_id + 1); spi_bus_config_t fspi_bus_cfg = { .mosi_io_num = FSPI_PIN_NUM_MOSI, .miso_io_num = FSPI_PIN_NUM_MISO, @@ -123,7 +123,7 @@ static void setup_bus(spi_host_device_t host_id) } #if SOC_SPI_PERIPH_NUM > 2 else if (host_id == SPI3_HOST) { - ESP_LOGI(TAG, "setup flash on SPI%u (HSPI) CS0...\n", host_id + 1); + ESP_LOGI(TAG, "setup flash on SPI%u (HSPI) CS0...", host_id + 1); spi_bus_config_t hspi_bus_cfg = { .mosi_io_num = HSPI_PIN_NUM_MOSI, .miso_io_num = HSPI_PIN_NUM_MISO, diff --git a/components/tcp_transport/transport_ws.c b/components/tcp_transport/transport_ws.c index 5d64c7d3c3..29b156fd11 100644 --- a/components/tcp_transport/transport_ws.c +++ b/components/tcp_transport/transport_ws.c @@ -448,7 +448,7 @@ static int ws_read_header(esp_transport_handle_t t, char *buffer, int len, int t mask = ((*data_ptr >> 7) & 0x01); payload_len = (*data_ptr & 0x7F); data_ptr++; - ESP_LOGD(TAG, "Opcode: %d, mask: %d, len: %d\r\n", ws->frame_state.opcode, mask, payload_len); + ESP_LOGD(TAG, "Opcode: %d, mask: %d, len: %d", ws->frame_state.opcode, mask, payload_len); if (payload_len == 126) { // headerLen += 2; if ((rlen = esp_transport_read(ws->parent, data_ptr, header, timeout_ms)) <= 0) { diff --git a/components/wear_levelling/WL_Ext_Perf.cpp b/components/wear_levelling/WL_Ext_Perf.cpp index 34a81626af..b0828ec20a 100644 --- a/components/wear_levelling/WL_Ext_Perf.cpp +++ b/components/wear_levelling/WL_Ext_Perf.cpp @@ -143,7 +143,7 @@ esp_err_t WL_Ext_Perf::erase_range(size_t start_address, size_t size) result = this->erase_sector_fit(start_address / this->fat_sector_size, pre_check_count); WL_EXT_RESULT_CHECK(result); } - ESP_LOGV(TAG, "%s rest_check_start = %i, pre_check_count=%i, rest_check_count=%i, post_check_count=%i\n", __func__, rest_check_start, pre_check_count, rest_check_count, post_check_count); + ESP_LOGV(TAG, "%s rest_check_start = %i, pre_check_count=%i, rest_check_count=%i, post_check_count=%i", __func__, rest_check_start, pre_check_count, rest_check_count, post_check_count); if (rest_check_count > 0) { rest_check_count = rest_check_count / this->size_factor; size_t start_sector = rest_check_start / this->flash_sector_size; diff --git a/components/wpa_supplicant/test/test_offchannel.c b/components/wpa_supplicant/test/test_offchannel.c index 9d235ff617..126b2844fe 100644 --- a/components/wpa_supplicant/test/test_offchannel.c +++ b/components/wpa_supplicant/test/test_offchannel.c @@ -104,7 +104,7 @@ static void start_wifi_as_sta(void) static void stop_wifi(void) { esp_event_loop_delete_default(); - ESP_LOGI(TAG, "Stop wifi\n"); + ESP_LOGI(TAG, "Stop wifi"); TEST_ESP_OK(esp_wifi_stop()); TEST_ESP_OK(esp_wifi_deinit()); esp_wifi_clear_default_wifi_driver_and_handlers(wifi_netif); diff --git a/docs/en/migration-guides/release-5.x/5.0/networking.rst b/docs/en/migration-guides/release-5.x/5.0/networking.rst index 8bbe707150..143fe70eb7 100644 --- a/docs/en/migration-guides/release-5.x/5.0/networking.rst +++ b/docs/en/migration-guides/release-5.x/5.0/networking.rst @@ -141,13 +141,13 @@ This is the preferred way to print the address: .. code-block:: c - ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip)); Instead of .. code-block:: c - ESP_LOGI(TAG, "got ip:%s\n", ip4addr_ntoa(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:%s", ip4addr_ntoa(&event->ip_info.ip)); Since ``ip4addr_ntoa()`` is a LwIP API, the esp-netif provides ``esp_ip4addr_ntoa()`` as a replacement. However, the above method using ``IP2STR()`` is generally preferred. diff --git a/docs/zh_CN/migration-guides/release-5.x/5.0/networking.rst b/docs/zh_CN/migration-guides/release-5.x/5.0/networking.rst index 3dc09712e8..2052cc6823 100644 --- a/docs/zh_CN/migration-guides/release-5.x/5.0/networking.rst +++ b/docs/zh_CN/migration-guides/release-5.x/5.0/networking.rst @@ -141,13 +141,13 @@ TCP/IP 适配器是在 ESP-IDF v4.1 之前使用的网络接口抽象组件。 .. code-block:: c - ESP_LOGI(TAG, "got ip:" IPSTR "\n", IP2STR(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:" IPSTR, IP2STR(&event->ip_info.ip)); 不建议使用下述方式： .. code-block:: c - ESP_LOGI(TAG, "got ip:%s\n", ip4addr_ntoa(&event->ip_info.ip)); + ESP_LOGI(TAG, "got ip:%s", ip4addr_ntoa(&event->ip_info.ip)); ``ip4addr_ntoa()`` 为 LwIP API，因此 esp-netif 还提供了替代函数 ``esp_ip4addr_ntoa()``，然而总得来说仍推荐使用 ``IP2STR()`` 这一方法。 diff --git a/examples/bluetooth/bluedroid/ble/ble_ancs/main/ble_ancs_demo.c b/examples/bluetooth/bluedroid/ble/ble_ancs/main/ble_ancs_demo.c index adc4d9822d..fa1464bd01 100644 --- a/examples/bluetooth/bluedroid/ble/ble_ancs/main/ble_ancs_demo.c +++ b/examples/bluetooth/bluedroid/ble/ble_ancs/main/ble_ancs_demo.c @@ -243,7 +243,7 @@ static void periodic_timer_callback(void* arg) static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) { - ESP_LOGV(BLE_ANCS_TAG, "GAP_EVT, event %d\n", event); + ESP_LOGV(BLE_ANCS_TAG, "GAP_EVT, event %d", event); switch (event) { case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT: @@ -640,7 +640,7 @@ void app_main(void) //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if (ret) { - ESP_LOGE(BLE_ANCS_TAG, "%s gattc register error, error code = %x\n", __func__, ret); + ESP_LOGE(BLE_ANCS_TAG, "%s gattc register error, error code = %x", __func__, ret); return; } @@ -652,7 +652,7 @@ void app_main(void) ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret) { - ESP_LOGE(BLE_ANCS_TAG, "%s gattc app register error, error code = %x\n", __func__, ret); + ESP_LOGE(BLE_ANCS_TAG, "%s gattc app register error, error code = %x", __func__, ret); } ret = esp_ble_gatt_set_local_mtu(500); diff --git a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/ble_compatibility_test.c b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/ble_compatibility_test.c index 82fb7aad1c..f5bfd969a8 100644 --- a/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/ble_compatibility_test.c +++ b/examples/bluetooth/bluedroid/ble/ble_compatibility_test/main/ble_compatibility_test.c @@ -309,7 +309,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { ESP_LOGE(EXAMPLE_TAG, "advertising start failed"); }else{ - ESP_LOGI(EXAMPLE_TAG, "(0) ***** advertising start successfully ***** \n"); + ESP_LOGI(EXAMPLE_TAG, "(0) ***** advertising start successfully ***** "); } break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: @@ -317,7 +317,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param ESP_LOGE(EXAMPLE_TAG, "Advertising stop failed"); } else { - ESP_LOGI(EXAMPLE_TAG, "Stop adv successfully\n"); + ESP_LOGI(EXAMPLE_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -360,10 +360,10 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param (bd_addr[4] << 8) + bd_addr[5]); EXAMPLE_DEBUG(EXAMPLE_TAG, "address type = %d", param->ble_security.auth_cmpl.addr_type); if (param->ble_security.auth_cmpl.success){ - ESP_LOGI(EXAMPLE_TAG, "(1) ***** pair status = success ***** \n"); + ESP_LOGI(EXAMPLE_TAG, "(1) ***** pair status = success ***** "); } else { - ESP_LOGI(EXAMPLE_TAG, "***** pair status = fail, reason = 0x%x *****\n", param->ble_security.auth_cmpl.fail_reason); + ESP_LOGI(EXAMPLE_TAG, "***** pair status = fail, reason = 0x%x *****", param->ble_security.auth_cmpl.fail_reason); } show_bonded_devices(); break; @@ -438,7 +438,7 @@ void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, esp_ble } } if(long_write_success) { - ESP_LOGI(EXAMPLE_TAG, "(4) ***** long write success ***** \n"); + ESP_LOGI(EXAMPLE_TAG, "(4) ***** long write success ***** "); } } }else{ @@ -493,10 +493,10 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ case ESP_GATTS_READ_EVT: //ESP_LOGE(EXAMPLE_TAG, "ESP_GATTS_READ_EVT, handle=0x%d, offset=%d", param->read.handle, param->read.offset); if(gatt_db_handle_table[IDX_CHAR_VAL_A] == param->read.handle) { - ESP_LOGE(EXAMPLE_TAG, "(2) ***** read char1 ***** \n"); + ESP_LOGE(EXAMPLE_TAG, "(2) ***** read char1 ***** "); } if(gatt_db_handle_table[IDX_CHAR_VAL_B] == param->read.handle) { - ESP_LOGE(EXAMPLE_TAG, "(5) ***** read char2 ***** \n"); + ESP_LOGE(EXAMPLE_TAG, "(5) ***** read char2 ***** "); } break; case ESP_GATTS_WRITE_EVT: @@ -512,7 +512,7 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ //the size of notify_data[] need less than MTU size esp_ble_gatts_send_indicate(gatts_if, param->write.conn_id, gatt_db_handle_table[IDX_CHAR_VAL_C], sizeof(notify_data), notify_data, false); - ESP_LOGI(EXAMPLE_TAG, "(6) ***** send notify AA BB ***** \n"); + ESP_LOGI(EXAMPLE_TAG, "(6) ***** send notify AA BB ***** "); }else if (descr_value == 0x0002){ //the size of indicate_data[] need less than MTU size esp_ble_gatts_send_indicate(gatts_if, param->write.conn_id, gatt_db_handle_table[IDX_CHAR_VAL_C], @@ -529,7 +529,7 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ if(gatt_db_handle_table[IDX_CHAR_VAL_A] == param->write.handle && param->write.len == 2) { uint8_t write_data[2] = {0x88, 0x99}; if(memcmp(write_data, param->write.value, param->write.len) == 0) { - ESP_LOGI(EXAMPLE_TAG, "(3)***** short write success ***** \n"); + ESP_LOGI(EXAMPLE_TAG, "(3)***** short write success ***** "); } } @@ -574,7 +574,7 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ doesn't equal to HRS_IDX_NB(%d)", param->add_attr_tab.num_handle, HRS_IDX_NB); } else { - ESP_LOGI(EXAMPLE_TAG, "create attribute table successfully, the number handle = %d\n",param->add_attr_tab.num_handle); + ESP_LOGI(EXAMPLE_TAG, "create attribute table successfully, the number handle = %d",param->add_attr_tab.num_handle); memcpy(gatt_db_handle_table, param->add_attr_tab.handles, sizeof(gatt_db_handle_table)); esp_ble_gatts_start_service(gatt_db_handle_table[IDX_SVC]); } diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/ble_hidd_demo_main.c b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/ble_hidd_demo_main.c index 8624e480f6..9b0df3e094 100644 --- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/ble_hidd_demo_main.c +++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/ble_hidd_demo_main.c @@ -206,30 +206,30 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(HID_DEMO_TAG, "%s initialize controller failed\n", __func__); + ESP_LOGE(HID_DEMO_TAG, "%s initialize controller failed", __func__); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(HID_DEMO_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(HID_DEMO_TAG, "%s enable controller failed", __func__); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed\n", __func__); + ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed", __func__); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed\n", __func__); + ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed", __func__); return; } if((ret = esp_hidd_profile_init()) != ESP_OK) { - ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed\n", __func__); + ESP_LOGE(HID_DEMO_TAG, "%s init bluedroid failed", __func__); } ///register the callback function to the gap module diff --git a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/hid_device_le_prf.c b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/hid_device_le_prf.c index 5ba30316eb..fc86ee30dc 100644 --- a/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/hid_device_le_prf.c +++ b/examples/bluetooth/bluedroid/ble/ble_hid_device_demo/main/hid_device_le_prf.c @@ -695,7 +695,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { heart_rate_profile_tab[PROFILE_APP_IDX].gatts_if = gatts_if; } else { - ESP_LOGI(HID_LE_PRF_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(HID_LE_PRF_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; diff --git a/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/ibeacon_demo.c b/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/ibeacon_demo.c index fc9dee7d16..3c3fd4dd1c 100644 --- a/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/ibeacon_demo.c +++ b/examples/bluetooth/bluedroid/ble/ble_ibeacon/main/ibeacon_demo.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -182,7 +182,7 @@ void app_main(void) esp_ble_gap_config_adv_data_raw((uint8_t*)&ibeacon_adv_data, sizeof(ibeacon_adv_data)); } else { - ESP_LOGE(DEMO_TAG, "Config iBeacon data failed: %s\n", esp_err_to_name(status)); + ESP_LOGE(DEMO_TAG, "Config iBeacon data failed: %s", esp_err_to_name(status)); } #endif } diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_client/main/spp_client_demo.c b/examples/bluetooth/bluedroid/ble/ble_spp_client/main/spp_client_demo.c index 39d1b3438c..7aae9e7304 100644 --- a/examples/bluetooth/bluedroid/ble/ble_spp_client/main/spp_client_demo.c +++ b/examples/bluetooth/bluedroid/ble/ble_spp_client/main/spp_client_demo.c @@ -128,7 +128,7 @@ static void notify_event_handler(esp_ble_gattc_cb_param_t * p_data) } handle = p_data->notify.handle; if(db == NULL) { - ESP_LOGE(GATTC_TAG, " %s db is NULL\n", __func__); + ESP_LOGE(GATTC_TAG, " %s db is NULL", __func__); return; } if(handle == db[SPP_IDX_SPP_DATA_NTY_VAL].attribute_handle){ @@ -143,13 +143,13 @@ static void notify_event_handler(esp_ble_gattc_cb_param_t * p_data) notify_value_count = 0; notify_value_p = NULL; notify_value_offset = 0; - ESP_LOGE(GATTC_TAG,"notify value count is not continuous,%s\n",__func__); + ESP_LOGE(GATTC_TAG,"notify value count is not continuous,%s",__func__); return; } if(p_data->notify.value[3] == 1){ notify_value_p = (char *)malloc(((spp_mtu_size-7)*(p_data->notify.value[2]))*sizeof(char)); if(notify_value_p == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n",__func__,__LINE__); + ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d",__func__,__LINE__); notify_value_count = 0; return; } @@ -250,7 +250,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par adv_name = esp_ble_resolve_adv_data(scan_result->scan_rst.ble_adv, ESP_BLE_AD_TYPE_NAME_CMPL, &adv_name_len); ESP_LOGI(GATTC_TAG, "Searched Device Name Len %d", adv_name_len); esp_log_buffer_char(GATTC_TAG, adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (adv_name != NULL) { if ( strncmp((char *)adv_name, device_name, adv_name_len) == 0) { memcpy(&(scan_rst), scan_result, sizeof(esp_ble_gap_cb_param_t)); @@ -339,7 +339,7 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ esp_ble_gattc_send_mtu_req(gattc_if, spp_conn_id); break; case ESP_GATTC_REG_FOR_NOTIFY_EVT: { - ESP_LOGI(GATTC_TAG,"Index = %d,status = %d,handle = %d\n",cmd, p_data->reg_for_notify.status, p_data->reg_for_notify.handle); + ESP_LOGI(GATTC_TAG,"Index = %d,status = %d,handle = %d",cmd, p_data->reg_for_notify.status, p_data->reg_for_notify.handle); if(p_data->reg_for_notify.status != ESP_GATT_OK){ ESP_LOGE(GATTC_TAG, "ESP_GATTC_REG_FOR_NOTIFY_EVT, status = %d", p_data->reg_for_notify.status); break; @@ -357,11 +357,11 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ break; } case ESP_GATTC_NOTIFY_EVT: - ESP_LOGI(GATTC_TAG,"ESP_GATTC_NOTIFY_EVT\n"); + ESP_LOGI(GATTC_TAG,"ESP_GATTC_NOTIFY_EVT"); notify_event_handler(p_data); break; case ESP_GATTC_READ_CHAR_EVT: - ESP_LOGI(GATTC_TAG,"ESP_GATTC_READ_CHAR_EVT\n"); + ESP_LOGI(GATTC_TAG,"ESP_GATTC_READ_CHAR_EVT"); break; case ESP_GATTC_WRITE_CHAR_EVT: ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_CHAR_EVT:status = %d,handle = %d", param->write.status, param->write.handle); @@ -375,7 +375,7 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ case ESP_GATTC_EXEC_EVT: break; case ESP_GATTC_WRITE_DESCR_EVT: - ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_DESCR_EVT: status =%d,handle = %d \n", p_data->write.status, p_data->write.handle); + ESP_LOGI(GATTC_TAG,"ESP_GATTC_WRITE_DESCR_EVT: status =%d,handle = %d", p_data->write.status, p_data->write.handle); if(p_data->write.status != ESP_GATT_OK){ ESP_LOGE(GATTC_TAG, "ESP_GATTC_WRITE_DESCR_EVT, error status = %d", p_data->write.status); break; @@ -404,46 +404,46 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ if(p_data->cfg_mtu.status != ESP_OK){ break; } - ESP_LOGI(GATTC_TAG,"+MTU:%d\n", p_data->cfg_mtu.mtu); + ESP_LOGI(GATTC_TAG,"+MTU:%d", p_data->cfg_mtu.mtu); spp_mtu_size = p_data->cfg_mtu.mtu; db = (esp_gattc_db_elem_t *)malloc(count*sizeof(esp_gattc_db_elem_t)); if(db == NULL){ - ESP_LOGE(GATTC_TAG,"%s:malloc db falied\n",__func__); + ESP_LOGE(GATTC_TAG,"%s:malloc db falied",__func__); break; } if(esp_ble_gattc_get_db(spp_gattc_if, spp_conn_id, spp_srv_start_handle, spp_srv_end_handle, db, &count) != ESP_GATT_OK){ - ESP_LOGE(GATTC_TAG,"%s:get db falied\n",__func__); + ESP_LOGE(GATTC_TAG,"%s:get db falied",__func__); break; } if(count != SPP_IDX_NB){ - ESP_LOGE(GATTC_TAG,"%s:get db count != SPP_IDX_NB, count = %d, SPP_IDX_NB = %d\n",__func__,count,SPP_IDX_NB); + ESP_LOGE(GATTC_TAG,"%s:get db count != SPP_IDX_NB, count = %d, SPP_IDX_NB = %d",__func__,count,SPP_IDX_NB); break; } for(int i = 0;i < SPP_IDX_NB;i++){ switch((db+i)->type){ case ESP_GATT_DB_PRIMARY_SERVICE: - ESP_LOGI(GATTC_TAG,"attr_type = PRIMARY_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = PRIMARY_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; case ESP_GATT_DB_SECONDARY_SERVICE: - ESP_LOGI(GATTC_TAG,"attr_type = SECONDARY_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = SECONDARY_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; case ESP_GATT_DB_CHARACTERISTIC: - ESP_LOGI(GATTC_TAG,"attr_type = CHARACTERISTIC,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = CHARACTERISTIC,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; case ESP_GATT_DB_DESCRIPTOR: - ESP_LOGI(GATTC_TAG,"attr_type = DESCRIPTOR,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = DESCRIPTOR,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; case ESP_GATT_DB_INCLUDED_SERVICE: - ESP_LOGI(GATTC_TAG,"attr_type = INCLUDED_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = INCLUDED_SERVICE,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; case ESP_GATT_DB_ALL: - ESP_LOGI(GATTC_TAG,"attr_type = ESP_GATT_DB_ALL,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x\n",\ + ESP_LOGI(GATTC_TAG,"attr_type = ESP_GATT_DB_ALL,attribute_handle=%d,start_handle=%d,end_handle=%d,properties=0x%x,uuid=0x%04x",\ (db+i)->attribute_handle, (db+i)->start_handle, (db+i)->end_handle, (db+i)->properties, (db+i)->uuid.uuid.uuid16); break; default: @@ -468,15 +468,15 @@ void spp_client_reg_task(void* arg) if(xQueueReceive(cmd_reg_queue, &cmd_id, portMAX_DELAY)) { if(db != NULL) { if(cmd_id == SPP_IDX_SPP_DATA_NTY_VAL){ - ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n", cmd_id, (db+SPP_IDX_SPP_DATA_NTY_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle); + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d", cmd_id, (db+SPP_IDX_SPP_DATA_NTY_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle); esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda, (db+SPP_IDX_SPP_DATA_NTY_VAL)->attribute_handle); }else if(cmd_id == SPP_IDX_SPP_STATUS_VAL){ - ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n", cmd_id, (db+SPP_IDX_SPP_STATUS_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle); + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d", cmd_id, (db+SPP_IDX_SPP_STATUS_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle); esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda, (db+SPP_IDX_SPP_STATUS_VAL)->attribute_handle); } #ifdef SUPPORT_HEARTBEAT else if(cmd_id == SPP_IDX_SPP_HEARTBEAT_VAL){ - ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d \n", cmd_id, (db+SPP_IDX_SPP_HEARTBEAT_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle); + ESP_LOGI(GATTC_TAG,"Index = %d,UUID = 0x%04x, handle = %d", cmd_id, (db+SPP_IDX_SPP_HEARTBEAT_VAL)->uuid.uuid.uuid16, (db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle); esp_ble_gattc_register_for_notify(spp_gattc_if, gl_profile_tab[PROFILE_APP_ID].remote_bda, (db+SPP_IDX_SPP_HEARTBEAT_VAL)->attribute_handle); } #endif @@ -504,7 +504,7 @@ void spp_heart_beat_task(void * arg) ESP_GATT_AUTH_REQ_NONE); vTaskDelay(5000 / portTICK_PERIOD_MS); }else{ - ESP_LOGI(GATTC_TAG,"disconnect\n"); + ESP_LOGI(GATTC_TAG,"disconnect"); break; } } @@ -559,7 +559,7 @@ void uart_task(void *pvParameters) uint8_t * temp = NULL; temp = (uint8_t *)malloc(sizeof(uint8_t)*event.size); if(temp == NULL){ - ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d\n", __func__, __LINE__); + ESP_LOGE(GATTC_TAG, "malloc failed,%s L#%d", __func__, __LINE__); break; } memset(temp, 0x0, event.size); @@ -614,25 +614,25 @@ void app_main(void) nvs_flash_init(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } - ESP_LOGI(GATTC_TAG, "%s init bluetooth\n", __func__); + ESP_LOGI(GATTC_TAG, "%s init bluetooth", __func__); ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/ble/ble_spp_server/main/ble_spp_server_demo.c b/examples/bluetooth/bluedroid/ble/ble_spp_server/main/ble_spp_server_demo.c index 433eca7837..f1688acd8c 100644 --- a/examples/bluetooth/bluedroid/ble/ble_spp_server/main/ble_spp_server_demo.c +++ b/examples/bluetooth/bluedroid/ble/ble_spp_server/main/ble_spp_server_demo.c @@ -260,7 +260,7 @@ static bool store_wr_buffer(esp_ble_gatts_cb_param_t *p_data) temp_spp_recv_data_node_p1 = (spp_receive_data_node_t *)malloc(sizeof(spp_receive_data_node_t)); if(temp_spp_recv_data_node_p1 == NULL){ - ESP_LOGI(GATTS_TABLE_TAG, "malloc error %s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "malloc error %s %d", __func__, __LINE__); return false; } if(temp_spp_recv_data_node_p2 != NULL){ @@ -325,17 +325,17 @@ void uart_task(void *pvParameters) uint8_t * ntf_value_p = NULL; #ifdef SUPPORT_HEARTBEAT if(!enable_heart_ntf){ - ESP_LOGE(GATTS_TABLE_TAG, "%s do not enable heartbeat Notify\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s do not enable heartbeat Notify", __func__); break; } #endif if(!enable_data_ntf){ - ESP_LOGE(GATTS_TABLE_TAG, "%s do not enable data Notify\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s do not enable data Notify", __func__); break; } temp = (uint8_t *)malloc(sizeof(uint8_t)*event.size); if(temp == NULL){ - ESP_LOGE(GATTS_TABLE_TAG, "%s malloc.1 failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s malloc.1 failed", __func__); break; } memset(temp,0x0,event.size); @@ -351,7 +351,7 @@ void uart_task(void *pvParameters) current_num = 1; ntf_value_p = (uint8_t *)malloc((spp_mtu_size-3)*sizeof(uint8_t)); if(ntf_value_p == NULL){ - ESP_LOGE(GATTS_TABLE_TAG, "%s malloc.2 failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s malloc.2 failed", __func__); free(temp); break; } @@ -464,7 +464,7 @@ static void spp_task_init(void) static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) { esp_err_t err; - ESP_LOGE(GATTS_TABLE_TAG, "GAP_EVT, event %d\n", event); + ESP_LOGE(GATTS_TABLE_TAG, "GAP_EVT, event %d", event); switch (event) { case ESP_GAP_BLE_ADV_DATA_RAW_SET_COMPLETE_EVT: @@ -473,7 +473,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if((err = param->adv_start_cmpl.status) != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed: %s\n", esp_err_to_name(err)); + ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed: %s", esp_err_to_name(err)); } break; default: @@ -486,16 +486,16 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ esp_ble_gatts_cb_param_t *p_data = (esp_ble_gatts_cb_param_t *) param; uint8_t res = 0xff; - ESP_LOGI(GATTS_TABLE_TAG, "event = %x\n",event); + ESP_LOGI(GATTS_TABLE_TAG, "event = %x",event); switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); esp_ble_gap_set_device_name(SAMPLE_DEVICE_NAME); - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); esp_ble_gap_config_adv_data_raw((uint8_t *)spp_adv_data, sizeof(spp_adv_data)); - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); esp_ble_gatts_create_attr_tab(spp_gatt_db, gatts_if, SPP_IDX_NB, SPP_SVC_INST_ID); break; case ESP_GATTS_READ_EVT: @@ -507,12 +507,12 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ case ESP_GATTS_WRITE_EVT: { res = find_char_and_desr_index(p_data->write.handle); if(p_data->write.is_prep == false){ - ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_WRITE_EVT : handle = %d\n", res); + ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_WRITE_EVT : handle = %d", res); if(res == SPP_IDX_SPP_COMMAND_VAL){ uint8_t * spp_cmd_buff = NULL; spp_cmd_buff = (uint8_t *)malloc((spp_mtu_size - 3) * sizeof(uint8_t)); if(spp_cmd_buff == NULL){ - ESP_LOGE(GATTS_TABLE_TAG, "%s malloc failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s malloc failed", __func__); break; } memset(spp_cmd_buff,0x0,(spp_mtu_size - 3)); @@ -548,13 +548,13 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ //TODO: } }else if((p_data->write.is_prep == true)&&(res == SPP_IDX_SPP_DATA_RECV_VAL)){ - ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_PREP_WRITE_EVT : handle = %d\n", res); + ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_PREP_WRITE_EVT : handle = %d", res); store_wr_buffer(p_data); } break; } case ESP_GATTS_EXEC_WRITE_EVT:{ - ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_EXEC_WRITE_EVT\n"); + ESP_LOGI(GATTS_TABLE_TAG, "ESP_GATTS_EXEC_WRITE_EVT"); if(p_data->exec_write.exec_write_flag){ print_write_buffer(); free_write_buffer(); @@ -604,7 +604,7 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ case ESP_GATTS_CONGEST_EVT: break; case ESP_GATTS_CREAT_ATTR_TAB_EVT:{ - ESP_LOGI(GATTS_TABLE_TAG, "The number handle =%x\n",param->add_attr_tab.num_handle); + ESP_LOGI(GATTS_TABLE_TAG, "The number handle =%x",param->add_attr_tab.num_handle); if (param->add_attr_tab.status != ESP_GATT_OK){ ESP_LOGE(GATTS_TABLE_TAG, "Create attribute table failed, error code=0x%x", param->add_attr_tab.status); } @@ -625,14 +625,14 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { - ESP_LOGI(GATTS_TABLE_TAG, "EVT %d, gatts if %d\n", event, gatts_if); + ESP_LOGI(GATTS_TABLE_TAG, "EVT %d, gatts if %d", event, gatts_if); /* If event is register event, store the gatts_if for each profile */ if (event == ESP_GATTS_REG_EVT) { if (param->reg.status == ESP_GATT_OK) { spp_profile_tab[SPP_PROFILE_APP_IDX].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d\n",param->reg.app_id, param->reg.status); + ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d",param->reg.app_id, param->reg.status); return; } } @@ -667,25 +667,25 @@ void app_main(void) ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } - ESP_LOGI(GATTS_TABLE_TAG, "%s init bluetooth\n", __func__); + ESP_LOGI(GATTS_TABLE_TAG, "%s init bluetooth", __func__); ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TABLE_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/example_ble_client_throughput.c b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/example_ble_client_throughput.c index 283a62c817..9418893bb9 100644 --- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/example_ble_client_throughput.c +++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_client/main/example_ble_client_throughput.c @@ -392,10 +392,10 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par ESP_BLE_AD_TYPE_NAME_CMPL, &adv_name_len); ESP_LOGI(GATTC_TAG, "searched Device Name Len %d", adv_name_len); esp_log_buffer_char(GATTC_TAG, adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (adv_name != NULL) { if (strlen(remote_device_name) == adv_name_len && strncmp((char *)adv_name, remote_device_name, adv_name_len) == 0) { - ESP_LOGI(GATTC_TAG, "searched device %s\n", remote_device_name); + ESP_LOGI(GATTC_TAG, "searched device %s", remote_device_name); if (connect == false) { connect = true; ESP_LOGI(GATTC_TAG, "connect to the remote device."); @@ -552,45 +552,45 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed, error code = %x", __func__, ret); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s enable controller failed, error code = %x", __func__, ret); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed, error code = %x", __func__, ret); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed, error code = %x", __func__, ret); return; } //register the callback function to the gap module ret = esp_ble_gap_register_callback(esp_gap_cb); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x", __func__, ret); return; } //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret){ - ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x", __func__, ret); } // set the maximum MTU for used. esp_err_t local_mtu_ret = esp_ble_gatt_set_local_mtu(517); diff --git a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/example_ble_server_throughput.c b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/example_ble_server_throughput.c index fa981ab51a..cfdd323ee2 100644 --- a/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/example_ble_server_throughput.c +++ b/examples/bluetooth/bluedroid/ble/ble_throughput/throughput_server/main/example_ble_server_throughput.c @@ -251,15 +251,15 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TAG, "Advertising start failed\n"); + ESP_LOGE(GATTS_TAG, "Advertising start failed"); } break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TAG, "Advertising stop failed\n"); + ESP_LOGE(GATTS_TAG, "Advertising stop failed"); } else { - ESP_LOGI(GATTS_TAG, "Stop adv successfully\n"); + ESP_LOGI(GATTS_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -284,7 +284,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE * sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -305,7 +305,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK) { - ESP_LOGE(GATTS_TAG, "Send response error\n"); + ESP_LOGE(GATTS_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK) { @@ -336,7 +336,7 @@ void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, esp_ble static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_A_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -375,7 +375,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_A_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_A); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -468,7 +468,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_A_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_A; @@ -489,7 +489,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i uint16_t length = 0; const uint8_t *prf_char; - ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gl_profile_tab[PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -499,9 +499,9 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i ESP_LOGE(GATTS_TAG, "ILLEGAL HANDLE"); } - ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x\n", length); + ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x", length); for(int i = 0; i < length; i++){ - ESP_LOGI(GATTS_TAG, "prf_char[%x] =%x\n",i,prf_char[i]); + ESP_LOGI(GATTS_TAG, "prf_char[%x] =%x",i,prf_char[i]); } esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gl_profile_tab[PROFILE_A_APP_ID].service_handle, &gl_profile_tab[PROFILE_A_APP_ID].descr_uuid, ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE, NULL, NULL); @@ -513,13 +513,13 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_A_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -566,7 +566,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { gl_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -657,23 +657,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTS_TAG, "%s initialize controller failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s initialize controller failed", __func__); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s enable controller failed", __func__); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s init bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s init bluetooth failed", __func__); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed", __func__); return; } diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c b/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c index ef4e1c670b..277fcffb41 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c +++ b/examples/bluetooth/bluedroid/ble/gatt_client/main/gattc_demo.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -354,11 +354,11 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par esp_log_buffer_hex(GATTC_TAG, &scan_result->scan_rst.ble_adv[scan_result->scan_rst.adv_data_len], scan_result->scan_rst.scan_rsp_len); } #endif - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (adv_name != NULL) { if (strlen(remote_device_name) == adv_name_len && strncmp((char *)adv_name, remote_device_name, adv_name_len) == 0) { - ESP_LOGI(GATTC_TAG, "searched device %s\n", remote_device_name); + ESP_LOGI(GATTC_TAG, "searched device %s", remote_device_name); if (connect == false) { connect = true; ESP_LOGI(GATTC_TAG, "connect to the remote device."); @@ -449,45 +449,45 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } //register the callback function to the gap module ret = esp_ble_gap_register_callback(esp_gap_cb); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x", __func__, ret); return; } //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret){ - ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x", __func__, ret); } esp_err_t local_mtu_ret = esp_ble_gatt_set_local_mtu(500); if (local_mtu_ret){ diff --git a/examples/bluetooth/bluedroid/ble/gatt_client/tutorial/Gatt_Client_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble/gatt_client/tutorial/Gatt_Client_Example_Walkthrough.md index ba40fdc5f9..af778dbd12 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_client/tutorial/Gatt_Client_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble/gatt_client/tutorial/Gatt_Client_Example_Walkthrough.md @@ -50,45 +50,45 @@ void app_main() esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed, error code = %x", __func__, ret); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s enable controller failed, error code = %x", __func__, ret); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed, error code = %x", __func__, ret); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed, error code = %x", __func__, ret); return; } //register the callback function to the gap module ret = esp_ble_gap_register_callback(esp_gap_cb); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gap register failed, error code = %x", __func__, ret); return; } //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret){ - ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc register failed, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register failed, error code = %x", __func__, ret); } esp_err_t local_mtu_ret = esp_ble_gatt_set_local_mtu(500); @@ -362,10 +362,10 @@ We are interested in the `ESP_GAP_SEARCH_INQ_RES_EVT` event, which is called eve adv_name = esp_ble_resolve_adv_data(scan_result->scan_rst.ble_adv, ESP_BLE_AD_TYPE_NAME_CMPL, &adv_name_len); ESP_LOGI(GATTC_TAG, "searched Device Name Len %d", adv_name_len); esp_log_buffer_char(GATTC_TAG, adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (adv_name != NULL) { if (strlen(remote_device_name) == adv_name_len && strncmp((char *)adv_name, remote_device_name, adv_name_len) == 0) { - ESP_LOGI(GATTC_TAG, "searched device %s\n", remote_device_name); + ESP_LOGI(GATTC_TAG, "searched device %s", remote_device_name); if (connect == false) { connect = true; ESP_LOGI(GATTC_TAG, "connect to the remote device."); diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/main/example_ble_sec_gattc_demo.c b/examples/bluetooth/bluedroid/ble/gatt_security_client/main/example_ble_sec_gattc_demo.c index b7759224f5..ba3f757e00 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_security_client/main/example_ble_sec_gattc_demo.c +++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/main/example_ble_sec_gattc_demo.c @@ -443,10 +443,10 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par ESP_BLE_AD_TYPE_NAME_CMPL, &adv_name_len); ESP_LOGI(GATTC_TAG, "Searched Device Name Len %d", adv_name_len); esp_log_buffer_char(GATTC_TAG, adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (adv_name != NULL) { if (strlen(remote_device_name) == adv_name_len && strncmp((char *)adv_name, remote_device_name, adv_name_len) == 0) { - ESP_LOGI(GATTC_TAG, "searched device %s\n", remote_device_name); + ESP_LOGI(GATTC_TAG, "searched device %s", remote_device_name); if (connect == false) { connect = true; ESP_LOGI(GATTC_TAG, "connect to the remote device."); @@ -523,45 +523,45 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } //register the callback function to the gap module ret = esp_ble_gap_register_callback(esp_gap_cb); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gap register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gap register error, error code = %x", __func__, ret); return; } //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret){ - ESP_LOGE(GATTC_TAG, "%s gattc register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc register error, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x", __func__, ret); } ret = esp_ble_gatt_set_local_mtu(200); diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md index e5fabaca12..17019d61a4 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble/gatt_security_client/tutorial/Gatt_Security_Client_Example_Walkthrough.md @@ -23,7 +23,7 @@ The registration takes place in the ``app_main()`` function by using the ``esp_b … ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x", __func__, ret); } … ``` diff --git a/examples/bluetooth/bluedroid/ble/gatt_security_server/main/example_ble_sec_gatts_demo.c b/examples/bluetooth/bluedroid/ble/gatt_security_server/main/example_ble_sec_gatts_demo.c index 29c1f7c5a6..f36548d281 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_security_server/main/example_ble_sec_gatts_demo.c +++ b/examples/bluetooth/bluedroid/ble/gatt_security_server/main/example_ble_sec_gatts_demo.c @@ -259,9 +259,9 @@ static void show_bonded_devices(void) esp_ble_bond_dev_t *dev_list = (esp_ble_bond_dev_t *)malloc(sizeof(esp_ble_bond_dev_t) * dev_num); esp_ble_get_bond_device_list(&dev_num, dev_list); - ESP_LOGI(GATTS_TABLE_TAG, "Bonded devices number : %d\n", dev_num); + ESP_LOGI(GATTS_TABLE_TAG, "Bonded devices number : %d", dev_num); - ESP_LOGI(GATTS_TABLE_TAG, "Bonded devices list : %d\n", dev_num); + ESP_LOGI(GATTS_TABLE_TAG, "Bonded devices list : %d", dev_num); for (int i = 0; i < dev_num; i++) { esp_log_buffer_hex(GATTS_TABLE_TAG, (void *)dev_list[i].bd_addr, sizeof(esp_bd_addr_t)); } @@ -284,7 +284,7 @@ static void __attribute__((unused)) remove_all_bonded_devices(void) static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) { - ESP_LOGV(GATTS_TABLE_TAG, "GAP_EVT, event %d\n", event); + ESP_LOGV(GATTS_TABLE_TAG, "GAP_EVT, event %d", event); switch (event) { case ESP_GAP_BLE_SCAN_RSP_DATA_SET_COMPLETE_EVT: @@ -396,7 +396,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { - ESP_LOGV(GATTS_TABLE_TAG, "event = %x\n",event); + ESP_LOGV(GATTS_TABLE_TAG, "event = %x",event); switch (event) { case ESP_GATTS_REG_EVT: esp_ble_gap_set_device_name(EXAMPLE_DEVICE_NAME); @@ -476,7 +476,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { heart_rate_profile_tab[HEART_PROFILE_APP_IDX].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/main/gatts_demo.c b/examples/bluetooth/bluedroid/ble/gatt_server/main/gatts_demo.c index 2b422b3858..f139e86860 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_server/main/gatts_demo.c +++ b/examples/bluetooth/bluedroid/ble/gatt_server/main/gatts_demo.c @@ -214,14 +214,14 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TAG, "Advertising start failed\n"); + ESP_LOGE(GATTS_TAG, "Advertising start failed"); } break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TAG, "Advertising stop failed\n"); + ESP_LOGE(GATTS_TAG, "Advertising stop failed"); } else { - ESP_LOGI(GATTS_TAG, "Stop adv successfully\n"); + ESP_LOGI(GATTS_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -246,7 +246,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE*sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -265,7 +265,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare memcpy(gatt_rsp->attr_value.value, param->write.value, param->write.len); esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK){ - ESP_LOGE(GATTS_TAG, "Send response error\n"); + ESP_LOGE(GATTS_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK){ @@ -298,7 +298,7 @@ void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, esp_ble static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_A_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -337,7 +337,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_A_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_A); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -405,7 +405,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_A_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_A; @@ -426,7 +426,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i uint16_t length = 0; const uint8_t *prf_char; - ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gl_profile_tab[PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -436,9 +436,9 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i ESP_LOGE(GATTS_TAG, "ILLEGAL HANDLE"); } - ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x\n", length); + ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x", length); for(int i = 0; i < length; i++){ - ESP_LOGI(GATTS_TAG, "prf_char[%x] =%x\n",i,prf_char[i]); + ESP_LOGI(GATTS_TAG, "prf_char[%x] =%x",i,prf_char[i]); } esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gl_profile_tab[PROFILE_A_APP_ID].service_handle, &gl_profile_tab[PROFILE_A_APP_ID].descr_uuid, ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE, NULL, NULL); @@ -449,13 +449,13 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i } case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_A_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -500,7 +500,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_B_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -509,7 +509,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_B_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_B); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -523,7 +523,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_WRITE_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d\n", param->write.conn_id, param->write.trans_id, param->write.handle); + ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %" PRIu32 ", handle %d", param->write.conn_id, param->write.trans_id, param->write.handle); if (!param->write.is_prep){ ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, value len %d, value :", param->write.len); esp_log_buffer_hex(GATTS_TAG, param->write.value, param->write.len); @@ -576,7 +576,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_B_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_B_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_B_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_B; @@ -594,7 +594,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_ADD_INCL_SRVC_EVT: break; case ESP_GATTS_ADD_CHAR_EVT: - ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_B_APP_ID].char_handle = param->add_char.attr_handle; @@ -606,13 +606,13 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_B_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -648,7 +648,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { gl_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -687,23 +687,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTS_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/ble/gatt_server/tutorial/Gatt_Server_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble/gatt_server/tutorial/Gatt_Server_Example_Walkthrough.md index bf2b8594bd..9aba4bb43a 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_server/tutorial/Gatt_Server_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble/gatt_server/tutorial/Gatt_Server_Example_Walkthrough.md @@ -53,23 +53,23 @@ The entry point to this example is the app_main() function: esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTS_TAG, "%s initialize controller failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s initialize controller failed", __func__); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s enable controller failed", __func__); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s init bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s init bluetooth failed", __func__); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TAG, "%s enable bluetooth failed", __func__); return; } @@ -258,7 +258,7 @@ Finally, to set the device name, the `esp_ble_gap_set_device_name()` function is static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_A_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -381,7 +381,7 @@ If the advertising started successfully, an `ESP_GAP_BLE_ADV_START_COMPLETE_EVT` case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TAG, "Advertising start failed\n"); + ESP_LOGE(GATTS_TAG, "Advertising start failed"); } break; … @@ -406,7 +406,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { gl_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -461,7 +461,7 @@ Application Profile B creates the service in the same way as Profile A: static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(GATTS_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_B_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -479,7 +479,7 @@ When a service is created successfully, an `ESP_GATTS_CREATE_EVT` event managed ```c case ESP_GATTS_CREATE_EVT: - ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(GATTS_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_A_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_A; @@ -558,7 +558,7 @@ The attribute handle returned by the event is stored in the profile table and th uint16_t length = 0; const uint8_t *prf_char; - ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gl_profile_tab[PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -567,9 +567,9 @@ The attribute handle returned by the event is stored in the profile table and th if (get_attr_ret == ESP_FAIL){ ESP_LOGE(GATTS_TAG, "ILLEGAL HANDLE"); } - ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x\n", length); + ESP_LOGI(GATTS_TAG, "the gatts demo char length = %x", length); for(int i = 0; i < length; i++){ - ESP_LOGI(GATTS_TAG, "prf_char[%x] = %x\n",i,prf_char[i]); + ESP_LOGI(GATTS_TAG, "prf_char[%x] = %x",i,prf_char[i]); } esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr( gl_profile_tab[PROFILE_A_APP_ID].service_handle, @@ -587,7 +587,7 @@ Once the descriptor is added, the `ESP_GATTS_ADD_CHAR_DESCR_EVT` event is trigge ```c case ESP_GATTS_ADD_CHAR_DESCR_EVT: - ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(GATTS_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); break; @@ -629,7 +629,7 @@ Profile B connection event: ```c case ESP_GATTS_CONNECT_EVT: - ESP_LOGI(GATTS_TAG, "CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x:, is_conn %d\n", + ESP_LOGI(GATTS_TAG, "CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x:, is_conn %d", param->connect.conn_id, param->connect.remote_bda[0], param->connect.remote_bda[1], @@ -675,7 +675,7 @@ In this example, a response is constructed with dummy data and sent back to the ```c case ESP_GATTS_READ_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %d, handle %d\n", + ESP_LOGI(GATTS_TAG, "GATT_READ_EVT, conn_id %d, trans_id %d, handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); @@ -715,7 +715,7 @@ When a write event is triggered, this example prints logging messages, and then ```c case ESP_GATTS_WRITE_EVT: { - ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %d, handle %d\n", param->write.conn_id, param->write.trans_id, param->write.handle); + ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %d, handle %d", param->write.conn_id, param->write.trans_id, param->write.handle); if (!param->write.is_prep){ ESP_LOGI(GATTS_TAG, "GATT_WRITE_EVT, value len %d, value :", param->write.len); esp_log_buffer_hex(GATTS_TAG, param->write.value, param->write.len); @@ -775,7 +775,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE*sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -796,7 +796,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK){ - ESP_LOGE(GATTS_TAG, "Send response error\n"); + ESP_LOGE(GATTS_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK){ @@ -855,7 +855,7 @@ if (prepare_write_env->prepare_buf == NULL) { (uint8_t*)malloc(PREPARE_BUF_MAX_SIZE*sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(GATTS_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } @@ -886,7 +886,7 @@ memcpy(gatt_rsp->attr_value.value, param->write.value, param->write.len); esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK){ - ESP_LOGE(GATTS_TAG, "Send response error\n"); + ESP_LOGE(GATTS_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK){ diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/gatts_table_creat_demo.c b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/gatts_table_creat_demo.c index d1681b580f..0110d3b238 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/gatts_table_creat_demo.c +++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/main/gatts_table_creat_demo.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -260,7 +260,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param ESP_LOGE(GATTS_TABLE_TAG, "Advertising stop failed"); } else { - ESP_LOGI(GATTS_TABLE_TAG, "Stop adv successfully\n"); + ESP_LOGI(GATTS_TABLE_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -463,7 +463,7 @@ static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_ doesn't equal to HRS_IDX_NB(%d)", param->add_attr_tab.num_handle, HRS_IDX_NB); } else { - ESP_LOGI(GATTS_TABLE_TAG, "create attribute table successfully, the number handle = %d\n",param->add_attr_tab.num_handle); + ESP_LOGI(GATTS_TABLE_TAG, "create attribute table successfully, the number handle = %d",param->add_attr_tab.num_handle); memcpy(heart_rate_handle_table, param->add_attr_tab.handles, sizeof(heart_rate_handle_table)); esp_ble_gatts_start_service(heart_rate_handle_table[IDX_SVC]); } diff --git a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/tutorial/Gatt_Server_Service_Table_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/tutorial/Gatt_Server_Service_Table_Example_Walkthrough.md index 6c47d91867..1cb9d2694a 100644 --- a/examples/bluetooth/bluedroid/ble/gatt_server_service_table/tutorial/Gatt_Server_Service_Table_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble/gatt_server_service_table/tutorial/Gatt_Server_Service_Table_Example_Walkthrough.md @@ -90,25 +90,25 @@ void app_main() esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed", __func__); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable controller failed", __func__); return; } - ESP_LOGI(GATTS_TABLE_TAG, "%s init bluetooth\n", __func__); + ESP_LOGI(GATTS_TABLE_TAG, "%s init bluetooth", __func__); ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s init bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s init bluetooth failed", __func__); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTS_TABLE_TAG, "%s enable bluetooth failed\n", __func__); + ESP_LOGE(GATTS_TABLE_TAG, "%s enable bluetooth failed", __func__); return; } @@ -214,14 +214,14 @@ An advertising payload can be up to 31 bytes of data. It is possible that some o static void gatts_profile_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { - ESP_LOGE(GATTS_TABLE_TAG, "event = %x\n",event); + ESP_LOGE(GATTS_TABLE_TAG, "event = %x",event); switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); esp_ble_gap_set_device_name(SAMPLE_DEVICE_NAME); - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); esp_ble_gap_config_adv_data(&heart_rate_adv_config); - ESP_LOGI(GATTS_TABLE_TAG, "%s %d\n", __func__, __LINE__); + ESP_LOGI(GATTS_TABLE_TAG, "%s %d", __func__, __LINE__); … ``` @@ -232,7 +232,7 @@ Once the advertising data have been set, the ``ESP_GAP_BLE_ADV_DATA_SET_COMPLETE ```c static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *param) { - ESP_LOGE(GATTS_TABLE_TAG, "GAP_EVT, event %d\n", event); + ESP_LOGE(GATTS_TABLE_TAG, "GAP_EVT, event %d", event); switch (event) { case ESP_GAP_BLE_ADV_DATA_SET_COMPLETE_EVT: @@ -241,7 +241,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed\n"); + ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed"); } break; default: @@ -300,7 +300,7 @@ If the advertising started successfully, an ``ESP_GAP_BLE_ADV_START_COMPLETE_EVT case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed\n"); + ESP_LOGE(GATTS_TABLE_TAG, "Advertising start failed"); } break; … @@ -320,14 +320,14 @@ In addition to the previous parameters, the event also contains the GATT interfa ```c static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { - ESP_LOGI(GATTS_TABLE_TAG, "EVT %d, gatts if %d\n", event, gatts_if); + ESP_LOGI(GATTS_TABLE_TAG, "EVT %d, gatts if %d", event, gatts_if); /* If event is register event, store the gatts_if for each profile */ if (event == ESP_GATTS_REG_EVT) { if (param->reg.status == ESP_GATT_OK) { heart_rate_profile_tab[HEART_PROFILE_APP_IDX].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -453,7 +453,7 @@ This example uses this event to print information and to check that the size of ```c case ESP_GATTS_CREAT_ATTR_TAB_EVT:{ - ESP_LOGI(GATTS_TABLE_TAG, "The number handle =%x\n",param->add_attr_tab.num_handle); + ESP_LOGI(GATTS_TABLE_TAG, "The number handle =%x",param->add_attr_tab.num_handle); if (param->add_attr_tab.status != ESP_GATT_OK){ ESP_LOGE(GATTS_TABLE_TAG, "Create attribute table failed, error code=0x%x", param->add_attr_tab.status); } diff --git a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/gattc_multi_connect.c b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/gattc_multi_connect.c index 7cd805a258..25330a9988 100644 --- a/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/gattc_multi_connect.c +++ b/examples/bluetooth/bluedroid/ble/gattc_multi_connect/main/gattc_multi_connect.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -775,7 +775,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par ESP_BLE_AD_TYPE_NAME_CMPL, &adv_name_len); ESP_LOGI(GATTC_TAG, "Searched Device Name Len %d", adv_name_len); esp_log_buffer_char(GATTC_TAG, adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "\n"); + ESP_LOGI(GATTC_TAG, " "); if (Isconnecting){ break; } @@ -895,25 +895,25 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/main/ble50_sec_gattc_demo.c b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/main/ble50_sec_gattc_demo.c index b08e6c8177..8d805bec9f 100644 --- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/main/ble50_sec_gattc_demo.c +++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/main/ble50_sec_gattc_demo.c @@ -491,7 +491,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par esp_ble_gap_stop_ext_scan(); esp_log_buffer_hex("adv addr", param->ext_adv_report.params.addr, 6); esp_log_buffer_char("adv name", adv_name, adv_name_len); - ESP_LOGI(GATTC_TAG, "Stop extend scan and create aux open, primary_phy %d secondary phy %d\n", param->ext_adv_report.params.primary_phy, param->ext_adv_report.params.secondly_phy); + ESP_LOGI(GATTC_TAG, "Stop extend scan and create aux open, primary_phy %d secondary phy %d", param->ext_adv_report.params.primary_phy, param->ext_adv_report.params.secondly_phy); esp_ble_gap_prefer_ext_connect_params_set(param->ext_adv_report.params.addr, ESP_BLE_GAP_PHY_1M_PREF_MASK | ESP_BLE_GAP_PHY_2M_PREF_MASK | ESP_BLE_GAP_PHY_CODED_PREF_MASK , @@ -562,45 +562,45 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GATTC_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } //register the callback function to the gap module ret = esp_ble_gap_register_callback(esp_gap_cb); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gap register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gap register error, error code = %x", __func__, ret); return; } //register the callback function to the gattc module ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret){ - ESP_LOGE(GATTC_TAG, "%s gattc register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc register error, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x", __func__, ret); } ret = esp_ble_gatt_set_local_mtu(200); diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/tutorial/ble50_security_client_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/tutorial/ble50_security_client_Example_Walkthrough.md index 513fa0e1b7..69c32b2853 100644 --- a/examples/bluetooth/bluedroid/ble_50/ble50_security_client/tutorial/ble50_security_client_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_client/tutorial/ble50_security_client_Example_Walkthrough.md @@ -49,7 +49,7 @@ The registration takes place in the ``app_main()`` function by using the ``esp_b … ret = esp_ble_gattc_app_register(PROFILE_A_APP_ID); if (ret){ - ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x\n", __func__, ret); + ESP_LOGE(GATTC_TAG, "%s gattc app register error, error code = %x", __func__, ret); } … ``` diff --git a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/main/ble50_sec_gatts_demo.c b/examples/bluetooth/bluedroid/ble_50/ble50_security_server/main/ble50_sec_gatts_demo.c index 2584702c92..e494d51024 100644 --- a/examples/bluetooth/bluedroid/ble_50/ble50_security_server/main/ble50_sec_gatts_demo.c +++ b/examples/bluetooth/bluedroid/ble_50/ble50_security_server/main/ble50_sec_gatts_demo.c @@ -431,7 +431,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { heart_rate_profile_tab[HEART_PROFILE_APP_IDX].gatts_if = gatts_if; } else { - ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(GATTS_TABLE_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; diff --git a/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c b/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c index 5932239200..e30c6a8961 100644 --- a/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c +++ b/examples/bluetooth/bluedroid/ble_50/multi-adv/main/multi_adv_demo.c @@ -204,23 +204,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/ble_50/multi-adv/tutorial/Mulit_Adv_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble_50/multi-adv/tutorial/Mulit_Adv_Example_Walkthrough.md index 4164204363..bad6d70d12 100644 --- a/examples/bluetooth/bluedroid/ble_50/multi-adv/tutorial/Mulit_Adv_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble_50/multi-adv/tutorial/Mulit_Adv_Example_Walkthrough.md @@ -56,23 +56,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/main/periodic_adv_demo.c b/examples/bluetooth/bluedroid/ble_50/peroidic_adv/main/periodic_adv_demo.c index 60f497e719..35f594c78b 100644 --- a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/main/periodic_adv_demo.c +++ b/examples/bluetooth/bluedroid/ble_50/peroidic_adv/main/periodic_adv_demo.c @@ -155,23 +155,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/tutorial/Periodic_adv_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble_50/peroidic_adv/tutorial/Periodic_adv_Example_Walkthrough.md index ad843f80d1..a45c3398d0 100644 --- a/examples/bluetooth/bluedroid/ble_50/peroidic_adv/tutorial/Periodic_adv_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble_50/peroidic_adv/tutorial/Periodic_adv_Example_Walkthrough.md @@ -56,24 +56,24 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret) + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret) ); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/main/periodic_sync_demo.c b/examples/bluetooth/bluedroid/ble_50/peroidic_sync/main/periodic_sync_demo.c index 10b8f42a3f..1752a49788 100644 --- a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/main/periodic_sync_demo.c +++ b/examples/bluetooth/bluedroid/ble_50/peroidic_sync/main/periodic_sync_demo.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -150,23 +150,23 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/tutorial/Periodic_Sync_Example_Walkthrough.md b/examples/bluetooth/bluedroid/ble_50/peroidic_sync/tutorial/Periodic_Sync_Example_Walkthrough.md index 37375c551f..3635c9e2ed 100644 --- a/examples/bluetooth/bluedroid/ble_50/peroidic_sync/tutorial/Periodic_Sync_Example_Walkthrough.md +++ b/examples/bluetooth/bluedroid/ble_50/peroidic_sync/tutorial/Periodic_Sync_Example_Walkthrough.md @@ -76,24 +76,24 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret) + ESP_LOGE(LOG_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret) ); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(LOG_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_ble_gap_register_callback(gap_event_handler); diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c index 74a3e9682d..63bc0022fb 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/main/main.c @@ -161,19 +161,19 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_AV_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_AV_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(err)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/tutorial/Example_A2DP_Sink.md b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/tutorial/Example_A2DP_Sink.md index 9604f00a59..ddb06a557e 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/tutorial/Example_A2DP_Sink.md +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_sink/tutorial/Example_A2DP_Sink.md @@ -53,12 +53,12 @@ The main function also initializes the Bluetooth Controller with default setting /* initialize Bluetooth Controller with default configuration */ esp_bt_controller_config_t bt_cfg = ONTROLLER_INIT_CONFIG_DEFAULT(); if (esp_bt_controller_init(&bt_cfg) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize controller ed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize controller ed", __func__); return; } /* enable Bluetooth Controller in Classic Bluetooth mode */ if (esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT) != OK) { - ESP_LOGE(BT_AV_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable controller failed", __func__); return; } ``` @@ -68,12 +68,12 @@ After the initialization of the Bluetooth Controller, the Bluedroid Stack, which ```c /* initialize Bluedroid Host */ if (esp_bluedroid_init() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed", __func__); return; } /* enable Bluedroid Host */ if (esp_bluedroid_enable() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed", __func__); return; } ``` diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c index 65f1621794..b4a370c7df 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/main/main.c @@ -743,19 +743,19 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if (esp_bt_controller_init(&bt_cfg) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize controller failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize controller failed", __func__); return; } if (esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable controller failed", __func__); return; } if (esp_bluedroid_init() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed", __func__); return; } if (esp_bluedroid_enable() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed", __func__); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/tutorial/Example_A2DP_Source.md b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/tutorial/Example_A2DP_Source.md index 34d1cf8010..bf1767a978 100644 --- a/examples/bluetooth/bluedroid/classic_bt/a2dp_source/tutorial/Example_A2DP_Source.md +++ b/examples/bluetooth/bluedroid/classic_bt/a2dp_source/tutorial/Example_A2DP_Source.md @@ -50,12 +50,12 @@ The main function also initializes the Bluetooth Controller with default setting /* initialize Bluetooth Controller with default configuration */ esp_bt_controller_config_t bt_cfg = ONTROLLER_INIT_CONFIG_DEFAULT(); if (esp_bt_controller_init(&bt_cfg) != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize controller ed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize controller ed", __func__); return; } /* Enable Bluetooth Controller in Classical Bluetooth mode */ if (esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT) != OK) { - ESP_LOGE(BT_AV_TAG, "%s enable controller failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable controller failed", __func__); return; } ``` @@ -65,12 +65,12 @@ After the initialization of the Bluetooth Controller, the Bluedroid stack, which ```c /* initialize Bluedroid Host */ if (esp_bluedroid_init() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s initialize bluedroid failed", __func__); return; } /* Enable Bluedroid Host */ if (esp_bluedroid_enable() != ESP_OK) { - ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed\n", __func__); + ESP_LOGE(BT_AV_TAG, "%s enable bluedroid failed", __func__); return; } ``` diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.md b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.md index 663337986c..dfe1a372a2 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.md +++ b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/README.md @@ -93,7 +93,7 @@ The main function also initializes the Bluetooth controller by first creating th ```c esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ``` @@ -102,7 +102,7 @@ Next, the controller is enabled in Classic Bluetooth Mode. ```c if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ``` @@ -119,12 +119,12 @@ After the initialization of the Bluetooth controller, the Bluedroid stack, which ```c if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } ``` diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/main.c index b73c055edd..475c0180e6 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_discovery/main/main.c @@ -284,22 +284,22 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(GAP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(GAP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/main.c index 372f1e80a7..50bab9fa33 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_hid_mouse_device/main/main.c @@ -402,27 +402,27 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(TAG, "initialize controller failed: %s\n", esp_err_to_name(ret)); + ESP_LOGE(TAG, "initialize controller failed: %s", esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(TAG, "enable controller failed: %s\n", esp_err_to_name(ret)); + ESP_LOGE(TAG, "enable controller failed: %s", esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(TAG, "initialize bluedroid failed: %s\n", esp_err_to_name(ret)); + ESP_LOGE(TAG, "initialize bluedroid failed: %s", esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(TAG, "enable bluedroid failed: %s\n", esp_err_to_name(ret)); + ESP_LOGE(TAG, "enable bluedroid failed: %s", esp_err_to_name(ret)); return; } if ((ret = esp_bt_gap_register_callback(esp_bt_gap_cb)) != ESP_OK) { - ESP_LOGE(TAG, "gap register failed: %s\n", esp_err_to_name(ret)); + ESP_LOGE(TAG, "gap register failed: %s", esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c index 523b4e381c..538673f044 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_client/main/main.c @@ -272,39 +272,39 @@ static void esp_hdl_bt_l2cap_cb_evt(uint16_t event, void *p_param) switch (event) { case ESP_BT_L2CAP_INIT_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d\n", l2cap_param->init.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d", l2cap_param->init.status); if (l2cap_param->init.status == ESP_BT_L2CAP_SUCCESS) { esp_bt_l2cap_vfs_register(); } break; case ESP_BT_L2CAP_UNINIT_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_UNINIT_EVT: status:%d\n", l2cap_param->uninit.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_UNINIT_EVT: status:%d", l2cap_param->uninit.status); break; case ESP_BT_L2CAP_OPEN_EVT: if (l2cap_param->open.status == ESP_BT_L2CAP_SUCCESS) { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d, fd = %d, tx mtu = %"PRId32", remote_address:%s\n", l2cap_param->open.status, + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d, fd = %d, tx mtu = %"PRId32", remote_address:%s", l2cap_param->open.status, l2cap_param->open.fd, l2cap_param->open.tx_mtu, bda2str(l2cap_param->open.rem_bda, bda_str, sizeof(bda_str))); l2cap_wr_task_start_up(l2cap_write_handle, l2cap_param->open.fd); } else { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d\n", l2cap_param->open.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d", l2cap_param->open.status); } break; case ESP_BT_L2CAP_CLOSE_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d\n", l2cap_param->close.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d", l2cap_param->close.status); break; case ESP_BT_L2CAP_CL_INIT_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CL_INIT_EVT: status:%d\n", l2cap_param->cl_init.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CL_INIT_EVT: status:%d", l2cap_param->cl_init.status); break; case ESP_BT_L2CAP_START_EVT: if (l2cap_param->start.status == ESP_BT_L2CAP_SUCCESS) { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d, hdl:0x%"PRIx32", sec_id:0x%x\n", + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d, hdl:0x%"PRIx32", sec_id:0x%x", l2cap_param->start.status, l2cap_param->start.handle, l2cap_param->start.sec_id); } else { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d\n", l2cap_param->start.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d", l2cap_param->start.status); } break; case ESP_BT_L2CAP_SRV_STOP_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d, psm = 0x%x\n", l2cap_param->srv_stop.status, l2cap_param->srv_stop.psm); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d, psm = 0x%x", l2cap_param->srv_stop.status, l2cap_param->srv_stop.psm); break; default: break; @@ -337,7 +337,7 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param) switch (event) { case ESP_SDP_INIT_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d\n", sdp_param->init.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d", sdp_param->init.status); if (sdp_param->init.status == ESP_SDP_SUCCESS) { record.hdr.type = ESP_SDP_TYPE_RAW; record.hdr.uuid.len = sizeof(UUID_UNKNOWN); @@ -351,20 +351,20 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param) } break; case ESP_SDP_DEINIT_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_DEINIT_EVT: status:%d\n", sdp_param->deinit.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_DEINIT_EVT: status:%d", sdp_param->deinit.status); break; case ESP_SDP_SEARCH_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_SEARCH_COMP_EVT: status:%d\n", sdp_param->search.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_SEARCH_COMP_EVT: status:%d", sdp_param->search.status); if (sdp_param->search.status == ESP_SDP_SUCCESS) { - ESP_LOGI(SDP_TAG, "Remote device address: %s\n", bda2str(sdp_param->search.remote_addr, bda_str, sizeof(bda_str))); - ESP_LOGI(SDP_TAG, "Remote device record count: %d\n", sdp_param->search.record_count); - ESP_LOGI(SDP_TAG, "Remote device rfcomm channel number: %"PRId32"\n", sdp_param->search.records->hdr.rfcomm_channel_number); - ESP_LOGI(SDP_TAG, "Remote device l2cap psm: 0x%04"PRIx32"\n", sdp_param->search.records->hdr.l2cap_psm); + ESP_LOGI(SDP_TAG, "Remote device address: %s", bda2str(sdp_param->search.remote_addr, bda_str, sizeof(bda_str))); + ESP_LOGI(SDP_TAG, "Remote device record count: %d", sdp_param->search.record_count); + ESP_LOGI(SDP_TAG, "Remote device rfcomm channel number: %"PRId32, sdp_param->search.records->hdr.rfcomm_channel_number); + ESP_LOGI(SDP_TAG, "Remote device l2cap psm: 0x%04"PRIx32, sdp_param->search.records->hdr.l2cap_psm); esp_bt_l2cap_connect(sec_mask, sdp_param->search.records->hdr.l2cap_psm, sdp_param->search.remote_addr); } break; case ESP_SDP_CREATE_RECORD_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d\n", sdp_param->create_record.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d", sdp_param->create_record.status); if (sdp_param->create_record.status == ESP_SDP_SUCCESS) { esp_bt_dev_set_device_name(EXAMPLE_DEVICE_NAME); esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE); @@ -372,7 +372,7 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param) } break; case ESP_SDP_REMOVE_RECORD_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_REMOVE_RECORD_COMP_EVT: status:%d\n", sdp_param->remove_record.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_REMOVE_RECORD_COMP_EVT: status:%d", sdp_param->remove_record.status); break; default: break; @@ -393,49 +393,49 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } bt_app_task_start_up(); if ((ret = esp_bt_gap_register_callback(esp_bt_gap_cb)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s gap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s gap register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_l2cap_register_callback(esp_bt_l2cap_cb)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s l2cap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s l2cap register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_l2cap_init()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s l2cap init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s l2cap init failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_sdp_register_callback(esp_sdp_cb)) != ESP_OK) { - ESP_LOGE(SDP_TAG, "%s sdp register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SDP_TAG, "%s sdp register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_sdp_init()) != ESP_OK) { - ESP_LOGE(SDP_TAG, "%s sdp init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SDP_TAG, "%s sdp init failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c index 95ff05e63a..fc03fb76d4 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_l2cap_server/main/main.c @@ -181,42 +181,42 @@ static void esp_hdl_bt_l2cap_cb_evt(uint16_t event, void *p_param) switch (event) { case ESP_BT_L2CAP_INIT_EVT: if (l2cap_param->init.status == ESP_BT_L2CAP_SUCCESS) { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d\n", l2cap_param->init.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d", l2cap_param->init.status); esp_bt_l2cap_vfs_register(); esp_bt_l2cap_start_srv(sec_mask, BT_L2CAP_DYNMIC_PSM); } else { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d\n", l2cap_param->init.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_INIT_EVT: status:%d", l2cap_param->init.status); } break; case ESP_BT_L2CAP_UNINIT_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_UNINIT_EVT: status:%d\n", l2cap_param->uninit.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_UNINIT_EVT: status:%d", l2cap_param->uninit.status); break; case ESP_BT_L2CAP_OPEN_EVT: if (l2cap_param->open.status == ESP_BT_L2CAP_SUCCESS) { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d, fd = %d, tx mtu = %"PRIu32", remote_address:%s\n", l2cap_param->open.status, + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d, fd = %d, tx mtu = %"PRIu32", remote_address:%s", l2cap_param->open.status, l2cap_param->open.fd, l2cap_param->open.tx_mtu, bda2str(l2cap_param->open.rem_bda, bda_str, sizeof(bda_str))); l2cap_wr_task_start_up(l2cap_read_handle, l2cap_param->open.fd); } else { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d\n", l2cap_param->open.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_OPEN_EVT: status:%d", l2cap_param->open.status); } break; case ESP_BT_L2CAP_CLOSE_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d\n", l2cap_param->close.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CLOSE_EVT: status:%d", l2cap_param->close.status); esp_bt_l2cap_start_srv(sec_mask, BT_L2CAP_DYNMIC_PSM); // bug, need to do fix break; case ESP_BT_L2CAP_CL_INIT_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CL_INIT_EVT: status:%d\n", l2cap_param->cl_init.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_CL_INIT_EVT: status:%d", l2cap_param->cl_init.status); break; case ESP_BT_L2CAP_START_EVT: if (l2cap_param->start.status == ESP_BT_L2CAP_SUCCESS) { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d, hdl:0x%"PRIx32", sec_id:0x%x\n", + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d, hdl:0x%"PRIx32", sec_id:0x%x", l2cap_param->start.status, l2cap_param->start.handle, l2cap_param->start.sec_id); } else { - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d\n", l2cap_param->start.status); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_START_EVT: status:%d", l2cap_param->start.status); } break; case ESP_BT_L2CAP_SRV_STOP_EVT: - ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_SRV_STOP_EVT: status:%d, psm = 0x%x\n", l2cap_param->srv_stop.status, l2cap_param->srv_stop.psm); + ESP_LOGI(L2CAP_TAG, "ESP_BT_L2CAP_SRV_STOP_EVT: status:%d, psm = 0x%x", l2cap_param->srv_stop.status, l2cap_param->srv_stop.psm); break; default: break; @@ -248,7 +248,7 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param) switch (event) { case ESP_SDP_INIT_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d\n", sdp_param->init.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_INIT_EVT: status:%d", sdp_param->init.status); if (sdp_param->init.status == ESP_SDP_SUCCESS) { record.hdr.type = ESP_SDP_TYPE_RAW; record.hdr.uuid.len = sizeof(UUID_UNKNOWN); @@ -262,20 +262,20 @@ static void esp_hdl_sdp_cb_evt(uint16_t event, void *p_param) } break; case ESP_SDP_DEINIT_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_DEINIT_EVT: status:%d\n", sdp_param->deinit.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_DEINIT_EVT: status:%d", sdp_param->deinit.status); break; case ESP_SDP_SEARCH_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_SEARCH_COMP_EVT: status:%d\n", sdp_param->search.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_SEARCH_COMP_EVT: status:%d", sdp_param->search.status); break; case ESP_SDP_CREATE_RECORD_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d\n", sdp_param->create_record.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_CREATE_RECORD_COMP_EVT: status:%d", sdp_param->create_record.status); if (sdp_param->create_record.status == ESP_SDP_SUCCESS) { esp_bt_dev_set_device_name(EXAMPLE_DEVICE_NAME); esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE); } break; case ESP_SDP_REMOVE_RECORD_COMP_EVT: - ESP_LOGI(SDP_TAG, "ESP_SDP_REMOVE_RECORD_COMP_EVT: status:%d\n", sdp_param->remove_record.status); + ESP_LOGI(SDP_TAG, "ESP_SDP_REMOVE_RECORD_COMP_EVT: status:%d", sdp_param->remove_record.status); break; default: break; @@ -296,49 +296,49 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } bt_app_task_start_up(); if ((ret = esp_bt_gap_register_callback(esp_bt_gap_cb)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s gap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s gap register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_l2cap_register_callback(esp_bt_l2cap_cb)) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s l2cap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s l2cap register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_l2cap_init()) != ESP_OK) { - ESP_LOGE(L2CAP_TAG, "%s l2cap init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(L2CAP_TAG, "%s l2cap init failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_sdp_register_callback(esp_sdp_cb)) != ESP_OK) { - ESP_LOGE(SDP_TAG, "%s sdp register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SDP_TAG, "%s sdp register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_sdp_init()) != ESP_OK) { - ESP_LOGE(SDP_TAG, "%s sdp init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SDP_TAG, "%s sdp init failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/main.c index 8cf704fe32..4449434e27 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_acceptor/main/main.c @@ -214,32 +214,32 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_gap_register_callback(esp_bt_gap_cb)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s gap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s gap register failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_spp_register_callback(esp_spp_cb)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s spp register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s spp register failed: %s", __func__, esp_err_to_name(ret)); return; } @@ -249,7 +249,7 @@ void app_main(void) .tx_buffer_size = 0, /* Only used for ESP_SPP_MODE_VFS mode */ }; if ((ret = esp_spp_enhanced_init(&bt_spp_cfg)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s spp init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s spp init failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/main.c index 97385bd2b7..3934336d6c 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_initiator/main/main.c @@ -346,27 +346,27 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((ret = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((ret = esp_bt_gap_register_callback(esp_bt_gap_cb)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s gap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s gap register failed: %s", __func__, esp_err_to_name(ret)); return; } @@ -382,7 +382,7 @@ void app_main(void) #endif if ((ret = esp_spp_register_callback(esp_spp_cb)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s spp register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s spp register failed: %s", __func__, esp_err_to_name(ret)); return; } @@ -392,7 +392,7 @@ void app_main(void) .tx_buffer_size = 0, /* Only used for ESP_SPP_MODE_VFS mode */ }; if ((ret = esp_spp_enhanced_init(&bt_spp_cfg)) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s spp init failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s spp init failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/main.c b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/main.c index 403ef58c8a..3c124d1bef 100644 --- a/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/bt_spp_vfs_acceptor/main/main.c @@ -245,7 +245,7 @@ void app_main(void) } if (esp_bt_gap_register_callback(esp_bt_gap_cb) != ESP_OK) { - ESP_LOGE(SPP_TAG, "%s gap register failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(SPP_TAG, "%s gap register failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/bt_app_hf.c b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/bt_app_hf.c index 130a8a5054..d860a5b2c8 100644 --- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/bt_app_hf.c +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/bt_app_hf.c @@ -237,7 +237,7 @@ static void bt_app_send_data_task(void *arg) bt_app_hf_create_audio_data(buf, frame_data_num); BaseType_t done = xRingbufferSend(s_m_rb, buf, frame_data_num, 0); if (!done) { - ESP_LOGE(BT_HF_TAG, "rb send fail\n"); + ESP_LOGE(BT_HF_TAG, "rb send fail"); } osi_free(buf); vRingbufferGetInfo(s_m_rb, NULL, NULL, NULL, NULL, &item_size); diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/main.c b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/main.c index 8e32156728..4d6cc06462 100644 --- a/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_ag/main/main.c @@ -85,19 +85,19 @@ void app_main(void) esp_err_t err; esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/main.c b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/main.c index a1a4629827..6842b5bbe6 100644 --- a/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/main.c +++ b/examples/bluetooth/bluedroid/classic_bt/hfp_hf/main/main.c @@ -73,7 +73,7 @@ void esp_bt_gap_cb(esp_bt_gap_cb_event_t event, esp_bt_gap_cb_param_t *param) && get_name_from_eir(param->disc_res.prop[i].val, peer_bdname, &peer_bdname_len)){ if (strcmp(peer_bdname, remote_device_name) == 0) { memcpy(peer_addr, param->disc_res.bda, ESP_BD_ADDR_LEN); - ESP_LOGI(BT_HF_TAG, "Found a target device address: \n"); + ESP_LOGI(BT_HF_TAG, "Found a target device address:"); esp_log_buffer_hex(BT_HF_TAG, peer_addr, ESP_BD_ADDR_LEN); ESP_LOGI(BT_HF_TAG, "Found a target device name: %s", peer_bdname); printf("Connect.\n"); @@ -164,22 +164,22 @@ void app_main(void) esp_err_t err; esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bt_controller_enable(ESP_BT_MODE_CLASSIC_BT)) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } if ((err = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(BT_HF_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(BT_HF_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(ret)); return; } diff --git a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/main.c b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/main.c index e813eac80e..54ad6654e0 100644 --- a/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/main.c +++ b/examples/bluetooth/bluedroid/coex/a2dp_gatts_coex/main/main.c @@ -167,17 +167,17 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(BT_BLE_COEX_TAG, "Advertising start failed\n"); + ESP_LOGE(BT_BLE_COEX_TAG, "Advertising start failed"); }else { - ESP_LOGI(BT_BLE_COEX_TAG, "Start adv successfully\n"); + ESP_LOGI(BT_BLE_COEX_TAG, "Start adv successfully"); } break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(BT_BLE_COEX_TAG, "Advertising stop failed\n"); + ESP_LOGE(BT_BLE_COEX_TAG, "Advertising stop failed"); } else { - ESP_LOGI(BT_BLE_COEX_TAG, "Stop adv successfully\n"); + ESP_LOGI(BT_BLE_COEX_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -202,7 +202,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE*sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(BT_BLE_COEX_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(BT_BLE_COEX_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -221,7 +221,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare memcpy(gatt_rsp->attr_value.value, param->write.value, param->write.len); esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK){ - ESP_LOGE(BT_BLE_COEX_TAG, "Send response error\n"); + ESP_LOGE(BT_BLE_COEX_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK){ @@ -254,7 +254,7 @@ void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, esp_ble static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(BT_BLE_COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); esp_ble_gap_config_local_privacy(true); gl_profile_tab[PROFILE_A_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; @@ -265,7 +265,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_A_APP_ID].service_id, GATTS_NUM_HANDLE_A); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(BT_BLE_COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(BT_BLE_COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -333,7 +333,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(BT_BLE_COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_A_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_A; @@ -351,7 +351,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_ADD_INCL_SRVC_EVT: break; case ESP_GATTS_ADD_CHAR_EVT: { - ESP_LOGI(BT_BLE_COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gl_profile_tab[PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -365,13 +365,13 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i } case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_A_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(BT_BLE_COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -404,7 +404,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(BT_BLE_COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_B_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_B_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -413,7 +413,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_B_APP_ID].service_id, GATTS_NUM_HANDLE_B); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(BT_BLE_COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(BT_BLE_COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -427,7 +427,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_WRITE_EVT: { - ESP_LOGI(BT_BLE_COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->write.conn_id, param->write.trans_id, param->write.handle); + ESP_LOGI(BT_BLE_COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->write.conn_id, param->write.trans_id, param->write.handle); if (!param->write.is_prep){ ESP_LOGI(BT_BLE_COEX_TAG, "GATT_WRITE_EVT, value len %d, value :", param->write.len); esp_log_buffer_hex(BT_BLE_COEX_TAG, param->write.value, param->write.len); @@ -480,7 +480,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(BT_BLE_COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_B_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_B_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_B_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_B; @@ -498,7 +498,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i case ESP_GATTS_ADD_INCL_SRVC_EVT: break; case ESP_GATTS_ADD_CHAR_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_B_APP_ID].char_handle = param->add_char.attr_handle; @@ -510,13 +510,13 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_B_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(BT_BLE_COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(BT_BLE_COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -552,7 +552,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { gl_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(BT_BLE_COEX_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(BT_BLE_COEX_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -710,19 +710,19 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); if ((err = esp_bt_controller_init(&bt_cfg)) != ESP_OK) { - ESP_LOGE(BT_BLE_COEX_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_BLE_COEX_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bt_controller_enable(ESP_BT_MODE_BTDM)) != ESP_OK) { - ESP_LOGE(BT_BLE_COEX_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_BLE_COEX_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bluedroid_init()) != ESP_OK) { - ESP_LOGE(BT_BLE_COEX_TAG, "%s initialize bluedroid failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_BLE_COEX_TAG, "%s initialize bluedroid failed: %s", __func__, esp_err_to_name(err)); return; } if ((err = esp_bluedroid_enable()) != ESP_OK) { - ESP_LOGE(BT_BLE_COEX_TAG, "%s enable bluedroid failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(BT_BLE_COEX_TAG, "%s enable bluedroid failed: %s", __func__, esp_err_to_name(err)); return; } diff --git a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/gattc_gatts_coex.c b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/gattc_gatts_coex.c index 7dc7731362..ee032531d3 100644 --- a/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/gattc_gatts_coex.c +++ b/examples/bluetooth/bluedroid/coex/gattc_gatts_coex/main/gattc_gatts_coex.c @@ -231,19 +231,19 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(COEX_TAG, "Advertising start failed\n"); + ESP_LOGE(COEX_TAG, "Advertising start failed"); } - ESP_LOGI(COEX_TAG, "Advertising start successfully\n"); + ESP_LOGI(COEX_TAG, "Advertising start successfully"); break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(COEX_TAG, "Advertising stop failed\n"); + ESP_LOGE(COEX_TAG, "Advertising stop failed"); } else { - ESP_LOGI(COEX_TAG, "Stop adv successfully\n"); + ESP_LOGI(COEX_TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: - ESP_LOGI(COEX_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d\n", + ESP_LOGI(COEX_TAG, "update connection params status = %d, min_int = %d, max_int = %d,conn_int = %d,latency = %d, timeout = %d", param->update_conn_params.status, param->update_conn_params.min_int, param->update_conn_params.max_int, @@ -253,13 +253,13 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param break; case ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT: if (param->scan_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(COEX_TAG, "scan stop failed, error status = %x\n", param->scan_stop_cmpl.status); + ESP_LOGE(COEX_TAG, "scan stop failed, error status = %x", param->scan_stop_cmpl.status); break; } - ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT, stop scan successfully\n"); + ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_STOP_COMPLETE_EVT, stop scan successfully"); break; case ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT: { - ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT, set scan sparameters complete\n"); + ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_PARAM_SET_COMPLETE_EVT, set scan sparameters complete"); //the unit of the duration is second uint32_t duration = 120; esp_ble_gap_start_scanning(duration); @@ -267,10 +267,10 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param } case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT: if (param->scan_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(COEX_TAG, "scan start failed, error status = %x\n", param->scan_start_cmpl.status); + ESP_LOGE(COEX_TAG, "scan start failed, error status = %x", param->scan_start_cmpl.status); break; } - ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_START_COMPLETE_EVT, scan start success\n"); + ESP_LOGI(COEX_TAG, "ESP_GAP_BLE_SCAN_START_COMPLETE_EVT, scan start success"); break; case ESP_GAP_BLE_SCAN_RESULT_EVT: { esp_ble_gap_cb_param_t *scan_result = (esp_ble_gap_cb_param_t *)param; @@ -282,7 +282,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param if (strlen(remote_device_name) == adv_name_len && strncmp((char *)adv_name, remote_device_name, adv_name_len) == 0) { if (connect == false) { connect = true; - ESP_LOGI(COEX_TAG, "connect to the remote device %s\n", remote_device_name); + ESP_LOGI(COEX_TAG, "connect to the remote device %s", remote_device_name); esp_ble_gap_stop_scanning(); esp_ble_gattc_open(gattc_profile_tab[GATTC_PROFILE_C_APP_ID].gattc_if, scan_result->scan_rst.bda, scan_result->scan_rst.ble_addr_type, true); } @@ -290,7 +290,7 @@ static void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param } break; case ESP_GAP_SEARCH_INQ_CMPL_EVT: - ESP_LOGI(COEX_TAG, "ESP_GAP_SEARCH_INQ_CMPL_EVT, scan stop\n"); + ESP_LOGI(COEX_TAG, "ESP_GAP_SEARCH_INQ_CMPL_EVT, scan stop"); break; default: break; @@ -308,70 +308,70 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ switch (event) { case ESP_GATTC_REG_EVT: - ESP_LOGI(COEX_TAG, "REG_EVT\n"); + ESP_LOGI(COEX_TAG, "REG_EVT"); esp_err_t scan_ret = esp_ble_gap_set_scan_params(&ble_scan_params); if (scan_ret) { ESP_LOGE(COEX_TAG, "set scan params error, error code = %x", scan_ret); } break; case ESP_GATTC_CONNECT_EVT: { - ESP_LOGI(COEX_TAG, "ESP_GATTC_CONNECT_EVT conn_id %d, if %d\n", p_data->connect.conn_id, gattc_if); + ESP_LOGI(COEX_TAG, "ESP_GATTC_CONNECT_EVT conn_id %d, if %d", p_data->connect.conn_id, gattc_if); gattc_profile_tab[GATTC_PROFILE_C_APP_ID].conn_id = p_data->connect.conn_id; memcpy(gattc_profile_tab[GATTC_PROFILE_C_APP_ID].remote_bda, p_data->connect.remote_bda, sizeof(esp_bd_addr_t)); ESP_LOGI(COEX_TAG, "REMOTE BDA:"); esp_log_buffer_hex(COEX_TAG, gattc_profile_tab[GATTC_PROFILE_C_APP_ID].remote_bda, sizeof(esp_bd_addr_t)); esp_err_t mtu_ret = esp_ble_gattc_send_mtu_req (gattc_if, p_data->connect.conn_id); if (mtu_ret) { - ESP_LOGE(COEX_TAG, "config MTU error, error code = %x\n", mtu_ret); + ESP_LOGE(COEX_TAG, "config MTU error, error code = %x", mtu_ret); } break; } case ESP_GATTC_OPEN_EVT: if (param->open.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "open failed, status %d\n", p_data->open.status); + ESP_LOGE(COEX_TAG, "open failed, status %d", p_data->open.status); break; } - ESP_LOGI(COEX_TAG, "open success\n"); + ESP_LOGI(COEX_TAG, "open success"); break; case ESP_GATTC_DIS_SRVC_CMPL_EVT: if (param->dis_srvc_cmpl.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "discover service failed, status %d\n", param->dis_srvc_cmpl.status); + ESP_LOGE(COEX_TAG, "discover service failed, status %d", param->dis_srvc_cmpl.status); break; } - ESP_LOGI(COEX_TAG, "discover service complete conn_id %d\n", param->dis_srvc_cmpl.conn_id); + ESP_LOGI(COEX_TAG, "discover service complete conn_id %d", param->dis_srvc_cmpl.conn_id); esp_ble_gattc_search_service(gattc_if, param->cfg_mtu.conn_id, &remote_filter_service_uuid); break; case ESP_GATTC_CFG_MTU_EVT: if (param->cfg_mtu.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG,"config mtu failed, error status = %x\n", param->cfg_mtu.status); + ESP_LOGE(COEX_TAG,"config mtu failed, error status = %x", param->cfg_mtu.status); } - ESP_LOGI(COEX_TAG, "ESP_GATTC_CFG_MTU_EVT, Status %d, MTU %d, conn_id %d\n", param->cfg_mtu.status, param->cfg_mtu.mtu, param->cfg_mtu.conn_id); + ESP_LOGI(COEX_TAG, "ESP_GATTC_CFG_MTU_EVT, Status %d, MTU %d, conn_id %d", param->cfg_mtu.status, param->cfg_mtu.mtu, param->cfg_mtu.conn_id); break; case ESP_GATTC_SEARCH_RES_EVT: { - ESP_LOGI(COEX_TAG, "SEARCH RES: conn_id = %x is primary service %d\n", p_data->search_res.conn_id, p_data->search_res.is_primary); - ESP_LOGI(COEX_TAG, "start handle %d end handle %d current handle value %d\n", p_data->search_res.start_handle, p_data->search_res.end_handle, p_data->search_res.srvc_id.inst_id); + ESP_LOGI(COEX_TAG, "SEARCH RES: conn_id = %x is primary service %d", p_data->search_res.conn_id, p_data->search_res.is_primary); + ESP_LOGI(COEX_TAG, "start handle %d end handle %d current handle value %d", p_data->search_res.start_handle, p_data->search_res.end_handle, p_data->search_res.srvc_id.inst_id); if (p_data->search_res.srvc_id.uuid.len == ESP_UUID_LEN_16 && p_data->search_res.srvc_id.uuid.uuid.uuid16 == REMOTE_SERVICE_UUID) { - ESP_LOGI(COEX_TAG, "service found\n"); + ESP_LOGI(COEX_TAG, "service found"); get_server = true; gattc_profile_tab[GATTC_PROFILE_C_APP_ID].service_start_handle = p_data->search_res.start_handle; gattc_profile_tab[GATTC_PROFILE_C_APP_ID].service_end_handle = p_data->search_res.end_handle; - ESP_LOGI(COEX_TAG, "UUID16: %x\n", p_data->search_res.srvc_id.uuid.uuid.uuid16); + ESP_LOGI(COEX_TAG, "UUID16: %x", p_data->search_res.srvc_id.uuid.uuid.uuid16); } break; } case ESP_GATTC_SEARCH_CMPL_EVT: if (p_data->search_cmpl.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "search service failed, error status = %x\n", p_data->search_cmpl.status); + ESP_LOGE(COEX_TAG, "search service failed, error status = %x", p_data->search_cmpl.status); break; } if(p_data->search_cmpl.searched_service_source == ESP_GATT_SERVICE_FROM_REMOTE_DEVICE) { - ESP_LOGI(COEX_TAG, "Get service information from remote device\n"); + ESP_LOGI(COEX_TAG, "Get service information from remote device"); } else if (p_data->search_cmpl.searched_service_source == ESP_GATT_SERVICE_FROM_NVS_FLASH) { - ESP_LOGI(COEX_TAG, "Get service information from flash\n"); + ESP_LOGI(COEX_TAG, "Get service information from flash"); } else { - ESP_LOGI(COEX_TAG, "unknown service source\n"); + ESP_LOGI(COEX_TAG, "unknown service source"); } - ESP_LOGI(COEX_TAG, "ESP_GATTC_SEARCH_CMPL_EVT\n"); + ESP_LOGI(COEX_TAG, "ESP_GATTC_SEARCH_CMPL_EVT"); if (get_server) { uint16_t count = 0; esp_gatt_status_t status = esp_ble_gattc_get_attr_count( gattc_if, @@ -382,13 +382,13 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ INVALID_HANDLE, &count); if (status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_attr_count error\n"); + ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_attr_count error"); } if (count > 0) { char_elem_result = (esp_gattc_char_elem_t *)malloc(sizeof(esp_gattc_char_elem_t) * count); if (!char_elem_result) { - ESP_LOGE(COEX_TAG, "gattc no mem\n"); + ESP_LOGE(COEX_TAG, "gattc no mem"); }else { status = esp_ble_gattc_get_char_by_uuid( gattc_if, p_data->search_cmpl.conn_id, @@ -398,7 +398,7 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ char_elem_result, &count); if (status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_char_by_uuid error\n"); + ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_char_by_uuid error"); } /* Every service have only one char in our 'ESP_GATTS_DEMO' demo, so we used first 'char_elem_result' */ @@ -410,14 +410,14 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ /* free char_elem_result */ free(char_elem_result); } else { - ESP_LOGE(COEX_TAG, "no char found\n"); + ESP_LOGE(COEX_TAG, "no char found"); } } break; case ESP_GATTC_REG_FOR_NOTIFY_EVT: { - ESP_LOGI(COEX_TAG, "ESP_GATTC_REG_FOR_NOTIFY_EVT\n"); + ESP_LOGI(COEX_TAG, "ESP_GATTC_REG_FOR_NOTIFY_EVT"); if (p_data->reg_for_notify.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "REG FOR NOTIFY failed: error status = %d\n", p_data->reg_for_notify.status); + ESP_LOGE(COEX_TAG, "REG FOR NOTIFY failed: error status = %d", p_data->reg_for_notify.status); } else { uint16_t count = 0; uint16_t notify_en = 1; @@ -429,12 +429,12 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ gattc_profile_tab[GATTC_PROFILE_C_APP_ID].char_handle, &count); if (ret_status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_attr_count error\n"); + ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_attr_count error"); } if (count > 0) { descr_elem_result = malloc(sizeof(esp_gattc_descr_elem_t) * count); if (!descr_elem_result) { - ESP_LOGE(COEX_TAG, "malloc error, gattc no mem\n"); + ESP_LOGE(COEX_TAG, "malloc error, gattc no mem"); } else { ret_status = esp_ble_gattc_get_descr_by_char_handle( gattc_if, gattc_profile_tab[GATTC_PROFILE_C_APP_ID].conn_id, @@ -443,7 +443,7 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ descr_elem_result, &count); if (ret_status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_descr_by_char_handle error\n"); + ESP_LOGE(COEX_TAG, "esp_ble_gattc_get_descr_by_char_handle error"); } /* Every char has only one descriptor in our 'ESP_GATTS_DEMO' demo, so we used first 'descr_elem_result' */ if (count > 0 && descr_elem_result[0].uuid.len == ESP_UUID_LEN_16 && descr_elem_result[0].uuid.uuid.uuid16 == ESP_GATT_UUID_CHAR_CLIENT_CONFIG) { @@ -457,14 +457,14 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ } if (ret_status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "esp_ble_gattc_write_char_descr error\n"); + ESP_LOGE(COEX_TAG, "esp_ble_gattc_write_char_descr error"); } /* free descr_elem_result */ free(descr_elem_result); } } else { - ESP_LOGE(COEX_TAG, "decsr not found\n"); + ESP_LOGE(COEX_TAG, "decsr not found"); } } @@ -480,10 +480,10 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ break; case ESP_GATTC_WRITE_DESCR_EVT: if (p_data->write.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "write descr failed, error status = %x\n", p_data->write.status); + ESP_LOGE(COEX_TAG, "write descr failed, error status = %x", p_data->write.status); break; } - ESP_LOGI(COEX_TAG, "write descr success \n"); + ESP_LOGI(COEX_TAG, "write descr success "); uint8_t write_char_data[35]; for (int i = 0; i < sizeof(write_char_data); ++ i) { write_char_data[i] = i % 256; @@ -505,15 +505,15 @@ static void gattc_profile_event_handler(esp_gattc_cb_event_t event, esp_gatt_if_ } case ESP_GATTC_WRITE_CHAR_EVT: if (p_data->write.status != ESP_GATT_OK) { - ESP_LOGE(COEX_TAG, "write char failed, error status = %x\n", p_data->write.status); + ESP_LOGE(COEX_TAG, "write char failed, error status = %x", p_data->write.status); break; } - ESP_LOGI(COEX_TAG, "write char success \n"); + ESP_LOGI(COEX_TAG, "write char success "); break; case ESP_GATTC_DISCONNECT_EVT: { connect = false; get_server = false; - ESP_LOGI(COEX_TAG, "ESP_GATTC_DISCONNECT_EVT, reason = %d\n", p_data->disconnect.reason); + ESP_LOGI(COEX_TAG, "ESP_GATTC_DISCONNECT_EVT, reason = %d", p_data->disconnect.reason); break; } default: @@ -529,7 +529,7 @@ static void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t * prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE*sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(COEX_TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(COEX_TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -548,7 +548,7 @@ static void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t * memcpy(gatt_rsp->attr_value.value, param->write.value, param->write.len); esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK) { - ESP_LOGE(COEX_TAG, "Send response error\n"); + ESP_LOGE(COEX_TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK) { @@ -569,7 +569,7 @@ static void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, if (param->exec_write.exec_write_flag == ESP_GATT_PREP_WRITE_EXEC) { esp_log_buffer_hex(COEX_TAG, prepare_write_env->prepare_buf, prepare_write_env->prepare_len); } else { - ESP_LOGI(COEX_TAG,"ESP_GATT_PREP_WRITE_CANCEL\n"); + ESP_LOGI(COEX_TAG,"ESP_GATT_PREP_WRITE_CANCEL"); } if (prepare_write_env->prepare_buf) { free(prepare_write_env->prepare_buf); @@ -581,7 +581,7 @@ static void example_exec_write_event_env(prepare_type_env_t *prepare_write_env, static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_id.is_primary = true; gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -589,30 +589,30 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_err_t set_dev_name_ret = esp_ble_gap_set_device_name(GATTS_ADV_NAME); if (set_dev_name_ret) { - ESP_LOGE(COEX_TAG, "set device name failed, error code = %x\n", set_dev_name_ret); + ESP_LOGE(COEX_TAG, "set device name failed, error code = %x", set_dev_name_ret); } #ifdef CONFIG_SET_RAW_ADV_DATA esp_err_t raw_adv_ret = esp_ble_gap_config_adv_data_raw(raw_adv_data, sizeof(raw_adv_data)); if (raw_adv_ret) { - ESP_LOGE(COEX_TAG, "config raw adv data failed, error code = %x \n", raw_adv_ret); + ESP_LOGE(COEX_TAG, "config raw adv data failed, error code = %x ", raw_adv_ret); } adv_config_done |= adv_config_flag; esp_err_t raw_scan_ret = esp_ble_gap_config_scan_rsp_data_raw(raw_scan_rsp_data, sizeof(raw_scan_rsp_data)); if (raw_scan_ret) { - ESP_LOGE(COEX_TAG, "config raw scan rsp data failed, error code = %x\n", raw_scan_ret); + ESP_LOGE(COEX_TAG, "config raw scan rsp data failed, error code = %x", raw_scan_ret); } adv_config_done |= scan_rsp_config_flag; #else //config adv data esp_err_t ret = esp_ble_gap_config_adv_data(&adv_data); if (ret) { - ESP_LOGE(COEX_TAG, "config adv data failed, error code = %x\n", ret); + ESP_LOGE(COEX_TAG, "config adv data failed, error code = %x", ret); } adv_config_done |= adv_config_flag; //config scan response data ret = esp_ble_gap_config_adv_data(&scan_rsp_data); if (ret) { - ESP_LOGE(COEX_TAG, "config scan response data failed, error code = %x\n", ret); + ESP_LOGE(COEX_TAG, "config scan response data failed, error code = %x", ret); } adv_config_done |= scan_rsp_config_flag; @@ -620,7 +620,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_A); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -634,7 +634,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_WRITE_EVT: { - ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->write.conn_id, param->write.trans_id, param->write.handle); + ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->write.conn_id, param->write.trans_id, param->write.handle); if (!param->write.is_prep) { ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, value len %d, value :", param->write.len); esp_log_buffer_hex(COEX_TAG, param->write.value, param->write.len); @@ -642,7 +642,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i uint16_t descr_value = param->write.value[1]<<8 | param->write.value[0]; if (descr_value == NOTIFY_ENABLE) { if (a_property & ESP_GATT_CHAR_PROP_BIT_NOTIFY) { - ESP_LOGI(COEX_TAG, "notify enable\n"); + ESP_LOGI(COEX_TAG, "notify enable"); uint8_t notify_data[15]; for (int i = 0; i < sizeof(notify_data); ++ i) { notify_data[i] = i%0xff; @@ -653,7 +653,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i } } else if (descr_value == INDICATE_ENABLE) { if (a_property & ESP_GATT_CHAR_PROP_BIT_INDICATE) { - ESP_LOGI(COEX_TAG, "indicate enable\n"); + ESP_LOGI(COEX_TAG, "indicate enable"); uint8_t indicate_data[15]; for (int i = 0; i < sizeof(indicate_data); ++ i) { indicate_data[i] = i%0xff; @@ -663,9 +663,9 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i sizeof(indicate_data), indicate_data, true); } } else if (descr_value == NOTIFY_INDICATE_DISABLE) { - ESP_LOGI(COEX_TAG, "notify/indicate disable \n"); + ESP_LOGI(COEX_TAG, "notify/indicate disable "); } else { - ESP_LOGE(COEX_TAG, "unknown descr value\n"); + ESP_LOGE(COEX_TAG, "unknown descr value"); esp_log_buffer_hex(COEX_TAG, param->write.value, param->write.len); } @@ -675,15 +675,15 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_EXEC_WRITE_EVT: - ESP_LOGI(COEX_TAG,"ESP_GATTS_EXEC_WRITE_EVT\n"); + ESP_LOGI(COEX_TAG,"ESP_GATTS_EXEC_WRITE_EVT"); esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, ESP_GATT_OK, NULL); example_exec_write_event_env(&a_prepare_write_env, param); break; case ESP_GATTS_MTU_EVT: - ESP_LOGI(COEX_TAG, "ESP_GATTS_MTU_EVT, MTU %d\n", param->mtu.mtu); + ESP_LOGI(COEX_TAG, "ESP_GATTS_MTU_EVT, MTU %d", param->mtu.mtu); break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_handle = param->create.service_handle; gatts_profile_tab[GATTS_PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gatts_profile_tab[GATTS_PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_A; @@ -695,11 +695,11 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i a_property, &gatts_demo_char1_val, NULL); if (add_char_ret) { - ESP_LOGE(COEX_TAG, "add char failed, error code =%x\n",add_char_ret); + ESP_LOGE(COEX_TAG, "add char failed, error code =%x",add_char_ret); } break; case ESP_GATTS_ADD_CHAR_EVT: { - ESP_LOGI(COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gatts_profile_tab[GATTS_PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gatts_profile_tab[GATTS_PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -708,22 +708,22 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gatts_profile_tab[GATTS_PROFILE_A_APP_ID].service_handle, &gatts_profile_tab[GATTS_PROFILE_A_APP_ID].descr_uuid, ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE, NULL, NULL); if (add_descr_ret) { - ESP_LOGE(COEX_TAG, "add char descr failed, error code =%x\n", add_descr_ret); + ESP_LOGE(COEX_TAG, "add char descr failed, error code =%x", add_descr_ret); } break; } case ESP_GATTS_ADD_CHAR_DESCR_EVT: gatts_profile_tab[GATTS_PROFILE_A_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_START_EVT: - ESP_LOGI(COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_CONNECT_EVT: { - ESP_LOGI(COEX_TAG, "ESP_GATTS_CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x\n", + ESP_LOGI(COEX_TAG, "ESP_GATTS_CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x", param->connect.conn_id, param->connect.remote_bda[0], param->connect.remote_bda[1], param->connect.remote_bda[2], param->connect.remote_bda[3], param->connect.remote_bda[4], param->connect.remote_bda[5]); @@ -731,11 +731,11 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_DISCONNECT_EVT: - ESP_LOGI(COEX_TAG, "ESP_GATTS_DISCONNECT_EVT, disconnect reason 0x%x\n", param->disconnect.reason); + ESP_LOGI(COEX_TAG, "ESP_GATTS_DISCONNECT_EVT, disconnect reason 0x%x", param->disconnect.reason); esp_ble_gap_start_advertising(&adv_params); break; case ESP_GATTS_CONF_EVT: - ESP_LOGI(COEX_TAG, "ESP_GATTS_CONF_EVT, status %d attr_handle %d\n", param->conf.status, param->conf.handle); + ESP_LOGI(COEX_TAG, "ESP_GATTS_CONF_EVT, status %d attr_handle %d", param->conf.status, param->conf.handle); if (param->conf.status != ESP_GATT_OK) { esp_log_buffer_hex(COEX_TAG, param->conf.value, param->conf.len); } @@ -749,7 +749,7 @@ static void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_i static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp_ble_gatts_cb_param_t *param) { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(COEX_TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gatts_profile_tab[GATTS_PROFILE_B_APP_ID].service_id.is_primary = true; gatts_profile_tab[GATTS_PROFILE_B_APP_ID].service_id.id.inst_id = 0x00; gatts_profile_tab[GATTS_PROFILE_B_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -758,7 +758,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i esp_ble_gatts_create_service(gatts_if, &gatts_profile_tab[GATTS_PROFILE_B_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_B); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(COEX_TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -772,7 +772,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_WRITE_EVT: { - ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->write.conn_id, param->write.trans_id, param->write.handle); + ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->write.conn_id, param->write.trans_id, param->write.handle); if (!param->write.is_prep) { ESP_LOGI(COEX_TAG, "GATT_WRITE_EVT, value len %d, value :", param->write.len); esp_log_buffer_hex(COEX_TAG, param->write.value, param->write.len); @@ -780,7 +780,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i uint16_t descr_value= param->write.value[1]<<8 | param->write.value[0]; if (descr_value == NOTIFY_ENABLE) { if (b_property & ESP_GATT_CHAR_PROP_BIT_NOTIFY) { - ESP_LOGI(COEX_TAG, "notify enable\n"); + ESP_LOGI(COEX_TAG, "notify enable"); uint8_t notify_data[15]; for (int i = 0; i < sizeof(notify_data); ++ i) { notify_data[i] = i%0xff; @@ -791,7 +791,7 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i } } else if (descr_value == INDICATE_ENABLE) { if (b_property & ESP_GATT_CHAR_PROP_BIT_INDICATE) { - ESP_LOGI(COEX_TAG, "indicate enable\n"); + ESP_LOGI(COEX_TAG, "indicate enable"); uint8_t indicate_data[15]; for (int i = 0; i < sizeof(indicate_data); ++ i) { indicate_data[i] = i%0xff; @@ -801,9 +801,9 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i sizeof(indicate_data), indicate_data, true); } } else if (descr_value == NOTIFY_INDICATE_DISABLE) { - ESP_LOGI(COEX_TAG, "notify/indicate disable \n"); + ESP_LOGI(COEX_TAG, "notify/indicate disable "); } else { - ESP_LOGE(COEX_TAG, "unknown value\n"); + ESP_LOGE(COEX_TAG, "unknown value"); } } @@ -812,17 +812,17 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; } case ESP_GATTS_EXEC_WRITE_EVT: - ESP_LOGI(COEX_TAG,"ESP_GATTS_EXEC_WRITE_EVT\n"); + ESP_LOGI(COEX_TAG,"ESP_GATTS_EXEC_WRITE_EVT"); esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, ESP_GATT_OK, NULL); example_exec_write_event_env(&b_prepare_write_env, param); break; case ESP_GATTS_MTU_EVT: - ESP_LOGI(COEX_TAG, "ESP_GATTS_MTU_EVT, MTU %d\n", param->mtu.mtu); + ESP_LOGI(COEX_TAG, "ESP_GATTS_MTU_EVT, MTU %d", param->mtu.mtu); break; case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(COEX_TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gatts_profile_tab[GATTS_PROFILE_B_APP_ID].service_handle = param->create.service_handle; gatts_profile_tab[GATTS_PROFILE_B_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gatts_profile_tab[GATTS_PROFILE_B_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_B; @@ -834,13 +834,13 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i b_property, NULL, NULL); if (add_char_ret) { - ESP_LOGE(COEX_TAG, "add char failed, error code =%x\n",add_char_ret); + ESP_LOGE(COEX_TAG, "add char failed, error code =%x",add_char_ret); } break; case ESP_GATTS_ADD_INCL_SRVC_EVT: break; case ESP_GATTS_ADD_CHAR_EVT: - ESP_LOGI(COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gatts_profile_tab[GATTS_PROFILE_B_APP_ID].char_handle = param->add_char.attr_handle; @@ -852,26 +852,26 @@ static void gatts_profile_b_event_handler(esp_gatts_cb_event_t event, esp_gatt_i break; case ESP_GATTS_ADD_CHAR_DESCR_EVT: gatts_profile_tab[GATTS_PROFILE_B_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(COEX_TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: break; case ESP_GATTS_CONNECT_EVT: - ESP_LOGI(COEX_TAG, "CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x\n", + ESP_LOGI(COEX_TAG, "CONNECT_EVT, conn_id %d, remote %02x:%02x:%02x:%02x:%02x:%02x", param->connect.conn_id, param->connect.remote_bda[0], param->connect.remote_bda[1], param->connect.remote_bda[2], param->connect.remote_bda[3], param->connect.remote_bda[4], param->connect.remote_bda[5]); gatts_profile_tab[GATTS_PROFILE_B_APP_ID].conn_id = param->connect.conn_id; break; case ESP_GATTS_CONF_EVT: - ESP_LOGI(COEX_TAG, "ESP_GATTS_CONF_EVT status %d attr_handle %d\n", param->conf.status, param->conf.handle); + ESP_LOGI(COEX_TAG, "ESP_GATTS_CONF_EVT status %d attr_handle %d", param->conf.status, param->conf.handle); if (param->conf.status != ESP_GATT_OK) { esp_log_buffer_hex(COEX_TAG, param->conf.value, param->conf.len); } @@ -890,7 +890,7 @@ static void esp_gattc_cb(esp_gattc_cb_event_t event, esp_gatt_if_t gattc_if, esp if (param->reg.status == ESP_GATT_OK) { gattc_profile_tab[param->reg.app_id].gattc_if = gattc_if; } else { - ESP_LOGI(COEX_TAG, "reg app failed, app_id %04x, status %d\n", + ESP_LOGI(COEX_TAG, "reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -919,7 +919,7 @@ static void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_ if (param->reg.status == ESP_GATT_OK) { gatts_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(COEX_TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(COEX_TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; @@ -958,25 +958,25 @@ void app_main(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); ret = esp_bt_controller_init(&bt_cfg); if (ret) { - ESP_LOGE(COEX_TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(COEX_TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (ret) { - ESP_LOGE(COEX_TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(COEX_TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_init(); if (ret) { - ESP_LOGE(COEX_TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(COEX_TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } ret = esp_bluedroid_enable(); if (ret) { - ESP_LOGE(COEX_TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(ret)); + ESP_LOGE(COEX_TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(ret)); return; } @@ -1008,13 +1008,13 @@ void app_main(void) // gattc regisrter ret = esp_ble_gattc_register_callback(esp_gattc_cb); if(ret) { - ESP_LOGE(COEX_TAG, "%s gattc register failed, error code = %x\n", __func__, ret); + ESP_LOGE(COEX_TAG, "%s gattc register failed, error code = %x", __func__, ret); return; } ret = esp_ble_gattc_app_register(GATTC_PROFILE_C_APP_ID); if (ret) { - ESP_LOGE(COEX_TAG, "%s gattc app register failed, error code = %x\n", __func__, ret); + ESP_LOGE(COEX_TAG, "%s gattc app register failed, error code = %x", __func__, ret); } esp_err_t local_mtu_ret = esp_ble_gatt_set_local_mtu(500); diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/ble_unit.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/ble_unit.c index 1858a18d48..38479d33f4 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/ble_unit.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/ble_unit.c @@ -65,13 +65,13 @@ static void ble_gap_event_default_handler(esp_gap_ble_cb_event_t event, esp_ble_ } case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: { if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(TAG, "Advertising start failed\n"); + ESP_LOGE(TAG, "Advertising start failed"); } break; } case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(TAG, "Advertising stop failed\n"); + ESP_LOGE(TAG, "Advertising stop failed"); } break; case ESP_GAP_BLE_SCAN_START_COMPLETE_EVT: { diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/run_tc.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/run_tc.c index 5b524e2dce..08460ae998 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/run_tc.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/run_tc.c @@ -232,7 +232,7 @@ void ble_scan_start(void *param) void ble_scan_end(void) { - ESP_LOGI(TAG, "%s \n", __func__); + ESP_LOGI(TAG, "%s", __func__); } tc_t tc_case[] = { @@ -266,7 +266,7 @@ static void run_task(void *arg) if ( msg.case_id < sizeof(tc_case) / sizeof(tc_case[0]) ) { xTaskCreatePinnedToCore(excute_case, tc_case_table->name, 4096, &tc_case_table[msg.case_id], RUN_TASK_PRIORITY, NULL, 0); } else { - ESP_LOGW(TAG, "msg.case_id %d\n", msg.case_id); + ESP_LOGW(TAG, "msg.case_id %d", msg.case_id); } } diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.c index 6169116dd0..0680cd5c69 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/sync.c @@ -224,7 +224,7 @@ void excute_case(uint8_t run_case) run_task_msg_t msg; msg.case_id = run_case; if (xQueueSend(xTaskQueue, &msg, portMAX_DELAY) != pdTRUE) { - ESP_LOGE(TAG, "xTaskQueue Post failed\n"); + ESP_LOGE(TAG, "xTaskQueue Post failed"); } } @@ -251,7 +251,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) for (int i = 0 ; i < PARAM_MAX; i++ ) { switch (GET_PARAM(param_bit, 0x1000 >> i)) { case BLE_CASE_ID: - ESP_LOGD(TAG, "BLE_CASE_ID\n"); + ESP_LOGD(TAG, "BLE_CASE_ID"); #if defined(CONFIG_EXAMPLE_BT_ROLE) sync_obj.own_ble_case = data[data_ptr]; (*recv_param_bit) |= BLE_CASE_ID; @@ -259,7 +259,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) data_ptr += 1; break; case WIFI_CASE_ID: - ESP_LOGD(TAG, "WIFI_CASE_ID\n"); + ESP_LOGD(TAG, "WIFI_CASE_ID"); #if defined(CONFIG_EXAMPLE_WIFI_ROLE) sync_obj.own_wifi_case = data[data_ptr]; (*recv_param_bit) |= WIFI_CASE_ID; @@ -267,12 +267,12 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) data_ptr += 1; break; case START_TIME: - ESP_LOGD(TAG, "START_TIME\n"); + ESP_LOGD(TAG, "START_TIME"); sync_obj.start_time = data[data_ptr]; data_ptr += 1; break; case SERVER_IP: { - ESP_LOGD(TAG, "SERVER_IP\n"); + ESP_LOGD(TAG, "SERVER_IP"); char server_ip[16]; memset(server_ip, '0', sizeof(server_ip)); sprintf(server_ip, "%d.%d.%d.%d", data[data_ptr], data[data_ptr + 1], data[data_ptr + 2], data[data_ptr + 3]); // size conversion @@ -283,7 +283,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) break; } case WIFI_SSID: { - ESP_LOGD(TAG, "WIFI_SSID\n"); + ESP_LOGD(TAG, "WIFI_SSID"); uint8_t length = data[data_ptr]; data_ptr += 1; if ( length > 20) { @@ -292,7 +292,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) } char *ssid = malloc(length + 1); if (ssid == NULL) { - ESP_LOGE(TAG, "%s malloc fail\n", __func__); + ESP_LOGE(TAG, "%s malloc fail", __func__); return ; } memset(ssid, '0', sizeof(length + 1)); @@ -308,7 +308,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) break; } case WIFI_PASSWIRD: { - ESP_LOGD(TAG, "WIFI_PASSWIRD\n"); + ESP_LOGD(TAG, "WIFI_PASSWIRD"); uint8_t length = data[data_ptr]; data_ptr += 1; if ( length > 20) { @@ -317,7 +317,7 @@ void analys_param(uint16_t param_bit, uint8_t data[], uint16_t *recv_param_bit) } char *password = malloc(length + 1); if (password == NULL) { - ESP_LOGE(TAG, "%s malloc fail\n", __func__); + ESP_LOGE(TAG, "%s malloc fail", __func__); return ; } memset(password, '0', sizeof(length + 1)); @@ -350,12 +350,12 @@ void sync_cmd_recv(uint8_t *raw_data, uint32_t raw_data_len) ESP_LOGD(TAG, "msg is unknown"); return; } - ESP_LOGD(TAG, "msg_id: %x\n", msg_head.msg_id); + ESP_LOGD(TAG, "msg_id: %x", msg_head.msg_id); // ESP_LOG_BUFFER_HEX("sync recv:", raw_data, raw_data_len); switch (sync_obj.state) { #if defined(CONFIG_EXAMPLE_WIFI_ROLE) || defined(CONFIG_EXAMPLE_BT_ROLE) case WAIT_CASE: { - ESP_LOGD(TAG, "WAIT_CASE\n"); + ESP_LOGD(TAG, "WAIT_CASE"); if (msg_head.msg_id == MSG_ID_ASSIGN_CASE) { analys_param(msg_head.param_bit, raw_data + MSG_DATA_BASE, &sync_obj.recv_param_bit ); #if defined(CONFIG_EXAMPLE_WIFI_ROLE) @@ -379,8 +379,8 @@ void sync_cmd_recv(uint8_t *raw_data, uint32_t raw_data_len) break; } case WAIT_START: - ESP_LOGD(TAG, "WAIT_START\n"); - ESP_LOGD(TAG, "WAIT_START %x\n", msg_head.msg_id); + ESP_LOGD(TAG, "WAIT_START"); + ESP_LOGD(TAG, "WAIT_START %x", msg_head.msg_id); if (msg_head.msg_id == MSG_ID_START_CASE) { analys_param(msg_head.param_bit, raw_data + MSG_DATA_BASE, &sync_obj.recv_param_bit ); sync_obj.state = START_CASE; @@ -395,7 +395,7 @@ void sync_cmd_recv(uint8_t *raw_data, uint32_t raw_data_len) #endif #if defined(CONFIG_EXAMPLE_COEX_ROLE) case ASSIGN_CASE: - ESP_LOGD(TAG, "ASSIGN_CASE\n"); + ESP_LOGD(TAG, "ASSIGN_CASE"); switch (msg_head.msg_id) { case MSG_ID_WIFI_DEV_INIT_FINISH: if (msg_head.param_bit != 0x0) { @@ -429,7 +429,7 @@ static void handle_sync_timeout(void *arg) switch (sync_obj.state) { #if defined(CONFIG_EXAMPLE_COEX_ROLE) case ASSIGN_CASE: - ESP_LOGD(TAG, "ASSIGN_CASE\n"); + ESP_LOGD(TAG, "ASSIGN_CASE"); assign_test_case(); esp_timer_start_periodic(sync_obj.sync_timer, SYNC_TIMEOUT); break; @@ -437,7 +437,7 @@ static void handle_sync_timeout(void *arg) #if defined(CONFIG_EXAMPLE_WIFI_ROLE) || defined(CONFIG_EXAMPLE_BT_ROLE) case WAIT_START: { - ESP_LOGD(TAG, "WAIT_START\n"); + ESP_LOGD(TAG, "WAIT_START"); #if defined(CONFIG_EXAMPLE_WIFI_ROLE) if ( WIFI_TCP_RX_CASE == sync_obj.own_wifi_case ) { send_tcp_rx_inited_msg(); @@ -454,12 +454,12 @@ static void handle_sync_timeout(void *arg) case START_CASE: { - ESP_LOGD(TAG, "START_CASE\n"); + ESP_LOGD(TAG, "START_CASE"); #if defined(CONFIG_EXAMPLE_BT_ROLE) excute_case(sync_obj.own_ble_case); #elif defined(CONFIG_EXAMPLE_WIFI_ROLE) - ESP_LOGD(TAG, "START_CASE\n"); + ESP_LOGD(TAG, "START_CASE"); if (arg != NULL) { xSemaphoreGive((SemaphoreHandle_t)arg); run_first = true; @@ -500,7 +500,7 @@ esp_err_t create_sync_timer(esp_timer_handle_t *timer_hdl) ret = esp_timer_create(&tca, timer_hdl); if (ret != ESP_OK) { - ESP_LOGE(TAG, "timer create failed %d %x\n", __LINE__, ret); + ESP_LOGE(TAG, "timer create failed %d %x", __LINE__, ret); return ret; } esp_timer_start_once( *timer_hdl, 10); diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_unit.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_unit.c index 0acb197130..15feed083f 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_unit.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/components/case/wifi_unit.c @@ -1,7 +1,7 @@ /* * ESP BLE Mesh Example * - * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -108,7 +108,7 @@ esp_err_t wifi_unit_tcp_recv(int socket_id, const char *duration, uint32_t user_ buffer = malloc(2920); if (buffer == NULL) { - ESP_LOGE(TAG, "%s malloc fail\n", __func__); + ESP_LOGE(TAG, "%s malloc fail", __func__); return ESP_ERR_NO_MEM; } @@ -140,7 +140,7 @@ esp_err_t wifi_util_tcp_send(int socket_id, uint32_t len, uint32_t delay, uint32 } buffer = malloc(len); if (buffer == NULL) { - ESP_LOGE(TAG, "%s malloc fail\n", __func__); + ESP_LOGE(TAG, "%s malloc fail", __func__); return ESP_ERR_NO_MEM; } diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/coex_cmd.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/coex_cmd.c index c35adcfa2a..e1f39052a0 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/coex_cmd.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_coex_test/main/coex_cmd.c @@ -91,14 +91,14 @@ static int process_run_tc_cmd(int argc, char **argv) if (tc_run_args.wifi_tc_idx->count == 1) { msg.case_id = atoi(tc_run_args.wifi_tc_idx->sval[0]); if (xQueueSend(xTaskQueue, &msg, portMAX_DELAY) != pdTRUE) { - ESP_LOGE(TAG_CNSL, "xTaskQueue Post failed\n"); + ESP_LOGE(TAG_CNSL, "xTaskQueue Post failed"); } } if (tc_run_args.bt_tc_idx->count == 1) { msg.case_id = atoi(tc_run_args.bt_tc_idx->sval[0]); if (xQueueSend(xTaskQueue, &msg, portMAX_DELAY) != pdTRUE) { - ESP_LOGE(TAG_CNSL, "xTaskQueue Post failed\n"); + ESP_LOGE(TAG_CNSL, "xTaskQueue Post failed"); } } @@ -110,7 +110,7 @@ static int process_get_mac_addr_cmd(int argc, char **argv) const uint8_t *mac = esp_bt_dev_get_address(); if (mac != NULL) { - ESP_LOGI(TAG_CNSL, "+BTMAC:"MACSTR"\n", MAC2STR(mac)); + ESP_LOGI(TAG_CNSL, "+BTMAC:"MACSTR, MAC2STR(mac)); } return 0; } diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.c index 35fd2ddf0d..a4e2722098 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.c @@ -168,7 +168,7 @@ int ble_mesh_node_statistics_init(uint16_t package_num) ble_mesh_node_statistics.package_index = malloc(sizeof(uint16_t) * package_num); ble_mesh_node_statistics.total_package_num = package_num; if (ble_mesh_node_statistics.package_index == NULL) { - ESP_LOGE(TAG, " %s, %d malloc fail\n", __func__, __LINE__); + ESP_LOGE(TAG, " %s, %d malloc fail", __func__, __LINE__); return ESP_ERR_NO_MEM; } @@ -328,13 +328,13 @@ int ble_mesh_test_performance_client_model_init(uint16_t node_num, uint32_t test test_perf_statistics.time = malloc(test_num * sizeof(uint16_t)); if (test_perf_statistics.time == NULL) { - ESP_LOGE(TAG, " %s %d, malloc fail\n", __func__, __LINE__); + ESP_LOGE(TAG, " %s %d, malloc fail", __func__, __LINE__); return ESP_ERR_NO_MEM; } test_perf_statistics.package_index = malloc(test_num * sizeof(uint16_t)); if (test_perf_statistics.package_index == NULL) { - ESP_LOGE(TAG, " %s %d, malloc fail\n", __func__, __LINE__); + ESP_LOGE(TAG, " %s %d, malloc fail", __func__, __LINE__); return ESP_ERR_NO_MEM; } for (i = 0; i < test_num; i++) { diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.h b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.h index e7193f7228..78584404c1 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.h +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_adapter.h @@ -71,7 +71,7 @@ extern ble_mesh_node_status node_status; #define arg_int_to_value(src_msg, dst_msg, message) do { \ if (src_msg->count != 0) {\ - ESP_LOGD(TAG, "\n%s, %s\n", __func__, message);\ + ESP_LOGD(TAG, "\n%s, %s", __func__, message);\ dst_msg = src_msg->ival[0];\ } \ } while(0) \ @@ -103,9 +103,9 @@ extern ble_mesh_node_status node_status; #define ble_mesh_callback_check_err_code(err_code, message) do { \ if (err_code == ESP_OK) { \ - ESP_LOGI(TAG, "%s,OK\n", message); \ + ESP_LOGI(TAG, "%s,OK", message); \ } else { \ - ESP_LOGE(TAG, "%s,Fail,%d\n", message, err_code); \ + ESP_LOGE(TAG, "%s,Fail,%d", message, err_code); \ } \ }while(0) \ diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_server_cmd.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_server_cmd.c index 9908d7c861..b9e82fed52 100644 --- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_server_cmd.c +++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_register_server_cmd.c @@ -38,7 +38,7 @@ int ble_mesh_module_publish_message(int argc, char **argv) uint8_t device_role = ROLE_NODE; uint16_t length = 0; - ESP_LOGD(TAG, "enter %s \n", __func__); + ESP_LOGD(TAG, "enter %s", __func__); int nerrors = arg_parse(argc, argv, (void **) &msg_publish); if (nerrors != 0) { @@ -48,7 +48,7 @@ int ble_mesh_module_publish_message(int argc, char **argv) data = malloc(strlen(msg_publish.data->sval[0])); if (data == NULL) { - ESP_LOGE(TAG, "ble mesh malloc failed, %d\n", __LINE__); + ESP_LOGE(TAG, "ble mesh malloc failed, %d", __LINE__); return ESP_ERR_NO_MEM; } else { get_value_string((char *)msg_publish.data->sval[0], (char *) data); @@ -88,7 +88,7 @@ int ble_mesh_module_publish_message(int argc, char **argv) length = strlen(msg_publish.data->sval[0]); data = malloc((length + 1) * sizeof(uint8_t)); if (data == NULL) { - ESP_LOGE(TAG, "ble mesh malloc failed, %d\n", __LINE__); + ESP_LOGE(TAG, "ble mesh malloc failed, %d", __LINE__); return ESP_ERR_NO_MEM; } else { get_value_string((char *)msg_publish.data->sval[0], (char *) data); @@ -97,7 +97,7 @@ int ble_mesh_module_publish_message(int argc, char **argv) err = esp_ble_mesh_model_publish(model, msg_publish.opcode->ival[0], length, data, device_role); - ESP_LOGD(TAG, "exit %s \n", __func__); + ESP_LOGD(TAG, "exit %s", __func__); free(data); return err; } diff --git a/examples/bluetooth/hci/ble_adv_scan_combined/main/app_bt.c b/examples/bluetooth/hci/ble_adv_scan_combined/main/app_bt.c index 920f1203e9..0f7aacf798 100644 --- a/examples/bluetooth/hci/ble_adv_scan_combined/main/app_bt.c +++ b/examples/bluetooth/hci/ble_adv_scan_combined/main/app_bt.c @@ -417,7 +417,7 @@ void app_main(void) /* A queue for storing received HCI packets. */ adv_queue = xQueueCreate(15, sizeof(host_rcv_data_t)); if (adv_queue == NULL) { - ESP_LOGE(TAG, "Queue creation failed\n"); + ESP_LOGE(TAG, "Queue creation failed"); return; } diff --git a/examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3/main/main.c b/examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3/main/main.c index 8770990c8e..8bef0692b5 100644 --- a/examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3/main/main.c +++ b/examples/bluetooth/hci/controller_hci_uart_esp32c3_and_esp32s3/main/main.c @@ -279,7 +279,7 @@ void app_main(void) return; } - ESP_LOGI(tag, "HCI messages can be communicated over UART%d: \n" + ESP_LOGI(tag, "HCI messages can be communicated over UART%d:\n" "--PINs: TxD %d, RxD %d, RTS %d, CTS %d\n" "--Baudrate: %d", UART_HCI_NUM, GPIO_UART_TXD_OUT, GPIO_UART_RXD_IN, GPIO_UART_RTS_OUT, GPIO_UART_CTS_IN, diff --git a/examples/bluetooth/nimble/ble_phy/phy_prph/tutorial/Ble_Phy_Peripheral_Example_Walkthrough.md b/examples/bluetooth/nimble/ble_phy/phy_prph/tutorial/Ble_Phy_Peripheral_Example_Walkthrough.md index 92c04de0c2..49557acee3 100644 --- a/examples/bluetooth/nimble/ble_phy/phy_prph/tutorial/Ble_Phy_Peripheral_Example_Walkthrough.md +++ b/examples/bluetooth/nimble/ble_phy/phy_prph/tutorial/Ble_Phy_Peripheral_Example_Walkthrough.md @@ -143,7 +143,7 @@ esp_err_t esp_nimble_init(void) npl_freertos_mempool_init(); if(esp_nimble_hci_init() != ESP_OK) { - ESP_LOGE(NIMBLE_PORT_LOG_TAG, "hci inits failed\n"); + ESP_LOGE(NIMBLE_PORT_LOG_TAG, "hci inits failed"); return ESP_FAIL; } diff --git a/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c b/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c index f88702aff1..240ba9fc73 100644 --- a/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c +++ b/examples/bluetooth/nimble/ble_spp/spp_client/main/main.c @@ -339,7 +339,7 @@ void ble_spp_client_host_task(void *param) } void ble_client_uart_task(void *pvParameters) { - ESP_LOGI(tag, "BLE client UART task started\n"); + ESP_LOGI(tag, "BLE client UART task started"); int rc; int i; uart_event_t event; @@ -355,7 +355,7 @@ void ble_client_uart_task(void *pvParameters) uint8_t *temp = NULL; temp = (uint8_t *)malloc(sizeof(uint8_t) * event.size); if (temp == NULL) { - ESP_LOGE(tag, "malloc failed,%s L#%d\n", __func__, __LINE__); + ESP_LOGE(tag, "malloc failed,%s L#%d", __func__, __LINE__); break; } memset(temp, 0x0, event.size); diff --git a/examples/bluetooth/nimble/blemesh/main/app_mesh.c b/examples/bluetooth/nimble/blemesh/main/app_mesh.c index 69e09bf711..4c8d3a00f7 100644 --- a/examples/bluetooth/nimble/blemesh/main/app_mesh.c +++ b/examples/bluetooth/nimble/blemesh/main/app_mesh.c @@ -62,7 +62,7 @@ fault_get_cur(struct bt_mesh_model *model, { uint8_t reg_faults[FAULT_ARR_SIZE] = { [0 ... FAULT_ARR_SIZE - 1] = 0xff }; - ESP_LOGI(tag, "fault_get_cur() has_reg_fault %u\n", has_reg_fault); + ESP_LOGI(tag, "fault_get_cur() has_reg_fault %u", has_reg_fault); *test_id = recent_test_id; *company_id = CID_VENDOR; @@ -84,7 +84,7 @@ fault_get_reg(struct bt_mesh_model *model, return -BLE_HS_EINVAL; } - ESP_LOGI(tag, "fault_get_reg() has_reg_fault %u\n", has_reg_fault); + ESP_LOGI(tag, "fault_get_reg() has_reg_fault %u", has_reg_fault); *test_id = recent_test_id; @@ -161,14 +161,14 @@ static void gen_onoff_status(struct bt_mesh_model *model, struct os_mbuf *msg = NET_BUF_SIMPLE(3); uint8_t *status; - ESP_LOGI(tag, "#mesh-onoff STATUS\n"); + ESP_LOGI(tag, "#mesh-onoff STATUS"); bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_2(0x82, 0x04)); status = net_buf_simple_add(msg, 1); *status = gen_on_off_state; if (bt_mesh_model_send(model, ctx, msg, NULL, NULL)) { - ESP_LOGI(tag, "#mesh-onoff STATUS: send status failed\n"); + ESP_LOGI(tag, "#mesh-onoff STATUS: send status failed"); } os_mbuf_free_chain(msg); @@ -178,7 +178,7 @@ static void gen_onoff_get(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, struct os_mbuf *buf) { - ESP_LOGI(tag, "#mesh-onoff GET\n"); + ESP_LOGI(tag, "#mesh-onoff GET"); gen_onoff_status(model, ctx); } @@ -187,7 +187,7 @@ static void gen_onoff_set(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, struct os_mbuf *buf) { - ESP_LOGI(tag, "#mesh-onoff SET\n"); + ESP_LOGI(tag, "#mesh-onoff SET"); gen_on_off_state = buf->om_data[0]; @@ -198,7 +198,7 @@ static void gen_onoff_set_unack(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, struct os_mbuf *buf) { - ESP_LOGI(tag, "#mesh-onoff SET-UNACK\n"); + ESP_LOGI(tag, "#mesh-onoff SET-UNACK"); gen_on_off_state = buf->om_data[0]; } @@ -215,13 +215,13 @@ static void gen_level_status(struct bt_mesh_model *model, { struct os_mbuf *msg = NET_BUF_SIMPLE(4); - ESP_LOGI(tag, "#mesh-level STATUS\n"); + ESP_LOGI(tag, "#mesh-level STATUS"); bt_mesh_model_msg_init(msg, BT_MESH_MODEL_OP_2(0x82, 0x08)); net_buf_simple_add_le16(msg, gen_level_state); if (bt_mesh_model_send(model, ctx, msg, NULL, NULL)) { - ESP_LOGI(tag, "#mesh-level STATUS: send status failed\n"); + ESP_LOGI(tag, "#mesh-level STATUS: send status failed"); } os_mbuf_free_chain(msg); @@ -231,7 +231,7 @@ static void gen_level_get(struct bt_mesh_model *model, struct bt_mesh_msg_ctx *ctx, struct os_mbuf *buf) { - ESP_LOGI(tag, "#mesh-level GET\n"); + ESP_LOGI(tag, "#mesh-level GET"); gen_level_status(model, ctx); } @@ -243,12 +243,12 @@ static void gen_level_set(struct bt_mesh_model *model, int16_t level; level = (int16_t) net_buf_simple_pull_le16(buf); - ESP_LOGI(tag, "#mesh-level SET: level=%d\n", level); + ESP_LOGI(tag, "#mesh-level SET: level=%d", level); gen_level_status(model, ctx); gen_level_state = level; - ESP_LOGI(tag, "#mesh-level: level=%d\n", gen_level_state); + ESP_LOGI(tag, "#mesh-level: level=%d", gen_level_state); } static void gen_level_set_unack(struct bt_mesh_model *model, @@ -258,10 +258,10 @@ static void gen_level_set_unack(struct bt_mesh_model *model, int16_t level; level = (int16_t) net_buf_simple_pull_le16(buf); - ESP_LOGI(tag, "#mesh-level SET-UNACK: level=%d\n", level); + ESP_LOGI(tag, "#mesh-level SET-UNACK: level=%d", level); gen_level_state = level; - ESP_LOGI(tag, "#mesh-level: level=%d\n", gen_level_state); + ESP_LOGI(tag, "#mesh-level: level=%d", gen_level_state); } static void gen_delta_set(struct bt_mesh_model *model, @@ -271,12 +271,12 @@ static void gen_delta_set(struct bt_mesh_model *model, int16_t delta_level; delta_level = (int16_t) net_buf_simple_pull_le16(buf); - ESP_LOGI(tag, "#mesh-level DELTA-SET: delta_level=%d\n", delta_level); + ESP_LOGI(tag, "#mesh-level DELTA-SET: delta_level=%d", delta_level); gen_level_status(model, ctx); gen_level_state += delta_level; - ESP_LOGI(tag, "#mesh-level: level=%d\n", gen_level_state); + ESP_LOGI(tag, "#mesh-level: level=%d", gen_level_state); } static void gen_delta_set_unack(struct bt_mesh_model *model, @@ -286,10 +286,10 @@ static void gen_delta_set_unack(struct bt_mesh_model *model, int16_t delta_level; delta_level = (int16_t) net_buf_simple_pull_le16(buf); - ESP_LOGI(tag, "#mesh-level DELTA-SET: delta_level=%d\n", delta_level); + ESP_LOGI(tag, "#mesh-level DELTA-SET: delta_level=%d", delta_level); gen_level_state += delta_level; - ESP_LOGI(tag, "#mesh-level: level=%d\n", gen_level_state); + ESP_LOGI(tag, "#mesh-level: level=%d", gen_level_state); } static void gen_move_set(struct bt_mesh_model *model, @@ -369,14 +369,14 @@ static const struct bt_mesh_comp comp = { static int output_number(bt_mesh_output_action_t action, uint32_t number) { - ESP_LOGI(tag, "OOB Number: %" PRIu32 "\n", number); + ESP_LOGI(tag, "OOB Number: %" PRIu32, number); return 0; } static void prov_complete(uint16_t net_idx, uint16_t addr) { - ESP_LOGI(tag, "Local node provisioned, primary address 0x%04x\n", addr); + ESP_LOGI(tag, "Local node provisioned, primary address 0x%04x", addr); } static const uint8_t dev_uuid[16] = MYNEWT_VAL(BLE_MESH_DEV_UUID); @@ -401,7 +401,7 @@ blemesh_on_sync(void) int err; ble_addr_t addr; - ESP_LOGI(tag, "Bluetooth initialized\n"); + ESP_LOGI(tag, "Bluetooth initialized"); /* Use NRPA */ err = ble_hs_id_gen_rnd(1, &addr); @@ -411,7 +411,7 @@ blemesh_on_sync(void) err = bt_mesh_init(addr.type, &prov, &comp); if (err) { - ESP_LOGI(tag, "Initializing mesh failed (err %d)\n", err); + ESP_LOGI(tag, "Initializing mesh failed (err %d)", err); return; } @@ -419,14 +419,14 @@ blemesh_on_sync(void) shell_register_default_module("mesh"); #endif - ESP_LOGI(tag, "Mesh initialized\n"); + ESP_LOGI(tag, "Mesh initialized"); if (IS_ENABLED(CONFIG_SETTINGS)) { settings_load(); } if (bt_mesh_is_provisioned()) { - ESP_LOGI(tag, "Mesh network restored from flash\n"); + ESP_LOGI(tag, "Mesh network restored from flash"); } } diff --git a/examples/bluetooth/nimble/bleprph/main/main.c b/examples/bluetooth/nimble/bleprph/main/main.c index 479d37ba82..e91811dce0 100644 --- a/examples/bluetooth/nimble/bleprph/main/main.c +++ b/examples/bluetooth/nimble/bleprph/main/main.c @@ -349,7 +349,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) return BLE_GAP_REPEAT_PAIRING_RETRY; case BLE_GAP_EVENT_PASSKEY_ACTION: - ESP_LOGI(tag, "PASSKEY_ACTION_EVENT started \n"); + ESP_LOGI(tag, "PASSKEY_ACTION_EVENT started"); struct ble_sm_io pkey = {0}; int key = 0; @@ -358,7 +358,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) pkey.passkey = 123456; // This is the passkey to be entered on peer ESP_LOGI(tag, "Enter passkey %" PRIu32 "on the peer side", pkey.passkey); rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_NUMCMP) { ESP_LOGI(tag, "Passkey on device's display: %" PRIu32 , event->passkey.params.numcmp); ESP_LOGI(tag, "Accept or reject the passkey through console in this format -> key Y or key N"); @@ -370,7 +370,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) ESP_LOGE(tag, "Timeout! Rejecting the key"); } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_OOB) { static uint8_t tem_oob[16] = {0}; pkey.action = event->passkey.params.action; @@ -378,7 +378,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) pkey.oob[i] = tem_oob[i]; } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_INPUT) { ESP_LOGI(tag, "Enter the passkey through console in this format-> key 123456"); pkey.action = event->passkey.params.action; @@ -389,7 +389,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) ESP_LOGE(tag, "Timeout! Passing 0 as the key"); } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } return 0; diff --git a/examples/bluetooth/nimble/bleprph_wifi_coex/main/gatt_svr.c b/examples/bluetooth/nimble/bleprph_wifi_coex/main/gatt_svr.c index c77ff7156c..0eda8bfc9e 100644 --- a/examples/bluetooth/nimble/bleprph_wifi_coex/main/gatt_svr.c +++ b/examples/bluetooth/nimble/bleprph_wifi_coex/main/gatt_svr.c @@ -164,7 +164,7 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) switch (ctxt->op) { case BLE_GATT_REGISTER_OP_SVC: - ESP_LOGD(TAG, "registered service %s with handle=%d\n", + ESP_LOGD(TAG, "registered service %s with handle=%d", ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), ctxt->svc.handle); break; @@ -178,7 +178,7 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) break; case BLE_GATT_REGISTER_OP_DSC: - ESP_LOGD(TAG, "registering descriptor %s with handle=%d\n", + ESP_LOGD(TAG, "registering descriptor %s with handle=%d", ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), ctxt->dsc.handle); break; diff --git a/examples/bluetooth/nimble/power_save/main/main.c b/examples/bluetooth/nimble/power_save/main/main.c index 428276d683..183bbb0055 100644 --- a/examples/bluetooth/nimble/power_save/main/main.c +++ b/examples/bluetooth/nimble/power_save/main/main.c @@ -379,7 +379,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) return BLE_GAP_REPEAT_PAIRING_RETRY; case BLE_GAP_EVENT_PASSKEY_ACTION: - ESP_LOGI(tag, "PASSKEY_ACTION_EVENT started \n"); + ESP_LOGI(tag, "PASSKEY_ACTION_EVENT started "); struct ble_sm_io pkey = {0}; int key = 0; @@ -388,7 +388,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) pkey.passkey = 123456; // This is the passkey to be entered on peer ESP_LOGI(tag, "Enter passkey %" PRIu32 "on the peer side", pkey.passkey); rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_NUMCMP) { ESP_LOGI(tag, "Passkey on device's display: %" PRIu32 , event->passkey.params.numcmp); ESP_LOGI(tag, "Accept or reject the passkey through console in this format -> key Y or key N"); @@ -400,7 +400,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) ESP_LOGE(tag, "Timeout! Rejecting the key"); } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_OOB) { static uint8_t tem_oob[16] = {0}; pkey.action = event->passkey.params.action; @@ -408,7 +408,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) pkey.oob[i] = tem_oob[i]; } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } else if (event->passkey.params.action == BLE_SM_IOACT_INPUT) { ESP_LOGI(tag, "Enter the passkey through console in this format-> key 123456"); pkey.action = event->passkey.params.action; @@ -419,7 +419,7 @@ bleprph_gap_event(struct ble_gap_event *event, void *arg) ESP_LOGE(tag, "Timeout! Passing 0 as the key"); } rc = ble_sm_inject_io(event->passkey.conn_handle, &pkey); - ESP_LOGI(tag, "ble_sm_inject_io result: %d\n", rc); + ESP_LOGI(tag, "ble_sm_inject_io result: %d", rc); } return 0; diff --git a/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c b/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c index 7edd712e29..1159238354 100644 --- a/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c +++ b/examples/bluetooth/nimble/throughput_app/blecent_throughput/main/main.c @@ -124,7 +124,7 @@ static int blecent_write(uint16_t conn_handle, uint16_t val_handle, goto label; } else if (rc != 0) { - ESP_LOGE(tag, "Error: Failed to write characteristic; rc=%d\n",rc); + ESP_LOGE(tag, "Error: Failed to write characteristic; rc=%d",rc); goto err; } @@ -401,7 +401,7 @@ blecent_scan(void) rc = ble_gap_disc(own_addr_type, BLE_HS_FOREVER, &disc_params, blecent_gap_event, NULL); if (rc != 0) { - ESP_LOGE(tag, "Error initiating GAP discovery procedure; rc=%d\n", + ESP_LOGE(tag, "Error initiating GAP discovery procedure; rc=%d", rc); } } @@ -481,7 +481,7 @@ blecent_connect_if_interesting(const struct ble_gap_disc_desc *disc) /* Figure out address to use for connect (no privacy for now) */ rc = ble_hs_id_infer_auto(0, &own_addr_type); if (rc != 0) { - ESP_LOGE(tag, "error determining address type; rc=%d\n", rc); + ESP_LOGE(tag, "error determining address type; rc=%d", rc); return; } @@ -592,9 +592,9 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_DISCONNECT: /* Connection terminated. */ - ESP_LOGI(tag, "disconnect; reason=%d ", event->disconnect.reason); + ESP_LOGI(tag, "disconnect; reason=%d", event->disconnect.reason); print_conn_desc(&event->disconnect.conn); - ESP_LOGI(tag, "\n"); + ESP_LOGI(tag, " "); /* Forget about peer. */ peer_delete(event->disconnect.conn.conn_handle); @@ -609,7 +609,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) case BLE_GAP_EVENT_ENC_CHANGE: /* Encryption has been enabled or disabled for this connection. */ - ESP_LOGI(tag, "encryption change event; status = %d ", + ESP_LOGI(tag, "encryption change event; status = %d", event->enc_change.status); rc = ble_gap_conn_find(event->enc_change.conn_handle, &desc); assert(rc == 0); @@ -646,7 +646,7 @@ blecent_gap_event(struct ble_gap_event *event, void *arg) static void blecent_on_reset(int reason) { - ESP_LOGE(tag, "Resetting state; reason=%d\n", reason); + ESP_LOGE(tag, "Resetting state; reason=%d", reason); } static void diff --git a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/gatt_svr.c b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/gatt_svr.c index 4a0059c5e6..4af6b559de 100644 --- a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/gatt_svr.c +++ b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/gatt_svr.c @@ -167,7 +167,7 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) switch (ctxt->op) { case BLE_GATT_REGISTER_OP_SVC: - ESP_LOGD(tag, "registered service %s with handle=%d\n", + ESP_LOGD(tag, "registered service %s with handle=%d", ble_uuid_to_str(ctxt->svc.svc_def->uuid, buf), ctxt->svc.handle); break; @@ -181,7 +181,7 @@ gatt_svr_register_cb(struct ble_gatt_register_ctxt *ctxt, void *arg) break; case BLE_GATT_REGISTER_OP_DSC: - ESP_LOGD(tag, "registering descriptor %s with handle=%d\n", + ESP_LOGD(tag, "registering descriptor %s with handle=%d", ble_uuid_to_str(ctxt->dsc.dsc_def->uuid, buf), ctxt->dsc.handle); break; diff --git a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c index 9c78b77268..fcbd906f4b 100644 --- a/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c +++ b/examples/bluetooth/nimble/throughput_app/bleprph_throughput/main/main.c @@ -124,7 +124,7 @@ gatts_advertise(void) rc = ble_gap_adv_set_fields(&fields); if (rc != 0) { - ESP_LOGE(tag, "Error setting advertisement data; rc=%d\n", rc); + ESP_LOGE(tag, "Error setting advertisement data; rc=%d", rc); return; } @@ -135,7 +135,7 @@ gatts_advertise(void) rc = ble_gap_adv_start(gatts_addr_type, NULL, BLE_HS_FOREVER, &adv_params, gatts_gap_event, NULL); if (rc != 0) { - ESP_LOGE(tag, "Error enabling advertisement; rc=%d\n", rc); + ESP_LOGE(tag, "Error enabling advertisement; rc=%d", rc); return; } } @@ -343,7 +343,7 @@ gatts_on_sync(void) static void gatts_on_reset(int reason) { - ESP_LOGE(tag, "Resetting state; reason=%d\n", reason); + ESP_LOGE(tag, "Resetting state; reason=%d", reason); } void gatts_host_task(void *param) diff --git a/examples/common_components/iperf/iperf.c b/examples/common_components/iperf/iperf.c index 22ba98a763..a798f98d5d 100644 --- a/examples/common_components/iperf/iperf.c +++ b/examples/common_components/iperf/iperf.c @@ -288,7 +288,7 @@ static esp_err_t IRAM_ATTR iperf_run_tcp_server(void) setsockopt(listen_socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)); client_socket = accept(listen_socket, (struct sockaddr *)&remote_addr, &addr_len); ESP_GOTO_ON_FALSE((client_socket >= 0), ESP_FAIL, exit, TAG, "Unable to accept connection: errno %d", errno); - ESP_LOGI(TAG, "accept: %s,%d\n", inet_ntoa(remote_addr.sin_addr), htons(remote_addr.sin_port)); + ESP_LOGI(TAG, "accept: %s,%d", inet_ntoa(remote_addr.sin_addr), htons(remote_addr.sin_port)); timeout.tv_sec = IPERF_SOCKET_RX_TIMEOUT; setsockopt(client_socket, SOL_SOCKET, SO_RCVTIMEO, &timeout, sizeof(timeout)); diff --git a/examples/common_components/iperf/wifi_cmd.c b/examples/common_components/iperf/wifi_cmd.c index 6c08d28207..0104985f44 100644 --- a/examples/common_components/iperf/wifi_cmd.c +++ b/examples/common_components/iperf/wifi_cmd.c @@ -263,12 +263,12 @@ static int wifi_cmd_reg_rw(int argc, char **argv) } if (reg_rw_args.read->count) { addr = (uint32_t) reg_rw_args.read->dval[0]; - ESP_LOGW(TAG, "reg read 0x%08lx : 0x%08lx\n", addr, REG_READ(addr)); + ESP_LOGW(TAG, "reg read 0x%08lx : 0x%08lx", addr, REG_READ(addr)); } else if (reg_rw_args.write->count && (uint32_t) reg_rw_args.value->count) { addr = (uint32_t) reg_rw_args.write->dval[0]; - ESP_LOGW(TAG, "reg write 0x%8lx : 0x%8lx\n", addr, (uint32_t) reg_rw_args.value->dval[0]); + ESP_LOGW(TAG, "reg write 0x%8lx : 0x%8lx", addr, (uint32_t) reg_rw_args.value->dval[0]); REG_WRITE(addr, (uint32_t ) reg_rw_args.value->dval[0]); - ESP_LOGW(TAG, "reg read 0x%08lx : 0x%08lx\n", addr, REG_READ(addr)); + ESP_LOGW(TAG, "reg read 0x%08lx : 0x%08lx", addr, REG_READ(addr)); } else { printf("Input Error\n"); } @@ -730,18 +730,18 @@ static int wifi_cmd_inactive_time(int argc, char **argv) if ((mode & WIFI_MODE_AP) && inactive_time_args.val->count) { err = esp_wifi_set_inactive_time(ESP_IF_WIFI_AP, inactive_time_args.val->ival[0]); if (err != ESP_OK) { - ESP_LOGW(TAG, "set softAP inactive time to %d seconds, err:0x%x\n", inactive_time_args.val->ival[0], err); + ESP_LOGW(TAG, "set softAP inactive time to %d seconds, err:0x%x", inactive_time_args.val->ival[0], err); } else { - ESP_LOGI(TAG, "set softAP inactive time to %d seconds\n", inactive_time_args.val->ival[0]); + ESP_LOGI(TAG, "set softAP inactive time to %d seconds", inactive_time_args.val->ival[0]); } } //WIFI_MODE_STA or WIFI_MODE_APSTA if ((mode & WIFI_MODE_STA) && inactive_time_args.val->count) { err = esp_wifi_set_inactive_time(ESP_IF_WIFI_STA, inactive_time_args.val->ival[0]); if (err != ESP_OK) { - ESP_LOGW(TAG, "set STA inactive time to %d seconds, err:0x%x\n", inactive_time_args.val->ival[0], err); + ESP_LOGW(TAG, "set STA inactive time to %d seconds, err:0x%x", inactive_time_args.val->ival[0], err); } else { - ESP_LOGI(TAG, "set STA inactive time to %d seconds\n", inactive_time_args.val->ival[0]); + ESP_LOGI(TAG, "set STA inactive time to %d seconds", inactive_time_args.val->ival[0]); } } uint16_t secs = 0; diff --git a/examples/common_components/iperf/wifi_stats.c b/examples/common_components/iperf/wifi_stats.c index f10cc3b71c..5fe1aa5299 100644 --- a/examples/common_components/iperf/wifi_stats.c +++ b/examples/common_components/iperf/wifi_stats.c @@ -148,7 +148,7 @@ int wifi_cmd_get_tx_statistics(int argc, char **argv) { uint8_t i, h, j, k; - ESP_LOGW(TAG, "Get tx statistics\n"); + ESP_LOGW(TAG, "Get tx statistics"); esp_test_tx_tb_statistics_t tb_stats = { 0, }; //32 bytes esp_test_tx_statistics_t tx_stats = { 0, }; //136 bytes esp_test_tx_fail_statistics_t tx_fail[TEST_TX_FAIL_MAX] = { 0, }; //TEST_TX_FAIL_MAX * 164 bytes diff --git a/examples/mesh/internal_communication/main/mesh_main.c b/examples/mesh/internal_communication/main/mesh_main.c index 3dfffb16a8..585df23cc9 100644 --- a/examples/mesh/internal_communication/main/mesh_main.c +++ b/examples/mesh/internal_communication/main/mesh_main.c @@ -446,7 +446,7 @@ void app_main(void) /* set the network active duty cycle. (default:10, -1, MESH_PS_NETWORK_DUTY_APPLIED_ENTIRE) */ ESP_ERROR_CHECK(esp_mesh_set_network_duty_cycle(CONFIG_MESH_PS_NWK_DUTY, CONFIG_MESH_PS_NWK_DUTY_DURATION, CONFIG_MESH_PS_NWK_DUTY_RULE)); #endif - ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32 ", %s<%d>%s, ps:%d\n", esp_get_minimum_free_heap_size(), + ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32 ", %s<%d>%s, ps:%d", esp_get_minimum_free_heap_size(), esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed", esp_mesh_get_topology(), esp_mesh_get_topology() ? "(chain)":"(tree)", esp_mesh_is_ps_enabled()); } diff --git a/examples/mesh/ip_internal_network/main/mesh_main.c b/examples/mesh/ip_internal_network/main/mesh_main.c index 9a56ed149d..d2870fbf79 100644 --- a/examples/mesh/ip_internal_network/main/mesh_main.c +++ b/examples/mesh/ip_internal_network/main/mesh_main.c @@ -423,6 +423,6 @@ void app_main(void) ESP_ERROR_CHECK(esp_mesh_set_config(&cfg)); /* mesh start */ ESP_ERROR_CHECK(esp_mesh_start()); - ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32 ", %s\n", esp_get_free_heap_size(), + ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32 ", %s", esp_get_free_heap_size(), esp_mesh_is_root_fixed() ? "root fixed" : "root not fixed"); } diff --git a/examples/mesh/manual_networking/main/mesh_main.c b/examples/mesh/manual_networking/main/mesh_main.c index 33958a768d..7dbdb73884 100644 --- a/examples/mesh/manual_networking/main/mesh_main.c +++ b/examples/mesh/manual_networking/main/mesh_main.c @@ -329,5 +329,5 @@ void app_main(void) ESP_ERROR_CHECK(esp_mesh_set_config(&cfg)); /* mesh start */ ESP_ERROR_CHECK(esp_mesh_start()); - ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32 "\n", esp_get_free_heap_size()); + ESP_LOGI(MESH_TAG, "mesh starts successfully, heap:%" PRId32, esp_get_free_heap_size()); } diff --git a/examples/network/bridge/main/bridge_console_cmd.c b/examples/network/bridge/main/bridge_console_cmd.c index 9b69f20eec..c0258f7a27 100644 --- a/examples/network/bridge/main/bridge_console_cmd.c +++ b/examples/network/bridge/main/bridge_console_cmd.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -89,7 +89,7 @@ static int cmd_br_fdb_add(int argc, char **argv) 1, TAG, "Adding FDB entry failed"); ESP_LOG_BUFFER_HEX_LEVEL(TAG, mac_addr, ETH_ADDR_LEN, ESP_LOG_DEBUG); - ESP_LOGD(TAG, "portmask 0x%" PRIu64 "\n", port_mask); + ESP_LOGD(TAG, "portmask 0x%" PRIu64, port_mask); ESP_LOGI(TAG, "Bridge Config OK!"); return 0; diff --git a/examples/network/simple_sniffer/main/simple_sniffer_example_main.c b/examples/network/simple_sniffer/main/simple_sniffer_example_main.c index ce4cdd8741..4674c78236 100644 --- a/examples/network/simple_sniffer/main/simple_sniffer_example_main.c +++ b/examples/network/simple_sniffer/main/simple_sniffer_example_main.c @@ -102,7 +102,7 @@ static void eth_event_handler(void *arg, esp_event_base_t event_base, esp_eth_ioctl(eth_handle, ETH_CMD_G_MAC_ADDR, mac_addr); printf("\n"); ESP_LOGI(TAG, "Ethernet Link Up"); - ESP_LOGI(TAG, "Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x\n", + ESP_LOGI(TAG, "Ethernet HW Addr %02x:%02x:%02x:%02x:%02x:%02x", mac_addr[0], mac_addr[1], mac_addr[2], mac_addr[3], mac_addr[4], mac_addr[5]); break; case ETHERNET_EVENT_DISCONNECTED: diff --git a/examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c b/examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c index 26b6db52b7..3fc3dd72a2 100644 --- a/examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c +++ b/examples/peripherals/i2c/i2c_self_test/main/i2c_example_main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -265,7 +265,7 @@ static void i2c_test_task(void *arg) printf("====TASK[%d] Master read ====\n", task_idx); disp_buf(data_rd, d_size); } else { - ESP_LOGW(TAG, "TASK[%d] %s: Master read slave error, IO not connected...\n", + ESP_LOGW(TAG, "TASK[%d] %s: Master read slave error, IO not connected...", task_idx, esp_err_to_name(ret)); } xSemaphoreGive(print_mux); @@ -292,7 +292,7 @@ static void i2c_test_task(void *arg) printf("----TASK[%d] Slave read: [%d] bytes ----\n", task_idx, size); disp_buf(data, size); } else { - ESP_LOGW(TAG, "TASK[%d] %s: Master write slave error, IO not connected....\n", + ESP_LOGW(TAG, "TASK[%d] %s: Master write slave error, IO not connected....", task_idx, esp_err_to_name(ret)); } xSemaphoreGive(print_mux); diff --git a/examples/peripherals/sdio/host/main/app_main.c b/examples/peripherals/sdio/host/main/app_main.c index ff39f922b1..0676d6da94 100644 --- a/examples/peripherals/sdio/host/main/app_main.c +++ b/examples/peripherals/sdio/host/main/app_main.c @@ -186,10 +186,10 @@ esp_err_t slave_init(essl_handle_t* handle) #ifndef CONFIG_EXAMPLE_SDIO_OVER_SPI sdmmc_host_t config = SDMMC_HOST_DEFAULT(); #ifdef CONFIG_EXAMPLE_SDIO_4BIT - ESP_LOGI(TAG, "Probe using SD 4-bit...\n"); + ESP_LOGI(TAG, "Probe using SD 4-bit..."); config.flags = SDMMC_HOST_FLAG_4BIT; #else - ESP_LOGI(TAG, "Probe using SD 1-bit...\n"); + ESP_LOGI(TAG, "Probe using SD 1-bit..."); config.flags = SDMMC_HOST_FLAG_1BIT; #endif @@ -249,7 +249,7 @@ esp_err_t slave_init(essl_handle_t* handle) ESP_ERROR_CHECK(err); err = sdspi_host_init_device(&dev_config, &sdspi_handle); ESP_ERROR_CHECK(err); - ESP_LOGI(TAG, "Probe using SPI...\n"); + ESP_LOGI(TAG, "Probe using SPI..."); sdmmc_host_t config = SDSPI_HOST_DEFAULT(); config.slot = sdspi_handle; diff --git a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c index 401cf40af9..8a64c7841d 100644 --- a/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c +++ b/examples/peripherals/uart/uart_echo_rs485/main/rs485_example.c @@ -95,7 +95,7 @@ static void echo_task(void *arg) // Allocate buffers for UART uint8_t* data = (uint8_t*) malloc(BUF_SIZE); - ESP_LOGI(TAG, "UART start recieve loop.\r\n"); + ESP_LOGI(TAG, "UART start recieve loop.\r"); echo_send(uart_num, "Start RS485 UART test.\r\n", 24); while(1) { diff --git a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/tusb_composite_main.c b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/tusb_composite_main.c index a7d4abbc5a..432b1b69d2 100644 --- a/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/tusb_composite_main.c +++ b/examples/peripherals/usb/device/tusb_composite_msc_serialdevice/main/tusb_composite_main.c @@ -58,7 +58,7 @@ static void file_operations(void) bool directory_exists = stat(directory, &s) == 0; if (!directory_exists) { if (mkdir(directory, 0775) != 0) { - ESP_LOGE(TAG, "mkdir failed with errno: %s\n", strerror(errno)); + ESP_LOGE(TAG, "mkdir failed with errno: %s", strerror(errno)); } } diff --git a/examples/peripherals/usb/host/msc/main/msc_example_main.c b/examples/peripherals/usb/host/msc/main/msc_example_main.c index eca2c415b7..1e690e1e73 100644 --- a/examples/peripherals/usb/host/msc/main/msc_example_main.c +++ b/examples/peripherals/usb/host/msc/main/msc_example_main.c @@ -80,7 +80,7 @@ static void file_operations(void) bool directory_exists = stat(directory, &s) == 0; if (!directory_exists) { if (mkdir(directory, 0775) != 0) { - ESP_LOGE(TAG, "mkdir failed with errno: %s\n", strerror(errno)); + ESP_LOGE(TAG, "mkdir failed with errno: %s", strerror(errno)); } } diff --git a/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c b/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c index d7da1926e9..e65b656c4b 100644 --- a/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c +++ b/examples/protocols/https_mbedtls/main/https_mbedtls_example_main.c @@ -71,7 +71,7 @@ static void https_get_task(void *pvParameters) #ifdef CONFIG_MBEDTLS_SSL_PROTO_TLS1_3 psa_status_t status = psa_crypto_init(); if (status != PSA_SUCCESS) { - ESP_LOGE(TAG, "Failed to initialize PSA crypto, returned %d\n", (int) status); + ESP_LOGE(TAG, "Failed to initialize PSA crypto, returned %d", (int) status); return; } #endif @@ -97,7 +97,7 @@ static void https_get_task(void *pvParameters) if(ret < 0) { - ESP_LOGE(TAG, "esp_crt_bundle_attach returned -0x%x\n\n", -ret); + ESP_LOGE(TAG, "esp_crt_bundle_attach returned -0x%x", -ret); abort(); } @@ -134,7 +134,7 @@ static void https_get_task(void *pvParameters) #endif if ((ret = mbedtls_ssl_setup(&ssl, &conf)) != 0) { - ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x\n\n", -ret); + ESP_LOGE(TAG, "mbedtls_ssl_setup returned -0x%x", -ret); goto exit; } diff --git a/examples/protocols/l2tap/main/l2tap_main.c b/examples/protocols/l2tap/main/l2tap_main.c index 997f907784..f22470109c 100644 --- a/examples/protocols/l2tap/main/l2tap_main.c +++ b/examples/protocols/l2tap/main/l2tap_main.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -129,7 +129,7 @@ static void echo_l2tap_task(void *pvParameters) // Send the echo message ssize_t ret = write(eth_tap_fd, &echo_msg, len); if (ret == -1) { - ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d\n", eth_tap_fd, errno); + ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d", eth_tap_fd, errno); break; } } else { @@ -177,7 +177,7 @@ static void nonblock_l2tap_echo_task(void *pvParameters) // Send the echo message ssize_t ret = write(eth_tap_fd, &echo_msg, len); if (ret == -1) { - ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d\n", eth_tap_fd, errno); + ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d", eth_tap_fd, errno); break; } } else { @@ -223,7 +223,7 @@ static void hello_tx_l2tap_task(void *pvParameters) // Send the Hello frame ssize_t ret = write(eth_tap_fd, &hello_msg, ETH_HEADER_LEN + strlen(hello_msg.payload)); if (ret == -1) { - ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d\n", eth_tap_fd, errno); + ESP_LOGE(TAG, "L2 TAP fd %d write error: errno: %d", eth_tap_fd, errno); break; } vTaskDelay(pdMS_TO_TICKS(3000)); diff --git a/examples/protocols/sockets/icmpv6_ping/main/icmpv6_ping.c b/examples/protocols/sockets/icmpv6_ping/main/icmpv6_ping.c index 695b67144f..1af387c3ad 100644 --- a/examples/protocols/sockets/icmpv6_ping/main/icmpv6_ping.c +++ b/examples/protocols/sockets/icmpv6_ping/main/icmpv6_ping.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -53,7 +53,7 @@ static socklen_t resolve_v6addr(char *addr_str_i, struct sockaddr_in6 *addr_o) // Resolve source using getaddrinfo(). if (0 != getaddrinfo(addr_str_i, NULL, &hints, &res)) { - ESP_LOGE(TAG, "getaddrinfo(): Could not resolve address, got error: %d\n", errno); + ESP_LOGE(TAG, "getaddrinfo(): Could not resolve address, got error: %d", errno); return 0; } @@ -94,13 +94,13 @@ static void send_ping(char *src_addr_str, char *dst_addr_str, char *interface) // Resolve source address. if (0 == (srclen = resolve_v6addr(src_addr_str, &src))) { - ESP_LOGE(TAG, "resolve_v6addr(): Source address error\n"); + ESP_LOGE(TAG, "resolve_v6addr(): Source address error"); return; } // Resolve destination address. if (0 == resolve_v6addr(dst_addr_str, &dst)) { - ESP_LOGE(TAG, "resolve_v6addr(): Destination address error\n"); + ESP_LOGE(TAG, "resolve_v6addr(): Destination address error"); return; } @@ -145,34 +145,34 @@ static void send_ping(char *src_addr_str, char *dst_addr_str, char *interface) // Request a socket descriptor sd. if ((sd = socket(AF_INET6, SOCK_RAW, IPPROTO_ICMPV6)) < 0) { - ESP_LOGE(TAG, "Failed to get socket descriptor.: %d\n", errno); + ESP_LOGE(TAG, "Failed to get socket descriptor.: %d", errno); return; } // Bind the socket descriptor to the source address. if (bind(sd, (struct sockaddr *)&src, srclen) != 0) { - ESP_LOGE(TAG, "Failed to bind the socket descriptor to the source address.: %d\n", errno); + ESP_LOGE(TAG, "Failed to bind the socket descriptor to the source address.: %d", errno); return; } // Bind socket to interface index. strcpy(ifr.ifr_name, interface); if (setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr)) < 0) { - ESP_LOGE(TAG, "setsockopt() failed to bind to interface: %d\n", errno); + ESP_LOGE(TAG, "setsockopt() failed to bind to interface: %d", errno); return; } // Send packet. int ret = 0; if ((ret = sendmsg(sd, &msghdr, 0)) < 0) { - ESP_LOGE(TAG, "sendmsg() failed: %d\n", errno); + ESP_LOGE(TAG, "sendmsg() failed: %d", errno); return; } free(msghdr.msg_control); ESP_LOGI(TAG, "ICMPv6 msg payload:"); ESP_LOG_BUFFER_HEXDUMP(TAG, &(psdhdr[IP6_HLEN]), ICMP6_HLEN + datalen, ESP_LOG_INFO); - ESP_LOGI(TAG, "Sent ICMPv6 msg: type: %d, code: %d, id: %d, seqno: %d\n", + ESP_LOGI(TAG, "Sent ICMPv6 msg: type: %d, code: %d, id: %d, seqno: %d", icmphdr->type, icmphdr->code, icmphdr->id, @@ -199,13 +199,13 @@ static void send_ping(char *src_addr_str, char *dst_addr_str, char *interface) icmphdr = (struct icmp6_echo_hdr *)(inpack + IP6_HLEN); while (ICMP6_TYPE_EREP != icmphdr->type) { if ((len = recvmsg(sd, &msghdr, 0)) < 0) { - ESP_LOGE(TAG, "recvmsg() failed: %d\n", errno); + ESP_LOGE(TAG, "recvmsg() failed: %d", errno); return; } ESP_LOGI(TAG, "ICMPv6 msg payload:"); ESP_LOG_BUFFER_HEXDUMP(TAG, inpack, IP6_HLEN + ICMP6_HLEN + datalen, ESP_LOG_INFO); - ESP_LOGI(TAG, "Received ICMPv6 msg: type: %d, code: %d, id: %d, seqno: %d\n", + ESP_LOGI(TAG, "Received ICMPv6 msg: type: %d, code: %d, id: %d, seqno: %d", icmphdr->type, icmphdr->code, icmphdr->id, diff --git a/examples/protocols/sockets/tcp_client/main/tcp_client_v6.c b/examples/protocols/sockets/tcp_client/main/tcp_client_v6.c index 73acd117e2..c150177b4a 100644 --- a/examples/protocols/sockets/tcp_client/main/tcp_client_v6.c +++ b/examples/protocols/sockets/tcp_client/main/tcp_client_v6.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ @@ -192,7 +192,7 @@ void tcp_client(void) ESP_LOGI(TAG, "Socket created, connecting to %s:%d", host_ip, PORT); if (0 != get_src_iface(interface)) { - ESP_LOGE(TAG, "Interface: Unavailable\n"); + ESP_LOGE(TAG, "Interface: Unavailable"); break; } @@ -205,7 +205,7 @@ void tcp_client(void) } #if defined(CONFIG_EXAMPLE_IPV6) dest_addr.sin6_scope_id = ifr.ifr_ifindex; - ESP_LOGI(TAG, "Interface index: %d\n", dest_addr.sin6_scope_id); + ESP_LOGI(TAG, "Interface index: %d", dest_addr.sin6_scope_id); #endif #else if (NULL == (netif = get_esp_netif_from_iface(interface))) { @@ -214,7 +214,7 @@ void tcp_client(void) } #if defined(CONFIG_EXAMPLE_IPV6) dest_addr.sin6_scope_id = esp_netif_get_netif_impl_index(netif); - ESP_LOGI(TAG, "Interface index: %d\n", dest_addr.sin6_scope_id); + ESP_LOGI(TAG, "Interface index: %d", dest_addr.sin6_scope_id); #endif #endif diff --git a/examples/protocols/sockets/udp_server/main/udp_server.c b/examples/protocols/sockets/udp_server/main/udp_server.c index 5381b00f7c..203a2cf3cd 100644 --- a/examples/protocols/sockets/udp_server/main/udp_server.c +++ b/examples/protocols/sockets/udp_server/main/udp_server.c @@ -125,7 +125,7 @@ static void udp_server_task(void *pvParameters) if ( cmsgtmp->cmsg_level == IPPROTO_IP && cmsgtmp->cmsg_type == IP_PKTINFO ) { struct in_pktinfo *pktinfo; pktinfo = (struct in_pktinfo*)CMSG_DATA(cmsgtmp); - ESP_LOGI(TAG, "dest ip: %s\n", inet_ntoa(pktinfo->ipi_addr)); + ESP_LOGI(TAG, "dest ip: %s", inet_ntoa(pktinfo->ipi_addr)); } } #endif diff --git a/examples/system/ota/advanced_https_ota/main/ble_helper/ble_api.c b/examples/system/ota/advanced_https_ota/main/ble_helper/ble_api.c index ce78fe5dfb..af9ee1f876 100644 --- a/examples/system/ota/advanced_https_ota/main/ble_helper/ble_api.c +++ b/examples/system/ota/advanced_https_ota/main/ble_helper/ble_api.c @@ -27,23 +27,23 @@ esp_err_t esp_ble_helper_init(void) esp_bt_controller_config_t bt_cfg = BT_CONTROLLER_INIT_CONFIG_DEFAULT(); err = esp_bt_controller_init(&bt_cfg); if (err) { - ESP_LOGE(TAG, "%s initialize controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(TAG, "%s initialize controller failed: %s", __func__, esp_err_to_name(err)); return err; } err = esp_bt_controller_enable(ESP_BT_MODE_BLE); if (err) { - ESP_LOGE(TAG, "%s enable controller failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(TAG, "%s enable controller failed: %s", __func__, esp_err_to_name(err)); return err; } err = esp_bluedroid_init(); if (err) { - ESP_LOGE(TAG, "%s init bluetooth failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(TAG, "%s init bluetooth failed: %s", __func__, esp_err_to_name(err)); return err; } err = esp_bluedroid_enable(); if (err) { - ESP_LOGE(TAG, "%s enable bluetooth failed: %s\n", __func__, esp_err_to_name(err)); + ESP_LOGE(TAG, "%s enable bluetooth failed: %s", __func__, esp_err_to_name(err)); return err; } diff --git a/examples/system/ota/advanced_https_ota/main/ble_helper/bluedroid_gatts.c b/examples/system/ota/advanced_https_ota/main/ble_helper/bluedroid_gatts.c index 60843e796b..c6c6482bcc 100644 --- a/examples/system/ota/advanced_https_ota/main/ble_helper/bluedroid_gatts.c +++ b/examples/system/ota/advanced_https_ota/main/ble_helper/bluedroid_gatts.c @@ -105,7 +105,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare prepare_write_env->prepare_buf = (uint8_t *)malloc(PREPARE_BUF_MAX_SIZE * sizeof(uint8_t)); prepare_write_env->prepare_len = 0; if (prepare_write_env->prepare_buf == NULL) { - ESP_LOGE(TAG, "Gatt_server prep no mem\n"); + ESP_LOGE(TAG, "Gatt_server prep no mem"); status = ESP_GATT_NO_RESOURCES; } } else { @@ -124,7 +124,7 @@ void example_write_event_env(esp_gatt_if_t gatts_if, prepare_type_env_t *prepare memcpy(gatt_rsp->attr_value.value, param->write.value, param->write.len); esp_err_t response_err = esp_ble_gatts_send_response(gatts_if, param->write.conn_id, param->write.trans_id, status, gatt_rsp); if (response_err != ESP_OK) { - ESP_LOGE(TAG, "Send response error\n"); + ESP_LOGE(TAG, "Send response error"); } free(gatt_rsp); if (status != ESP_GATT_OK) { @@ -145,7 +145,7 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat { switch (event) { case ESP_GATTS_REG_EVT: - ESP_LOGI(TAG, "REGISTER_APP_EVT, status %d, app_id %d\n", param->reg.status, param->reg.app_id); + ESP_LOGI(TAG, "REGISTER_APP_EVT, status %d, app_id %d", param->reg.status, param->reg.app_id); gl_profile_tab[PROFILE_A_APP_ID].service_id.is_primary = true; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.inst_id = 0x00; gl_profile_tab[PROFILE_A_APP_ID].service_id.id.uuid.len = ESP_UUID_LEN_16; @@ -171,7 +171,7 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat esp_ble_gatts_create_service(gatts_if, &gl_profile_tab[PROFILE_A_APP_ID].service_id, GATTS_NUM_HANDLE_TEST_A); break; case ESP_GATTS_READ_EVT: { - ESP_LOGI(TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d\n", param->read.conn_id, param->read.trans_id, param->read.handle); + ESP_LOGI(TAG, "GATT_READ_EVT, conn_id %d, trans_id %"PRIu32", handle %d", param->read.conn_id, param->read.trans_id, param->read.handle); esp_gatt_rsp_t rsp; memset(&rsp, 0, sizeof(esp_gatt_rsp_t)); rsp.attr_value.handle = param->read.handle; @@ -236,7 +236,7 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat case ESP_GATTS_UNREG_EVT: break; case ESP_GATTS_CREATE_EVT: - ESP_LOGI(TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d\n", param->create.status, param->create.service_handle); + ESP_LOGI(TAG, "CREATE_SERVICE_EVT, status %d, service_handle %d", param->create.status, param->create.service_handle); gl_profile_tab[PROFILE_A_APP_ID].service_handle = param->create.service_handle; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.len = ESP_UUID_LEN_16; gl_profile_tab[PROFILE_A_APP_ID].char_uuid.uuid.uuid16 = GATTS_CHAR_UUID_TEST_A; @@ -257,7 +257,7 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat uint16_t length = 0; const uint8_t *prf_char; - ESP_LOGI(TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(TAG, "ADD_CHAR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char.status, param->add_char.attr_handle, param->add_char.service_handle); gl_profile_tab[PROFILE_A_APP_ID].char_handle = param->add_char.attr_handle; gl_profile_tab[PROFILE_A_APP_ID].descr_uuid.len = ESP_UUID_LEN_16; @@ -267,9 +267,9 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat ESP_LOGE(TAG, "ILLEGAL HANDLE"); } - ESP_LOGI(TAG, "the gatts demo char length = %x\n", length); + ESP_LOGI(TAG, "the gatts demo char length = %x", length); for (int i = 0; i < length; i++) { - ESP_LOGI(TAG, "prf_char[%x] =%x\n", i, prf_char[i]); + ESP_LOGI(TAG, "prf_char[%x] =%x", i, prf_char[i]); } esp_err_t add_descr_ret = esp_ble_gatts_add_char_descr(gl_profile_tab[PROFILE_A_APP_ID].service_handle, &gl_profile_tab[PROFILE_A_APP_ID].descr_uuid, ESP_GATT_PERM_READ | ESP_GATT_PERM_WRITE, NULL, NULL); @@ -280,13 +280,13 @@ void gatts_profile_a_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gat } case ESP_GATTS_ADD_CHAR_DESCR_EVT: gl_profile_tab[PROFILE_A_APP_ID].descr_handle = param->add_char_descr.attr_handle; - ESP_LOGI(TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d\n", + ESP_LOGI(TAG, "ADD_DESCR_EVT, status %d, attr_handle %d, service_handle %d", param->add_char_descr.status, param->add_char_descr.attr_handle, param->add_char_descr.service_handle); break; case ESP_GATTS_DELETE_EVT: break; case ESP_GATTS_START_EVT: - ESP_LOGI(TAG, "SERVICE_START_EVT, status %d, service_handle %d\n", + ESP_LOGI(TAG, "SERVICE_START_EVT, status %d, service_handle %d", param->start.status, param->start.service_handle); break; case ESP_GATTS_STOP_EVT: @@ -349,14 +349,14 @@ void gap_event_handler(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par case ESP_GAP_BLE_ADV_START_COMPLETE_EVT: //advertising start complete event to indicate advertising start successfully or failed if (param->adv_start_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(TAG, "Advertising start failed\n"); + ESP_LOGE(TAG, "Advertising start failed"); } break; case ESP_GAP_BLE_ADV_STOP_COMPLETE_EVT: if (param->adv_stop_cmpl.status != ESP_BT_STATUS_SUCCESS) { - ESP_LOGE(TAG, "Advertising stop failed\n"); + ESP_LOGE(TAG, "Advertising stop failed"); } else { - ESP_LOGI(TAG, "Stop adv successfully\n"); + ESP_LOGI(TAG, "Stop adv successfully"); } break; case ESP_GAP_BLE_UPDATE_CONN_PARAMS_EVT: @@ -380,7 +380,7 @@ void gatts_event_handler(esp_gatts_cb_event_t event, esp_gatt_if_t gatts_if, esp if (param->reg.status == ESP_GATT_OK) { gl_profile_tab[param->reg.app_id].gatts_if = gatts_if; } else { - ESP_LOGI(TAG, "Reg app failed, app_id %04x, status %d\n", + ESP_LOGI(TAG, "Reg app failed, app_id %04x, status %d", param->reg.app_id, param->reg.status); return; diff --git a/examples/wifi/roaming/main/roaming_example.c b/examples/wifi/roaming/main/roaming_example.c index 9b61dbc284..41150ed86e 100644 --- a/examples/wifi/roaming/main/roaming_example.c +++ b/examples/wifi/roaming/main/roaming_example.c @@ -51,7 +51,7 @@ static void event_handler(void* arg, esp_event_base_t event_base, } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_CONNECTED) { #if EXAMPLE_WIFI_RSSI_THRESHOLD if (EXAMPLE_WIFI_RSSI_THRESHOLD) { - ESP_LOGI(TAG, "setting rssi threshold as %d\n", EXAMPLE_WIFI_RSSI_THRESHOLD); + ESP_LOGI(TAG, "setting rssi threshold as %d", EXAMPLE_WIFI_RSSI_THRESHOLD); esp_wifi_set_rssi_threshold(EXAMPLE_WIFI_RSSI_THRESHOLD); } #endif diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 121946c5ed..dd61508999 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -159,7 +159,7 @@ static void wifi_scan(void) if (ap_info[i].authmode != WIFI_AUTH_WEP) { print_cipher_type(ap_info[i].pairwise_cipher, ap_info[i].group_cipher); } - ESP_LOGI(TAG, "Channel \t\t%d\n", ap_info[i].primary); + ESP_LOGI(TAG, "Channel \t\t%d", ap_info[i].primary); } } diff --git a/examples/wifi/wifi_easy_connect/dpp-enrollee/main/dpp_enrollee_main.c b/examples/wifi/wifi_easy_connect/dpp-enrollee/main/dpp_enrollee_main.c index 87ba52a601..76a8fee407 100644 --- a/examples/wifi/wifi_easy_connect/dpp-enrollee/main/dpp_enrollee_main.c +++ b/examples/wifi/wifi_easy_connect/dpp-enrollee/main/dpp_enrollee_main.c @@ -80,7 +80,7 @@ void dpp_enrollee_event_cb(esp_supp_dpp_event_t event, void *data) if (data != NULL) { esp_qrcode_config_t cfg = ESP_QRCODE_CONFIG_DEFAULT(); - ESP_LOGI(TAG, "Scan below QR Code to configure the enrollee:\n"); + ESP_LOGI(TAG, "Scan below QR Code to configure the enrollee:"); esp_qrcode_generate(&cfg, (const char *)data); } break; diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 2fbcea9a5e..4c69866ca7 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -553,7 +553,6 @@ components/esp_wifi/include/esp_private/wifi_types.h components/esp_wifi/include/smartconfig_ack.h components/esp_wifi/src/lib_printf.c components/esp_wifi/src/mesh_event.c -components/esp_wifi/src/smartconfig.c components/esp_wifi/test/test_wifi_init.c components/fatfs/diskio/diskio.c components/fatfs/diskio/diskio_impl.h diff --git a/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c b/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c index f49904d325..8b74f4e0a5 100644 --- a/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c +++ b/tools/test_apps/protocols/mqtt/publish_connect_test/main/publish_test.c @@ -204,7 +204,7 @@ void publish_test(const char *line) } sscanf(line, "%s %s %d %d %d %d", transport, pattern, &repeat, &expected_published, &qos_test, &enqueue); - ESP_LOGI(TAG, "PATTERN:%s REPEATED:%d PUBLISHED:%d\n", pattern, repeat, expected_published); + ESP_LOGI(TAG, "PATTERN:%s REPEATED:%d PUBLISHED:%d", pattern, repeat, expected_published); pattern_setup(pattern, repeat); xEventGroupClearBits(mqtt_event_group, CONNECTED_BIT); configure_client(transport);