Merge branch 'master' into feature/esp32s2beta_update

This commit is contained in:
Angus Gratton
2019-08-08 14:00:45 +10:00
committed by Angus Gratton
657 changed files with 6814 additions and 7534 deletions

View File

@@ -53,7 +53,7 @@ static intr_handle_t s_intr_handle;
static portMUX_TYPE s_lock = portMUX_INITIALIZER_UNLOCKED;
static volatile uint32_t s_milliseconds;
void ref_clock_init()
void ref_clock_init(void)
{
assert(s_intr_handle == NULL && "already initialized");
@@ -133,7 +133,7 @@ static void IRAM_ATTR pcnt_isr(void* arg)
portEXIT_CRITICAL_ISR(&s_lock);
}
void ref_clock_deinit()
void ref_clock_deinit(void)
{
assert(s_intr_handle && "deinit called without init");
@@ -152,7 +152,7 @@ void ref_clock_deinit()
periph_module_disable(PERIPH_PCNT_MODULE);
}
uint64_t ref_clock_get()
uint64_t ref_clock_get(void)
{
portENTER_CRITICAL(&s_lock);
uint32_t microseconds = PCNT.cnt_unit[REF_CLOCK_PCNT_UNIT].cnt_val;