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
Appearance settings

Commit 010a7c6

Browse filesBrowse files
me-no-devme-no-dev
authored
Update IDF to abea9e4c0 (espressif#2458)
* Update IDF to abea9e4c0 * Update esptool * Enable PSRAM for PICO D4 * Enable APP_ROLLBACK_ENABLE
1 parent c0345ea commit 010a7c6
Copy full SHA for 010a7c6

File tree

Expand file treeCollapse file tree

101 files changed

+741
-307
lines changed
Filter options

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

101 files changed

+741
-307
lines changed

‎cores/esp32/esp32-hal-misc.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-misc.c
+20Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
#include "esp_partition.h"
2222
#include "esp_log.h"
2323
#include "esp_timer.h"
24+
#ifdef CONFIG_APP_ROLLBACK_ENABLE
25+
#include "esp_ota_ops.h"
26+
#endif //CONFIG_APP_ROLLBACK_ENABLE
2427
#ifdef CONFIG_BT_ENABLED
2528
#include "esp_bt.h"
2629
#endif //CONFIG_BT_ENABLED
@@ -145,6 +148,9 @@ void initVariant() {}
145148
void init() __attribute__((weak));
146149
void init() {}
147150

151+
bool verifyOta() __attribute__((weak));
152+
bool verifyOta() { return true; }
153+
148154
#ifdef CONFIG_BT_ENABLED
149155
//overwritten in esp32-hal-bt.c
150156
bool btInUse() __attribute__((weak));
@@ -153,6 +159,20 @@ bool btInUse(){ return false; }
153159

154160
void initArduino()
155161
{
162+
#ifdef CONFIG_APP_ROLLBACK_ENABLE
163+
const esp_partition_t *running = esp_ota_get_running_partition();
164+
esp_ota_img_states_t ota_state;
165+
if (esp_ota_get_state_partition(running, &ota_state) == ESP_OK) {
166+
if (ota_state == ESP_OTA_IMG_PENDING_VERIFY) {
167+
if (verifyOta()) {
168+
esp_ota_mark_app_valid_cancel_rollback();
169+
} else {
170+
log_e("OTA verification failed! Start rollback to the previous version ...");
171+
esp_ota_mark_app_invalid_rollback_and_reboot();
172+
}
173+
}
174+
}
175+
#endif
156176
//init proper ref tick value for PLL (uncomment if REF_TICK is different than 1MHz)
157177
//ESP_REG(APB_CTRL_PLL_TICK_CONF_REG) = APB_CLK_FREQ / REF_CLK_FREQ - 1;
158178
#ifdef F_CPU

‎cores/esp32/esp32-hal-psram.c

Copy file name to clipboardExpand all lines: cores/esp32/esp32-hal-psram.c
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ bool psramInit(){
1919
}
2020
uint32_t chip_ver = REG_GET_FIELD(EFUSE_BLK0_RDATA3_REG, EFUSE_RD_CHIP_VER_PKG);
2121
uint32_t pkg_ver = chip_ver & 0x7;
22-
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4) {
22+
if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5 || pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) {
2323
spiramFailed = true;
2424
log_w("PSRAM not supported!");
2525
return false;

‎package/package_esp32_index.template.json

Copy file name to clipboardExpand all lines: package/package_esp32_index.template.json
+22-22Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
{
3939
"packager": "esp32",
4040
"name": "esptool_py",
41-
"version": "2.6.0"
41+
"version": "2.6.1"
4242
},
4343
{
4444
"packager": "esp32",
@@ -85,42 +85,42 @@
8585
},
8686
{
8787
"name": "esptool_py",
88-
"version": "2.6.0",
88+
"version": "2.6.1",
8989
"systems": [
9090
{
9191
"host": "i686-mingw32",
92-
"url": "https://dl.espressif.com/dl/esptool-2.6.0-windows.zip",
93-
"archiveFileName": "esptool-2.6.0-windows.zip",
94-
"checksum": "SHA-256:a73f4cf68db240d7f1d250c5c7f2dfcb53c17a37483729f1bf71f8f43d79a799",
95-
"size": "3421208"
92+
"url": "https://dl.espressif.com/dl/esptool-2.6.1-windows.zip",
93+
"archiveFileName": "esptool-2.6.1-windows.zip",
94+
"checksum": "SHA-256:84cf0b369a7707fe566434faba148852fc464992111d5baa95b658b374802f96",
95+
"size": "3422445"
9696
},
9797
{
9898
"host": "x86_64-apple-darwin",
99-
"url": "https://dl.espressif.com/dl/esptool-2.6.0-macos.tar.gz",
100-
"archiveFileName": "esptool-2.6.0-macos.tar.gz",
101-
"checksum": "SHA-256:0a881b91547c840fab8c72ae3d031069384278b8c2e5241647e8c8292c5e4a4b",
102-
"size": "3835660"
99+
"url": "https://dl.espressif.com/dl/esptool-2.6.1-macos.tar.gz",
100+
"archiveFileName": "esptool-2.6.1-macos.tar.gz",
101+
"checksum": "SHA-256:f4eb758a301d6902cc9dfcd49d36345d2f075ad123da7cf8132d15cfb7533457",
102+
"size": "3837085"
103103
},
104104
{
105105
"host": "x86_64-pc-linux-gnu",
106-
"url": "https://dl.espressif.com/dl/esptool-2.6.0-linux.tar.gz",
107-
"archiveFileName": "esptool-2.6.0-linux.tar.gz",
108-
"checksum": "SHA-256:6d162f70f395ca31f5008829dd7e833e729f044a9c7355d5be8ce333a054e110",
109-
"size": "43535"
106+
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
107+
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
108+
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
109+
"size": "44762"
110110
},
111111
{
112112
"host": "i686-pc-linux-gnu",
113-
"url": "https://dl.espressif.com/dl/esptool-2.6.0-linux.tar.gz",
114-
"archiveFileName": "esptool-2.6.0-linux.tar.gz",
115-
"checksum": "SHA-256:6d162f70f395ca31f5008829dd7e833e729f044a9c7355d5be8ce333a054e110",
116-
"size": "43535"
113+
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
114+
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
115+
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
116+
"size": "44762"
117117
},
118118
{
119119
"host": "arm-linux-gnueabihf",
120-
"url": "https://dl.espressif.com/dl/esptool-2.6.0-linux.tar.gz",
121-
"archiveFileName": "esptool-2.6.0-linux.tar.gz",
122-
"checksum": "SHA-256:6d162f70f395ca31f5008829dd7e833e729f044a9c7355d5be8ce333a054e110",
123-
"size": "43535"
120+
"url": "https://dl.espressif.com/dl/esptool-2.6.1-linux.tar.gz",
121+
"archiveFileName": "esptool-2.6.1-linux.tar.gz",
122+
"checksum": "SHA-256:eaf82ff4070d9792f6a42ae1e485375de5a87bec59ef01dfb95de901519ec7fb",
123+
"size": "44762"
124124
}
125125
]
126126
},

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.