From 515f085f701007715fe019de82a7471496f35b51 Mon Sep 17 00:00:00 2001 From: Simon H Date: Thu, 29 Feb 2024 17:58:06 +0800 Subject: [PATCH] fix(esp_wifi): Remove semicolon from SMARTCONFIG_START_CONFIG_DEFAULT Removed rogue semicolon from SMARTCONFIG_START_CONFIG_DEFAULT() macro. This fixes build issues when this macro is used via C++ brace initialization. Closes https://github.com/espressif/esp-idf/pull/12867 [Darian Leung: Updated commit message] Signed-off-by: Darian Leung --- components/esp_wifi/include/esp_smartconfig.h | 20 ++++++------------- tools/ci/check_copyright_ignore.txt | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/components/esp_wifi/include/esp_smartconfig.h b/components/esp_wifi/include/esp_smartconfig.h index b70d0c401a..3b67a1a965 100644 --- a/components/esp_wifi/include/esp_smartconfig.h +++ b/components/esp_wifi/include/esp_smartconfig.h @@ -1,16 +1,8 @@ -// Copyright 2015-2016 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: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef __ESP_SMARTCONFIG_H__ #define __ESP_SMARTCONFIG_H__ @@ -64,7 +56,7 @@ typedef struct { .enable_log = false, \ .esp_touch_v2_enable_crypt = false,\ .esp_touch_v2_key = NULL \ -}; +} /** * @brief Get the version of SmartConfig. diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index b02be5c105..fc7064a78e 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -620,7 +620,6 @@ components/esp_system/test_eh_frame_parser/linker.ld components/esp_system/ubsan.c components/esp_wifi/include/esp_private/esp_wifi_types_private.h components/esp_wifi/include/esp_private/wifi_types.h -components/esp_wifi/include/esp_smartconfig.h components/esp_wifi/src/lib_printf.c components/esp_wifi/src/mesh_event.c components/esp_wifi/src/smartconfig.c