Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
过眠
arduino-esp32
提交
6d985556
A
arduino-esp32
项目概览
过眠
/
arduino-esp32
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
arduino-esp32
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6d985556
编写于
9月 28, 2017
作者:
M
me-no-dev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Change timer interrupt allocator
上级
f9b2d42a
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
8 deletion
+13
-8
cores/esp32/esp32-hal-timer.c
cores/esp32/esp32-hal-timer.c
+13
-8
未找到文件。
cores/esp32/esp32-hal-timer.c
浏览文件 @
6d985556
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
#include "esp_attr.h"
#include "esp_attr.h"
#include "esp_intr.h"
#include "esp_intr.h"
#define HWTIMER_INUM 10
#define HWTIMER_LOCK() portENTER_CRITICAL(timer->lock)
#define HWTIMER_LOCK() portENTER_CRITICAL(timer->lock)
#define HWTIMER_UNLOCK() portEXIT_CRITICAL(timer->lock)
#define HWTIMER_UNLOCK() portEXIT_CRITICAL(timer->lock)
...
@@ -220,7 +219,10 @@ void timerEnd(hw_timer_t *timer){
...
@@ -220,7 +219,10 @@ void timerEnd(hw_timer_t *timer){
void
timerAttachInterrupt
(
hw_timer_t
*
timer
,
void
(
*
fn
)(
void
),
bool
edge
){
void
timerAttachInterrupt
(
hw_timer_t
*
timer
,
void
(
*
fn
)(
void
),
bool
edge
){
static
bool
initialized
=
false
;
static
bool
initialized
=
false
;
ESP_INTR_DISABLE
(
HWTIMER_INUM
);
static
intr_handle_t
intr_handle
=
NULL
;
if
(
intr_handle
){
esp_intr_disable
(
intr_handle
);
}
if
(
fn
==
NULL
){
if
(
fn
==
NULL
){
timer
->
dev
->
config
.
level_int_en
=
0
;
timer
->
dev
->
config
.
level_int_en
=
0
;
timer
->
dev
->
config
.
edge_int_en
=
0
;
timer
->
dev
->
config
.
edge_int_en
=
0
;
...
@@ -232,10 +234,6 @@ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
...
@@ -232,10 +234,6 @@ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
}
}
__timerInterruptHandlers
[
timer
->
num
]
=
NULL
;
__timerInterruptHandlers
[
timer
->
num
]
=
NULL
;
}
else
{
}
else
{
if
(
!
initialized
){
xt_set_interrupt_handler
(
HWTIMER_INUM
,
&
__timerISR
,
NULL
);
initialized
=
true
;
}
__timerInterruptHandlers
[
timer
->
num
]
=
fn
;
__timerInterruptHandlers
[
timer
->
num
]
=
fn
;
timer
->
dev
->
config
.
level_int_en
=
edge
?
0
:
1
;
//When set, an alarm will generate a level type interrupt.
timer
->
dev
->
config
.
level_int_en
=
edge
?
0
:
1
;
//When set, an alarm will generate a level type interrupt.
timer
->
dev
->
config
.
edge_int_en
=
edge
?
1
:
0
;
//When set, an alarm will generate an edge type interrupt.
timer
->
dev
->
config
.
edge_int_en
=
edge
?
1
:
0
;
//When set, an alarm will generate an edge type interrupt.
...
@@ -253,14 +251,21 @@ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
...
@@ -253,14 +251,21 @@ void timerAttachInterrupt(hw_timer_t *timer, void (*fn)(void), bool edge){
intr_source
=
ETS_TG0_T0_EDGE_INTR_SOURCE
+
timer
->
timer
;
intr_source
=
ETS_TG0_T0_EDGE_INTR_SOURCE
+
timer
->
timer
;
}
}
}
}
intr_matrix_set
(
xPortGetCoreID
(),
intr_source
,
HWTIMER_INUM
);
if
(
!
initialized
){
initialized
=
true
;
esp_intr_alloc
(
intr_source
,
(
int
)
ESP_INTR_FLAG_IRAM
,
__timerISR
,
NULL
,
&
intr_handle
);
}
else
{
intr_matrix_set
(
esp_intr_get_cpu
(
intr_handle
),
intr_source
,
esp_intr_get_intno
(
intr_handle
));
}
if
(
timer
->
group
){
if
(
timer
->
group
){
TIMERG1
.
int_ena
.
val
|=
BIT
(
timer
->
timer
);
TIMERG1
.
int_ena
.
val
|=
BIT
(
timer
->
timer
);
}
else
{
}
else
{
TIMERG0
.
int_ena
.
val
|=
BIT
(
timer
->
timer
);
TIMERG0
.
int_ena
.
val
|=
BIT
(
timer
->
timer
);
}
}
}
}
ESP_INTR_ENABLE
(
HWTIMER_INUM
);
if
(
intr_handle
){
esp_intr_enable
(
intr_handle
);
}
}
}
void
timerDetachInterrupt
(
hw_timer_t
*
timer
){
void
timerDetachInterrupt
(
hw_timer_t
*
timer
){
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录