Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Arduino Core for SAMD21 CPU
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
josc941e
Arduino Core for SAMD21 CPU
Commits
6b117d45
Commit
6b117d45
authored
10 years ago
by
Jérôme SEMETTE
Browse files
Options
Downloads
Patches
Plain Diff
rework wiring_analog.c PWM part to get PWM channel information in
variant.c instead of TC/TCC information
parent
8a13af10
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cores/arduino/wiring_analog.c
+13
-13
13 additions, 13 deletions
cores/arduino/wiring_analog.c
variants/arduino_zero/variant.cpp
+1
-1
1 addition, 1 deletion
variants/arduino_zero/variant.cpp
with
14 additions
and
14 deletions
cores/arduino/wiring_analog.c
+
13
−
13
View file @
6b117d45
...
@@ -265,70 +265,70 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
...
@@ -265,70 +265,70 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
}
}
switch
(
g_APinDescription
[
ulPin
].
ul
TC
Channel
)
switch
(
g_APinDescription
[
ulPin
].
ul
PWM
Channel
)
{
{
case
TC
3_CH0
:
case
PWM
3_CH0
:
TCx
=
TC3
;
TCx
=
TC3
;
Channelx
=
0
;
Channelx
=
0
;
isTC
=
1
;
isTC
=
1
;
break
;
break
;
case
TC
3_CH1
:
case
PWM
3_CH1
:
TCx
=
TC3
;
TCx
=
TC3
;
Channelx
=
1
;
Channelx
=
1
;
isTC
=
1
;
isTC
=
1
;
break
;
break
;
case
TCC
0_CH0
:
case
PWM
0_CH0
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
Channelx
=
0
;
Channelx
=
0
;
break
;
break
;
case
TCC
0_CH1
:
case
PWM
0_CH1
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
Channelx
=
1
;
Channelx
=
1
;
break
;
break
;
case
TCC
0_CH4
:
case
PWM
0_CH4
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
//Channelx = 4;
//Channelx = 4;
Channelx
=
0
;
Channelx
=
0
;
break
;
break
;
case
TCC
0_CH5
:
case
PWM
0_CH5
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
//Channelx = 5;
//Channelx = 5;
Channelx
=
1
;
Channelx
=
1
;
break
;
break
;
case
TCC
0_CH6
:
case
PWM
0_CH6
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
//Channelx = 6;
//Channelx = 6;
Channelx
=
2
;
Channelx
=
2
;
break
;
break
;
case
TCC
0_CH7
:
case
PWM
0_CH7
:
TCCx
=
TCC0
;
TCCx
=
TCC0
;
//Channelx = 7;
//Channelx = 7;
Channelx
=
3
;
Channelx
=
3
;
break
;
break
;
case
TCC
1_CH0
:
case
PWM
1_CH0
:
TCCx
=
TCC1
;
TCCx
=
TCC1
;
Channelx
=
0
;
Channelx
=
0
;
break
;
break
;
case
TCC
1_CH1
:
case
PWM
1_CH1
:
TCCx
=
TCC1
;
TCCx
=
TCC1
;
Channelx
=
1
;
Channelx
=
1
;
break
;
break
;
case
TCC
2_CH0
:
case
PWM
2_CH0
:
TCCx
=
TCC2
;
TCCx
=
TCC2
;
Channelx
=
0
;
Channelx
=
0
;
break
;
break
;
case
TCC
2_CH1
:
case
PWM
2_CH1
:
TCCx
=
TCC2
;
TCCx
=
TCC2
;
Channelx
=
1
;
Channelx
=
1
;
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
variants/arduino_zero/variant.cpp
+
1
−
1
View file @
6b117d45
...
@@ -125,7 +125,7 @@ const PinDescription g_APinDescription[]=
...
@@ -125,7 +125,7 @@ const PinDescription g_APinDescription[]=
{
PORTA
,
19
,
PIO_TIMER
,
(
PIN_ATTR_DIGITAL
|
PIN_ATTR_PWM
|
PIN_ATTR_TIMER
),
No_ADC_Channel
,
PWM3_CH1
,
TC3_CH1
},
// TC3/WO[1]
{
PORTA
,
19
,
PIO_TIMER
,
(
PIN_ATTR_DIGITAL
|
PIN_ATTR_PWM
|
PIN_ATTR_TIMER
),
No_ADC_Channel
,
PWM3_CH1
,
TC3_CH1
},
// TC3/WO[1]
// 13 (LED)
// 13 (LED)
{
PORTA
,
17
,
PIO_
TIMER
,
(
PIN_ATTR_DIGITAL
|
PIN_ATTR_PWM
|
PIN_ATTR_TIMER
),
No_ADC_Channel
,
PWM2_CH1
,
TCC2_CH1
},
// TCC2/WO[1]
{
PORTA
,
17
,
PIO_
PWM
,
(
PIN_ATTR_DIGITAL
|
PIN_ATTR_PWM
),
No_ADC_Channel
,
PWM2_CH1
,
NOT_ON_TIMER
},
// TCC2/WO[1]
// 14 (GND)
// 14 (GND)
{
NOT_A_PORT
,
0
,
PIO_NOT_A_PIN
,
PIN_ATTR_NONE
,
No_ADC_Channel
,
NOT_ON_PWM
,
NOT_ON_TIMER
},
{
NOT_A_PORT
,
0
,
PIO_NOT_A_PIN
,
PIN_ATTR_NONE
,
No_ADC_Channel
,
NOT_ON_PWM
,
NOT_ON_TIMER
},
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment