espressif/esp-matter
1
0
Fork 0
mirror of https://github.com/espressif/esp-matter.git synced 2026-04-27 19:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'purge_s2' into 'main'

Browse Source 
Remove S2 references and do not deinit ble on commissioning complete

See merge request app-frameworks/esp-matter!140
This commit is contained in:
Hrishikesh Dhayagude
2022-06-09 23:46:02 +08:00
parent f8b2b92290 bc45bb3a66
commit f64458248b
21 changed files with 8 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
device_hal/device/esp32s2_devkit_c/device.c
-43
View File
@@ -1,43 +0,0 @@
// Copyright 2021 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.
// 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
#include <esp_log.h>
#include <iot_button.h>
#include <led_driver.h>
#define LED_GPIO_PIN GPIO_NUM_8
#define LED_CHANNEL 0 /* RMT_CHANNEL_0 */
#define BUTTON_GPIO_PIN GPIO_NUM_0
static const char *TAG = "device";
led_driver_config_t led_driver_get_config()
{
led_driver_config_t config = {
.gpio = LED_GPIO_PIN,
.channel = LED_CHANNEL,
};
return config;
}
button_config_t button_driver_get_config()
{
button_config_t config = {
.type = BUTTON_TYPE_GPIO,
.gpio_button_config = {
.gpio_num = BUTTON_GPIO_PIN,
.active_level = 0,
}
};
return config;
}
device_hal/device/esp32s2_devkit_c/esp_matter_device.cmake
-11
View File
@@ -1,11 +0,0 @@
cmake_minimum_required(VERSION 3.5)
if (NOT ("${IDF_TARGET}" STREQUAL "esp32s2" ))
message(FATAL_ERROR "please set esp32s2 as the IDF_TARGET using 'idf.py set-target esp32s2'")
endif()
SET(device_type esp32s2_devkit_c)
SET(led_type hollow_led)
SET(button_type iot)
SET(extra_components_dirs_append "$ENV{ESP_MATTER_DEVICE_PATH}/../../led_driver"
"$ENV{ESP_MATTER_DEVICE_PATH}/../../button_driver/iot_button")
docs/_static/esp_matter_versions.js
Vendored
+1 -2
View File
@@ -3,11 +3,10 @@ var DOCUMENTATION_VERSIONS = {
supported_targets: [ "esp32" ]
},
VERSIONS: [
{ name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32s2", "esp32c3", "esp32s3", "esp32h2" ] },
{ name: "latest", has_targets: true, supported_targets: [ "esp32", "esp32c3", "esp32s3", "esp32h2" ] },
],
IDF_TARGETS: [
{ text: "ESP32", value: "esp32" },
{ text: "ESP32-S2", value: "esp32s2" },
{ text: "ESP32-S3", value: "esp32s3" },
{ text: "ESP32-C3", value: "esp32c3" },
{ text: "ESP32-H2", value: "esp32h2" },
docs/conf_common.py
+1 -1
View File
@@ -1,7 +1,7 @@
from esp_docs.conf_docs import * # noqa: F403,F401
languages = ['en']
idf_targets = ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32h2']
idf_targets = ['esp32', 'esp32s3', 'esp32c3', 'esp32h2']
extensions += ['sphinx_copybutton',
# Needed as a trigger for running doxygen
docs/en/developing.rst
+1 -1
View File
@@ -1,7 +1,7 @@
2. Developing with ESP Matter
=============================
Please refer the :project_file:`Changelog <CHANGELOG.md>` to know more about
Please refer the :project_file:`Release Notes <RELEASE_NOTES.txt>` to know more about
ESP Matter releases
2.1 Development Setup
examples/blemesh_bridge/CMakeLists.txt
-2
View File
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32c3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
else()
examples/light/CMakeLists.txt
-2
View File
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32h2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
else()
examples/light/main/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset esp_matter_ota)
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset esp_matter_ota)
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "."
examples/light/main/app_main.cpp
-2
View File
@@ -15,7 +15,6 @@
#include <esp_matter_ota.h>
#include <esp_route_hook.h>
#include <app_ble.h>
#include <app_priv.h>
#include <app_qrcode.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
ESP_LOGI(TAG, "Commissioning complete");
app_ble_disable();
break;
default:
examples/light_switch/CMakeLists.txt
-2
View File
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32h2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
else()
message(FATAL_ERROR "Unsupported IDF_TARGET")
endif()
examples/light_switch/main/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset esp_matter_ota)
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset esp_matter_ota)
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "."
examples/light_switch/main/app_main.cpp
-2
View File
@@ -15,7 +15,6 @@
#include <esp_matter_ota.h>
#include <esp_route_hook.h>
#include <app_ble.h>
#include <app_priv.h>
#include <app_qrcode.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
ESP_LOGI(TAG, "Commissioning complete");
app_ble_disable();
break;
default:
examples/rainmaker_light/CMakeLists.txt
-2
View File
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32c3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
else()
examples/rainmaker_light/main/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_rainmaker route_hook app_ble app_qrcode app_reset
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console esp_matter_rainmaker route_hook app_qrcode app_reset
esp_rainmaker)
idf_component_register(SRC_DIRS "."
examples/rainmaker_light/main/app_main.cpp
-2
View File
@@ -14,7 +14,6 @@
#include <esp_matter_console.h>
#include <esp_route_hook.h>
#include <app_ble.h>
#include <app_priv.h>
#include <app_qrcode.h>
#include <app_rainmaker.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
ESP_LOGI(TAG, "Commissioning complete");
app_ble_disable();
break;
default:
examples/zap_light/CMakeLists.txt
-2
View File
@@ -13,8 +13,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32h2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32h2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
else()
examples/zap_light/main/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode app_reset)
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode app_reset)
idf_component_register(SRC_DIRS "."
PRIV_INCLUDE_DIRS "."
examples/zap_light/main/app_main.cpp
-2
View File
@@ -14,7 +14,6 @@
#include <esp_matter_console.h>
#include <esp_route_hook.h>
#include <app_ble.h>
#include <app_priv.h>
#include <app_qrcode.h>
@@ -36,7 +35,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
ESP_LOGI(TAG, "Commissioning complete");
app_ble_disable();
break;
default:
examples/zigbee_bridge/CMakeLists.txt
-2
View File
@@ -11,8 +11,6 @@ if(NOT DEFINED ENV{ESP_MATTER_DEVICE_PATH})
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32c3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32c3_devkit_m)
elseif("${IDF_TARGET}" STREQUAL "esp32s2")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s2_devkit_c)
elseif("${IDF_TARGET}" STREQUAL "esp32s3")
set(ENV{ESP_MATTER_DEVICE_PATH} $ENV{ESP_MATTER_PATH}/device_hal/device/esp32s3_devkit_c)
else()
examples/zigbee_bridge/main/CMakeLists.txt
+1 -1
View File
@@ -1,4 +1,4 @@
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_ble app_qrcode esp_matter_ota app_bridge
set(PRIV_REQUIRES_LIST device esp_matter esp_matter_console route_hook app_qrcode esp_matter_ota app_bridge
esp-zboss-lib)
idf_component_register(SRC_DIRS "."
examples/zigbee_bridge/main/app_main.cpp
-2
View File
@@ -15,7 +15,6 @@
#include <esp_matter_ota.h>
#include <esp_route_hook.h>
#include <app_ble.h>
#include <app_qrcode.h>
#include <app_zboss.h>
#include <app_bridged_device.h>
@@ -38,7 +37,6 @@ static void app_event_cb(const ChipDeviceEvent *event, intptr_t arg)
case chip::DeviceLayer::DeviceEventType::PublicEventTypes::kCommissioningComplete:
ESP_LOGI(TAG, "Commissioning complete");
app_ble_disable();
break;
default: