diff --git a/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_one_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_one_regs.h index 27c4e423336..83955ac348e 100644 --- a/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_one_regs.h +++ b/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_one_regs.h @@ -7,7 +7,9 @@ /****************************************************************************** * - * Copyright (C) 2024 Analog Devices, Inc. + * Copyright (C) 2022-2023 Maxim Integrated Products, Inc. (now owned by + * Analog Devices, Inc.), + * Copyright (C) 2023-2024 Analog Devices, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -191,7 +193,6 @@ extern "C" { #define MXC_R_AFE_ADC_ONE_ADC_TRIM1 ((uint32_t)0x00F80002UL) /**< Offset from AFE_ADC_ONE Base Address: 0xF80002 */ #define MXC_R_AFE_ADC_ONE_ANA_TRIM ((uint32_t)0x00F90002UL) /**< Offset from AFE_ADC_ONE Base Address: 0xF90002 */ #define MXC_R_AFE_ADC_ONE_SYS_CTRL ((uint32_t)0x00FA0001UL) /**< Offset from AFE_ADC_ONE Base Address: 0xFA0001 */ -#define MXC_R_AFE_ADC_ONE_TS_CTRL ((uint32_t)0x00FC0001UL) /**< Offset from AFE_ADC_ONE Base Address: 0xFC0001 */ /**@} end of group afe_adc_one_registers */ /** @@ -2025,23 +2026,6 @@ extern "C" { /**@} end of group AFE_ADC_ONE_SYS_CTRL_Register */ -/** - * @ingroup afe_adc_one_registers - * @defgroup AFE_ADC_ONE_TS_CTRL AFE_ADC_ONE_TS_CTRL - * @brief Temperature Sensor Control - * @{ - */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN_POS 0 /**< TS_CTRL_TS_EN Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN_POS)) /**< TS_CTRL_TS_EN Mask */ - -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN_POS 1 /**< TS_CTRL_TS_CONV_EN Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN_POS)) /**< TS_CTRL_TS_CONV_EN Mask */ - -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY_POS 2 /**< TS_CTRL_TS_INTG_RDY Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY_POS)) /**< TS_CTRL_TS_INTG_RDY Mask */ - -/**@} end of group AFE_ADC_ONE_TS_CTRL_Register */ - #ifdef __cplusplus } #endif diff --git a/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_zero_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_zero_regs.h index ab92522de26..81eaedf7b90 100644 --- a/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_zero_regs.h +++ b/Libraries/CMSIS/Device/Maxim/MAX32675/Include/afe_adc_zero_regs.h @@ -7,7 +7,9 @@ /****************************************************************************** * - * Copyright (C) 2024 Analog Devices, Inc. + * Copyright (C) 2022-2023 Maxim Integrated Products, Inc. (now owned by + * Analog Devices, Inc.), + * Copyright (C) 2023-2024 Analog Devices, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -91,6 +93,7 @@ extern "C" { #define MXC_R_AFE_ADC_ZERO_PGA ((uint32_t)0x000E0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0xE0001 */ #define MXC_R_AFE_ADC_ZERO_WAIT_EXT ((uint32_t)0x000F0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0xF0001 */ #define MXC_R_AFE_ADC_ZERO_WAIT_START ((uint32_t)0x00100001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x100001 */ +#define MXC_R_AFE_ADC_ZERO_PART_ID ((uint32_t)0x00110003UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x110003 */ #define MXC_R_AFE_ADC_ZERO_SYSC_SEL ((uint32_t)0x00120003UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x120003 */ #define MXC_R_AFE_ADC_ZERO_SYS_OFF_A ((uint32_t)0x00130003UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x130003 */ #define MXC_R_AFE_ADC_ZERO_SYS_OFF_B ((uint32_t)0x00140003UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x140003 */ @@ -190,8 +193,6 @@ extern "C" { #define MXC_R_AFE_ADC_ZERO_ADC_TRIM1 ((uint32_t)0x00780002UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x780002 */ #define MXC_R_AFE_ADC_ZERO_ANA_TRIM ((uint32_t)0x00790002UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x790002 */ #define MXC_R_AFE_ADC_ZERO_SYS_CTRL ((uint32_t)0x007A0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x7A0001 */ -#define MXC_R_AFE_ADC_ZERO_TS_CTRL ((uint32_t)0x007C0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x7C0001 */ -#define MXC_R_AFE_ADC_ZERO_PART_ID ((uint32_t)0x00910003UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x910003 */ /**@} end of group afe_adc_zero_registers */ /** @@ -554,6 +555,20 @@ extern "C" { /**@} end of group AFE_ADC_ZERO_WAIT_EXT_Register */ +/** + * @ingroup afe_adc_zero_registers + * @defgroup AFE_ADC_ZERO_PART_ID AFE_ADC_ZERO_PART_ID + * @brief Silicon Revision ID + * @{ + */ +#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS 0 /**< PART_ID_REV_ID Position */ +#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID ((uint32_t)(0x1FUL << MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ + +#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS 5 /**< PART_ID_ADC_SEL Position */ +#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL ((uint32_t)(0x1UL << MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS)) /**< PART_ID_ADC_SEL Mask */ + +/**@} end of group AFE_ADC_ZERO_PART_ID_Register */ + /** * @ingroup afe_adc_zero_registers * @defgroup AFE_ADC_ZERO_SYSC_SEL AFE_ADC_ZERO_SYSC_SEL @@ -2011,37 +2026,6 @@ extern "C" { /**@} end of group AFE_ADC_ZERO_SYS_CTRL_Register */ -/** - * @ingroup afe_adc_zero_registers - * @defgroup AFE_ADC_ZERO_TS_CTRL AFE_ADC_ZERO_TS_CTRL - * @brief Temperature Sensor Control - * @{ - */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN_POS 0 /**< TS_CTRL_TS_EN Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN_POS)) /**< TS_CTRL_TS_EN Mask */ - -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN_POS 1 /**< TS_CTRL_TS_CONV_EN Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN_POS)) /**< TS_CTRL_TS_CONV_EN Mask */ - -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY_POS 2 /**< TS_CTRL_TS_INTG_RDY Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY_POS)) /**< TS_CTRL_TS_INTG_RDY Mask */ - -/**@} end of group AFE_ADC_ZERO_TS_CTRL_Register */ - -/** - * @ingroup afe_adc_zero_registers - * @defgroup AFE_ADC_ZERO_PART_ID AFE_ADC_ZERO_PART_ID - * @brief Silicon Revision ID - * @{ - */ -#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS 0 /**< PART_ID_REV_ID Position */ -#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID ((uint32_t)(0x1FUL << MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ - -#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS 5 /**< PART_ID_ADC_SEL Position */ -#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL ((uint32_t)(0x1UL << MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS)) /**< PART_ID_ADC_SEL Mask */ - -/**@} end of group AFE_ADC_ZERO_PART_ID_Register */ - #ifdef __cplusplus } #endif diff --git a/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_one_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_one_regs.h index 20fc136b9b4..310cfe77b67 100644 --- a/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_one_regs.h +++ b/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_one_regs.h @@ -193,7 +193,6 @@ extern "C" { #define MXC_R_AFE_ADC_ONE_ADC_TRIM1 ((uint32_t)0x00F80002UL) /**< Offset from AFE_ADC_ONE Base Address: 0xF80002 */ #define MXC_R_AFE_ADC_ONE_ANA_TRIM ((uint32_t)0x00F90002UL) /**< Offset from AFE_ADC_ONE Base Address: 0xF90002 */ #define MXC_R_AFE_ADC_ONE_SYS_CTRL ((uint32_t)0x00FA0001UL) /**< Offset from AFE_ADC_ONE Base Address: 0xFA0001 */ -#define MXC_R_AFE_ADC_ONE_TS_CTRL ((uint32_t)0x00FC0001UL) /**< Offset from AFE_ADC_ONE Base Address: 0xFC0001 */ /**@} end of group afe_adc_one_registers */ /** @@ -563,7 +562,10 @@ extern "C" { * @{ */ #define MXC_F_AFE_ADC_ONE_PART_ID_REV_ID_POS 0 /**< PART_ID_REV_ID Position */ -#define MXC_F_AFE_ADC_ONE_PART_ID_REV_ID ((uint32_t)(0x7UL << MXC_F_AFE_ADC_ONE_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ +#define MXC_F_AFE_ADC_ONE_PART_ID_REV_ID ((uint32_t)(0x1FUL << MXC_F_AFE_ADC_ONE_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ + +#define MXC_F_AFE_ADC_ONE_PART_ID_ADC_SEL_POS 5 /**< PART_ID_ADC_SEL Position */ +#define MXC_F_AFE_ADC_ONE_PART_ID_ADC_SEL ((uint32_t)(0x1UL << MXC_F_AFE_ADC_ONE_PART_ID_ADC_SEL_POS)) /**< PART_ID_ADC_SEL Mask */ /**@} end of group AFE_ADC_ONE_PART_ID_Register */ @@ -2024,23 +2026,6 @@ extern "C" { /**@} end of group AFE_ADC_ONE_SYS_CTRL_Register */ -/** - * @ingroup afe_adc_one_registers - * @defgroup AFE_ADC_ONE_TS_CTRL AFE_ADC_ONE_TS_CTRL - * @brief Temperature Sensor Control - * @{ - */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN_POS 0 /**< TS_CTRL_TS_EN Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_EN_POS)) /**< TS_CTRL_TS_EN Mask */ - -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN_POS 1 /**< TS_CTRL_TS_CONV_EN Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_CONV_EN_POS)) /**< TS_CTRL_TS_CONV_EN Mask */ - -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY_POS 2 /**< TS_CTRL_TS_INTG_RDY Position */ -#define MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ONE_TS_CTRL_TS_INTG_RDY_POS)) /**< TS_CTRL_TS_INTG_RDY Mask */ - -/**@} end of group AFE_ADC_ONE_TS_CTRL_Register */ - #ifdef __cplusplus } #endif diff --git a/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_zero_regs.h b/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_zero_regs.h index 9b3298a5e77..949029fc267 100644 --- a/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_zero_regs.h +++ b/Libraries/CMSIS/Device/Maxim/MAX32680/Include/afe_adc_zero_regs.h @@ -193,7 +193,6 @@ extern "C" { #define MXC_R_AFE_ADC_ZERO_ADC_TRIM1 ((uint32_t)0x00780002UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x780002 */ #define MXC_R_AFE_ADC_ZERO_ANA_TRIM ((uint32_t)0x00790002UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x790002 */ #define MXC_R_AFE_ADC_ZERO_SYS_CTRL ((uint32_t)0x007A0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x7A0001 */ -#define MXC_R_AFE_ADC_ZERO_TS_CTRL ((uint32_t)0x007C0001UL) /**< Offset from AFE_ADC_ZERO Base Address: 0x7C0001 */ /**@} end of group afe_adc_zero_registers */ /** @@ -563,7 +562,10 @@ extern "C" { * @{ */ #define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS 0 /**< PART_ID_REV_ID Position */ -#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID ((uint32_t)(0x3FUL << MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ +#define MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID ((uint32_t)(0x1FUL << MXC_F_AFE_ADC_ZERO_PART_ID_REV_ID_POS)) /**< PART_ID_REV_ID Mask */ + +#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS 5 /**< PART_ID_ADC_SEL Position */ +#define MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL ((uint32_t)(0x1UL << MXC_F_AFE_ADC_ZERO_PART_ID_ADC_SEL_POS)) /**< PART_ID_ADC_SEL Mask */ /**@} end of group AFE_ADC_ZERO_PART_ID_Register */ @@ -2024,23 +2026,6 @@ extern "C" { /**@} end of group AFE_ADC_ZERO_SYS_CTRL_Register */ -/** - * @ingroup afe_adc_zero_registers - * @defgroup AFE_ADC_ZERO_TS_CTRL AFE_ADC_ZERO_TS_CTRL - * @brief Temperature Sensor Control - * @{ - */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN_POS 0 /**< TS_CTRL_TS_EN Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_EN_POS)) /**< TS_CTRL_TS_EN Mask */ - -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN_POS 1 /**< TS_CTRL_TS_CONV_EN Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_CONV_EN_POS)) /**< TS_CTRL_TS_CONV_EN Mask */ - -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY_POS 2 /**< TS_CTRL_TS_INTG_RDY Position */ -#define MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY ((uint8_t)(0x1UL << MXC_F_AFE_ADC_ZERO_TS_CTRL_TS_INTG_RDY_POS)) /**< TS_CTRL_TS_INTG_RDY Mask */ - -/**@} end of group AFE_ADC_ZERO_TS_CTRL_Register */ - #ifdef __cplusplus } #endif diff --git a/Libraries/PeriphDrivers/Source/AFE/afe_adc_one_reva.svd b/Libraries/PeriphDrivers/Source/AFE/afe_adc_one_reva.svd index b15783d5fbf..526002539da 100644 --- a/Libraries/PeriphDrivers/Source/AFE/afe_adc_one_reva.svd +++ b/Libraries/PeriphDrivers/Source/AFE/afe_adc_one_reva.svd @@ -2789,32 +2789,6 @@ - - TS_CTRL - Temperature Sensor Control - 0x00FC0001 - 8 - - - TS_EN - Description not included - 0 - 1 - - - TS_CONV_EN - Description not included - 1 - 1 - - - TS_INTG_RDY - Description not included - 2 - 1 - - - diff --git a/Libraries/PeriphDrivers/Source/AFE/afe_adc_zero_reva.svd b/Libraries/PeriphDrivers/Source/AFE/afe_adc_zero_reva.svd index e8d6703cb12..403611a8455 100644 --- a/Libraries/PeriphDrivers/Source/AFE/afe_adc_zero_reva.svd +++ b/Libraries/PeriphDrivers/Source/AFE/afe_adc_zero_reva.svd @@ -696,7 +696,7 @@ PART_ID Silicon Revision ID - 0x00910003 + 0x00110003 REV_ID @@ -2789,32 +2789,6 @@ - - TS_CTRL - Temperature Sensor Control - 0x007C0001 - 8 - - - TS_EN - Description not included - 0 - 1 - - - TS_CONV_EN - Description not included - 1 - 1 - - - TS_INTG_RDY - Description not included - 2 - 1 - - -