Add support for CPU frequencies in the IDE board menu

Author: me-no-dev

boards.txt

@@ -1,4 +1,5 @@
 menu.UploadSpeed=Upload Speed
+menu.CPUFreq=CPU Frequency
 menu.FlashFreq=Flash Frequency
 menu.FlashMode=Flash Mode
 menu.FlashSize=Flash Size
@@ -49,6 +50,35 @@ esp32.menu.PartitionScheme.min_spiffs.upload.maximum_size=1966080
 esp32.menu.PartitionScheme.fatflash=16M Fat
 esp32.menu.PartitionScheme.fatflash.build.partitions=ffat
 
+esp32.menu.CPUFreq.240=240MHz
+esp32.menu.CPUFreq.240.build.f_cpu=240000000L
+esp32.menu.CPUFreq.160=160MHz
+esp32.menu.CPUFreq.160.build.f_cpu=160000000L
+esp32.menu.CPUFreq.80=80MHz
+esp32.menu.CPUFreq.80.build.f_cpu=80000000L
+esp32.menu.CPUFreq.40=40MHz (40MHz XTAL)
+esp32.menu.CPUFreq.40.build.f_cpu=40000000L
+esp32.menu.CPUFreq.26=26MHz (26MHz XTAL)
+esp32.menu.CPUFreq.26.build.f_cpu=26000000L
+esp32.menu.CPUFreq.20=20MHz (40MHz XTAL)
+esp32.menu.CPUFreq.20.build.f_cpu=20000000L
+esp32.menu.CPUFreq.13=13MHz
+esp32.menu.CPUFreq.13.build.f_cpu=13000000L
+esp32.menu.CPUFreq.10=10MHz (40MHz XTAL)
+esp32.menu.CPUFreq.10.build.f_cpu=10000000L
+esp32.menu.CPUFreq.8=8MHz (40MHz XTAL)
+esp32.menu.CPUFreq.8.build.f_cpu=8000000L
+esp32.menu.CPUFreq.5=5MHz
+esp32.menu.CPUFreq.5.build.f_cpu=5000000L
+esp32.menu.CPUFreq.4=4MHz
+esp32.menu.CPUFreq.4.build.f_cpu=4000000L
+esp32.menu.CPUFreq.3=3MHz
+esp32.menu.CPUFreq.3.build.f_cpu=3000000L
+esp32.menu.CPUFreq.2=2MHz
+esp32.menu.CPUFreq.2.build.f_cpu=2000000L
+esp32.menu.CPUFreq.1=1MHz
+esp32.menu.CPUFreq.1.build.f_cpu=1000000L
+
 esp32.menu.FlashMode.qio=QIO
 esp32.menu.FlashMode.qio.build.flash_mode=dio
 esp32.menu.FlashMode.qio.build.boot=qio

cores/esp32/esp32-hal-misc.c

@@ -43,6 +43,7 @@ void yield()
 }
 
 static uint32_t _cpu_freq_mhz = CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ;
+static uint32_t _sys_time_multiplier = 1;
 
 bool setCpuFrequency(uint32_t cpu_freq_mhz){
     rtc_cpu_freq_config_t conf, cconf;
@@ -54,10 +55,13 @@ bool setCpuFrequency(uint32_t cpu_freq_mhz){
         log_e("CPU clock could not be set to %u MHz", cpu_freq_mhz);
         return false;
     }
+#if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
     log_i("%s: %u / %u = %u Mhz", (conf.source == RTC_CPU_FREQ_SRC_PLL)?"PLL":((conf.source == RTC_CPU_FREQ_SRC_APLL)?"APLL":((conf.source == RTC_CPU_FREQ_SRC_XTAL)?"XTAL":"8M")), conf.source_freq_mhz, conf.div, conf.freq_mhz);
-    delay(1);
+    delay(10);
+#endif
     rtc_clk_cpu_freq_set_config(&conf);
     _cpu_freq_mhz = conf.freq_mhz;
+    _sys_time_multiplier = 80 / getApbFrequency();
     return true;
 }
 
@@ -68,12 +72,12 @@ uint32_t getCpuFrequency(){
 }
 
 uint32_t getApbFrequency(){
-    return rtc_clk_apb_freq_get();
+    return rtc_clk_apb_freq_get() / 1000000;
 }
 
 unsigned long IRAM_ATTR micros()
 {
-    return (unsigned long) ((esp_timer_get_time() * 240) / _cpu_freq_mhz);
+    return (unsigned long) (esp_timer_get_time()) * _sys_time_multiplier;
 }
 
 unsigned long IRAM_ATTR millis()
@@ -116,8 +120,8 @@ bool btInUse(){ return false; }
 
 void initArduino()
 {
-#ifdef ARDUINO_CPU_FREQ
-    setCpuFrequency(ARDUINO_CPU_FREQ);
+#ifdef F_CPU
+    setCpuFrequency(F_CPU/1000000L);
 #endif
 #if CONFIG_SPIRAM_SUPPORT
     psramInit();