From ee9686f44b5440ea16d75a0f90f6197e4b240ac4 Mon Sep 17 00:00:00 2001 From: strahi-linux Date: Tue, 10 Dec 2024 14:02:38 +0100 Subject: [PATCH] Updated files --- .../include/boards/board_easypic_pro_v8/board.h | 11 +++++++++++ .../include/boards/board_fusion_for_arm_v8/board.h | 4 ++++ .../boards/board_fusion_for_kinetis_v8/board.h | 4 ++++ .../include/boards/board_fusion_for_pic32_v8/board.h | 12 ++++++------ .../include/boards/board_fusion_for_pic_v8/board.h | 12 ++++++------ .../include/boards/board_fusion_for_stm32_v8/board.h | 4 ++++ .../include/boards/board_fusion_for_tiva_v8/board.h | 4 ++++ bsp/board/include/boards/board_uni_ds_v8/board.h | 12 ++++++------ 8 files changed, 45 insertions(+), 18 deletions(-) diff --git a/bsp/board/include/boards/board_easypic_pro_v8/board.h b/bsp/board/include/boards/board_easypic_pro_v8/board.h index 95b0584a5..46c3c8504 100644 --- a/bsp/board/include/boards/board_easypic_pro_v8/board.h +++ b/bsp/board/include/boards/board_easypic_pro_v8/board.h @@ -159,10 +159,21 @@ extern "C"{ #define CTP_INT LEFT_CN_PIN_060 #define CTP_RST LEFT_CN_PIN_062 +#ifdef __XC__ +#define AN1_PIN RIGHT_CN_PIN_128 +#define AN2_PIN RIGHT_CN_PIN_127 +#define AN3_PIN RIGHT_CN_PIN_126 +#define AN4_PIN RIGHT_CN_PIN_125 +#else #define AN1 RIGHT_CN_PIN_128 #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 #define AN4 RIGHT_CN_PIN_125 +#define AN1_PIN AN1 +#define AN2_PIN AN2 +#define AN3_PIN AN3 +#define AN4_PIN AN4 +#endif #define USB_SW_ID RIGHT_CN_PIN_130 #define USB_VBUS RIGHT_CN_PIN_133 diff --git a/bsp/board/include/boards/board_fusion_for_arm_v8/board.h b/bsp/board/include/boards/board_fusion_for_arm_v8/board.h index e00e21822..8b8538d21 100644 --- a/bsp/board/include/boards/board_fusion_for_arm_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_arm_v8/board.h @@ -163,6 +163,10 @@ extern "C"{ #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 #define AN4 RIGHT_CN_PIN_125 +#define AN1_PIN AN1 +#define AN2_PIN AN2 +#define AN3_PIN AN3 +#define AN4_PIN AN4 #define USB_SW_ID RIGHT_CN_PIN_130 #define USB_VBUS RIGHT_CN_PIN_133 diff --git a/bsp/board/include/boards/board_fusion_for_kinetis_v8/board.h b/bsp/board/include/boards/board_fusion_for_kinetis_v8/board.h index 949b4a067..73735ab7d 100644 --- a/bsp/board/include/boards/board_fusion_for_kinetis_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_kinetis_v8/board.h @@ -163,6 +163,10 @@ extern "C"{ #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 #define AN4 RIGHT_CN_PIN_125 +#define AN1_PIN AN1 +#define AN2_PIN AN2 +#define AN3_PIN AN3 +#define AN4_PIN AN4 #define USB_SW_ID RIGHT_CN_PIN_130 #define USB_VBUS RIGHT_CN_PIN_133 diff --git a/bsp/board/include/boards/board_fusion_for_pic32_v8/board.h b/bsp/board/include/boards/board_fusion_for_pic32_v8/board.h index ce05ffee8..4f570f574 100644 --- a/bsp/board/include/boards/board_fusion_for_pic32_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_pic32_v8/board.h @@ -167,7 +167,12 @@ extern "C"{ #define CTP_WAKE LEFT_CN_PIN_061 #define CTP_RST LEFT_CN_PIN_062 -#ifndef __XC32__ +#ifdef __XC__ +#define AN1_PIN RIGHT_CN_PIN_128 +#define AN2_PIN RIGHT_CN_PIN_127 +#define AN3_PIN RIGHT_CN_PIN_126 +#define AN4_PIN RIGHT_CN_PIN_125 +#else #define AN1 RIGHT_CN_PIN_128 #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 @@ -176,11 +181,6 @@ extern "C"{ #define AN2_PIN AN2 #define AN3_PIN AN3 #define AN4_PIN AN4 -#else -#define AN1_PIN RIGHT_CN_PIN_128 -#define AN2_PIN RIGHT_CN_PIN_127 -#define AN3_PIN RIGHT_CN_PIN_126 -#define AN4_PIN RIGHT_CN_PIN_125 #endif #define USB_UART_RX RIGHT_CN_PIN_159 diff --git a/bsp/board/include/boards/board_fusion_for_pic_v8/board.h b/bsp/board/include/boards/board_fusion_for_pic_v8/board.h index 0a29f8206..6c7f6bd0b 100644 --- a/bsp/board/include/boards/board_fusion_for_pic_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_pic_v8/board.h @@ -167,7 +167,12 @@ extern "C"{ #define CTP_INT LEFT_CN_PIN_060 #define CTP_RST LEFT_CN_PIN_062 -#ifndef __XC32__ +#ifdef __XC__ +#define AN1_PIN RIGHT_CN_PIN_128 +#define AN2_PIN RIGHT_CN_PIN_127 +#define AN3_PIN RIGHT_CN_PIN_126 +#define AN4_PIN RIGHT_CN_PIN_125 +#else #define AN1 RIGHT_CN_PIN_128 #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 @@ -176,11 +181,6 @@ extern "C"{ #define AN2_PIN AN2 #define AN3_PIN AN3 #define AN4_PIN AN4 -#else -#define AN1_PIN RIGHT_CN_PIN_128 -#define AN2_PIN RIGHT_CN_PIN_127 -#define AN3_PIN RIGHT_CN_PIN_126 -#define AN4_PIN RIGHT_CN_PIN_125 #endif #define USB_SW_ID RIGHT_CN_PIN_130 diff --git a/bsp/board/include/boards/board_fusion_for_stm32_v8/board.h b/bsp/board/include/boards/board_fusion_for_stm32_v8/board.h index e292b748c..86c348651 100644 --- a/bsp/board/include/boards/board_fusion_for_stm32_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_stm32_v8/board.h @@ -163,6 +163,10 @@ extern "C"{ #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 #define AN4 RIGHT_CN_PIN_125 +#define AN1_PIN AN1 +#define AN2_PIN AN2 +#define AN3_PIN AN3 +#define AN4_PIN AN4 #define USB_SW_ID RIGHT_CN_PIN_130 #define USB_VBUS RIGHT_CN_PIN_133 diff --git a/bsp/board/include/boards/board_fusion_for_tiva_v8/board.h b/bsp/board/include/boards/board_fusion_for_tiva_v8/board.h index 07ea2b434..8598786a3 100644 --- a/bsp/board/include/boards/board_fusion_for_tiva_v8/board.h +++ b/bsp/board/include/boards/board_fusion_for_tiva_v8/board.h @@ -171,6 +171,10 @@ extern "C"{ #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 #define AN4 RIGHT_CN_PIN_125 +#define AN1_PIN AN1 +#define AN2_PIN AN2 +#define AN3_PIN AN3 +#define AN4_PIN AN4 #define USB_SW_ID RIGHT_CN_PIN_130 #define USB_VBUS RIGHT_CN_PIN_133 diff --git a/bsp/board/include/boards/board_uni_ds_v8/board.h b/bsp/board/include/boards/board_uni_ds_v8/board.h index 5ecba975d..7d7e6ab03 100644 --- a/bsp/board/include/boards/board_uni_ds_v8/board.h +++ b/bsp/board/include/boards/board_uni_ds_v8/board.h @@ -159,7 +159,12 @@ extern "C"{ #define CTP_INT LEFT_CN_PIN_060 #define CTP_RST LEFT_CN_PIN_062 -#ifndef __XC32__ +#ifdef __XC__ +#define AN1_PIN RIGHT_CN_PIN_128 +#define AN2_PIN RIGHT_CN_PIN_127 +#define AN3_PIN RIGHT_CN_PIN_126 +#define AN4_PIN RIGHT_CN_PIN_125 +#else #define AN1 RIGHT_CN_PIN_128 #define AN2 RIGHT_CN_PIN_127 #define AN3 RIGHT_CN_PIN_126 @@ -168,11 +173,6 @@ extern "C"{ #define AN2_PIN AN2 #define AN3_PIN AN3 #define AN4_PIN AN4 -#else -#define AN1_PIN RIGHT_CN_PIN_128 -#define AN2_PIN RIGHT_CN_PIN_127 -#define AN3_PIN RIGHT_CN_PIN_126 -#define AN4_PIN RIGHT_CN_PIN_125 #endif #define USB_SW_ID RIGHT_CN_PIN_130