espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 02:37:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_wifi): Remove semicolon from SMARTCONFIG_START_CONFIG_DEFAULT

Browse Source 
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 <darian@espressif.com>
This commit is contained in:
Simon H
2024-02-29 17:58:06 +08:00
committed by Darian Leung
parent 702853c00e
commit 515f085f70
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
components/esp_wifi/include/esp_smartconfig.h
View File

@ -1,16 +1,8 @@
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// 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.
#ifndef __ESP_SMARTCONFIG_H__ #ifndef __ESP_SMARTCONFIG_H__
#define __ESP_SMARTCONFIG_H__ #define __ESP_SMARTCONFIG_H__
@ -64,7 +56,7 @@ typedef struct {
.enable_log = false, \ .enable_log = false, \
.esp_touch_v2_enable_crypt = false,\ .esp_touch_v2_enable_crypt = false,\
.esp_touch_v2_key = NULL \ .esp_touch_v2_key = NULL \
}; }
/** /**
* @brief Get the version of SmartConfig. * @brief Get the version of SmartConfig.

1
tools/ci/check_copyright_ignore.txt
View File

@ -620,7 +620,6 @@ components/esp_system/test_eh_frame_parser/linker.ld
components/esp_system/ubsan.c components/esp_system/ubsan.c
components/esp_wifi/include/esp_private/esp_wifi_types_private.h 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_private/wifi_types.h
components/esp_wifi/include/esp_smartconfig.h
components/esp_wifi/src/lib_printf.c components/esp_wifi/src/lib_printf.c
components/esp_wifi/src/mesh_event.c components/esp_wifi/src/mesh_event.c
components/esp_wifi/src/smartconfig.c components/esp_wifi/src/smartconfig.c