Commit e92e631

committed

feat: Allow calls to timer functions within ISR

1 parent c369dca commit e92e631Copy full SHA for e92e631

File tree

1 file changed

-12

lines changed

cores/esp32
- esp32-hal-timer.c

1 file changed

-12

lines changed

`‎cores/esp32/esp32-hal-timer.c‎`

Lines changed: 7 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,25 +36,23 @@ struct timer_struct_t {`
`36`	`36`	`bool timer_started;`
`37`	`37`	`};`
`38`	`38`
`39`		`-inline uint64_t timerRead(hw_timer_t *timer) {`
	`39`	`+inline IRAM_ATTRuint64_t timerRead(hw_timer_t *timer) {`
`40`	`40`	`if (timer == NULL) {`
`41`		`- log_e("Timer handle is NULL");`
`42`	`41`	`return 0;`
`43`	`42`	`}`
`44`	`43`	`uint64_t value;`
`45`	`44`	`gptimer_get_raw_count(timer->timer_handle, &value);`
`46`	`45`	`return value;`
`47`	`46`	`}`
`48`	`47`
`49`		`-void timerWrite(hw_timer_t *timer, uint64_t val) {`
	`48`	`+void IRAM_ATTRtimerWrite(hw_timer_t *timer, uint64_t val) {`
`50`	`49`	`if (timer == NULL) {`
`51`		`- log_e("Timer handle is NULL");`
`52`	`50`	`return;`
`53`	`51`	`}`
`54`	`52`	`gptimer_set_raw_count(timer->timer_handle, val);`
`55`	`53`	`}`
`56`	`54`
`57`		`-void timerAlarm(hw_timer_t *timer, uint64_t alarm_value, bool autoreload, uint64_t reload_count) {`
	`55`	`+void IRAM_ATTRtimerAlarm(hw_timer_t *timer, uint64_t alarm_value, bool autoreload, uint64_t reload_count) {`
`58`	`56`	`if (timer == NULL) {`
`59`	`57`	`log_e("Timer handle is NULL");`
`60`	`58`	`return;`
`@@ -67,7 +65,7 @@ void timerAlarm(hw_timer_t *timer, uint64_t alarm_value, bool autoreload, uint64`
`67`	`65`	`};`
`68`	`66`	`err = gptimer_set_alarm_action(timer->timer_handle, &alarm_cfg);`
`69`	`67`	`if (err != ESP_OK) {`
`70`		`- log_e("Timer Alarm Write failed, error num=%d", err);`
	`68`	`+ ; // Ignore`
`71`	`69`	`}`
`72`	`70`	`}`
`73`	`71`
`@@ -80,27 +78,24 @@ uint32_t timerGetFrequency(hw_timer_t *timer) {`
`80`	`78`	`return frequency;`
`81`	`79`	`}`
`82`	`80`
`83`		`-void timerStart(hw_timer_t *timer) {`
	`81`	`+void IRAM_ATTRtimerStart(hw_timer_t *timer) {`
`84`	`82`	`if (timer == NULL) {`
`85`		`- log_e("Timer handle is NULL");`
`86`	`83`	`return;`
`87`	`84`	`}`
`88`	`85`	`gptimer_start(timer->timer_handle);`
`89`	`86`	`timer->timer_started = true;`
`90`	`87`	`}`
`91`	`88`
`92`		`-void timerStop(hw_timer_t *timer) {`
	`89`	`+void IRAM_ATTRtimerStop(hw_timer_t *timer) {`
`93`	`90`	`if (timer == NULL) {`
`94`		`- log_e("Timer handle is NULL");`
`95`	`91`	`return;`
`96`	`92`	`}`
`97`	`93`	`gptimer_stop(timer->timer_handle);`
`98`	`94`	`timer->timer_started = false;`
`99`	`95`	`}`
`100`	`96`
`101`		`-void timerRestart(hw_timer_t *timer) {`
	`97`	`+void IRAM_ATTRtimerRestart(hw_timer_t *timer) {`
`102`	`98`	`if (timer == NULL) {`
`103`		`- log_e("Timer handle is NULL");`
`104`	`99`	`return;`
`105`	`100`	`}`
`106`	`101`	`gptimer_set_raw_count(timer->timer_handle, 0);`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit e92e631

File tree

1 file changed

1 file changed

`‎cores/esp32/esp32-hal-timer.c‎`

0 commit comments