Don't misuse COMP1, COMP2

[CanastraRF]

Dear Support

You define in lot of CPU files

#define COMP1 (COMP_TypeDef *) COMP1_BASE
#define COMP2 (COMP_TypeDef *) COMP2_BASE

But CMSIS also use COMP1 or COMP2 in DWT_Type in core_cm4.h

So depending of the include order of above file one of both symbols is not accessible or result in compile errors.

Please don't use preprocessor for most definition

Better use
static COMP_TypeDef * const COMP1 = (COMP_TypeDef *) COMP1_BASE;
static COMP_TypeDef * const COMP2 = (COMP_TypeDef *) COMP2_BASE;

Modern Compiler can remove unused const
Reto Felix