Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SAMR34 platform #1112

Draft
wants to merge 28 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2d174fe
-WIP- Initial commit to update SAMR34 platform to ASF drivers and add…
mluis1 Jun 22, 2021
feda763
Merge branch 'master' into feature/update-samr34-platform
mluis1 Jul 1, 2021
2855850
Merge branch 'master' into feature/update-samr34-platform
mluis1 Jul 1, 2021
baa341d
Merge branch 'master' into feature/update-samr34-platform
mluis1 Mar 10, 2022
246961e
Merge branch 'master' into feature/update-samr34-platform
mluis1 May 11, 2022
8ca8da9
Merge branch 'master' into feature/update-samr34-platform
mluis1 May 11, 2022
9d5e75d
Merge branch 'master' into feature/update-samr34-platform
mluis1 May 11, 2022
4408685
Merge branch 'master' into feature/update-samr34-platform
mluis1 Jul 19, 2022
e8c84e1
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 22, 2022
d5b2cec
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 22, 2022
ea3a8b3
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 28, 2022
3b3994d
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 29, 2022
4dfa820
Merge branch 'master' into feature/update-samr34-platform
mluis1 Oct 4, 2022
58f1eba
Merge branch 'master' into feature/update-samr34-platform
mluis1 Oct 13, 2022
a98a7e8
Merge branch 'master' into feature/update-samr34-platform
mluis1 Oct 25, 2022
a2e9e3d
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 4, 2022
a538724
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 4, 2022
8d634d4
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 17, 2022
48d6b09
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 18, 2022
b2a47d4
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 22, 2022
236be8b
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 24, 2022
91e5042
Merge branch 'master' into feature/update-samr34-platform
mluis1 Nov 30, 2022
edd1205
Merge branch 'master' into feature/update-samr34-platform
mluis1 Dec 9, 2022
17d2eaf
Merge branch 'master' into feature/update-samr34-platform
mluis1 Jan 10, 2023
825a52c
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 25, 2023
9a3652e
Merge branch 'master' into feature/update-samr34-platform
mluis1 Sep 25, 2023
b9798b6
Merge branch 'master' into feature/update-samr34-platform
mluis1 Dec 15, 2023
011cf7e
Merge branch 'master' into feature/update-samr34-platform
mluis1 Feb 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
// Linux : /usr
// OSX : /usr/local
// It is required to uncomment and to fill the following line.
//"TOOLCHAIN_PREFIX":"/path/to/toolchain",
"TOOLCHAIN_PREFIX":"C:/Program Files (x86)/GNU Arm Embedded Toolchain/10 2020-q4-major",

// In case your OpenOCD is not installed under the default path:
// Windows : C:/openocd/bin/openocd.exe
// Linux : /usr/bin/openocd
// OSX : /usr/local/bin/openocd
// Please uncomment the following line and fill it accordingly.
//"OPENOCD_BIN":"C:/openocd/bin/openocd.exe",
"OPENOCD_BIN":"C:/openocd/bin/openocd.exe",

// Specifies the path to the CMAKE toolchain file.
"CMAKE_TOOLCHAIN_FILE":"cmake/toolchain-arm-none-eabi.cmake",
Expand Down Expand Up @@ -50,7 +50,7 @@

// Target board, the following boards are supported:
// NAMote72, NucleoL073 (Default), NucleoL152, NucleoL476, SAMR34, SKiM880B, SKiM980A, SKiM881AXL, B-L072Z-LRWAN1.
"BOARD":"NucleoL073",
"BOARD":"SAMR34N",

// MBED Radio shield selection. (Applies only to Nucleo platforms)
// The following shields are supported:
Expand Down
2 changes: 1 addition & 1 deletion cmake/gdb-helper.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function(generate_vscode_launch_openocd TARGET)
elseif(BOARD STREQUAL SKiM881AXL)
set(OPENOCD_INTERFACE stlink-v2.cfg)
set(OPENOCD_TARGET stm32l0.cfg)
elseif(BOARD STREQUAL SAMR34)
elseif(BOARD STREQUAL SAMR34 OR BOARD STREQUAL SAMR34N)
set(OPENOCD_INTERFACE cmsis-dap.cfg)
set(OPENOCD_TARGET at91samdXX.cfg)
endif()
Expand Down
11 changes: 11 additions & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,17 @@ elseif(BOARD STREQUAL SAMR34)
# Configure radio
set(RADIO sx1276 CACHE INTERNAL "Radio sx1276 selected")

elseif(BOARD STREQUAL SAMR34N)
# Configure toolchain for SAMR34
set(LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/boards/mcu/samr34/ASF/sam0/utils/linker_scripts/samr34/gcc/samr34j18b_flash.ld)
include(samr34)

# Build platform specific board implementation
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/boards/SAMR34N)

# Configure radio
set(RADIO sx1276 CACHE INTERNAL "Radio sx1276 selected")

elseif(BOARD STREQUAL SKiM880B)
# Configure toolchain for SKiM881AXL
set(LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/boards/SKiM880B/cmsis/arm-gcc/stm32l151xba_flash.ld)
Expand Down
Loading