Merge branch 'espressif:release/v2.x' into release/v2.x

Jason2866 · web-flow · commit 5f28f4bf5e48 · 2024-01-08T13:40:35.000+01:00
diff --git a/cores/esp32/Esp.cpp b/cores/esp32/Esp.cpp
@@ -119,7 +119,7 @@ unsigned long long operator"" _GB(unsigned long long x)
 
 EspClass ESP;
 
-void EspClass::deepSleep(uint32_t time_us)
+void EspClass::deepSleep(uint64_t time_us)
 {
     esp_deep_sleep(time_us);
 }
diff --git a/cores/esp32/Esp.h b/cores/esp32/Esp.h
@@ -83,7 +83,7 @@ class EspClass
     inline uint32_t getCycleCount() __attribute__((always_inline));
     const char * getSdkVersion();
 
-    void deepSleep(uint32_t time_us);
+    void deepSleep(uint64_t time_us);
 
     uint32_t getFlashChipSize();
     uint32_t getFlashChipSpeed();

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ unsigned long long operator"" _GB(unsigned long long x)`
`119`	`119`
`120`	`120`	`EspClass ESP;`
`121`	`121`
`122`		`-void EspClass::deepSleep(uint32_t time_us)`
	`122`	`+void EspClass::deepSleep(uint64_t time_us)`
`123`	`123`	`{`
`124`	`124`	`esp_deep_sleep(time_us);`
`125`	`125`	`}`