Skip to content

Commit d1f512d

Browse files
Jason2866me-no-dev
Jason2866
and
me-no-dev
authored
upstream 20042022 (#129)
* Delete stale.yml * IDF release/v4.4 b8050b365e (espressif#6594) * Delete libraries/RainMaker directory * Delete tools/sdk/esp32/include/esp_rainmaker/include directory * Delete tools/sdk/esp32c3/include/esp_rainmaker directory * Delete tools/sdk/esp32s2/include/esp_rainmaker directory * Delete tools/sdk/esp32s3/include/esp_rainmaker directory Co-authored-by: Me No Dev <[email protected]>
1 parent 901c03b commit d1f512d

File tree

120 files changed

+88
-5861
lines changed

Some content is hidden

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

120 files changed

+88
-5861
lines changed

Diff for: ‎.github/stale.yml

-26
This file was deleted.

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/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_console.h

-52
This file was deleted.

0 commit comments

Comments
 (0)