Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Nodemcu Firmware
Commits
9e7eb48f
Commit
9e7eb48f
authored
May 13, 2017
by
devsaurus
Browse files
Updated ESP-IDF to latest.
can: Use DPORT_(SET|clear)_PERI_REG_MASK for DPORT regs.
parent
d8b55051
Changes
2
Hide whitespace changes
Inline
Side-by-side
components/driver_can/CAN.c
View file @
9e7eb48f
...
@@ -160,8 +160,8 @@ int CAN_write_frame(const CAN_frame_t* p_frame){
...
@@ -160,8 +160,8 @@ int CAN_write_frame(const CAN_frame_t* p_frame){
int
CAN_init
(){
int
CAN_init
(){
//enable module
//enable module
SET_PERI_REG_MASK
(
DPORT_PERIP_CLK_EN_REG
,
DPORT_CAN_CLK_EN
);
DPORT_
SET_PERI_REG_MASK
(
DPORT_PERIP_CLK_EN_REG
,
DPORT_CAN_CLK_EN
);
CLEAR_PERI_REG_MASK
(
DPORT_PERIP_RST_EN_REG
,
DPORT_CAN_RST
);
DPORT_
CLEAR_PERI_REG_MASK
(
DPORT_PERIP_RST_EN_REG
,
DPORT_CAN_RST
);
//configure TX pin
//configure TX pin
gpio_set_direction
(
CAN_cfg
.
tx_pin_id
,
GPIO_MODE_OUTPUT
);
gpio_set_direction
(
CAN_cfg
.
tx_pin_id
,
GPIO_MODE_OUTPUT
);
...
...
esp32-esp-idf
@
1e0710f1
Compare
07b61d54
...
1e0710f1
Subproject commit
07b61d54f7e502bb12527e4b582de121ffa6fa02
Subproject commit
1e0710f1b24429a316c9c34732aa17bd3f189421
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment