alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-03 14:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: Apply new version logic (major * 100 + minor)

Browse Source
This commit is contained in:
KonstantinKondrashov
2022-03-17 21:58:15 +08:00
committed by BOT
parent 2b04fa8059
commit e88f235326
48 changed files with 548 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/hal/esp32/efuse_hal.c
View File

@@ -10,8 +10,9 @@
#include "hal/efuse_ll.h"
#include "hal/efuse_hal.h"
#include "soc/syscon_reg.h"
#include "esp_attr.h"
uint32_t efuse_hal_get_major_chip_version(void)
IRAM_ATTR uint32_t efuse_hal_get_major_chip_version(void)
{
uint8_t eco_bit0 = efuse_ll_get_chip_ver_rev1();
uint8_t eco_bit1 = efuse_ll_get_chip_ver_rev2();
@@ -43,7 +44,7 @@ uint32_t efuse_hal_get_major_chip_version(void)
return chip_ver;
}
uint32_t efuse_hal_get_minor_chip_version(void)
IRAM_ATTR uint32_t efuse_hal_get_minor_chip_version(void)
{
return efuse_ll_get_chip_wafer_version_minor();
}

2
components/hal/esp32/include/hal/can_types.h
View File

@@ -38,7 +38,7 @@ extern "C" {
#define CAN_MSG_FLAG_SELF TWAI_MSG_FLAG_SELF
#define CAN_MSG_FLAG_DLC_NON_COMP TWAI_MSG_FLAG_DLC_NON_COMP
#if (SOC_TWAI_BRP_MAX > 128) || (CONFIG_ESP32_REV_MIN >= 2)
#if (SOC_TWAI_BRP_MAX > 128) || (CONFIG_ESP32_REV_MIN_FULL >= 200)
#define CAN_TIMING_CONFIG_12_5KBITS() TWAI_TIMING_CONFIG_12_5KBITS()
#define CAN_TIMING_CONFIG_16KBITS() TWAI_TIMING_CONFIG_16KBITS()
#define CAN_TIMING_CONFIG_20KBITS() TWAI_TIMING_CONFIG_20KBITS()