Custom SAMD51 Board (Add pins in variant files) Issue

@MartinL

Are these Variant files correct they don`t seems to match. Also I found this in the variant.ccp line 199

// SAMD21J18A Pins...

e.g

Variant.h
/*

  • Analog pins
    */
    #define PIN_A0 (14ul)
    #define PIN_A1 (PIN_A0 + 1)
    #define PIN_A2 (PIN_A0 + 2)
    #define PIN_A3 (PIN_A0 + 3)
    #define PIN_A4 (PIN_A0 + 4)
    #define PIN_A5 (PIN_A0 + 5)
    #define PIN_A6 (PIN_A0 + 6)
    #define PIN_A7 (PIN_A0 + 7)
    #define PIN_A8 (PIN_A0 + 8)
    #define PIN_A9 (PIN_A0 + 9)
    #define PIN_DAC0 (14ul)
    #define PIN_DAC1 PIN_A1

Variant.ccp
// 14..19 - Analog pins
// --------------------
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[0]
{ PORTB, 8, PIO_ANALOG, 0, ADC_Channel2, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_8 }, // ADC/AIN[2]
{ PORTB, 9, PIO_ANALOG, 0, ADC_Channel3, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_9 }, // ADC/AIN[3]
{ PORTA, 4, PIO_ANALOG, 0, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 }, // ADC/AIN[4]
{ PORTA, 5, PIO_ANALOG, 0, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 }, // ADC/AIN[5]
{ PORTB, 2, PIO_ANALOG, 0, ADC_Channel10, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 }, // ADC/AIN[10]

// 20..21 I2C pins (SDA/SCL and also EDBG:SDA/SCL)
// ----------------------
{ PORTA, 22, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 }, // SDA: SERCOM3/PAD[0]
{ PORTA, 23, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 }, // SCL: SERCOM3/PAD[1]