Skip to content

Commit ec69488

Browse files
committed
add boost enable pin for CAN feather
1 parent 1fa45ad commit ec69488

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

variants/feather_m4_can/variant.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ const PinDescription g_APinDescription[PINS_COUNT]=
5151
{ PORTA, 19, PIO_TIMER_ALT, PIN_ATTR_PWM_F, No_ADC_Channel, TCC1_CH3, TC3_CH1, EXTERNAL_INT_3 },
5252
{ PORTA, 20, PIO_TIMER_ALT, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH0, NOT_ON_TIMER, EXTERNAL_INT_4 },
5353
{ PORTA, 21, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH1, NOT_ON_TIMER, EXTERNAL_INT_5 },
54-
{ PORTA, 22, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH2, NOT_ON_TIMER, EXTERNAL_INT_6 },
54+
{ PORTA, 22, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH2, NOT_ON_TIMER, EXTERNAL_INT_6 }, // CAN TX
5555

5656
// 13 (LED)
57-
{ PORTA, 23, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH3, TC4_CH1, EXTERNAL_INT_7 }, // TCC2/WO[1]
57+
{ PORTA, 23, PIO_DIGITAL, PIN_ATTR_PWM_G, No_ADC_Channel, TCC0_CH3, TC4_CH1, EXTERNAL_INT_7 }, // CAN RX
5858

5959
// 14..19 - Analog pins
6060
// --------------------
@@ -109,7 +109,8 @@ const PinDescription g_APinDescription[PINS_COUNT]=
109109
{ PORTA, 11, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
110110

111111
// ----------------------
112-
// 40..42 CAN (STANDBY, TX, RX)
112+
// 40..43 CAN (STANDBY, BOOST, TX, RX)
113+
{ PORTB, 12, PIO_DIGITAL, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
113114
{ PORTB, 13, PIO_DIGITAL, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
114115
{ PORTB, 14, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },
115116
{ PORTB, 15, PIO_COM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_NONE },

variants/feather_m4_can/variant.h

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ extern "C"
5757
*----------------------------------------------------------------------------*/
5858

5959
// Number of pins defined in PinDescription array
60-
#define PINS_COUNT (43u)
60+
#define PINS_COUNT (44u)
6161
#define NUM_DIGITAL_PINS (23u)
6262
#define NUM_ANALOG_INPUTS (6u)
6363
#define NUM_ANALOG_OUTPUTS (1u)
@@ -206,9 +206,14 @@ static const uint8_t SCL = PIN_WIRE_SCL;
206206
/*
207207
* CAN
208208
*/
209-
#define PIN_CAN_RX (42)
210209
#define PIN_CAN_STANDBY (40)
211-
#define PIN_CAN_TX (41)
210+
#define PIN_CAN_BOOSTEN (41)
211+
#define PIN_CAN_TX (42)
212+
#define PIN_CAN_RX (43)
213+
214+
#define PIN_CAN1_TX (12)
215+
#define PIN_CAN1_RX (13)
216+
212217

213218
#ifdef __cplusplus
214219
}

0 commit comments

Comments
 (0)