Skip to content

Commit c64c9de

Browse files
Jason2866Jason2866
authored
branch Arduino Idf release/v5.4
2 parents 5b04646 + 3718f60 commit c64c9de

File tree

2 files changed

+44
-34
lines changed

2 files changed

+44
-34
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include "soc/efuse_reg.h"
2727
#include "esp32-hal.h"
2828
#include "esp32-hal-cpu.h"
29+
#include "hal/timer_ll.h"
30+
#include "esp_private/systimer.h"
2931

3032
#include "esp_system.h"
3133
#ifdef ESP_IDF_VERSION_MAJOR // IDF 4+
@@ -173,7 +175,9 @@ static uint32_t calculateApb(rtc_cpu_freq_config_t *conf) {
173175
#endif
174176
}
175177

178+
#if defined(CONFIG_IDF_TARGET_ESP32) && !defined(LACT_MODULE) && !defined(LACT_TICKS_PER_US)
176179
void esp_timer_impl_update_apb_freq(uint32_t apb_ticks_per_us); //private in IDF
180+
#endif
177181

178182
bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
179183
rtc_cpu_freq_config_t conf, cconf;
@@ -246,7 +250,13 @@ bool setCpuFrequencyMhz(uint32_t cpu_freq_mhz) {
246250
//Update APB Freq REG
247251
rtc_clk_apb_freq_update(apb);
248252
//Update esp_timer divisor
253+
#if CONFIG_IDF_TARGET_ESP32
254+
#if defined(LACT_MODULE) && defined(LACT_TICKS_PER_US)
255+
timer_ll_set_lact_clock_prescale(TIMER_LL_GET_HW(LACT_MODULE), apb / MHZ / LACT_TICKS_PER_US);
256+
#else
249257
esp_timer_impl_update_apb_freq(apb / MHZ);
258+
#endif
259+
#endif
250260
}
251261
#endif
252262
//Update FreeRTOS Tick Divisor

‎package/package_esp32_index.template.json

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"packager": "esp32",
5353
"name": "esp32-arduino-libs",
54-
"version": "idf-release_v5.4-fe753553-v1"
54+
"version": "idf-release_v5.4-aed8bdc8-v1"
5555
},
5656
{
5757
"packager": "esp32",
@@ -104,63 +104,63 @@
104104
"tools": [
105105
{
106106
"name": "esp32-arduino-libs",
107-
"version": "idf-release_v5.4-fe753553-v1",
107+
"version": "idf-release_v5.4-aed8bdc8-v1",
108108
"systems": [
109109
{
110110
"host": "i686-mingw32",
111-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
112-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
113-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
114-
"size": "353685379"
111+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
112+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
113+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
114+
"size": "353758723"
115115
},
116116
{
117117
"host": "x86_64-mingw32",
118-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
119-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
120-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
121-
"size": "353685379"
118+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
119+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
120+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
121+
"size": "353758723"
122122
},
123123
{
124124
"host": "arm64-apple-darwin",
125-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
126-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
127-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
128-
"size": "353685379"
125+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
126+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
127+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
128+
"size": "353758723"
129129
},
130130
{
131131
"host": "x86_64-apple-darwin",
132-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
133-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
134-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
135-
"size": "353685379"
132+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
133+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
134+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
135+
"size": "353758723"
136136
},
137137
{
138138
"host": "x86_64-pc-linux-gnu",
139-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
140-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
141-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
142-
"size": "353685379"
139+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
140+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
141+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
142+
"size": "353758723"
143143
},
144144
{
145145
"host": "i686-pc-linux-gnu",
146-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
147-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
148-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
149-
"size": "353685379"
146+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
147+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
148+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
149+
"size": "353758723"
150150
},
151151
{
152152
"host": "aarch64-linux-gnu",
153-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
154-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
155-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
156-
"size": "353685379"
153+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
154+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
155+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
156+
"size": "353758723"
157157
},
158158
{
159159
"host": "arm-linux-gnueabihf",
160-
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
161-
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-fe753553-v1.zip",
162-
"checksum": "SHA-256:79abe0d17524dc64eccdab97bf4407127d8249e99c9b929357c10d24fe47a703",
163-
"size": "353685379"
160+
"url": "https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.4/esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
161+
"archiveFileName": "esp32-arduino-libs-idf-release_v5.4-aed8bdc8-v1.zip",
162+
"checksum": "SHA-256:113dee2a730eb2a16e322ec11b225697e3b43404cc25616c14b1a556e4f26dd5",
163+
"size": "353758723"
164164
}
165165
]
166166
},

0 commit comments

Comments
 (0)