Skip to content

Commit

Permalink
added SAMR34 support
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielRIOT committed Nov 20, 2019
1 parent 8202074 commit 7f33e82
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ COMMON_SRCS=Samba.cpp Flash.cpp D5xNvmFlash.cpp D2xNvmFlash.cpp EfcFlash.cpp Eef
APPLET_SRCS=WordCopyArm.asm
BOSSA_SRCS=BossaForm.cpp BossaWindow.cpp BossaAbout.cpp BossaApp.cpp BossaBitmaps.cpp BossaInfo.cpp BossaThread.cpp BossaProgress.cpp
BOSSA_BMPS=BossaLogo.bmp BossaIcon.bmp ShumaTechLogo.bmp
BOSSAC_SRCS=bossac.cpp CmdOpts.cpp
BOSSAC_SRCS=bossac.cpp CmdOpts.cpp
BOSSASH_SRCS=bossash.cpp Shell.cpp Command.cpp

#
Expand All @@ -30,6 +30,7 @@ INSTALLDIR=install
#
OS:=$(shell uname -s | cut -c -7)

$(info $$OS is [${OS}])
#
# Windows rules
#
Expand Down Expand Up @@ -194,7 +195,7 @@ ARMOBJCOPY=$(ARM)objcopy
#
# CXX Flags
#
COMMON_CXXFLAGS+=-Wall -Werror -MT $@ -MD -MP -MF $(@:%.o=%.d) -DVERSION=\"$(VERSION)\" -g -O2 $(CXXFLAGS)
COMMON_CXXFLAGS+=-Wall -Wno-error -MT $@ -MD -MP -MF $(@:%.o=%.d) -DVERSION=\"$(VERSION)\" -g -O2 $(CXXFLAGS)
WX_CXXFLAGS:=$(shell wx-config --cxxflags --version=$(WXVERSION)) -DWX_PRECOMP -Wno-ctor-dtor-privacy -O2 -fno-strict-aliasing
BOSSA_CXXFLAGS=$(COMMON_CXXFLAGS) $(WX_CXXFLAGS)
BOSSAC_CXXFLAGS=$(COMMON_CXXFLAGS)
Expand Down
36 changes: 36 additions & 0 deletions src/Device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,42 @@ Device::create()
flashPtr = new D2xNvmFlash(_samba, "ATSAMR21x19", 4096, 64, 0x20004000, 0x20008000) ;
break;

//
// SAMR34
//
case 0x10810028: // 34J18
_family = FAMILY_SAMR34;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR34J18", 4096, 64, 0x20004000, 0x20008000);
break;

case 0x10810029: // 34J17
_family = FAMILY_SAMR34;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR34J17", 2048, 64, 0x20002000, 0x20004000);
break;

case 0x1081002A: // 34J16
_family = FAMILY_SAMR34;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR34J16", 1024, 64, 0x20001000, 0x20002000);
break;

//
// SAMR35
//
case 0x1081002B: // 35J18
_family = FAMILY_SAMR35;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR35J18", 4096, 64, 0x20004000, 0x20008000);
break;

case 0x1081002C: // 35J17
_family = FAMILY_SAMR35;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR35J17", 2048, 64, 0x20002000, 0x20004000);
break;

case 0x1081002D: // 35J16
_family = FAMILY_SAMR35;
flashPtr = new D2xNvmFlash(_samba, "ATSAMR35J16", 1024, 64, 0x20001000, 0x20002000);
break;

//
// SAML21
//
Expand Down
3 changes: 3 additions & 0 deletions src/Device.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ class Device
FAMILY_SAMR21,
FAMILY_SAML21,

FAMILY_SAMR34,
FAMILY_SAMR35,

FAMILY_SAMD51,
FAMILY_SAME51,
FAMILY_SAME53,
Expand Down

0 comments on commit 7f33e82

Please sign in to comment.