MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updated ESP-IDF to latest. 

can: Use DPORT_(SET|clear)_PERI_REG_MASK for DPORT regs.
This commit is contained in:
devsaurus 2017-05-13 22:22:20 +02:00
parent d8b55051c7
commit 9e7eb48fef
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/driver_can/CAN.c
View File

@ -160,8 +160,8 @@ int CAN_write_frame(const CAN_frame_t* p_frame){
int CAN_init(){
//enable module
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_SET_PERI_REG_MASK(DPORT_PERIP_CLK_EN_REG, DPORT_CAN_CLK_EN);
DPORT_CLEAR_PERI_REG_MASK(DPORT_PERIP_RST_EN_REG, DPORT_CAN_RST);
//configure TX pin
gpio_set_direction(CAN_cfg.tx_pin_id,GPIO_MODE_OUTPUT);

2
sdk/esp32-esp-idf

@ -1 +1 @@
Subproject commit 07b61d54f7e502bb12527e4b582de121ffa6fa02
Subproject commit 1e0710f1b24429a316c9c34732aa17bd3f189421