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

DM: updates for rev B

Browse source
This commit is contained in:
dean 2017-10-17 15:48:37 -04:00
parent 03efcf3880
commit 9eecac827b
17 changed files with 40 additions and 537 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
boards.txt
View file

@ -226,8 +226,7 @@ adafruit_metro_m4.vid.2.bootloader.file=metroM4/samdx1_sam_ba.bin
adafruit_metro_m4.upload.tool=bossac
adafruit_metro_m4.upload.protocol=sam-ba
#TODO: fix
adafruit_metro_m4.upload.maximum_size=262144
adafruit_metro_m4.upload.maximum_size=507904
adafruit_metro_m4.upload.use_1200bps_touch=true
adafruit_metro_m4.upload.wait_for_upload_port=true
adafruit_metro_m4.upload.native_usb=true
@ -237,7 +236,7 @@ adafruit_metro_m4.build.usb_product="Adafruit Metro M4"
adafruit_metro_m4.build.usb_manufacturer="Adafruit LLC"
adafruit_metro_m4.build.board=METRO_M4
adafruit_metro_m4.build.core=arduino
adafruit_metro_m4.build.extra_flags=-D__SAMD51J20A__ -D__SAMD51__ {build.usb_flags}
adafruit_metro_m4.build.extra_flags=-D__SAMD51J19A__ -D__SAMD51__ {build.usb_flags}
adafruit_metro_m4.build.ldscript=linker_scripts/gcc/flash_with_bootloader.ld
adafruit_metro_m4.build.openocdscript=openocd_scripts/arduino_zero.cfg
adafruit_metro_m4.build.variant=metro_m4
@ -245,7 +244,7 @@ adafruit_metro_m4.build.variant_system_lib=
adafruit_metro_m4.build.vid=0x239A
adafruit_metro_m4.build.pid=0x8020
adafruit_metro_m4.bootloader.tool=openocd
adafruit_metro_m4.bootloader.file=metroM4/samd51_sam_ba.bin
adafruit_metro_m4.bootloader.file=metroM4/METRO_M4_sam_ba.bin
adafruit_metro_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_metro_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_metro_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
@ -259,7 +258,7 @@ adafruit_feather_m4.vid.1=0x239A
adafruit_feather_m4.pid.1=0x0022
adafruit_feather_m4.upload.tool=bossac
adafruit_feather_m4.upload.protocol=sam-ba
adafruit_feather_m4.upload.maximum_size=524288
adafruit_feather_m4.upload.maximum_size=507904
adafruit_feather_m4.upload.use_1200bps_touch=true
adafruit_feather_m4.upload.wait_for_upload_port=true
adafruit_feather_m4.upload.native_usb=true
@ -277,7 +276,7 @@ adafruit_feather_m4.build.variant_system_lib=
adafruit_feather_m4.build.vid=0x239A
adafruit_feather_m4.build.pid=0x8022
adafruit_feather_m4.bootloader.tool=openocd
adafruit_feather_m4.bootloader.file=metroM4/samd51_sam_ba.bin
adafruit_feather_m4.bootloader.file=metroM4/FEATHER_M4_sam_ba.bin
adafruit_feather_m4.compiler.c.elf.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_feather_m4.compiler.c.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
adafruit_feather_m4.compiler.cpp.extra_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16

BIN
bootloaders/metroM4/.vs/samdx1_sam_ba/v14/.atsuo
View file

Binary file not shown.

7
bootloaders/metroM4/Makefile
View file

@ -55,11 +55,6 @@ OBJCOPY=$(ARM_GCC_PATH)objcopy
NM=$(ARM_GCC_PATH)nm
SIZE=$(ARM_GCC_PATH)size
# -----------------------------------------------------------------------------
# Boards definitions
BOARD_ID?=FEATHER_M4
BOARD_CHIP?=__SAMD51G19A__
# -----------------------------------------------------------------------------
# Compiler options
CFLAGS_EXTRA=-D$(BOARD_CHIP) -DBOARD_ID_$(BOARD_ID)
@ -71,7 +66,7 @@ else
endif
ELF=$(BOARD_ID)_sam_ba.elf
BIN=$(BOARD_ID)_ba.bin
BIN=$(BOARD_ID)_sam_ba.bin
HEX=$(BOARD_ID)_sam_ba.hex

2
bootloaders/metroM4/board_definitions_feather_m4.h
View file

@ -35,7 +35,7 @@
* BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
* be touched from the loaded application.
*/
#define BOOT_DOUBLE_TAP_ADDRESS (0x20007FFCul)
#define BOOT_DOUBLE_TAP_ADDRESS (0x2002FFFCul)
#define BOOT_DOUBLE_TAP_DATA (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
/*

3
bootloaders/metroM4/board_definitions_metro_m4.h
View file

@ -28,13 +28,14 @@
#define USB_PID_HIGH 0x00
#define USB_PID_LOW 0x20
/*
* If BOOT_DOUBLE_TAP_ADDRESS is defined the bootloader is started by
* quickly tapping two times on the reset button.
* BOOT_DOUBLE_TAP_ADDRESS must point to a free SRAM cell that must not
* be touched from the loaded application.
*/
#define BOOT_DOUBLE_TAP_ADDRESS (0x20007FFCul)
#define BOOT_DOUBLE_TAP_ADDRESS (0x2002FFFCul)
#define BOOT_DOUBLE_TAP_DATA (*((volatile uint32_t *) BOOT_DOUBLE_TAP_ADDRESS))
/*

2
bootloaders/metroM4/bootloader_METRO_M4.ld
View file

@ -28,7 +28,7 @@
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000, LENGTH = 0x4000 /* First 16KB used by bootloader */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00030000-0x0004 /* 4 bytes used by bootloader to keep data between resets */
}
/* Linker script to place sections and symbol values. Should be used together

BIN
bootloaders/metroM4/samd51_sam_ba.bin
View file

Binary file not shown.

14
bootloaders/metroM4/samd51_sam_ba.cproj
View file

@ -5,7 +5,7 @@
<ProjectVersion>7.0</ProjectVersion>
<ToolchainName>com.Atmel.ARMGCC.C</ToolchainName>
<ProjectGuid>dce6c7e3-ee26-4d79-826b-08594b9ad897</ProjectGuid>
<avrdevice>ATSAMD51G19A</avrdevice>
<avrdevice>ATSAMD51J19A</avrdevice>
<avrdeviceseries>none</avrdeviceseries>
<OutputType>Executable</OutputType>
<Language>C</Language>
@ -41,7 +41,7 @@
</AsfFrameworkConfig>
<avrtool>com.atmel.avrdbg.tool.edbg</avrtool>
<avrtoolserialnumber>00000000EZE000006352</avrtoolserialnumber>
<avrdeviceexpectedsignature>0x60060007</avrdeviceexpectedsignature>
<avrdeviceexpectedsignature>0x60060005</avrdeviceexpectedsignature>
<avrtoolinterface>SWD</avrtoolinterface>
<com_atmel_avrdbg_tool_atmelice>
<ToolOptions>
@ -130,7 +130,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'featherm4' ">
<ToolchainSettings>
<ArmGcc xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ArmGcc>
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
@ -159,13 +159,13 @@
<UsesExternalMakeFile>True</UsesExternalMakeFile>
<OutputDirectory />
<BuildTarget>DEBUG=1 all BOARD_ID=FEATHER_M4 BOARD_CHIP=__SAMD51G19A__</BuildTarget>
<CleanTarget>clean</CleanTarget>
<CleanTarget>clean BOARD_ID=FEATHER_M4</CleanTarget>
<ExternalMakeFilePath>Makefile</ExternalMakeFilePath>
<OutputPath>bin\featherm4\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'metrom4' ">
<ToolchainSettings>
<ArmGcc xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ArmGcc>
<armgcc.common.outputfiles.hex>True</armgcc.common.outputfiles.hex>
<armgcc.common.outputfiles.lss>True</armgcc.common.outputfiles.lss>
<armgcc.common.outputfiles.eep>True</armgcc.common.outputfiles.eep>
@ -193,8 +193,8 @@
</ToolchainSettings>
<UsesExternalMakeFile>True</UsesExternalMakeFile>
<OutputDirectory />
<BuildTarget>DEBUG=1 all BOARD_ID=METRO_M4 BOARD_CHIP=__SAMD51J20A__</BuildTarget>
<CleanTarget>clean</CleanTarget>
<BuildTarget>DEBUG=1 all BOARD_ID=METRO_M4 BOARD_CHIP=__SAMD51J19A__</BuildTarget>
<CleanTarget>clean BOARD_ID=METRO_M4</CleanTarget>
<ExternalMakeFilePath>Makefile</ExternalMakeFilePath>
<OutputPath>bin\metrom4\</OutputPath>
</PropertyGroup>

BIN
bootloaders/metroM4/samd51_sam_ba.elf
View file

Binary file not shown.

457
bootloaders/metroM4/samd51_sam_ba.hex
View file

@ -1,457 +0,0 @@
:10000000FCFF022055060000390600003D060000F6
:1000100041060000450600004906000000000000FF
:100020000000000000000000000000004D0600007D
:10003000000000000000000051060000E50700007D
:1000400010B5054C237833B9044B13B10448AFF312
:1000500000800123237010BD5C0000200000000020
:10006000041C000008B5064B1BB106480649AFF357
:1000700000800648036813B1054B03B1984708BDDB
:1000800000000000041C0000600000205800002058
:10009000000000001A4B1B7813F0FF0F0AD1194B18
:1000A0001A78194909780A44D2B21A704FF400320A
:1000B000164BDA61124B1A780132D2B21A70114B18
:1000C0001B78DBB2F02B04D80E4B1B78DBB2092B6C
:1000D0000AD80D4B1A785242D2B21A70094A1178D6
:1000E0001B780B44DBB21370054B1A78054B1B7859
:1000F000D2B29A4203D14FF40032044BDA61704716
:100100007800002001000020000000200080004155
:1001100010B4C36913F0020FFBD104686FF34104FC
:100120000460C36913F0010FFBD1046844F00104BB
:100130000460036813F0010FFBD1C36913F0010FD2
:10014000FBD1C36913F0020FF7D142F0804343F0B3
:1001500004030360C36913F0040FFBD14FF4403371
:1001600043608181C36913F0020FFBD1036843F040
:10017000020303605DF8044B704700BF037E13F079
:10018000010FFBD081627047037E13F0040FFBD098
:10019000438B13F0010F07D1438B13F0020F03D1F0
:1001A000438B13F0040F02D00122024B1A70806AB5
:1001B000C0B270477900002070B5044603689A8B7E
:1001C00002F0080292B232B308259D8380229A720F
:1001D000112183F80011402183F8051183F80421CF
:1001E000114A5068032666F31E705060506966F32A
:1001F0001E7050610D4810600D481061506865F325
:100200009B30506050686FF30D00506083F804110C
:100210000023237106E093F8073113F0100F01D08B
:1002200000F022FB207970BD940100209400002092
:10023000140100200160002303714371054B8360AA
:100240000B7843F002030B700268937813F0020FEF
:10025000FBD17047B901000008B5444A936943F0E7
:1002600001039361424B93F8581041F0010183F868
:10027000581093F83C1001F0F00183F83C1093F80B
:100280003C1041F0070183F83C1093F8591041F0FD
:10029000010183F8591093F83C1001F00F0183F825
:1002A0003C1093F83C1041F0700183F83C10402161
:1002B000304BC3F8A810936943F00103936102F532
:1002C000A052536813F0040FFBD14FF082431A7809
:1002D00042F001021A701A46937813F0010FFBD115
:1002E000254B1968C1F34412C1F3822311F01F0199
:1002F00003D01F2908BF092100E009211AB11F2AD4
:1003000008BF192200E019221BB1072B08BF0623E2
:1003100000E0062302F01F0242EA81111B0303F4EE
:10032000E04319434FF082431985DA7842F0030223
:10033000DA70DA7842F00C02DA701A786FF3C712CA
:100340001A701A7842F004021A700C4858621A891E
:100350006FF383021A811A8922F001021204120C2F
:100360001A810021802201F0C6FA08BD0008004071
:1003700000800041001C00408400800094010020A7
:100380002DE9F041064615461C461F46214B03EB5E
:10039000441310335B68C3F302730333012202FA80
:1003A00003F3AB4207D81B4A02EB4412536943F0F4
:1003B000004353610CE014F1000818BF4FF001082E
:1003C000154B03EB881840462A4601F08BFA41464C
:1003D000104A02EB441202F110031161526965F3F5
:1003E0000D025A605A686FF39B325A60083406EB6C
:1003F00044140223E371637943F08003637107F1CE
:10040000080106EB4111CB7913F0020FFBD028460F
:10041000BDE8F081940100201401002038B50546A4
:1004200014461B4B1B7813F0FF0F13D1194B1A4ABC
:100430001A645A6C6FF30D025A645A6C6FF39B3254
:100440005A6490F8443143F0400380F8443101226B
:100450000F4B1A7095F8473113F0010F15D00D4B63
:100460005B6CC3F30D03A34203D20A4B5C6CC4F371
:100470000D0408460849224601F034FA012385F8A4
:1004800047310022024B1A7000E00024204638BD9C
:100490007A00002094010020D400002031B190F8AF
:1004A000053143F0200380F80531704790F805319D
:1004B00043F0100380F80531704700BF094B5A69BB
:1004C0006FF30D025A61022380F8073190F805316D
:1004D00043F0800380F8053190F8073113F0020FE4
:1004E000FAD070479401002061F07F01C9B2817297
:1004F000704700BF10B4032280F84021104B596CA4
:1005000062F31E715964402180F845110D4C1C6442
:10051000302480F820415C6B62F31E745C6380229F
:1005200080F82421084C1C6380F86011596F6FF328
:100530001E71596780F864215DF8044B704700BF55
:1005400094010020D400002054010020344B1A886C
:1005500092B21A8042F20E02324B9A821A46D36845
:1005600013F0010FFBD02F4B1A7C6FF302021A74A9
:1005700003F500631A7842F001021A701A465368B4
:1005800013F0010FFBD140F20512274BDA621A4635
:10059000536813F0200FFBD14FF48272224B1A6282
:1005A000A3F5406300221A77204A9A621A4692F80D
:1005B0002C3013F0100FFAD100221D4B83F82020AD
:1005C0001A4692F82C3013F0040FFAD1184B1A7F08
:1005D00042F002021A771A4692F82C3013F0020FFA
:1005E000FAD1134B5A6A5A621A4692F82C3013F019
:1005F000080FFAD198220E4B83F820201A4613696F
:1006000013F4807FFBD040F60632074B1A621A467D
:10061000536813F0040FFBD10122064B5A71704747
:100620000040004100140040001C00400000010494
:1006300000100040000800400EBEFEE70DBEFEE7C1
:100640000DBEFEE70DBEFEE70DBEFEE705BEFEE7F2
:1006500002BEFEE710B5174B174A9A4215D0134653
:10066000164A9A4211D0134B134A9A420DD2131DC7
:10067000134CE41A24F003040434002310460F49F9
:100680005A581A500433A342FAD10E4B0E4A9A42DA
:100690000CD00BD2131D0D49C91A21F003011944C6
:1006A000043B002243F8042B8B42FBD100F010F8EE
:1006B000FEE700BF5C00002000000020081C0000D6
:1006C0005F000020A40300205C000020A70300209E
:1006D00070B5394B1B68B3F1FF3F2DD0374A384B0B
:1006E0001A60043A12F07F0F26D1364B1B7813F0B4
:1006F000010F03D00021344B196011E0324B19680F
:10070000324B994203D100222F4B1A6014E02F493B
:100710002D4B19602E4B013BFDD100212A4B196056
:10072000254B1B6883F3088822F07F02294B9A60CF
:10073000234B1B681B681847FFF708FF62B600F0E1
:10074000D1FE00F055F80546234B4FF400329A6075
:100750000822C3F88820C3F898204FF000629A60FE
:100760009A611E4B40F2E7325A60C021194A82F862
:10077000231000229A6007221A60194C0126AB68E8
:100780002846984700B12670237813F0FF0F05D054
:10079000002000F02DFB00F0C5FBFCE7237813F0F0
:1007A000FF0FECD100F016FF0028E8D0012000F088
:1007B0001FFB00F0B7FBFCE7004000000440000016
:1007C00014020020000C0040FC7F002035817307DC
:1007D000808D5B0000ED00E00080004110E000E053
:1007E0007B00002008B5FFF755FC00F077FB08BD43
:1007F00010B5064C4FF082432360FFF72DFD2046D5
:100800002168FFF717FD204610BD00BF1802002029
:10081000F0B5C1B007460E461546084601F073F81C
:100820004000831C8DF8003003238DF801303378AD
:1008300073B16D08012D0DDD6C463146012224F89F
:10084000023F013211F8013F2BB1AA42F7DB02E06F
:10085000012200E001223846694652000023FFF7DA
:100860008FFD41B0F0BD00BFF0B583B0064604680F
:10087000102384F80731A04B1A78A04D2A705A78BB
:100880009F490A7098789F4A1080108880B2DF785C
:1008900040EA0720108018799B4A1080108880B2A7
:1008A0005F7940EA072010809879984A1080108874
:1008B00080B2DB7940EA03231380402384F80431BB
:1008C0000A782B7843EA022340F20232934200F086
:1008D0002D811EDCB3F5807F00F0598109DC812B6E
:1008E00000F0C880822B00F0CD80802B40F0F0819A
:1008F000B8E0B3F5817F00F05381C0F24D81B3F5CC
:10090000407F00F0EF8040F20132934200F0EF8030
:10091000DEE1B3F5106F00F093800BDCB3F5D06F20
:100920001FD0B3F5086F00F09580B3F5A06F40F0CD
:10093000CF817BE042F22102934200F0AF8105DCDF
:1009400040F60132934200F02281C1E142F2A1124D
:10095000934200F0A78142F22122934200F0B1813C
:10096000B6E1684B1B88C3F30723012B0ED1306817
:10097000664B1B889BB2122B9DBF644B1A8892B2A8
:10098000122263490023FFF7FBFCA5E15D4B1B88A6
:10099000C3F30723022B0ED130685C4B1B889BB23C
:1009A000432B9DBF594B1A8892B2432259490023C9
:1009B000FFF7E6FC90E1534B1B88C3F30723032B9F
:1009C0002FD1504B1B88DBB2012B15D013B1022B5A
:1009D0001AD021E0504B1868019030684B4B1B88AF
:1009E0009BB2042B9DBF494B1A8892B2042201A9E5
:1009F0000023FFF7C5FC6FE1444B1A883068474974
:100A0000D2B2FFF705FF67E1404B1A8830684449CE
:100A1000D2B2FFF7FDFE5FE120460121FFF73EFD68
:100A20005AE120460121FFF739FD55E12046FFF745
:100A300045FD344B1988306889B2FFF755FD4BE10D
:100A4000304B1B8833712046FFF738FD2046FFF7F7
:100A500051FD41E1314651F8040B01220023FFF71B
:100A60008FFC39E12F4900230B8030680222FFF709
:100A700087FC31E12B4900230B8030680222FFF70D
:100A80007FFC29E10022274B1A801F4B198801F0B7
:100A90005001254A11701A8802F00F021A801B8833
:100AA0009BB2032B19D8204B1B7813F0FF0F164B6A
:100AB0001B889BB203F1080304EB4314A27914BF13
:100AC000C2F34012C2F30012164B1A803068154967
:100AD00002220023FFF754FCFEE020460121FFF72D
:100AE000DDFCF9E020460121FFF7D8FCF4E02046C8
:100AF000FFF7E4FCF0E000BF94000020810000203C
:100B000084000020860000207C0000207E00002061
:100B10004C190000040000203019000034190000B6
:100B20004019000082000020800000206B4B1988D3
:100B300089B221F07F01C9B2694A11701A8802F0A6
:100B40000F021A80674B1B889BB2DBB9634B1B8873
:100B50009BB2BBB1614B1B889BB2032B12D8604B7D
:100B60001B7813F0FF0F5D4B1B889BB203F108034A
:100B700004EB431314BF202210225A712046FFF7C2
:100B80009DFCA9E020460121FFF788FCA4E0204657
:100B90000121FFF783FC9FE02046FFF78FFC9BE0DD
:100BA0004E4B198889B221F07F01C9B24C4A1170AD
:100BB0001A8802F00F021A804A4B1B889BB2002B46
:100BC00067D1464B1B889BB2002B62D0434B1B88DE
:100BD0009BB2032B5DD8424B1B7813F0FF0F2AD03A
:100BE0003E4B1B889BB2083304EB43139B7913F0F5
:100BF000200F4AD0394B1A8892B2083204EB4212C5
:100C0000202111711B889BB2083304EB4313DB795D
:100C100013F0400F39D0314B1A8892B2083204EBEE
:100C200042124021D1711B889BB2083304EB43135D
:100C300002221A7129E0294B1B889BB2083304EB6E
:100C400043139B7913F0100F1FD0244B1A8892B2D4
:100C5000083204EB4212102111711B889BB2083339
:100C600004EB4313DB7913F0200F0ED01B4B1A88D3
:100C700092B2083204EB42122021D1711B889BB240
:100C8000083304EB431301221A712046FFF716FCC8
:100C900022E020460121FFF701FC1DE02046FFF77E
:100CA0000DFC19E03068104B1B889BB2082B9DBFD0
:100CB0000D4B1A8892B208220C490023FFF760FB03
:100CC0000AE0084B1B8873712046FFF7F7FB03E02F
:100CD00020460121FFF7E2FB03B0F0BD7C000020BD
:100CE00080000020860000207E00002048000020B8
:100CF00000B583B002A941F8040D054B1868012224
:100D00001346FFF73DFB012003B05DF804FB00BF75
:100D10001802002000B583B0054B18680DF10701DB
:100D20000122FFF77BFB9DF8070003B05DF804FB91
:100D30001802002008B50648FFF73EFA30B1044B10
:100D40001B6893F8470100F0010008BD002008BDB2
:100D50001802002010B503460C46044A10681946D4
:100D600022460123FFF70CFB204610BD180200208D
:100D700038B505460C460648FFF71EFA30B1044B5D
:100D8000186829462246FFF749FB38BD002038BDC8
:100D900018020020F8B505460F460B48FFF70CFA7D
:100DA00058B167B13C46084E306829462246FFF7E5
:100DB00035FB0544241AF7D103E00020F8BD38467E
:100DC000F8BD3846F8BD00BF1802002008B5C3685A
:100DD0000846114698474FF00062034B5A6164225F
:100DE000024B1A8008BD00BF008000419000002027
:100DF000012806D1054A064B1A600122054B1A70DC
:100E0000704710B9044A024B1A60704780190000FD
:100E10008802002092000020D819000070B584B02C
:100E200004460A46244B1B7813F0FF0F34D00429E4
:100E300001D1036836E0022901D1038832E003784A
:100E40004E0004AC34440B3C86BB0CE003F00F05B1
:100E5000092D94BF45F03005373565701B09013009
:100E6000013CB042F2D330238DF8043078238DF862
:100E700005300132520004AB13440A2103F80C1C64
:100E800004AB1E440D2306F8093C0C4B186801A95D
:100E90000232FFF79BFF0CE0084B18682146FFF772
:100EA00095FF06E0560004AC34440B3C013C0020A6
:100EB000CCE704B070BD00BF8C0000208802002089
:100EC00072B6EFF30882044B1A60036883F3088854
:100ED00043681847704700BF8C0200200E4B1B88E8
:100EE0009BB24BB10C4A1388013B9BB213801BB9D8
:100EF0004FF00062094B9A61094B1B889BB24BB1C2
:100F0000074A1388013B9BB213801BB90822034B8D
:100F1000C3F89820704700BF900000200080004177
:100F20008E0000202DE9F0438BB002AC894D0FCD2F
:100F30000FC495E80F0084E80F00874A9368C3F355
:100F400002430AA901EB830353F8203C83490B6059
:100F5000926892B282490A6002FB03F381490B60F6
:100F60000022814B1A607A22804B1A707A4C7B4D9A
:100F70007F4B1B681B697F4840219847034630B16F
:100F800008217D4AC2F8941064217C4A11807C4A71
:100F9000136078497B4A116000217B4A1160002B65
:100FA000E6D0784B1B681B78FF2B00F06682232B62
:100FB00040F00482754B1B7813F0FF0F05D06C4B8B
:100FC000186873490222FFF701FF684B1B78532B07
:100FD00044D16B4B1B686C4A126893421FD9694815
:100FE0000168013101600132674802609A1A694B59
:100FF00018688242684B34BF1A601860664E5A4BBC
:101000001868326800F06EFC33685F4A1168194452
:1010100011605C4A116819441160604A13705A4BA0
:101020001A68013A1A60574B1A68013A1A605B4B0A
:101030001B78584A11688B420ED24D4A1268926949
:1010400049480068C91A904730B108224A4BC3F892
:1010500094206422494B1A8000BF9DE1522B0FD18E
:10106000434B1B685B69404A10684A4A11689847BD
:101070004FF00062404B5A616422494B1A808BE169
:101080004F2B05D1384B1B68424A12681A7083E116
:10109000482B05D1344B1B683E4A12681A807BE10D
:1010A000572B05D1304B1A683A4B1B68136073E11C
:1010B0006F2B05D12C4B18680121FFF7AFFE6BE1B8
:1010C000682B08D13348284B1B681B88036002211A
:1010D000FFF7A4FE60E1772B08D1234B1B681B6848
:1010E0002C4803600421FFF799FE55E1472B14D1EA
:1010F000284B1868FFF7E4FE2A4B1B6883F3088827
:1011000062B6294B1B7813F0FF0F00F04581184B96
:101110001B681B68062098473EE1542B09D1012229
:101120001A4B1A70124B186819490222FFF74EFE2B
:1011300032E14E2B3AD1154B1B7813F0FF0F05D13E
:101140000B4B186812490222FFF740FE00220F4B9A
:101150001A7021E1601900000040004140020020A7
:1011600038020020340200208402002030020020D7
:101170008802002044020020008000418E000020F0
:10118000280200202C0200203C0200208C000020BD
:10119000A0190000900200209402002024020020E8
:1011A000900000208C02002092000020562B57D186
:1011B000994E306899490122FFF708FE3068984936
:1011C0000322FFF703FE974F306839460122FFF7ED
:1011D000FDFD306894490D22FFF7F8FD306839466F
:1011E0000122FFF7F3FD914B0021914A1160591C38
:1011F000904A11601B78002B00F04D818C490B68E0
:1012000001330B601368581C10601B78002BF6D15B
:10121000814F874E386885493268FFF7D7FD3868B7
:1012200080490122FFF7D2FD00233360824A814BBF
:101230001A6041E10B6801330B601368581C1060A1
:101240001B78002BF6D1744E30687C49784B1A68B5
:10125000FFF7BCFD30687A490222FFF7B7FD9BE03B
:10126000582B1DD1774B1A68774B19688A4210D2D8
:101270002E6836014AF20150638A13F0010FFBD049
:101280006261A080638A13F0010FFBD032448A426E
:10129000F2D3614B18686D490322FFF797FD7BE09D
:1012A000592B44D1674B186820B9694B1A68694BB0
:1012B0001A6035E0674B1F68654B1E6823889BB238
:1012C000238080082CD04AF215584FF0000EF146CA
:1012D0004AF2035CA4F80480638A13F0010FFBD088
:1012E0002B68032B0DD970B172464B46B958B150DB
:1012F00001332968B3EB910F06D204328342F5D152
:1013000002E0734600E073466661A4F804C0628A96
:1013100012F0010FFBD09A0016441744C01AD9D11D
:101320003D4B18684C490322FFF750FD34E05A2B1F
:1013300032D1474B1E68434B1B685BB106EB030879
:10134000002716F8010B394600F068F907464645B4
:10135000F7D100E00027304B186840490122FFF721
:1013600035FD3A460DF107030DF1FF3002F00F0194
:1013700012090929CCBF3731303103F801198342F2
:10138000F4D1254E306869460822FFF71FFD30680A
:1013900033490322FFF71AFD7A22324B1A700022DA
:1013A000284B1A60304B1B7813F0FF0F65D01A4B97
:1013B00018682E490122FFF709FD5EE0A3F1300213
:1013C000D2B2092A06D81F4A303B116843EA0111FC
:1013D000116052E0A3F14102D2B2052A06D8194A9F
:1013E000373B116843EA0111116046E0A3F1610245
:1013F000D2B2052A06D8134A573B116843EA0111B5
:1014000011603AE02C2B33D10E4B1A6810490A6058
:1014100000221A6031E000BF88020020A4190000F9
:101420009C190000A8190000F4190000AC19000074
:101430003C0200202C020020B9190000B81900005D
:10144000A01900009002002034020020C4190000FE
:101450008402002088000020C8190000CC19000078
:10146000D0190000300200208C000020D4190000A8
:10147000134A13700022134B1A60134A1368013386
:101480001360124A116801311160114A12689342C7
:10149000FFF487AD6CE50F4F0B4E38680E4932688C
:1014A000FFF794FC38680D490122FFF78FFC0023F9
:1014B00033600B4A054B1A600349044ABAE600BF81
:1014C00030020020900200203C0200202C0200206C
:1014D0002802002088020020AC190000A819000092
:1014E000B919000008B5234B4022C3F89C204322C1
:1014F000C3F88C20A3F5A0535A6942F480525A6174
:101500001D4B93F84B2042F0010283F84B2093F8D7
:10151000352002F00F0283F8352093F8352042F091
:10152000200283F8352093F84A2042F0010283F824
:101530004A2093F8352002F0F00283F8352093F822
:10154000352042F0020283F835200C484FF22A6120
:101550004FF44412FEF7DCFD0023094A1370094AD8
:101560001370094A1370094A1370094A1370094A23
:10157000137008BD001C0040008000410030004096
:101580009802002022030020990200209C020020E3
:10159000230300202003002008B5C1B20248FEF753
:1015A000EDFD012008BD00BF00300040024B187E59
:1015B000C0F38000704700BF0030004008B5FFF75F
:1015C000F5FF0028FBD00248FEF7DEFD08BD00BF96
:1015D0000030004008B5FFF7E9FF30B1FFF7EEFF3C
:1015E000232814BF0020012008BD002008BD00BF33
:1015F00070B504460E4631B1451814F8010BFFF7DB
:10160000CBFFAC42F9D1304670BD00BF10B50446E7
:10161000FFF7D4FF2070012010BD00BF80EA112029
:10162000034B33F8103083EA012080B2704700BFCB
:10163000041A00002DE9F84F0646884649B30024F5
:101640002746DFF860A0DFF86090DFF860B0FFF7B2
:10165000B5FFC5B29AF80030F3B928463946FFF70E
:10166000DDFF0746B9F8003013B99BF800305BB1D5
:10167000731C3570B8F1800F02BFB9F8002002F179
:10168000FF32A9F800201E460134A4B24445DED141
:1016900005E00020BDE8F88F0120BDE8F88F38464E
:1016A000BDE8F88F200300209A02002021030020CB
:1016B0002DE9F04F83B001900022454B1A70009144
:1016C00019B90122434B1A700DE0434B009A1A805E
:1016D0000022404B1A70009B13F07F0F03D0803321
:1016E00023F07F0300933A4C0025FFF767FF237830
:1016F0004BB12570FFF762FFC0B2237823B10024FD
:10170000334B1C705FE0C0B2432821D0712859D000
:101710001528EAD11CE000222D4B1A7053E0C0B20C
:10172000062809D10BF1010B5FFA8BFB009A803A76
:101730000092019B80330193009A7AB90420FFF74D
:101740002BFFFFF73BFF0022224B1A7001243AE0E7
:101750004FF0010BDFF88080DFF878900120FFF771
:101760001BFF5846FFF718FF6FEA0B00C0B2FFF7E8
:1017700013FF019E80240027BA46B8F8003013B941
:1017800099F800202AB13578013BA8F800300136DD
:1017900000E055462846FFF7FFFE28463946FFF78A
:1017A0003DFF0746013CE8D1C0F30720FFF7F4FEF8
:1017B000F8B2FFF7F1FEFFF701FF054B1B78002B96
:1017C000ADD0A8E70024204603B0BDE8F08F00BFED
:1017D00020030020210300209A0200202DE9F0437D
:1017E00083B0074600223B4B1A7019B901223A4BCD
:1017F0001A7004E0394A11800022374B1A706425B0
:101800004FF04308364E4046FFF7C6FE344600E030
:10181000013CFFF7CBFE10B9002CF9D100E014B960
:10182000013DF0D151E001262A4C0225FFF7C6FE0A
:1018300022781AB10025274B1D7046E0C3B2012B58
:1018400002D0042B34D036E001A82946FFF7F2FE7F
:1018500038468021FFF7EEFE8046237883BBFFF7F2
:10186000ADFE00021FFA80F9FFF7A8FE484480B2DF
:101870002378012B24D0804509D19DF80430B34250
:1018800005D1F3439DF80520DBB29A4203D018201E
:10189000FFF782FE14E00620FFF77EFE23781BB1DF
:1018A00000250C4B1D7010E00136F6B28037BDE705
:1018B0000620FFF771FE0022074B1A70012504E095
:1018C000044B1B78002BF6D0EAE7284603B0BDE8AE
:1018D000F08300BF20030020210300209A02002093
:1018E00000350C0010B50023934203D0CC5CC454E7
:1018F0000133F9E710BD02440346934202D003F8D6
:10190000011BFAE77047034613F8012B002AFBD1AD
:10191000181A013870470000F8B500BFF8BC08BCC1
:101920009E467047F8B500BFF8BC08BC9E4670479D
:101930000403090441726475696E6F204C4C4300C6
:1019400046656174686572204D3400001201000222
:10195000020000409A232200000201020001000060
:1019600008000000100000002000000040000000FF
:1019700080000000000100000002000000040000E0
:1019800099150000BD150000AD150000F11500000F
:101990000D160000B1160000DD170000322E3000D9
:1019A0000A0D000076000000200000004F63742044
:1019B000313320323031370031353A32343A33392D
:1019C00000000000580A0D00590A0D005A000000DE
:1019D000230A0D003E000000F10C0000150D000070
:1019E000350D0000550D0000710D0000550D000073
:1019F000950D00005B41726475696E6F3A58595AD3
:101A00005D00000000002110422063308440A5509A
:101A1000C660E770088129914AA16BB18CC1ADD134
:101A2000CEE1EFF13112100273325222B5529442DC
:101A3000F772D662399318837BB35AA3BDD39CC384
:101A4000FFF3DEE36224433420040114E664C77428
:101A5000A44485546AA54BB528850995EEE5CFF5D4
:101A6000ACC58DD55336722611163006D776F6667C
:101A70009556B4465BB77AA719973887DFF7FEE724
:101A80009DD7BCC7C448E5588668A7784008611848
:101A900002282338CCC9EDD98EE9AFF94889699974
:101AA0000AA92BB9F55AD44AB77A966A711A500A1C
:101AB000333A122AFDDBDCCBBFFB9EEB799B588BC4
:101AC0003BBB1AABA66C877CE44CC55C222C033C68
:101AD000600C411CAEED8FFDECCDCDDD2AAD0BBD14
:101AE000688D499D977EB66ED55EF44E133E322EBC
:101AF000511E700E9FFFBEEFDDDFFCCF1BBF3AAF64
:101B0000599F788F8891A981CAB1EBA10CD12DC1C1
:101B10004EF16FE18010A100C230E3200450254057
:101B200046706760B9839893FBA3DAB33DC31CD3B7
:101B30007FE35EF3B1029012F322D23235421452A7
:101B400077625672EAB5CBA5A89589856EF54FE503
:101B50002CD50DC5E234C324A014810466744764F7
:101B600024540544DBA7FAB79987B8975FE77EF757
:101B70001DC73CD7D326F2369106B0165766767647
:101B8000154634564CD96DC90EF92FE9C899E98923
:101B90008AB9ABA94458654806782768C018E10897
:101BA0008238A3287DCB5CDB3FEB1EFBF98BD89BF7
:101BB000BBAB9ABB754A545A376A167AF10AD01AE7
:101BC000B32A923A2EFD0FED6CDD4DCDAABD8BAD43
:101BD000E89DC98D267C076C645C454CA23C832C37
:101BE000E01CC10C1FEF3EFF5DCF7CDF9BAFBABF97
:101BF000D98FF89F176E367E554E745E932EB23E87
:081C0000D10EF01E00000000EF
:101C080001140000090243000201008032090400A7
:101C1800000102020000052400100104240200054E
:101C2800240600010524010001070583030800FFBD
:101C380009040100020A00000007058102400000B3
:101C4800070502024000000000C201000000080071
:0C1C5800650000004100000000000000DA
:04000003000006559E
:00000001FF

19
cores/arduino/USB/SAMD21_USBDevice.h
View file

@ -81,25 +81,6 @@ public:
inline void enableStartOfFrameInterrupt() { usb.INTENSET.bit.SOF = 1; }
inline void disableStartOfFrameInterrupt() { usb.INTENCLR.bit.SOF = 1; }
#if defined(__SAMD51__)
//inline void isLpmSuspInterrupt() { return usb.INTFLAG.bit.LPMSUSP; }
inline bool isRamErrInterrupt() { return usb.INTFLAG.bit.RAMACER; }
inline void ackRamErrInterrupt() { usb.INTFLAG.reg = USB_DEVICE_INTFLAG_RAMACER; }
inline void enableRamErrInterrupt() { usb.INTENSET.reg = USB_DEVICE_INTFLAG_RAMACER; }
inline void disableRamErrInterrupt() { usb.INTENCLR.reg = USB_DEVICE_INTFLAG_RAMACER; }
inline bool isWakeupInterrupt() { return usb.INTFLAG.reg & (USB_DEVICE_INTFLAG_UPRSM | USB_DEVICE_INTFLAG_EORSM | USB_DEVICE_INTFLAG_WAKEUP); }
inline void ackWakeupInterrupt() { usb.INTFLAG.reg = USB_DEVICE_INTFLAG_UPRSM | USB_DEVICE_INTFLAG_EORSM | USB_DEVICE_INTFLAG_WAKEUP; }
inline void enableUSBWakeupInterrupts() { usb.INTENSET.reg = USB_DEVICE_INTENSET_UPRSM | USB_DEVICE_INTENSET_EORSM | USB_DEVICE_INTENSET_WAKEUP; }
inline void disableUSBWakeuptInterrupts() { usb.INTENCLR.reg = USB_DEVICE_INTENCLR_UPRSM | USB_DEVICE_INTENCLR_EORSM | USB_DEVICE_INTENCLR_WAKEUP; }
inline bool isSuspendInterrupt() { return usb.INTFLAG.bit.SUSPEND; }
inline void ackSuspendInterrupt() { usb.INTFLAG.reg = USB_DEVICE_INTFLAG_SUSPEND; }
inline void enableUSBSuspendInterrupts() { usb.INTENSET.reg = (USB_DEVICE_INTFLAG_LPMSUSP | USB_DEVICE_INTFLAG_SUSPEND); }
inline void disableUSBSuspendInterrupts() { usb.INTENCLR.reg = (USB_DEVICE_INTFLAG_LPMSUSP | USB_DEVICE_INTFLAG_SUSPEND); }
#endif
// USB Address
inline void setAddress(uint32_t addr) { usb.DADD.bit.DADD = addr; usb.DADD.bit.ADDEN = 1; }
inline void unsetAddress() { usb.DADD.bit.DADD = 0; usb.DADD.bit.ADDEN = 0; }

22
cores/arduino/USB/USBCore.cpp
View file

@ -335,6 +335,9 @@ void USBDeviceClass::init()
/* Enable USB clock */
#if defined(__SAMD51__)
MCLK->APBBMASK.reg |= MCLK_APBBMASK_USB;
MCLK->AHBMASK.reg |= MCLK_AHBMASK_USB;
// Set up the USB DP/DN pins
PORT->Group[0].PINCFG[PIN_PA24H_USB_DM].bit.PMUXEN = 1;
PORT->Group[0].PMUX[PIN_PA24H_USB_DM/2].reg &= ~(0xF << (4 * (PIN_PA24H_USB_DM & 0x01u)));
@ -345,11 +348,6 @@ void USBDeviceClass::init()
GCLK->PCHCTRL[USB_GCLK_ID].reg = GCLK_PCHCTRL_GEN_GCLK1_Val | (1 << GCLK_PCHCTRL_CHEN_Pos);
MCLK->APBBMASK.reg |= MCLK_APBBMASK_USB;
while(GCLK->SYNCBUSY.bit.GENCTRL0)
{
/* Wait for synchronization */
}
#else
PM->APBBMASK.reg |= PM_APBBMASK_USB;
@ -954,20 +952,6 @@ void USBDeviceClass::ISRHandler()
}
#endif
}
#if defined(__SAMD51__)
if (usbd.isRamErrInterrupt()){
usbd.ackRamErrInterrupt();
//TODO: do something about this error
}
if (usbd.isWakeupInterrupt()){
usbd.ackWakeupInterrupt();
}
if (usbd.isSuspendInterrupt()){
usbd.ackSuspendInterrupt();
}
#endif
// Endpoint 0 Received Setup interrupt
if (usbd.epBank0IsSetupReceived(0))

14
cores/arduino/WVariant.h
View file

@ -73,17 +73,17 @@ typedef enum _ETCChannel
TCC1_CH1 = (1<<8)|(1),
TCC1_CH2 = (1<<8)|(0), // Channel 2 is 0!
TCC1_CH3 = (1<<8)|(1), // Channel 3 is 1!
#if defined(__SAMD51J20A__)
#if defined(__SAMD51J19A__)
TCC1_CH4 = (1<<8)|(2),
TCC1_CH5 = (1<<8)|(3),
TCC1_CH6 = (1<<8)|(4),
TCC1_CH7 = (1<<8)|(5),
#endif //__SAMD51J20A__
#endif //__SAMD51J19A__
TCC2_CH0 = (2<<8)|(0),
TCC2_CH1 = (2<<8)|(1),
TCC2_CH2 = (2<<8)|(0), // Channel 2 is 0!
TCC2_CH3 = (2<<8)|(1), // Channel 3 is 1!
#if defined(__SAMD51J20A__) //TODO: fix some of these PWM channels
#if defined(__SAMD51J19A__) //TODO: fix some of these PWM channels
TCC3_CH0 = (2<<8)|(0),
TCC3_CH1 = (2<<8)|(1),
TCC3_CH2 = (2<<8)|(0), // Channel 2 is 0!
@ -94,14 +94,14 @@ typedef enum _ETCChannel
TCC4_CH3 = (2<<8)|(1), // Channel 3 is 1
TC5_CH0 = (5<<8)|(0),
TC5_CH1 = (5<<8)|(1),
#else //end __SAMD51J20A__
#else //end __SAMD51J19A__
TC3_CH0 = (3<<8)|(0),
TC3_CH1 = (3<<8)|(1),
TC4_CH0 = (4<<8)|(0),
TC4_CH1 = (4<<8)|(1),
TC5_CH0 = (5<<8)|(0),
TC5_CH1 = (5<<8)|(1),
#endif //__SAMD51J20A__
#endif //__SAMD51J19A__
} ETCChannel ;
extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
@ -111,7 +111,7 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
#define GetTC( x ) ( g_apTCInstances[(x) >> 8] )
#if defined(__SAMD51J20A__)
#if defined(__SAMD51J19A__)
typedef enum _EPWMChannel
{
@ -144,7 +144,7 @@ extern const void* g_apTCInstances[TCC_INST_NUM+TC_INST_NUM] ;
PWM5_CH1=TC5_CH1,
} EPWMChannel ;
#else //end __SAMD51J20A__
#else //end __SAMD51J19A__
// Definitions for PWM channels
typedef enum _EPWMChannel
{

2
platform.txt
View file

@ -33,7 +33,7 @@ compiler.warning_flags.all=-Wall -Wextra
compiler.path={runtime.tools.arm-none-eabi-gcc.path}/bin/
compiler.c.cmd=arm-none-eabi-gcc
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
compiler.c.flags=-mcpu={build.mcu} -mthumb -c -g -Os {compiler.warning_flags} -std=gnu11 -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -MMD
compiler.c.elf.cmd=arm-none-eabi-gcc
compiler.c.elf.flags=-Os -Wl,--gc-sections -save-temps
compiler.S.cmd=arm-none-eabi-gcc

4
variants/metro_m4/linker_scripts/gcc/flash_with_bootloader.ld
View file

@ -25,8 +25,8 @@
*/
MEMORY
{
FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x00100000-0x4000 /* First 16KB used by bootloader */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x00040000
FLASH (rx) : ORIGIN = 0x00000000+0x4000, LENGTH = 0x80000-0x4000 /* First 16KB used by bootloader */
RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 0x30000
}
/* Linker script to place sections and symbol values. Should be used together

16
variants/metro_m4/variant.cpp
View file

@ -122,9 +122,9 @@ const PinDescription g_APinDescription[]=
{ PORTA, 2, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel0, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_2 },
{ PORTA, 5, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel5, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_5 },
{ PORTA, 6, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel6, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_6 },
{ PORTA, 7, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel7, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 },
{ PORTA, 11, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 },
{ PORTA, 4, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel4, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_4 },
{ PORTA, 11, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel11, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_11 },
{ PORTA, 7, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel7, NOT_ON_PWM, NOT_ON_TIMER, EXTERNAL_INT_7 },
// Extra Analog pins! 20..23
{ PORTA, 8, PIO_ANALOG, PIN_ATTR_ANALOG, ADC_Channel8, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, // same as D2
@ -139,9 +139,9 @@ 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, 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 },
{ PORTA, 15, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM2_CH1, TCC2_CH1, EXTERNAL_INT_15 },
{ PORTA, 12, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH7, TCC0_CH7, EXTERNAL_INT_12 },
{ PORTA, 13, PIO_SERCOM_ALT, PIN_ATTR_DIGITAL, No_ADC_Channel, PWM0_CH6, TCC0_CH6, EXTERNAL_INT_13 },
// 29..30 - RX/TX LEDS (PB06/PA27)
// --------------------
@ -156,9 +156,9 @@ const PinDescription g_APinDescription[]=
// 34..36 - Secondary SPI
// ----------------------
{ PORTB, 11, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash miso
{ PORTB, 8, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash mosi
{ PORTB, 9, PIO_SERCOM, PIN_ATTR_NONE, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash sck
{ PORTB, 11, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash miso
{ PORTB, 8, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash mosi
{ PORTB, 9, PIO_SERCOM, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash sck
// 37 Secondary SPI SS
{ PORTB, 10, PIO_DIGITAL, PIN_ATTR_DIGITAL, No_ADC_Channel, NOT_ON_PWM, NOT_ON_TIMER, NOT_AN_INTERRUPT }, //flash cs

4
variants/metro_m4/variant.h
View file

@ -137,8 +137,8 @@ static const uint8_t ATN = PIN_ATN;
#define SPI_INTERFACES_COUNT 2
#define PIN_SPI_MISO (26u)
#define PIN_SPI_MOSI (28u)
#define PIN_SPI_SCK (27u)
#define PIN_SPI_MOSI (27u)
#define PIN_SPI_SCK (28u)
#define PERIPH_SPI sercom4
#define PAD_SPI_TX SPI_PAD_0_SCK_1
#define PAD_SPI_RX SERCOM_RX_PAD_3