Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit45b7fa0

Browse files
authored
IDF release/v4.4 b8050b365e (#6594)
1 parentd334083 commit45b7fa0

File tree

109 files changed

+396
-93
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+396
-93
lines changed

‎platform.txt‎

Lines changed: 8 additions & 8 deletions
Large diffs are not rendered by default.

‎tools/platformio-build-esp32.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"-u","pthread_include_pthread_cond_impl",
101101
"-u","pthread_include_pthread_local_storage_impl",
102102
"-u","pthread_include_pthread_rwlock_impl",
103+
"-u","include_esp_phy_override",
103104
"-u","ld_include_highint_hdl",
104105
"-u","start_app",
105106
"-u","start_app_other_cores",
@@ -309,7 +310,7 @@
309310
"UNITY_INCLUDE_CONFIG_H",
310311
"WITH_POSIX",
311312
"_GNU_SOURCE",
312-
("IDF_VER",'\\"v4.4-367-gc29343eb94\\"'),
313+
("IDF_VER",'\\"v4.4.1-1-gb8050b365e\\"'),
313314
"ESP_PLATFORM",
314315
"_POSIX_READER_WRITER_LOCKS",
315316
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
"-u","pthread_include_pthread_cond_impl",
102102
"-u","pthread_include_pthread_local_storage_impl",
103103
"-u","pthread_include_pthread_rwlock_impl",
104+
"-u","include_esp_phy_override",
104105
"-u","start_app",
105106
"-u","__ubsan_include",
106107
"-u","__assert_func",
@@ -302,7 +303,7 @@
302303
"UNITY_INCLUDE_CONFIG_H",
303304
"WITH_POSIX",
304305
"_GNU_SOURCE",
305-
("IDF_VER",'\\"v4.4-367-gc29343eb94\\"'),
306+
("IDF_VER",'\\"v4.4.1-1-gb8050b365e\\"'),
306307
"ESP_PLATFORM",
307308
"_POSIX_READER_WRITER_LOCKS",
308309
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"-u","pthread_include_pthread_cond_impl",
9898
"-u","pthread_include_pthread_local_storage_impl",
9999
"-u","pthread_include_pthread_rwlock_impl",
100+
"-u","include_esp_phy_override",
100101
"-u","ld_include_highint_hdl",
101102
"-u","start_app",
102103
"-u","__ubsan_include",
@@ -304,7 +305,7 @@
304305
"UNITY_INCLUDE_CONFIG_H",
305306
"WITH_POSIX",
306307
"_GNU_SOURCE",
307-
("IDF_VER",'\\"v4.4-367-gc29343eb94\\"'),
308+
("IDF_VER",'\\"v4.4.1-1-gb8050b365e\\"'),
308309
"ESP_PLATFORM",
309310
"_POSIX_READER_WRITER_LOCKS",
310311
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
"-u","pthread_include_pthread_cond_impl",
9797
"-u","pthread_include_pthread_local_storage_impl",
9898
"-u","pthread_include_pthread_rwlock_impl",
99+
"-u","include_esp_phy_override",
99100
"-u","ld_include_highint_hdl",
100101
"-u","start_app",
101102
"-u","start_app_other_cores",
@@ -321,7 +322,7 @@
321322
"UNITY_INCLUDE_CONFIG_H",
322323
"WITH_POSIX",
323324
"_GNU_SOURCE",
324-
("IDF_VER",'\\"v4.4-367-gc29343eb94\\"'),
325+
("IDF_VER",'\\"v4.4.1-1-gb8050b365e\\"'),
325326
"ESP_PLATFORM",
326327
"_POSIX_READER_WRITER_LOCKS",
327328
"ARDUINO_ARCH_ESP32",

‎tools/sdk/esp32/include/esp_common/include/esp_idf_version.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
/** Minor version number (x.X.x) */
2424
#defineESP_IDF_VERSION_MINOR 4
2525
/** Patch version number (x.x.X) */
26-
#defineESP_IDF_VERSION_PATCH0
26+
#defineESP_IDF_VERSION_PATCH1
2727

2828
/**
2929
* Macro to convert IDF version number into an integer

‎tools/sdk/esp32/include/esp_hw_support/port/esp32/regi2c_ctrl.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
5252
voidregi2c_ctrl_write_reg(uint8_tblock,uint8_thost_id,uint8_treg_add,uint8_tdata);
5353
voidregi2c_ctrl_write_reg_mask(uint8_tblock,uint8_thost_id,uint8_treg_add,uint8_tmsb,uint8_tlsb,uint8_tdata);
5454

55+
/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
56+
voidregi2c_enter_critical(void);
57+
voidregi2c_exit_critical(void);
58+
5559
#endif// BOOTLOADER_BUILD
5660

5761
/* Convenience macros for the above functions, these use register definitions

‎tools/sdk/esp32/include/esp_littlefs/include/esp_littlefs.h‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
#ifndefESP_LITTLEFS_H__
22
#defineESP_LITTLEFS_H__
33

4-
#include<stdint.h>
5-
#include<stddef.h>
6-
#include<stdarg.h>
7-
#include<unistd.h>
8-
#include<utime.h>
9-
#include"freertos/FreeRTOS.h"
10-
#include"freertos/semphr.h"
114
#include"esp_err.h"
12-
#include<sys/types.h>
13-
#include<sys/reent.h>
14-
#include<sys/stat.h>
15-
#include<sys/time.h>
16-
#include<sys/poll.h>
17-
#include<sys/dirent.h>
18-
#include<string.h>
19-
#include"sdkconfig.h"
20-
215
#include"littlefs/lfs.h"
6+
#include"sdkconfig.h"
227

238
#ifdef__cplusplus
249
extern"C" {

‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ typedef enum {
154154
ESP_RMAKER_REQ_SRC_CLOUD,
155155
/** Request received when a schedule has triggered */
156156
ESP_RMAKER_REQ_SRC_SCHEDULE,
157+
/** Request received when a scene has been activated */
158+
ESP_RMAKER_REQ_SRC_SCENE_ACTIVATE,
159+
/** Request received when a scene has been deactivated */
160+
ESP_RMAKER_REQ_SRC_SCENE_DEACTIVATE,
157161
/** Request received from a local controller */
158162
ESP_RMAKER_REQ_SRC_LOCAL,
159163
/** This will always be the last value. Any value equal to or
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// Copyright 2022 Espressif Systems (Shanghai) PTE LTD
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
#pragma once
16+
17+
#ifdef__cplusplus
18+
extern"C"
19+
{
20+
#endif
21+
22+
#include<esp_err.h>
23+
24+
/** Enable Scenes
25+
*
26+
* This API enables the scenes service for the node. For more information,
27+
* check [here](https://rainmaker.espressif.com/docs/scenes.html)
28+
*
29+
* @note This API should be called after esp_rmaker_node_init() but before esp_rmaker_start().
30+
*
31+
* @return ESP_OK on success.
32+
* @return error in case of failure.
33+
*/
34+
esp_err_tesp_rmaker_scenes_enable(void);
35+
36+
#ifdef__cplusplus
37+
}
38+
#endif

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp