Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ESP32 revisions to support esp32-c3 and s2 variants #2365

Merged
merged 26 commits into from
Sep 16, 2021
Merged

ESP32 revisions to support esp32-c3 and s2 variants #2365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cdd9b20
Create separate SDK project for debug/release builds.
mikee47 Sep 4, 2021
43ff9b1
Remove redundant `sdk-defconfig` target
mikee47 Sep 5, 2021
eed59be
Doc fixes
mikee47 Sep 5, 2021
5ec3fec
Build only selected SDK components
mikee47 Sep 6, 2021
3e35732
Move SDK build targets into appropriate help categories
mikee47 Sep 6, 2021
2336d5b
Fix issues with mismatched types
mikee47 Sep 10, 2021
3fd6553
Fix flashing for esp32c3 & esp32s2 variants
mikee47 Sep 6, 2021
6c5a3d9
Route `_write_r` to `m_nputs` and set IDF logging function to `m_vpri…
mikee47 Sep 6, 2021
a8f8c8b
Simplify `initorder` test
mikee47 Sep 15, 2021
8cbaa7f
Fix `interrupts()` function
mikee47 Sep 11, 2021
2716d22
`system_os_post()` must be in IRAM
mikee47 Sep 12, 2021
fe10fb0
Move XorOutputStream from Network Component into gen. pop.
mikee47 Sep 8, 2021
115ef05
Compile HttpRequest, TcpClient test modules only for Host
mikee47 Sep 8, 2021
7fef095
Remove redundant network code
mikee47 Sep 8, 2021
fbf5f98
Fix building for esp32c3 with DISABLE_WIFI=1
mikee47 Sep 8, 2021
109d5f5
Use separate build directory for variants, persist ESP_VARIANT for ea…
mikee47 Sep 8, 2021
b42f774
Rework uart driver using IDF HAL
mikee47 Sep 15, 2021
6b7db65
Enable GDB panic handler and fix serial debugging
mikee47 Sep 6, 2021
5df7adb
SDK builds automatically if files or config changed
mikee47 Sep 9, 2021
45619a4
Clock tests sometimes generate interrupt WDT timeout on ESP32
mikee47 Sep 9, 2021
1e6c932
Fix heap checking for shared pointers
mikee47 Sep 9, 2021
798d87e
Fix `flashmem_get_address()` for all Esp32 variants
mikee47 Sep 10, 2021
a2a9a46
Fix PROGMEM definition
mikee47 Sep 11, 2021
400c1da
Implement CPU frequency setting
mikee47 Sep 15, 2021
01a3a2f
Remove SDK_FULL_BUILD option, strip out more unrequired definitions.
mikee47 Sep 14, 2021
7cf98e5
Fix uart exception on ESP32-WROOM
mikee47 Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Sming/Arch/Esp32/Components/driver/include/driver/hw_timer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#pragma once

#if defined(SUBARCH_ESP32) || defined(SUBARCH_ESP32S2)
#if defined(SUBARCH_ESP32)
#define FRC_TIMER_ENABLED
#endif

Expand Down Expand Up @@ -158,8 +158,12 @@ __forceinline uint32_t hw_timer1_read(void)
*
*************************************/

#ifdef FRC_TIMER_ENABLED
constexpr uint32_t HW_TIMER2_CLKDIV = TIMER_CLKDIV_1;
constexpr uint32_t HW_TIMER2_CLK = HW_TIMER_BASE_CLK >> HW_TIMER2_CLKDIV;
#else
constexpr uint32_t HW_TIMER2_CLK = 1000000;
#endif

/**
* @brief Read current timer2 value
Expand Down
Loading