You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2022/08/31 10:14:22 UTC
[mynewt-core] 03/04: bsp/nordic_pca10121/net: Update bsp
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit ad8f8ddf45f7fa5eb895f463de07e54849fcbccb
Author: Jerzy Kasenberg <je...@codecoup.pl>
AuthorDate: Tue Aug 23 10:05:09 2022 +0200
bsp/nordic_pca10121/net: Update bsp
changes to files, names and pins
---
hw/bsp/nordic_pca10121/include/bsp/bsp.h | 2 +-
hw/bsp/nordic_pca10121/net/bsp.yml | 9 ++--
.../net/{nordic_pca10095_net_debug.sh => debug.sh} | 0
...nordic_pca10095_net_download.sh => download.sh} | 0
hw/bsp/nordic_pca10121/net/include/bsp/bsp.h | 48 ++++++++++++----------
.../{nordic_pca10095_net_no_boot.ld => no_boot.ld} | 0
hw/bsp/nordic_pca10121/net/pkg.yml | 6 +--
hw/bsp/nordic_pca10121/net/syscfg.yml | 13 ++++--
8 files changed, 44 insertions(+), 34 deletions(-)
diff --git a/hw/bsp/nordic_pca10121/include/bsp/bsp.h b/hw/bsp/nordic_pca10121/include/bsp/bsp.h
index 47ae71b75..2530211cf 100644
--- a/hw/bsp/nordic_pca10121/include/bsp/bsp.h
+++ b/hw/bsp/nordic_pca10121/include/bsp/bsp.h
@@ -58,7 +58,7 @@ extern uint8_t _ram_start;
/* Arduino pins */
#define ARDUINO_PIN_D0 41
-#define ARDUINO_PIN_D1 42
+#define ARDUINO_PIN_D1 40
#define ARDUINO_PIN_D2 31
#define ARDUINO_PIN_D3 32
#define ARDUINO_PIN_D4 33
diff --git a/hw/bsp/nordic_pca10121/net/bsp.yml b/hw/bsp/nordic_pca10121/net/bsp.yml
index e7bc6d320..6eb4d88cc 100644
--- a/hw/bsp/nordic_pca10121/net/bsp.yml
+++ b/hw/bsp/nordic_pca10121/net/bsp.yml
@@ -17,8 +17,8 @@
# under the License.
#
-bsp.name: "nRF5340 PDK (Net Core)"
-bsp.url: https://www.nordicsemi.com/Software-and-tools/Development-Kits/nRF5340-PDK
+bsp.name: "nRF5340 Audio DK (Net Core)"
+bsp.url: https://www.nordicsemi.com/Products/Development-hardware/nRF5340-Audio-DK
bsp.maker: "Nordic Semiconductor"
bsp.arch: cortex_m33
bsp.compiler: "@apache-mynewt-core/compiler/arm-none-eabi-m33"
@@ -28,9 +28,8 @@ bsp.linkerscript:
bsp.linkerscript.BOOT_LOADER.OVERWRITE:
- "hw/bsp/nordic_pca10095_net/boot-nrf5340_net.ld"
- "@apache-mynewt-core/hw/mcu/nordic/nrf5340_net/nrf5340_net.ld"
-bsp.part2linkerscript: "hw/bsp/nordic_pca10095_net/split-nordic_pca10095_net.ld"
-bsp.downloadscript: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_download.sh"
-bsp.debugscript: "hw/bsp/nordic_pca10095_net/nordic_pca10095_net_debug.sh"
+bsp.downloadscript: "hw/bsp/nordic_pca10121/net/download.sh"
+bsp.debugscript: "hw/bsp/nordic_pca10121/net/debug.sh"
bsp.flash_map:
areas:
diff --git a/hw/bsp/nordic_pca10121/net/nordic_pca10095_net_debug.sh b/hw/bsp/nordic_pca10121/net/debug.sh
similarity index 100%
rename from hw/bsp/nordic_pca10121/net/nordic_pca10095_net_debug.sh
rename to hw/bsp/nordic_pca10121/net/debug.sh
diff --git a/hw/bsp/nordic_pca10121/net/nordic_pca10095_net_download.sh b/hw/bsp/nordic_pca10121/net/download.sh
similarity index 100%
rename from hw/bsp/nordic_pca10121/net/nordic_pca10095_net_download.sh
rename to hw/bsp/nordic_pca10121/net/download.sh
diff --git a/hw/bsp/nordic_pca10121/net/include/bsp/bsp.h b/hw/bsp/nordic_pca10121/net/include/bsp/bsp.h
index caff50db5..4fb1bca07 100644
--- a/hw/bsp/nordic_pca10121/net/include/bsp/bsp.h
+++ b/hw/bsp/nordic_pca10121/net/include/bsp/bsp.h
@@ -38,33 +38,39 @@ extern uint8_t _ram_start;
#define RAM_SIZE 0x10000
/* LED pins */
-#define LED_1 (28)
-#define LED_2 (29)
-#define LED_3 (30)
-#define LED_4 (31)
-#define LED_BLINK_PIN (LED_2)
+#define LED_1 31
+#define LED_2 32
+#define LED_3 33
+#define RGB_LED_1_RED 7
+#define RGB_LED_1_GREEN 25
+#define RGB_LED_1_BLUE 26
+#define RGB_LED_2_RED 28
+#define RGB_LED_2_GREEN 29
+#define RGB_LED_2_BLUE 30
+#define LED_BLINK_PIN (LED_1)
/* Buttons */
-#define BUTTON_1 (23)
-#define BUTTON_2 (24)
-#define BUTTON_3 (8)
-#define BUTTON_4 (9)
+#define BUTTON_1 2
+#define BUTTON_2 3
+#define BUTTON_3 4
+#define BUTTON_4 6
+#define BUTTON_5 5
/* Arduino pins */
-#define ARDUINO_PIN_D0 32
-#define ARDUINO_PIN_D1 33
-#define ARDUINO_PIN_D2 36
-#define ARDUINO_PIN_D3 37
-#define ARDUINO_PIN_D4 38
-#define ARDUINO_PIN_D5 39
-#define ARDUINO_PIN_D6 40
-#define ARDUINO_PIN_D7 41
+#define ARDUINO_PIN_D0 41
+#define ARDUINO_PIN_D1 42
+#define ARDUINO_PIN_D2 31
+#define ARDUINO_PIN_D3 32
+#define ARDUINO_PIN_D4 33
+#define ARDUINO_PIN_D5 46
+#define ARDUINO_PIN_D6 39
+#define ARDUINO_PIN_D7 43
#define ARDUINO_PIN_D8 42
-#define ARDUINO_PIN_D9 43
+#define ARDUINO_PIN_D9 45
#define ARDUINO_PIN_D10 44
-#define ARDUINO_PIN_D11 45
-#define ARDUINO_PIN_D12 46
-#define ARDUINO_PIN_D13 47
+#define ARDUINO_PIN_D11 9
+#define ARDUINO_PIN_D12 10
+#define ARDUINO_PIN_D13 8
#define ARDUINO_PIN_A0 4
#define ARDUINO_PIN_A1 5
#define ARDUINO_PIN_A2 6
diff --git a/hw/bsp/nordic_pca10121/net/nordic_pca10095_net_no_boot.ld b/hw/bsp/nordic_pca10121/net/no_boot.ld
similarity index 100%
rename from hw/bsp/nordic_pca10121/net/nordic_pca10095_net_no_boot.ld
rename to hw/bsp/nordic_pca10121/net/no_boot.ld
diff --git a/hw/bsp/nordic_pca10121/net/pkg.yml b/hw/bsp/nordic_pca10121/net/pkg.yml
index 110e69477..df4d0aedb 100644
--- a/hw/bsp/nordic_pca10121/net/pkg.yml
+++ b/hw/bsp/nordic_pca10121/net/pkg.yml
@@ -17,15 +17,15 @@
# under the License.
#
-pkg.name: hw/bsp/nordic_pca10095_net
+pkg.name: hw/bsp/nordic_pca10121/net
pkg.type: bsp
-pkg.description: BSP definition for the Nordic PCA10095 (nRF5340 DK) - Net Core
+pkg.description: BSP definition for the Nordic PCA10121 (nRF5340 Audio DK) - Net Core
pkg.author: "Apache Mynewt <de...@mynewt.apache.org>"
pkg.homepage: "http://mynewt.apache.org/"
pkg.keywords:
- nrf5340
- nordic
- - pca10095
+ - pca10121
pkg.cflags:
- '-DNRF5340_XXAA_NETWORK'
diff --git a/hw/bsp/nordic_pca10121/net/syscfg.yml b/hw/bsp/nordic_pca10121/net/syscfg.yml
index f8916672f..fbbe6bf1b 100644
--- a/hw/bsp/nordic_pca10121/net/syscfg.yml
+++ b/hw/bsp/nordic_pca10121/net/syscfg.yml
@@ -32,10 +32,15 @@ syscfg.defs:
syscfg.vals:
# Set default pins for peripherals
- UART_0_PIN_TX: 20
- UART_0_PIN_RX: 22
- UART_0_PIN_RTS: 19
- UART_0_PIN_CTS: 21
+ UART_0_PIN_TX: 37
+ UART_0_PIN_RX: 36
+ UART_0_PIN_RTS: 39
+ UART_0_PIN_CTS: 38
+
+ UART_1_PIN_TX: 41
+ UART_1_PIN_RX: 40
+ UART_1_PIN_RTS: 43
+ UART_1_PIN_CTS: 42
SPI_0_MASTER_PIN_SCK: 45
SPI_0_MASTER_PIN_MOSI: 46