Merge pull request #5921 from microDev1/espressif

tannewt · web-flow · commit ac7a80753fe9 · 2022-01-26T10:26:45.000-08:00
Return default cpu frequency on espressif
diff --git a/ports/espressif/common-hal/microcontroller/Processor.c b/ports/espressif/common-hal/microcontroller/Processor.c
@@ -60,7 +60,13 @@ float common_hal_mcu_processor_get_voltage(void) {
 }
 
 uint32_t common_hal_mcu_processor_get_frequency(void) {
-    return 0;
+    #ifdef CONFIG_IDF_TARGET_ESP32C3
+    return CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ * 1000000;
+    #elif defined(CONFIG_IDF_TARGET_ESP32S2)
+    return CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000;
+    #elif defined(CONFIG_IDF_TARGET_ESP32S3)
+    return CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000;
+    #endif
 }
 
 STATIC uint8_t swap_nibbles(uint8_t v) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,13 @@ float common_hal_mcu_processor_get_voltage(void) {`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`uint32_t common_hal_mcu_processor_get_frequency(void) {`
`63`		`- return 0;`
	`63`	`+ #ifdef CONFIG_IDF_TARGET_ESP32C3`
	`64`	`+ return CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ * 1000000;`
	`65`	`+ #elif defined(CONFIG_IDF_TARGET_ESP32S2)`
	`66`	`+ return CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ * 1000000;`
	`67`	`+ #elif defined(CONFIG_IDF_TARGET_ESP32S3)`
	`68`	`+ return CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ * 1000000;`
	`69`	`+ #endif`
`64`	`70`	`}`
`65`	`71`
`66`	`72`	`STATIC uint8_t swap_nibbles(uint8_t v) {`