Skip to content

Commit 426884e

Browse files
committed
Fix compile for not defined F_CPU
If defined F_CPU, make getCpuFreqMHz() a constexpr
1 parent 689187f commit 426884e

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

cores/esp8266/Esp.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -264,6 +264,12 @@ uint8_t EspClass::getBootMode(void)
264264
return system_get_boot_mode();
265265
}
266266

267+
#ifndef F_CPU
268+
uint8_t EspClass::getCpuFreqMHz(void)
269+
{
270+
return system_get_cpu_freq();
271+
}
272+
#endif
267273

268274
uint32_t EspClass::getFlashChipId(void)
269275
{

cores/esp8266/Esp.h

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,11 @@ class EspClass {
157157
uint8_t getBootVersion();
158158
uint8_t getBootMode();
159159

160-
#ifndef CORE_MOCK
161-
inline uint8_t getCpuFreqMHz() __attribute__((always_inline));
160+
#if !defined(CORE_MOCK) && defined(F_CPU)
161+
constexpr uint8_t getCpuFreqMHz() const
162+
{
163+
return clockCyclesPerMicrosecond();
164+
}
162165
#else
163166
uint8_t getCpuFreqMHz();
164167
#endif
@@ -207,15 +210,6 @@ class EspClass {
207210

208211
#ifndef CORE_MOCK
209212

210-
uint8_t EspClass::getCpuFreqMHz()
211-
{
212-
#if defined(F_CPU)
213-
return clockCyclesPerMicrosecond();
214-
#elif !defined(F_CPU)
215-
return system_get_cpu_freq();
216-
#endif
217-
}
218-
219213
uint32_t EspClass::getCycleCount()
220214
{
221215
return esp_get_cycle_count();

0 commit comments

Comments
 (0)