From 9e7eb48fef29036adbcaebc21af59b9ac7eea87b Mon Sep 17 00:00:00 2001 From: devsaurus Date: Sat, 13 May 2017 22:22:20 +0200 Subject: [PATCH] Updated ESP-IDF to latest. can: Use DPORT_(SET|clear)_PERI_REG_MASK for DPORT regs. --- components/driver_can/CAN.c | 4 ++-- sdk/esp32-esp-idf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/driver_can/CAN.c b/components/driver_can/CAN.c index 674f8b17..dfbeca66 100644 --- a/components/driver_can/CAN.c +++ b/components/driver_can/CAN.c @@ -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); diff --git a/sdk/esp32-esp-idf b/sdk/esp32-esp-idf index 07b61d54..1e0710f1 160000 --- a/sdk/esp32-esp-idf +++ b/sdk/esp32-esp-idf @@ -1 +1 @@ -Subproject commit 07b61d54f7e502bb12527e4b582de121ffa6fa02 +Subproject commit 1e0710f1b24429a316c9c34732aa17bd3f189421