DM: fixed DAC, SPI

Author: deanm1278

cores/arduino/startup.c

@@ -150,7 +150,7 @@ void SystemInit( void )
    while( OSCCTRL->Dpll[0].DPLLSTATUS.bit.CLKRDY == 0 || OSCCTRL->Dpll[0].DPLLSTATUS.bit.LOCK == 0 );
 
    //PLL1 is 100MHz
-   OSCCTRL->Dpll[1].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0xc) | OSCCTRL_DPLLRATIO_LDR(0xbea); //120 Mhz
+   OSCCTRL->Dpll[1].DPLLRATIO.reg = OSCCTRL_DPLLRATIO_LDRFRAC(0xc) | OSCCTRL_DPLLRATIO_LDR(0xbea); //100 Mhz
 
    while(OSCCTRL->Dpll[1].DPLLSYNCBUSY.bit.DPLLRATIO);
 

cores/arduino/wiring.c

@@ -108,7 +108,7 @@ void init( void )
   // Initialize Analog Controller
   // Setting clock
 #if defined(__SAMD51__)
-	GCLK->PCHCTRL[ADC0_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK2_Val | (1 << GCLK_PCHCTRL_CHEN_Pos); //use clock generator 0
+	GCLK->PCHCTRL[ADC0_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK1_Val | (1 << GCLK_PCHCTRL_CHEN_Pos); //use clock generator 1 (48Mhz)
 
 	ADC0->CTRLA.bit.PRESCALER = ADC_CTRLA_PRESCALER_DIV256_Val;
 	ADC0->CTRLB.bit.RESSEL = ADC_CTRLB_RESSEL_10BIT_Val;
@@ -131,7 +131,7 @@ void init( void )
 
 	analogReference( AR_DEFAULT ) ; // Analog Reference is AREF pin (3.3v)
 
-	GCLK->PCHCTRL[DAC_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK2_Val | (1 << GCLK_PCHCTRL_CHEN_Pos); //use clock generator 0
+	GCLK->PCHCTRL[DAC_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK1_Val | (1 << GCLK_PCHCTRL_CHEN_Pos); //use clock generator 1 (48mhz)
 	while (GCLK->PCHCTRL[DAC_GCLK_ID].bit.CHEN == 0);
 
 	while ( DAC->SYNCBUSY.bit.SWRST == 1 ); // Wait for synchronization of registers between the clock domains

cores/arduino/wiring_analog.c

@@ -28,7 +28,7 @@ static int _ADCResolution = 10;
 static int _writeResolution = 8;
 
 #if defined(__SAMD51__)
-static int _dacResolution = 10;
+static int _dacResolution = 12;
 #else
 static int _dacResolution = 8;
 #endif
@@ -348,7 +348,7 @@ void analogWrite(uint32_t pin, uint32_t value)
 	      return;
 	    }
 
-	    //value = mapResolution(value, _dacResolution, 10);
+    value = mapResolution(value, _writeResolution, _dacResolution);
 
 	#if defined(__SAMD51__)
 		uint8_t channel = (pin == PIN_A0 ? 0 : 1);
@@ -387,6 +387,7 @@ void analogWrite(uint32_t pin, uint32_t value)
 
 
 	#else
+	    value = mapResolution(value, _dacResolution, 10);
 		syncDAC();
 	    DAC->DATA.reg = value & 0x3FF;  // DAC on 10 bits.
 	    syncDAC();
@@ -399,7 +400,6 @@ void analogWrite(uint32_t pin, uint32_t value)
 
   if ((attr & PIN_ATTR_PWM) == PIN_ATTR_PWM)
   {
-    value = mapResolution(value, _writeResolution, 8);
 
     uint32_t tcNum = GetTCNumber(pinDesc.ulPWMChannel);
     uint8_t tcChannel = GetTCChannelNumber(pinDesc.ulPWMChannel);

variants/metro_m4/variant.cpp

@@ -112,7 +112,7 @@ const PinDescription g_APinDescription[]=
   { PORTA,  17, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH1, NOT_ON_TIMER, EXTERNAL_INT_7  },
   { PORTA,  18, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH2, NOT_ON_TIMER, EXTERNAL_INT_2  },
   { PORTA,  19, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH3, NOT_ON_TIMER, EXTERNAL_INT_3  },
-  { PORTA,  12, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH4, NOT_ON_TIMER, EXTERNAL_INT_4  },
+  { PORTA,  20, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH4, NOT_ON_TIMER, EXTERNAL_INT_4  },
 
   // 13 (LED)
   { PORTA,  21, PIO_TIMER_ALT, (PIN_ATTR_DIGITAL|PIN_ATTR_PWM), No_ADC_Channel, PWM1_CH5, NOT_ON_TIMER, EXTERNAL_INT_5  },
@@ -140,8 +140,8 @@ const PinDescription g_APinDescription[]=
   // 26..28 - SPI pins (ICSP:MISO,SCK,MOSI)
   // ----------------------
   { PORTA,  15, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
-  { PORTA,  14, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_13 },
-  { PORTA,  12, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_12 },
+  { PORTA,  12, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
+  { PORTA,  13, PIO_SERCOM_ALT, PIN_ATTR_NONE, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
 
   // 29..30 - RX/TX LEDS (PB06/PA27)
   // --------------------

variants/metro_m4/variant.h

@@ -136,25 +136,25 @@ static const uint8_t ATN = PIN_ATN;
  */
 #define SPI_INTERFACES_COUNT 2
 
-#define PIN_SPI_MISO         (28u)
-#define PIN_SPI_MOSI         (29u)
-#define PIN_SPI_SCK          (30u)
+#define PIN_SPI_MISO         (26u)
+#define PIN_SPI_MOSI         (28u)
+#define PIN_SPI_SCK          (27u)
 #define PERIPH_SPI           sercom4
-#define PAD_SPI_TX           SPI_PAD_0_SCK_3
-#define PAD_SPI_RX           SERCOM_RX_PAD_2
+#define PAD_SPI_TX           SPI_PAD_0_SCK_1
+#define PAD_SPI_RX           SERCOM_RX_PAD_3
 
 static const uint8_t SS	  = PIN_A2 ;	// SERCOM4 last PAD is present on A2 but HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI = PIN_SPI_MOSI ;
 static const uint8_t MISO = PIN_SPI_MISO ;
 static const uint8_t SCK  = PIN_SPI_SCK ;
 
-
-#define PIN_SPI1_MISO         (36u)
-#define PIN_SPI1_MOSI         (37u)
-#define PIN_SPI1_SCK          (38u)
+//TODO: we may have to move SPI1 (SPI flash) to another sercom
+#define PIN_SPI1_MISO         (34u)
+#define PIN_SPI1_MOSI         (35u)
+#define PIN_SPI1_SCK          (36u)
 #define PERIPH_SPI1           sercom5
-#define PAD_SPI1_TX           SPI_PAD_2_SCK_3
-#define PAD_SPI1_RX           SERCOM_RX_PAD_1
+#define PAD_SPI1_TX           SPI_PAD_0_SCK_1
+#define PAD_SPI1_RX           SERCOM_RX_PAD_3
 
 static const uint8_t SS1   = 39 ;	// HW SS isn't used. Set here only for reference.
 static const uint8_t MOSI1 = PIN_SPI_MOSI ;
@@ -178,9 +178,9 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 /*
  * USB
  */
-#define PIN_USB_HOST_ENABLE (33ul)
-#define PIN_USB_DM          (34ul)
-#define PIN_USB_DP          (35ul)
+#define PIN_USB_HOST_ENABLE (31ul)
+#define PIN_USB_DM          (32ul)
+#define PIN_USB_DP          (33ul)
 
 /*
  * I2S Interfaces