mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'feature/make-debug-verbose-usable' into 'master'
logs: Make verbose and debug logging cleaner Closes IDFGH-782 See merge request idf/esp-idf!4578
This commit is contained in:
commit
ce07a1057c
@ -1506,7 +1506,6 @@ esp_err_t adc1_adc_mode_acquire()
|
|||||||
//lazy initialization
|
//lazy initialization
|
||||||
//for adc1, block until acquire the lock
|
//for adc1, block until acquire the lock
|
||||||
_lock_acquire( &adc1_i2s_lock );
|
_lock_acquire( &adc1_i2s_lock );
|
||||||
ESP_LOGD( RTC_MODULE_TAG, "adc mode takes adc1 lock." );
|
|
||||||
portENTER_CRITICAL(&rtc_spinlock);
|
portENTER_CRITICAL(&rtc_spinlock);
|
||||||
// for now the WiFi would use ADC2 and set xpd_sar force on.
|
// for now the WiFi would use ADC2 and set xpd_sar force on.
|
||||||
// so we can not reset xpd_sar to fsm mode directly.
|
// so we can not reset xpd_sar to fsm mode directly.
|
||||||
@ -1526,7 +1525,6 @@ esp_err_t adc1_lock_release()
|
|||||||
// We should handle this after the synchronization mechanism is established.
|
// We should handle this after the synchronization mechanism is established.
|
||||||
|
|
||||||
_lock_release( &adc1_i2s_lock );
|
_lock_release( &adc1_i2s_lock );
|
||||||
ESP_LOGD( RTC_MODULE_TAG, "returns adc1 lock." );
|
|
||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -97,7 +97,6 @@ static inline void phy_update_wifi_mac_time(bool en_clock_stopped, int64_t now)
|
|||||||
s_wifi_mac_time_update_cb(diff);
|
s_wifi_mac_time_update_cb(diff);
|
||||||
}
|
}
|
||||||
s_common_clock_disable_time = 0;
|
s_common_clock_disable_time = 0;
|
||||||
ESP_LOGD(TAG, "wifi mac time delta: %u", diff);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user