From b4d904f8f05a69f96587f7e0d1807363d985e131 Mon Sep 17 00:00:00 2001 From: Luke Dennis Date: Mon, 9 Jan 2023 13:46:51 +1100 Subject: [PATCH 1/2] Make macro defined event base variables immutable and update license --- components/esp_event/include/esp_event_base.h | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/components/esp_event/include/esp_event_base.h b/components/esp_event/include/esp_event_base.h index fc5a1deb02..0da0a99159 100644 --- a/components/esp_event/include/esp_event_base.h +++ b/components/esp_event/include/esp_event_base.h @@ -1,16 +1,8 @@ -// Copyright 2018 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: 2018-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef ESP_EVENT_BASE_H_ #define ESP_EVENT_BASE_H_ @@ -20,8 +12,8 @@ extern "C" { #endif // Defines for declaring and defining event base -#define ESP_EVENT_DECLARE_BASE(id) extern esp_event_base_t id -#define ESP_EVENT_DEFINE_BASE(id) esp_event_base_t id = #id +#define ESP_EVENT_DECLARE_BASE(id) extern esp_event_base_t const id +#define ESP_EVENT_DEFINE_BASE(id) esp_event_base_t const id = #id // Event loop library types typedef const char* esp_event_base_t; /**< unique pointer to a subsystem that exposes events */ From 01b4c7d8b12b32c994a4c0bdf20627995a114621 Mon Sep 17 00:00:00 2001 From: Jakob Hasse Date: Fri, 13 Jan 2023 11:16:50 +0800 Subject: [PATCH 2/2] fix(esp_event): removed header from pre-commit ignore list --- tools/ci/check_copyright_ignore.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index fc5c2b16ba..9a5217d576 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -408,7 +408,6 @@ components/esp_event/event_loop_legacy.c components/esp_event/event_send.c components/esp_event/host_test/esp_event_unit_test/main/esp_event_test.cpp components/esp_event/host_test/fixtures.hpp -components/esp_event/include/esp_event_base.h components/esp_event/include/esp_event_loop.h components/esp_event/private_include/esp_event_internal.h components/esp_event/private_include/esp_event_private.h