adafruit-mirror/ArduinoCore-samd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rework wiring_analog.c PWM part to get PWM channel information in

Browse source 
variant.c instead of TC/TCC information
This commit is contained in:
Jérôme SEMETTE 2014-05-13 13:47:06 +02:00
parent 8a13af1052
commit 6b117d4519
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cores/arduino/wiring_analog.c
View file

@ -265,70 +265,70 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
} }
switch (g_APinDescription[ulPin].ulTCChannel) switch (g_APinDescription[ulPin].ulPWMChannel)
{ {
case TC3_CH0 : case PWM3_CH0 :
TCx = TC3; TCx = TC3;
Channelx = 0; Channelx = 0;
isTC = 1; isTC = 1;
break; break;
case TC3_CH1: case PWM3_CH1:
TCx = TC3 ; TCx = TC3 ;
Channelx = 1; Channelx = 1;
isTC = 1; isTC = 1;
break; break;
case TCC0_CH0 : case PWM0_CH0 :
TCCx = TCC0; TCCx = TCC0;
Channelx = 0; Channelx = 0;
break; break;
case TCC0_CH1 : case PWM0_CH1 :
TCCx = TCC0; TCCx = TCC0;
Channelx = 1; Channelx = 1;
break; break;
case TCC0_CH4 : case PWM0_CH4 :
TCCx = TCC0; TCCx = TCC0;
//Channelx = 4; //Channelx = 4;
Channelx = 0; Channelx = 0;
break; break;
case TCC0_CH5 : case PWM0_CH5 :
TCCx = TCC0; TCCx = TCC0;
//Channelx = 5; //Channelx = 5;
Channelx = 1; Channelx = 1;
break; break;
case TCC0_CH6 : case PWM0_CH6 :
TCCx = TCC0; TCCx = TCC0;
//Channelx = 6; //Channelx = 6;
Channelx = 2; Channelx = 2;
break; break;
case TCC0_CH7 : case PWM0_CH7 :
TCCx = TCC0; TCCx = TCC0;
//Channelx = 7; //Channelx = 7;
Channelx = 3; Channelx = 3;
break; break;
case TCC1_CH0 : case PWM1_CH0 :
TCCx = TCC1; TCCx = TCC1;
Channelx = 0; Channelx = 0;
break; break;
case TCC1_CH1 : case PWM1_CH1 :
TCCx = TCC1; TCCx = TCC1;
Channelx = 1; Channelx = 1;
break; break;
case TCC2_CH0 : case PWM2_CH0 :
TCCx = TCC2; TCCx = TCC2;
Channelx = 0; Channelx = 0;
break; break;
case TCC2_CH1 : case PWM2_CH1 :
TCCx = TCC2; TCCx = TCC2;
Channelx = 1; Channelx = 1;
break; break;

2
variants/arduino_zero/variant.cpp
View file

@ -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 },