diff --git a/Telem_Debug/Debug1/SunseekerTelemetry2021.h b/Telem_Debug/Debug1/SunseekerTelemetry2021.h index c6f5ebb..656446a 100644 --- a/Telem_Debug/Debug1/SunseekerTelemetry2021.h +++ b/Telem_Debug/Debug1/SunseekerTelemetry2021.h @@ -63,7 +63,7 @@ void timerB_init(void); #define SDC_SCLK 0x08 #define CAN0_MOSI 0x10 #define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 +#define CAN1_SCLK 0x40 #define IMU_SDA 0x80 #define P3_UNUSED 0x00 diff --git a/Telem_Debug/Debug2/SunseekerTelemetry2021.h b/Telem_Debug/Debug2/SunseekerTelemetry2021.h index f8c507f..5fdfa31 100644 --- a/Telem_Debug/Debug2/SunseekerTelemetry2021.h +++ b/Telem_Debug/Debug2/SunseekerTelemetry2021.h @@ -112,7 +112,7 @@ static inline void delay(void) #define SDC_SCLK 0x08 #define CAN0_MOSI 0x10 #define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 +#define CAN1_SCLK 0x40 #define IMU_SDA 0x80 #define P3_UNUSED 0x00 diff --git a/Telem_Debug/Debug2/io_init.c b/Telem_Debug/Debug2/io_init.c index 7c9b8b6..4ce09eb 100644 --- a/Telem_Debug/Debug2/io_init.c +++ b/Telem_Debug/Debug2/io_init.c @@ -44,10 +44,10 @@ void io_init( void ) /******************************PORT 3**************************************/ P3OUT = 0x00; // Pull pins low - P3DIR = CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_CLK | P3_UNUSED; - P3OUT |= CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_CLK; + P3DIR = CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_SCLK | P3_UNUSED; + P3OUT |= CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_SCLK; P3DIR &= ~(CAN0_MISO | SDC_SOMI); - P3SEL = CAN0_SCLK | CAN0_MOSI | CAN0_MISO | SDC_SCLK | SDC_SIMO | SDC_SOMI | CAN1_CLK | IMU_SDA; + P3SEL = CAN0_SCLK | CAN0_MOSI | CAN0_MISO | SDC_SCLK | SDC_SIMO | SDC_SOMI | CAN1_SCLK | IMU_SDA; /******************************PORT 4**************************************/ P4OUT = 0x00; // Pull pins low diff --git a/Telem_Debug/Debug3/SunseekerTelemetry2021.h b/Telem_Debug/Debug3/SunseekerTelemetry2021.h index edb6a05..9c272b1 100644 --- a/Telem_Debug/Debug3/SunseekerTelemetry2021.h +++ b/Telem_Debug/Debug3/SunseekerTelemetry2021.h @@ -107,7 +107,7 @@ static inline void delay(void) #define SDC_SCLK 0x08 #define CAN0_MOSI 0x10 #define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 +#define CAN1_SCLK 0x40 #define IMU_SDA 0x80 #define P3_UNUSED 0x00 diff --git a/Telem_Debug/Debug3/io_init.c b/Telem_Debug/Debug3/io_init.c index 065078b..64e0df8 100644 --- a/Telem_Debug/Debug3/io_init.c +++ b/Telem_Debug/Debug3/io_init.c @@ -1,10 +1,4 @@ /* - * Battery Protection Software for BPS PCB Development - * Originally Written for BPS_V1 2012 - * - * Modified for BPS_V2 2015 by Scott Haver - * WMU Sunseeker 2015 - * * I/O Initialization */ @@ -13,13 +7,14 @@ /* * Initialize I/O port directions and states - * Drive unused pins as outputs to avoid floating inputs + * Drive unused pins as outputs to avoid floating inputs and wasting power * */ + void io_init( void ) { /******************************PORT 1**************************************/ - P1OUT = 0x00; // Pull pins low + P1OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P1DIR = P1_UNUSED; //set to output P1DIR &= ~(RTC_MFP | IMU_INTn); //set to input /*Interrupts Enable*/ @@ -30,7 +25,7 @@ void io_init( void ) delay(); /******************************PORT 2**************************************/ - P2OUT = 0x00; // Pull pins low + P2OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P2DIR = P2_UNUSED; //set to output /*Interrupts Enable */ // P2SEL = CAN0_INTn | CAN1_INTn | GPS_INTn; //Interrupts Select @@ -43,14 +38,14 @@ void io_init( void ) delay(); /******************************PORT 3**************************************/ - P3OUT = 0x00; // Pull pins low - P3DIR = CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_CLK | P3_UNUSED; - P3OUT |= CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_CLK; + P3OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs + P3DIR = CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_SCLK | P3_UNUSED; + P3OUT |= CAN0_SCLK | CAN0_MOSI | SDC_SCLK | SDC_SIMO | CAN1_SCLK; P3DIR &= ~(CAN0_MISO | SDC_SOMI); - P3SEL = CAN0_SCLK | CAN0_MOSI | CAN0_MISO | SDC_SCLK | SDC_SIMO | SDC_SOMI | CAN1_CLK | IMU_SDA; + P3SEL = CAN0_SCLK | CAN0_MOSI | CAN0_MISO | SDC_SCLK | SDC_SIMO | SDC_SOMI | CAN1_SCLK | IMU_SDA; /******************************PORT 4**************************************/ - P4OUT = 0x00; // Pull pins low + P4OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P4DIR = CAN0_RSTn | CAN0_CSn | CAN1_RSTn | CAN1_CSn | P4_UNUSED; P4OUT = CAN0_RSTn | CAN0_CSn | CAN1_RSTn | CAN1_CSn; delay(); @@ -60,43 +55,43 @@ void io_init( void ) P4OUT |= (CAN0_RSTn | CAN1_RSTn) ; /******************************PORT 5**************************************/ - P5OUT = 0x00; // Pull pins low + P5OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P5DIR = XT2OUT | CAN1_MOSI | P5_UNUSED; P5OUT = CAN1_MOSI; P5DIR &= ~(CAN1_MISO); P5SEL = XT2IN | XT2OUT | IMU_SCL | CAN1_MOSI | CAN1_MISO; /******************************PORT 6**************************************/ - P6OUT = 0x00; // Pull pins low + P6OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P6DIR = P6_UNUSED; P6SEL = 0x00; /******************************PORT 7**************************************/ - P7OUT = 0x00; // Pull pins low + P7OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P7DIR = XT1OUT | P7_UNUSED; P7SEL = XT1IN | XT1OUT; /******************************PORT 8**************************************/ - P8OUT = 0x00; // Pull pins low + P8OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P8DIR = LEDG | LEDR | LEDY0 | LEDY1 | P8_UNUSED; P8DIR &= ~(Button0); P8SEL = 0x00; /******************************PORT 9**************************************/ - P9OUT = 0x00; // Pull pins low + P9OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P9DIR = USB_TX | SDC_CSn | GPS_CSn | P9_UNUSED; P9OUT = SDC_CSn | GPS_CSn; P9SEL = RTC_SDA | RTC_SCL | USB_TX | USB_RX; /******************************PORT 10**************************************/ - P10OUT = 0x00; // Pull pins low + P10OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P10DIR = BT_CSn | BT_MOSI | BT_SCLK | UART_TX | BT_EN |P10_UNUSED; P10OUT = BT_CSn | BT_MOSI | BT_SCLK; P10SEL = BT_MOSI | BT_MISO | BT_SCLK | UART_TX | UART_RX; /******************************PORT 11**************************************/ - P11OUT = 0x00; // Pull pins low + P11OUT = 0x00; // Pull pins low, only affects ports set as output, no effect on inputs P11DIR = ACLK_TEST | MCLK_TEST | SMCLK_TEST; P11OUT = ACLK_TEST | MCLK_TEST | SMCLK_TEST; P11SEL = ACLK_TEST | MCLK_TEST | SMCLK_TEST; diff --git a/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h b/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h index 152c552..0fbe507 100644 --- a/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h +++ b/Telem_Debug/Debug_BlinkyLED/SunseekerTelemetry2021.h @@ -106,7 +106,7 @@ static inline void delay(void) #define SDC_SCLK 0x08 #define CAN0_MOSI 0x10 #define CAN0_MISO 0x20 -#define CAN1_CLK 0x40 +#define CAN1_SCLK 0x40 #define IMU_SDA 0x80 #define P3_UNUSED 0x00