Skip to content

Commit 78d9fbe

Browse files
committed
update pinout and stuff for new revision
1 parent d27f766 commit 78d9fbe

File tree

3 files changed

+84
-162
lines changed

3 files changed

+84
-162
lines changed

cores/arduino/WVariant.h

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,30 @@ typedef enum _EAnalogChannel
5757
DAC_Channel1,
5858
} EAnalogChannel ;
5959

60+
#if defined(__SAMD51__)
61+
62+
typedef enum _ETCChannel
63+
{
64+
NOT_ON_TIMER=-1,
65+
TCC0_CH0 = (0<<8)|(0),
66+
TCC0_CH1 = (0<<8)|(1),
67+
TCC0_CH2 = (0<<8)|(2),
68+
TCC0_CH3 = (0<<8)|(3),
69+
TCC0_CH4 = (0<<8)|(4),
70+
TCC0_CH5 = (0<<8)|(5),
71+
TCC0_CH6 = (0<<8)|(6),
72+
TCC0_CH7 = (0<<8)|(7),
73+
TCC1_CH0 = (1<<8)|(0),
74+
TCC1_CH1 = (1<<8)|(1),
75+
TCC1_CH2 = (1<<8)|(2),
76+
TCC1_CH3 = (1<<8)|(3),
77+
TCC1_CH4 = (1<<8)|(4),
78+
TCC1_CH5 = (1<<8)|(5),
79+
TCC1_CH6 = (1<<8)|(6),
80+
TCC1_CH7 = (1<<8)|(7),
81+
} ETCChannel ;
82+
83+
#else
6084
// Definitions for TC channels
6185
typedef enum _ETCChannel
6286
{
@@ -73,36 +97,18 @@ typedef enum _ETCChannel
7397
TCC1_CH1 = (1<<8)|(1),
7498
TCC1_CH2 = (1<<8)|(0), // Channel 2 is 0!
7599
TCC1_CH3 = (1<<8)|(1), // Channel 3 is 1!
76-
#if defined(__SAMD51J19A__)
77-
TCC1_CH4 = (1<<8)|(2),
78-
TCC1_CH5 = (1<<8)|(3),
79-
TCC1_CH6 = (1<<8)|(4),
80-
TCC1_CH7 = (1<<8)|(5),
81-
#endif //__SAMD51J19A__
82100
TCC2_CH0 = (2<<8)|(0),
83101
TCC2_CH1 = (2<<8)|(1),
84102
TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
85103
TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
86-
#if defined(__SAMD51J19A__) //TODO: fix some of these PWM channels
87-
TCC3_CH0 = (2<<8)|(0),
88-
TCC3_CH1 = (2<<8)|(1),
89-
TCC3_CH2 = (2<<8)|(0), // Channel 2 is 0!
90-
TCC3_CH3 = (2<<8)|(1), // Channel 3 is 1!
91-
TCC4_CH0 = (2<<8)|(0),
92-
TCC4_CH1 = (2<<8)|(1),
93-
TCC4_CH2 = (2<<8)|(0), // Channel 2 is 0!
94-
TCC4_CH3 = (2<<8)|(1), // Channel 3 is 1
95-
TC5_CH0 = (5<<8)|(0),
96-
TC5_CH1 = (5<<8)|(1),
97-
#else //end __SAMD51J19A__
98104
TC3_CH0 = (3<<8)|(0),
99105
TC3_CH1 = (3<<8)|(1),
100106
TC4_CH0 = (4<<8)|(0),
101107
TC4_CH1 = (4<<8)|(1),
102108
TC5_CH0 = (5<<8)|(0),
103109
TC5_CH1 = (5<<8)|(1),
104-
#endif //__SAMD51J19A__
105110
} ETCChannel ;
111+
#endif
106112

107113
extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
108114

@@ -111,7 +117,7 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
111117
#define GetTC( x ) ( g_apTCInstances[(x) >> 8] )
112118

113119

114-
#if defined(__SAMD51J19A__)
120+
#if defined(__SAMD51__)
115121

116122
typedef enum _EPWMChannel
117123
{
@@ -132,16 +138,6 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
132138
PWM1_CH5=TCC1_CH5,
133139
PWM1_CH6=TCC1_CH6,
134140
PWM1_CH7=TCC1_CH7,
135-
PWM2_CH0=TCC2_CH0,
136-
PWM2_CH1=TCC2_CH1,
137-
PWM2_CH2=TCC2_CH2,
138-
PWM2_CH3=TCC2_CH3,
139-
PWM3_CH0=TCC3_CH0,
140-
PWM3_CH1=TCC3_CH1,
141-
PWM4_CH0=TCC4_CH0,
142-
PWM4_CH1=TCC4_CH1,
143-
PWM5_CH0=TC5_CH0,
144-
PWM5_CH1=TC5_CH1,
145141
} EPWMChannel ;
146142

147143
#else //end __SAMD51J19A__

0 commit comments

Comments
 (0)