Merge branch 'bugfix/system_restore_duplicate' into 'master'
esp32: remove duplicate definition of system_restore See merge request idf/esp-idf!1864
This commit is contained in:
commit
1249659931
|
@ -355,11 +355,6 @@ void IRAM_ATTR esp_restart_noos()
|
||||||
|
|
||||||
void system_restart(void) __attribute__((alias("esp_restart")));
|
void system_restart(void) __attribute__((alias("esp_restart")));
|
||||||
|
|
||||||
void system_restore(void)
|
|
||||||
{
|
|
||||||
esp_wifi_restore();
|
|
||||||
}
|
|
||||||
|
|
||||||
uint32_t esp_get_free_heap_size( void )
|
uint32_t esp_get_free_heap_size( void )
|
||||||
{
|
{
|
||||||
return heap_caps_get_free_size( MALLOC_CAP_DEFAULT );
|
return heap_caps_get_free_size( MALLOC_CAP_DEFAULT );
|
||||||
|
|
Loading…
Reference in a new issue