Skip to content

Commit 45b7fa0

Browse files
me-no-devme-no-dev
authored
IDF release/v4.4 b8050b365e (espressif#6594)
1 parent d334083 commit 45b7fa0

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

Diff for: ‎platform.txt

+8-8
Large diffs are not rendered by default.

Diff for: ‎tools/platformio-build-esp32.py

+2-1
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",

Diff for: ‎tools/platformio-build-esp32c3.py

+2-1
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",

Diff for: ‎tools/platformio-build-esp32s2.py

+2-1
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",

Diff for: ‎tools/platformio-build-esp32s3.py

+2-1
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",

Diff for: ‎tools/sdk/esp32/include/esp_common/include/esp_idf_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
/** Minor version number (x.X.x) */
2424
#define ESP_IDF_VERSION_MINOR 4
2525
/** Patch version number (x.x.X) */
26-
#define ESP_IDF_VERSION_PATCH 0
26+
#define ESP_IDF_VERSION_PATCH 1
2727

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

Diff for: ‎tools/sdk/esp32/include/esp_hw_support/port/esp32/regi2c_ctrl.h

+4
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
void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
5353
void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
5454

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

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

Diff for: ‎tools/sdk/esp32/include/esp_littlefs/include/esp_littlefs.h

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
#ifndef ESP_LITTLEFS_H__
22
#define ESP_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" {

Diff for: ‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_core.h

+4
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

Diff for: ‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_scenes.h

+38
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_t esp_rmaker_scenes_enable(void);
35+
36+
#ifdef __cplusplus
37+
}
38+
#endif

Diff for: ‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_standard_params.h

+15
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ extern "C"
4545
#define ESP_RMAKER_DEF_TIMEZONE_NAME "TZ"
4646
#define ESP_RMAKER_DEF_TIMEZONE_POSIX_NAME "TZ-POSIX"
4747
#define ESP_RMAKER_DEF_SCHEDULE_NAME "Schedules"
48+
#define ESP_RMAKER_DEF_SCENES_NAME "Scenes"
4849
#define ESP_RMAKER_DEF_REBOOT_NAME "Reboot"
4950
#define ESP_RMAKER_DEF_FACTORY_RESET_NAME "Factory-Reset"
5051
#define ESP_RMAKER_DEF_WIFI_RESET_NAME "Wi-Fi-Reset"
@@ -265,6 +266,20 @@ esp_rmaker_param_t *esp_rmaker_timezone_posix_param_create(const char *param_nam
265266
*/
266267
esp_rmaker_param_t *esp_rmaker_schedules_param_create(const char *param_name, int max_schedules);
267268

269+
/**
270+
* Create standard Scenes param
271+
*
272+
* This will create the standard scenes parameter. Default value
273+
* is set internally.
274+
*
275+
* @param[in] param_name Name of the parameter
276+
* @param[in] max_scenes Maximum number of scenes allowed
277+
*
278+
* @return Parameter handle on success.
279+
* @return NULL in case of failures.
280+
*/
281+
esp_rmaker_param_t *esp_rmaker_scenes_param_create(const char *param_name, int max_scenes);
282+
268283
/**
269284
* Create standard Reboot param
270285
*

Diff for: ‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_standard_services.h

+18
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,24 @@ esp_rmaker_device_t *esp_rmaker_time_service_create(const char *serv_name, const
7171
*/
7272
esp_rmaker_device_t *esp_rmaker_create_schedule_service(const char *serv_name, esp_rmaker_device_write_cb_t write_cb, esp_rmaker_device_read_cb_t read_cb, int max_schedules, void *priv_data);
7373

74+
/** Create a standard Scenes service
75+
*
76+
* This creates a Scenes service with the mandatory parameters. The default parameter names will be used.
77+
* Refer \ref esp_rmaker_standard_params.h for default names.
78+
*
79+
* @param[in] serv_name The unique service name
80+
* @param[in] write_cb Write callback.
81+
* @param[in] read_cb Read callback.
82+
* @param[in] max_scenes Maximum number of scenes supported.
83+
* @param[in] deactivation_support Deactivation callback support.
84+
* @param[in] priv_data (Optional) Private data associated with the service. This should stay
85+
* allocated throughout the lifetime of the service.
86+
*
87+
* @return service_handle on success.
88+
* @return NULL in case of any error.
89+
*/
90+
esp_rmaker_device_t *esp_rmaker_create_scenes_service(const char *serv_name, esp_rmaker_device_write_cb_t write_cb, esp_rmaker_device_read_cb_t read_cb, int max_scenes, bool deactivation_support, void *priv_data);
91+
7492
/** Create a standard System service
7593
*
7694
* This creates an empty System service. Appropriate parameters should be added by the caller.

Diff for: ‎tools/sdk/esp32/include/esp_rainmaker/include/esp_rmaker_standard_types.h

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ extern "C"
4444
#define ESP_RMAKER_PARAM_TIMEZONE "esp.param.tz"
4545
#define ESP_RMAKER_PARAM_TIMEZONE_POSIX "esp.param.tz_posix"
4646
#define ESP_RMAKER_PARAM_SCHEDULES "esp.param.schedules"
47+
#define ESP_RMAKER_PARAM_SCENES "esp.param.scenes"
4748
#define ESP_RMAKER_PARAM_REBOOT "esp.param.reboot"
4849
#define ESP_RMAKER_PARAM_FACTORY_RESET "esp.param.factory-reset"
4950
#define ESP_RMAKER_PARAM_WIFI_RESET "esp.param.wifi-reset"
@@ -63,6 +64,7 @@ extern "C"
6364
#define ESP_RMAKER_SERVICE_OTA "esp.service.ota"
6465
#define ESP_RMAKER_SERVICE_TIME "esp.service.time"
6566
#define ESP_RMAKER_SERVICE_SCHEDULE "esp.service.schedule"
67+
#define ESP_RMAKER_SERVICE_SCENES "esp.service.scenes"
6668
#define ESP_RMAKER_SERVICE_SYSTEM "esp.service.system"
6769
#define ESP_RMAKER_SERVICE_LOCAL_CONTROL "esp.service.local_control"
6870

Diff for: ‎tools/sdk/esp32/include/fb_gfx/include/fb_gfx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extern "C" {
1919
#endif
2020

2121
typedef enum {
22-
FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565
22+
FB_RGB888, FB_BGR888, FB_RGB565, FB_BGR565, FB_GRAY
2323
} fb_format_t;
2424

2525
typedef struct {

Diff for: ‎tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_eth.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_littlefs.a

9.14 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_phy.a

17.2 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_rainmaker.a

76 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libesp_wifi.a

-1.73 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/libfb_gfx.a

284 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/lib/liblwip.a

472 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/qspi_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@
5757
#define CONFIG_ESP_RMAKER_OTA_AUTOFETCH_PERIOD 0
5858
#define CONFIG_ESP_RMAKER_OTA_HTTP_RX_BUFFER_SIZE 1024
5959
#define CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES 10
60+
#define CONFIG_ESP_RMAKER_SCENES_MAX_SCENES 10
6061
#define CONFIG_ENABLE_ARDUINO_DEPENDS 1
6162
#define CONFIG_AUTOSTART_ARDUINO 1
6263
#define CONFIG_ARDUINO_RUN_CORE1 1
@@ -691,5 +692,5 @@
691692
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
692693
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
693694
#define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
694-
#define CONFIG_ARDUINO_IDF_COMMIT "c29343eb94"
695+
#define CONFIG_ARDUINO_IDF_COMMIT "b8050b365e"
695696
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

Diff for: ‎tools/sdk/esp32/qspi_qspi/libesp_hw_support.a

6.85 KB
Binary file not shown.

Diff for: ‎tools/sdk/esp32/qspi_qspi/libesp_system.a

0 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/sdkconfig

+7
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,13 @@ CONFIG_ESP_RMAKER_OTA_HTTP_RX_BUFFER_SIZE=1024
162162
#
163163
CONFIG_ESP_RMAKER_SCHEDULING_MAX_SCHEDULES=10
164164
# end of ESP RainMaker Scheduling
165+
166+
#
167+
# ESP RainMaker Scenes
168+
#
169+
CONFIG_ESP_RMAKER_SCENES_MAX_SCENES=10
170+
# CONFIG_ESP_RMAKER_SCENES_DEACTIVATE_SUPPORT is not set
171+
# end of ESP RainMaker Scenes
165172
# end of ESP RainMaker Config
166173

167174
#

Diff for: ‎tools/sdk/esp32c3/include/esp_common/include/esp_idf_version.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ extern "C" {
2323
/** Minor version number (x.X.x) */
2424
#define ESP_IDF_VERSION_MINOR 4
2525
/** Patch version number (x.x.X) */
26-
#define ESP_IDF_VERSION_PATCH 0
26+
#define ESP_IDF_VERSION_PATCH 1
2727

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

Diff for: ‎tools/sdk/esp32c3/include/esp_hw_support/port/esp32c3/regi2c_ctrl.h

+4
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ uint8_t regi2c_ctrl_read_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_ad
6565
void regi2c_ctrl_write_reg(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t data);
6666
void regi2c_ctrl_write_reg_mask(uint8_t block, uint8_t host_id, uint8_t reg_add, uint8_t msb, uint8_t lsb, uint8_t data);
6767

68+
/* enter the critical section that protects internal registers. Don't use it in SDK. Use the functions above. */
69+
void regi2c_enter_critical(void);
70+
void regi2c_exit_critical(void);
71+
6872
#endif // BOOTLOADER_BUILD
6973

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

Diff for: ‎tools/sdk/esp32c3/include/esp_littlefs/include/esp_littlefs.h

+1-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,9 @@
11
#ifndef ESP_LITTLEFS_H__
22
#define ESP_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" {

Diff for: ‎tools/sdk/esp32c3/include/esp_rainmaker/include/esp_rmaker_core.h

+4
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

Diff for: ‎tools/sdk/esp32c3/include/esp_rainmaker/include/esp_rmaker_scenes.h

+38
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_t esp_rmaker_scenes_enable(void);
35+
36+
#ifdef __cplusplus
37+
}
38+
#endif

Diff for: ‎tools/sdk/esp32c3/include/esp_rainmaker/include/esp_rmaker_standard_params.h

+15
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ extern "C"
4545
#define ESP_RMAKER_DEF_TIMEZONE_NAME "TZ"
4646
#define ESP_RMAKER_DEF_TIMEZONE_POSIX_NAME "TZ-POSIX"
4747
#define ESP_RMAKER_DEF_SCHEDULE_NAME "Schedules"
48+
#define ESP_RMAKER_DEF_SCENES_NAME "Scenes"
4849
#define ESP_RMAKER_DEF_REBOOT_NAME "Reboot"
4950
#define ESP_RMAKER_DEF_FACTORY_RESET_NAME "Factory-Reset"
5051
#define ESP_RMAKER_DEF_WIFI_RESET_NAME "Wi-Fi-Reset"
@@ -265,6 +266,20 @@ esp_rmaker_param_t *esp_rmaker_timezone_posix_param_create(const char *param_nam
265266
*/
266267
esp_rmaker_param_t *esp_rmaker_schedules_param_create(const char *param_name, int max_schedules);
267268

269+
/**
270+
* Create standard Scenes param
271+
*
272+
* This will create the standard scenes parameter. Default value
273+
* is set internally.
274+
*
275+
* @param[in] param_name Name of the parameter
276+
* @param[in] max_scenes Maximum number of scenes allowed
277+
*
278+
* @return Parameter handle on success.
279+
* @return NULL in case of failures.
280+
*/
281+
esp_rmaker_param_t *esp_rmaker_scenes_param_create(const char *param_name, int max_scenes);
282+
268283
/**
269284
* Create standard Reboot param
270285
*

0 commit comments

Comments
 (0)