From 8d241875c2385854c8c0cdb414564497c4ca0ff1 Mon Sep 17 00:00:00 2001 From: William Miceli Date: Fri, 14 May 2021 16:08:17 -0400 Subject: [PATCH] Fixed issue with Port 9 unused pin definitions --- Telem_Debug/Debug1/main.h | 2 +- Telem_Debug/Debug2/Sunseeker2021.h | 194 ++++++++++---------- Telem_Debug/Debug3/Sunseeker2021.h | 194 ++++++++++---------- Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h | 2 +- 4 files changed, 196 insertions(+), 196 deletions(-) diff --git a/Telem_Debug/Debug1/main.h b/Telem_Debug/Debug1/main.h index b7021f9..554263b 100644 --- a/Telem_Debug/Debug1/main.h +++ b/Telem_Debug/Debug1/main.h @@ -131,7 +131,7 @@ void timerB_init(void); #define USB_RX 0x20 #define SDC_CSn 0x40 #define GPS_CSn 0x80 -#define P9_UNUSED 0x40 | 0x80 +#define P9_UNUSED 0x01 | 0x08 // PORT 10 #define BT_CSn 0x01 diff --git a/Telem_Debug/Debug2/Sunseeker2021.h b/Telem_Debug/Debug2/Sunseeker2021.h index a11fdb1..38095f3 100644 --- a/Telem_Debug/Debug2/Sunseeker2021.h +++ b/Telem_Debug/Debug2/Sunseeker2021.h @@ -84,125 +84,125 @@ static inline void delay(void) /******************** Pin Definitions *************************/ // PORT 1 -#define P10 0x01 -#define P11 0x02 -#define P12 0x04 -#define P13 0x08 -#define P14 0x10 -#define P15 0x20 -#define RTC_MFP 0x40 -#define IMU_INTn 0x80 -#define P1_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 +#define P10 0x01 +#define P11 0x02 +#define P12 0x04 +#define P13 0x08 +#define P14 0x10 +#define P15 0x20 +#define RTC_MFP 0x40 +#define IMU_INTn 0x80 +#define P1_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 // PORT 2 -#define CAN0_INTn 0x01 -#define CAN0_RXB0n 0x02 -#define CAN0_RXB1n 0x04 -#define CAN1_INTn 0x08 -#define CAN1_RXB0n 0x10 -#define CAN1_RXB1n 0x20 -#define GPS_INTn 0x40 -#define P27 0x80 -#define P2_UNUSED 0x80 +#define CAN0_INTn 0x01 +#define CAN0_RXB0n 0x02 +#define CAN0_RXB1n 0x04 +#define CAN1_INTn 0x08 +#define CAN1_RXB0n 0x10 +#define CAN1_RXB1n 0x20 +#define GPS_INTn 0x40 +#define P27 0x80 +#define P2_UNUSED 0x80 // PORT 3 -#define CAN0_SCLK 0x01 -#define SDC_SIMO 0x02 -#define SDC_SOMI 0x04 -#define SDC_SCLK 0x08 -#define CAN0_MOSI 0x10 -#define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 -#define IMU_SDA 0x80 -#define P3_UNUSED 0x00 +#define CAN0_SCLK 0x01 +#define SDC_SIMO 0x02 +#define SDC_SOMI 0x04 +#define SDC_SCLK 0x08 +#define CAN0_MOSI 0x10 +#define CAN0_MISO 0x20 +#define CAN1_CLK 0x40 +#define IMU_SDA 0x80 +#define P3_UNUSED 0x00 // PORT 4 -#define CAN0_RSTn 0x01 -#define CAN0_CSn 0x02 -#define CAN1_RSTn 0x04 -#define CAN1_CSn 0x08 -#define SDC_WPn 0x10 -#define SDC_CDn 0x20 -#define P46 0x40 -#define P47 0x80 -#define P4_UNUSED 0x40 | 0x80 +#define CAN0_RSTn 0x01 +#define CAN0_CSn 0x02 +#define CAN1_RSTn 0x04 +#define CAN1_CSn 0x08 +#define SDC_WPn 0x10 +#define SDC_CDn 0x20 +#define P46 0x40 +#define P47 0x80 +#define P4_UNUSED 0x40 | 0x80 // PORT 5 -#define P50 0x01 -#define P51 0x02 -#define XT2IN 0x04 -#define XT2OUT 0x08 -#define IMU_SCL 0x10 -#define P55 0x20 -#define CAN1_MOSI 0x40 -#define CAN1_MISO 0x80 -#define P5_UNUSED 0x01 | 0x02 | 0x20 +#define P50 0x01 +#define P51 0x02 +#define XT2IN 0x04 +#define XT2OUT 0x08 +#define IMU_SCL 0x10 +#define P55 0x20 +#define CAN1_MOSI 0x40 +#define CAN1_MISO 0x80 +#define P5_UNUSED 0x01 | 0x02 | 0x20 // PORT 6 -#define P60 0x01 -#define P61 0x02 -#define P62 0x04 -#define P63 0x08 -#define P64 0x10 -#define P65 0x20 -#define P66 0x40 -#define P67 0x80 -#define P6_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 +#define P60 0x01 +#define P61 0x02 +#define P62 0x04 +#define P63 0x08 +#define P64 0x10 +#define P65 0x20 +#define P66 0x40 +#define P67 0x80 +#define P6_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 // PORT 7 -#define XT1IN 0x01 -#define XT1OUT 0x02 -#define P72 0x04 -#define P73 0x08 -#define P74 0x10 -#define P75 0x20 -#define P76 0x40 -#define P77 0x80 -#define P7_UNUSED 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 +#define XT1IN 0x01 +#define XT1OUT 0x02 +#define P72 0x04 +#define P73 0x08 +#define P74 0x10 +#define P75 0x20 +#define P76 0x40 +#define P77 0x80 +#define P7_UNUSED 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 // PORT 8 -#define P80 0x01 -#define P81 0x02 -#define P82 0x04 -#define LEDG 0x08 -#define LEDR 0x10 -#define LEDY0 0x20 -#define LEDY1 0x40 -#define Button0 0x80 -#define P8_UNUSED 0x01 | 0x02 | 0x04 +#define P80 0x01 +#define P81 0x02 +#define P82 0x04 +#define LEDG 0x08 +#define LEDR 0x10 +#define LEDY0 0x20 +#define LEDY1 0x40 +#define Button0 0x80 +#define P8_UNUSED 0x01 | 0x02 | 0x04 // PORT 9 -#define P90 0x01 -#define RTC_SDA 0x02 -#define RTC_SCL 0x04 -#define P93 0x08 -#define USB_TX 0x10 -#define USB_RX 0x20 -#define SDC_CSn 0x40 -#define GPS_CSn 0x80 -#define P9_UNUSED 0x40 | 0x80 +#define P90 0x01 +#define RTC_SDA 0x02 +#define RTC_SCL 0x04 +#define P93 0x08 +#define USB_TX 0x10 +#define USB_RX 0x20 +#define SDC_CSn 0x40 +#define GPS_CSn 0x80 +#define P9_UNUSED 0x01 | 0x08 // PORT 10 -#define BT_CSn 0x01 -#define BT_MOSI 0x02 -#define BT_MISO 0x04 -#define BT_SCLK 0x08 -#define UART_TX 0x10 -#define UART_RX 0x20 -#define BT_EN 0x40 -#define P107 0x80 -#define P10_UNUSED 0x80 +#define BT_CSn 0x01 +#define BT_MOSI 0x02 +#define BT_MISO 0x04 +#define BT_SCLK 0x08 +#define UART_TX 0x10 +#define UART_RX 0x20 +#define BT_EN 0x40 +#define P107 0x80 +#define P10_UNUSED 0x80 // PORT 11 -#define ACLK_TEST 0x01 -#define MCLK_TEST 0x02 -#define SMCLK_TEST 0x04 +#define ACLK_TEST 0x01 +#define MCLK_TEST 0x02 +#define SMCLK_TEST 0x04 // PORT J -#define JTAG_TDO 0x01 -#define JTAG_TDI 0x02 -#define JTAG_TMS 0x04 -#define JTAG_TCK 0x08 +#define JTAG_TDO 0x01 +#define JTAG_TDI 0x02 +#define JTAG_TMS 0x04 +#define JTAG_TCK 0x08 // Motor controller CAN base address and packet offsets #define MC_CAN_BASE1 0x400 // High = CAN1_SERIAL Number Low = 0x00004003 P=1s diff --git a/Telem_Debug/Debug3/Sunseeker2021.h b/Telem_Debug/Debug3/Sunseeker2021.h index 32a29b4..5d3ffa3 100644 --- a/Telem_Debug/Debug3/Sunseeker2021.h +++ b/Telem_Debug/Debug3/Sunseeker2021.h @@ -79,125 +79,125 @@ static inline void delay(void) /******************** Pin Definitions *************************/ // PORT 1 -#define P10 0x01 -#define P11 0x02 -#define P12 0x04 -#define P13 0x08 -#define P14 0x10 -#define P15 0x20 -#define RTC_MFP 0x40 -#define IMU_INTn 0x80 -#define P1_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 +#define P10 0x01 +#define P11 0x02 +#define P12 0x04 +#define P13 0x08 +#define P14 0x10 +#define P15 0x20 +#define RTC_MFP 0x40 +#define IMU_INTn 0x80 +#define P1_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 // PORT 2 -#define CAN0_INTn 0x01 -#define CAN0_RXB0n 0x02 -#define CAN0_RXB1n 0x04 -#define CAN1_INTn 0x08 -#define CAN1_RXB0n 0x10 -#define CAN1_RXB1n 0x20 -#define GPS_INTn 0x40 -#define P27 0x80 -#define P2_UNUSED 0x80 +#define CAN0_INTn 0x01 +#define CAN0_RXB0n 0x02 +#define CAN0_RXB1n 0x04 +#define CAN1_INTn 0x08 +#define CAN1_RXB0n 0x10 +#define CAN1_RXB1n 0x20 +#define GPS_INTn 0x40 +#define P27 0x80 +#define P2_UNUSED 0x80 // PORT 3 -#define CAN0_SCLK 0x01 -#define SDC_SIMO 0x02 -#define SDC_SOMI 0x04 -#define SDC_SCLK 0x08 -#define CAN0_MOSI 0x10 -#define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 -#define IMU_SDA 0x80 -#define P3_UNUSED 0x00 +#define CAN0_SCLK 0x01 +#define SDC_SIMO 0x02 +#define SDC_SOMI 0x04 +#define SDC_SCLK 0x08 +#define CAN0_MOSI 0x10 +#define CAN0_MISO 0x20 +#define CAN1_CLK 0x40 +#define IMU_SDA 0x80 +#define P3_UNUSED 0x00 // PORT 4 -#define CAN0_RSTn 0x01 -#define CAN0_CSn 0x02 -#define CAN1_RSTn 0x04 -#define CAN1_CSn 0x08 -#define SDC_WPn 0x10 -#define SDC_CDn 0x20 -#define P46 0x40 -#define P47 0x80 -#define P4_UNUSED 0x40 | 0x80 +#define CAN0_RSTn 0x01 +#define CAN0_CSn 0x02 +#define CAN1_RSTn 0x04 +#define CAN1_CSn 0x08 +#define SDC_WPn 0x10 +#define SDC_CDn 0x20 +#define P46 0x40 +#define P47 0x80 +#define P4_UNUSED 0x40 | 0x80 // PORT 5 -#define P50 0x01 -#define P51 0x02 -#define XT2IN 0x04 -#define XT2OUT 0x08 -#define IMU_SCL 0x10 -#define P55 0x20 -#define CAN1_MOSI 0x40 -#define CAN1_MISO 0x80 -#define P5_UNUSED 0x01 | 0x02 | 0x20 +#define P50 0x01 +#define P51 0x02 +#define XT2IN 0x04 +#define XT2OUT 0x08 +#define IMU_SCL 0x10 +#define P55 0x20 +#define CAN1_MOSI 0x40 +#define CAN1_MISO 0x80 +#define P5_UNUSED 0x01 | 0x02 | 0x20 // PORT 6 -#define P60 0x01 -#define P61 0x02 -#define P62 0x04 -#define P63 0x08 -#define P64 0x10 -#define P65 0x20 -#define P66 0x40 -#define P67 0x80 -#define P6_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 +#define P60 0x01 +#define P61 0x02 +#define P62 0x04 +#define P63 0x08 +#define P64 0x10 +#define P65 0x20 +#define P66 0x40 +#define P67 0x80 +#define P6_UNUSED 0x01 | 0x02 | 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 // PORT 7 -#define XT1IN 0x01 -#define XT1OUT 0x02 -#define P72 0x04 -#define P73 0x08 -#define P74 0x10 -#define P75 0x20 -#define P76 0x40 -#define P77 0x80 -#define P7_UNUSED 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 +#define XT1IN 0x01 +#define XT1OUT 0x02 +#define P72 0x04 +#define P73 0x08 +#define P74 0x10 +#define P75 0x20 +#define P76 0x40 +#define P77 0x80 +#define P7_UNUSED 0x04 | 0x08 | 0x10 | 0x20 | 0x40 | 0x80 // PORT 8 -#define P80 0x01 -#define P81 0x02 -#define P82 0x04 -#define LEDG 0x08 -#define LEDR 0x10 -#define LEDY0 0x20 -#define LEDY1 0x40 -#define Button0 0x80 -#define P8_UNUSED 0x01 | 0x02 | 0x04 +#define P80 0x01 +#define P81 0x02 +#define P82 0x04 +#define LEDG 0x08 +#define LEDR 0x10 +#define LEDY0 0x20 +#define LEDY1 0x40 +#define Button0 0x80 +#define P8_UNUSED 0x01 | 0x02 | 0x04 // PORT 9 -#define P90 0x01 -#define RTC_SDA 0x02 -#define RTC_SCL 0x04 -#define P93 0x08 -#define USB_TX 0x10 -#define USB_RX 0x20 -#define SDC_CSn 0x40 -#define GPS_CSn 0x80 -#define P9_UNUSED 0x40 | 0x80 +#define P90 0x01 +#define RTC_SDA 0x02 +#define RTC_SCL 0x04 +#define P93 0x08 +#define USB_TX 0x10 +#define USB_RX 0x20 +#define SDC_CSn 0x40 +#define GPS_CSn 0x80 +#define P9_UNUSED 0x01 | 0x08 // PORT 10 -#define BT_CSn 0x01 -#define BT_MOSI 0x02 -#define BT_MISO 0x04 -#define BT_SCLK 0x08 -#define UART_TX 0x10 -#define UART_RX 0x20 -#define BT_EN 0x40 -#define P107 0x80 -#define P10_UNUSED 0x80 +#define BT_CSn 0x01 +#define BT_MOSI 0x02 +#define BT_MISO 0x04 +#define BT_SCLK 0x08 +#define UART_TX 0x10 +#define UART_RX 0x20 +#define BT_EN 0x40 +#define P107 0x80 +#define P10_UNUSED 0x80 // PORT 11 -#define ACLK_TEST 0x01 -#define MCLK_TEST 0x02 -#define SMCLK_TEST 0x04 +#define ACLK_TEST 0x01 +#define MCLK_TEST 0x02 +#define SMCLK_TEST 0x04 // PORT J -#define JTAG_TDO 0x01 -#define JTAG_TDI 0x02 -#define JTAG_TMS 0x04 -#define JTAG_TCK 0x08 +#define JTAG_TDO 0x01 +#define JTAG_TDI 0x02 +#define JTAG_TMS 0x04 +#define JTAG_TCK 0x08 // Transmit Packet Info #define HF_MSG_PACKET 10 //number of messages per packet in high frequency diff --git a/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h b/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h index 32a29b4..1ce8e91 100644 --- a/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h +++ b/Telem_Debug/Debug_BlinkyLED/Sunseeker2021.h @@ -175,7 +175,7 @@ static inline void delay(void) #define USB_RX 0x20 #define SDC_CSn 0x40 #define GPS_CSn 0x80 -#define P9_UNUSED 0x40 | 0x80 +#define P9_UNUSED 0x01 | 0x08 // PORT 10 #define BT_CSn 0x01