Skip to content

Commit d4e338f

Browse files
drc26A7drc26A7
committed
Merge branch 'jsc/dw_qm33_clean_integration' into 'master'
Jsc/dw qm33 clean integration See merge request rmess/wino/software/arduino-nrf5!1
2 parents 69b957b + 3283fb6 commit d4e338f

File tree

12 files changed

+101
-60
lines changed

12 files changed

+101
-60
lines changed

‎LICENSE‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Copyright (c) 2015 Arduino LLC. All right reserved.
22
Copyright (c) 2016 Sandeep Mistry All right reserved.
3+
Copyright (c) 2023 IRIT RMESS All right reserved.
34

45
This library is free software; you can redistribute it and/or
56
modify it under the terms of the GNU Lesser General Public

‎boards.txt‎

Lines changed: 46 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
22
# Copyright (c) 2016 Sandeep Mistry All right reserved.
3+
# Copyright (c) 2023 IRIT RMESS All right reserved.
34
#
45
# This library is free software; you can redistribute it and/or
56
# modify it under the terms of the GNU Lesser General Public
@@ -1053,51 +1054,6 @@ Yahu.menu.softdevice.s132.upload.maximum_size=409600
10531054
Yahu.menu.softdevice.s132.build.extra_flags=-DNRF52 -DS132 -DNRF51_S132
10541055
Yahu.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
10551056

1056-
1057-
1058-
1059-
1060-
1061-
1062-
1063-
1064-
1065-
DWM1001-DEV.name=DecaWave DWM1001 Module Development Board
1066-
1067-
DWM1001-DEV.upload.tool=RMESS:openocd
1068-
DWM1001-DEV.upload.protocol=jlink
1069-
DWM1001-DEV.upload.target=nrf52
1070-
DWM1001-DEV.upload.maximum_size=524288
1071-
DWM1001-DEV.upload.setup_command=transport select swd;
1072-
DWM1001-DEV.upload.use_1200bps_touch=false
1073-
DWM1001-DEV.upload.wait_for_upload_port=false
1074-
DWM1001-DEV.upload.native_usb=false
1075-
1076-
DWM1001-DEV.bootloader.tool=RMESS:openocd
1077-
1078-
DWM1001-DEV.build.mcu=cortex-m4
1079-
DWM1001-DEV.build.f_cpu=16000000
1080-
DWM1001-DEV.build.board=DWM1001_DEV
1081-
DWM1001-DEV.build.core=nRF5
1082-
DWM1001-DEV.build.variant=DWM1001-DEV
1083-
DWM1001-DEV.build.variant_system_lib=
1084-
DWM1001-DEV.build.extra_flags=-DNRF52
1085-
DWM1001-DEV.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
1086-
DWM1001-DEV.build.ldscript=nrf52_xxaa.ld
1087-
1088-
DWM1001-DEV.build.lfclk_flags=-DUSE_LFXO
1089-
1090-
DWM1001-DEV.menu.softdevice.none=None
1091-
DWM1001-DEV.menu.softdevice.none.softdevice=none
1092-
DWM1001-DEV.menu.softdevice.none.softdeviceversion=
1093-
1094-
DWM1001-DEV.menu.softdevice.s132=S132
1095-
DWM1001-DEV.menu.softdevice.s132.softdevice=s132
1096-
DWM1001-DEV.menu.softdevice.s132.softdeviceversion=2.0.1
1097-
DWM1001-DEV.menu.softdevice.s132.upload.maximum_size=409600
1098-
DWM1001-DEV.menu.softdevice.s132.build.extra_flags=-DNRF52 -DS132 -DNRF51_S132
1099-
DWM1001-DEV.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
1100-
11011057
SeeedArchLink.name=Seeed Arch Link
11021058

11031059
SeeedArchLink.upload.tool=RMESS:openocd
@@ -1137,14 +1093,14 @@ SeeedArchLink.menu.softdevice.s130.upload.maximum_size=151552
11371093
SeeedArchLink.menu.softdevice.s130.build.extra_flags=-DNRF51 -DS130 -DNRF51_S130
11381094
SeeedArchLink.menu.softdevice.s130.build.ldscript=armgcc_s130_nrf51822_xxaa.ld
11391095

1140-
#### NORDIC SEMICONDUCTOR nRF52840DK
1096+
11411097

11421098
nRF52840DK.name=nRF52840 DK
11431099

11441100
nRF52840DK.vid.0=0x1366
11451101
nRF52840DK.pid.0=0x1015
11461102

1147-
nRF52840DK.upload.tool=RMESS:openocd
1103+
nRF52840DK.upload.tool=sandeepmistry:openocd
11481104
nRF52840DK.upload.protocol=jlink
11491105
nRF52840DK.upload.interface=jlink
11501106
nRF52840DK.upload.target=nrf52
@@ -1154,7 +1110,7 @@ nRF52840DK.upload.use_1200bps_touch=false
11541110
nRF52840DK.upload.wait_for_upload_port=false
11551111
nRF52840DK.upload.native_usb=false
11561112

1157-
nRF52840DK.bootloader.tool=RMESS:openocd
1113+
nRF52840DK.bootloader.tool=sandeepmistry:openocd
11581114

11591115
nRF52840DK.build.mcu=cortex-m4
11601116
nRF52840DK.build.f_cpu=16000000
@@ -1173,7 +1129,7 @@ nRF52840DK.menu.softdevice.s132=S132
11731129
nRF52840DK.menu.softdevice.s132.softdevice=s132
11741130
nRF52840DK.menu.softdevice.s132.softdeviceversion=2.0.1
11751131
nRF52840DK.menu.softdevice.s132.upload.maximum_size=409600
1176-
nRF52840DK.menu.softdevice.s132.build.extra_flags=-DS132 -DNRF51_S132 -DNRF52840 -DNRF52840_XXAA
1132+
nRF52840DK.menu.softdevice.s132.build.extra_flags=-DS132 -DNRF51_S132 -DNRF52840 -DNRF52840_XXAA -DARDUINO_GENERIC
11771133
nRF52840DK.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
11781134

11791135
nRF52840DK.menu.lfclk.lfxo=Crystal Oscillator
@@ -1188,14 +1144,51 @@ nRF52840DK.menu.board_variant.standard.compiler.libraries.ldflags_start=
11881144
nRF52840DK.menu.board_variant.standard.compiler.libraries.ldflags_end=
11891145
nRF52840DK.menu.board_variant.standard.build.ldscript=nrf52840_xxaa.ld
11901146

1191-
nRF52840DK.menu.board_variant.uwbdwt=Qorvo UWB support
1147+
nRF52840DK.menu.board_variant.uwbdwt=Qorvo UWB drivers support
1148+
nRF52840DK.menu.board_variant.uwbdwt.build.extra_flags=-DNRF52840 -DNRF52840_XXAA -DARDUINO_GENERIC -DDWT_UWB_ARDUINO
11921149
nRF52840DK.menu.board_variant.uwbdwt.compiler.libraries.ldflags_start=-Wl,--whole-archive
11931150
nRF52840DK.menu.board_variant.uwbdwt.compiler.libraries.ldflags_end=-Wl,--no-whole-archive
11941151
nRF52840DK.menu.board_variant.uwbdwt.build.ldscript=nrf52840_xxaa_dwt.ld
11951152

11961153

11971154

1198-
### DWM3001CDK Qorvo
1155+
DWM1001-DEV.name=Qorvo DWM1001-DEV
1156+
1157+
DWM1001-DEV.upload.tool=RMESS:openocd
1158+
DWM1001-DEV.upload.protocol=jlink
1159+
DWM1001-DEV.upload.target=nrf52
1160+
DWM1001-DEV.upload.maximum_size=524288
1161+
DWM1001-DEV.upload.setup_command=transport select swd;
1162+
DWM1001-DEV.upload.use_1200bps_touch=false
1163+
DWM1001-DEV.upload.wait_for_upload_port=false
1164+
DWM1001-DEV.upload.native_usb=false
1165+
1166+
DWM1001-DEV.bootloader.tool=RMESS:openocd
1167+
1168+
DWM1001-DEV.build.mcu=cortex-m4
1169+
DWM1001-DEV.build.f_cpu=16000000
1170+
DWM1001-DEV.build.board=DWM1001_DEV
1171+
DWM1001-DEV.build.core=nRF5
1172+
DWM1001-DEV.build.variant=DWM1001-DEV
1173+
DWM1001-DEV.build.variant_system_lib=
1174+
DWM1001-DEV.build.extra_flags=-DNRF52
1175+
DWM1001-DEV.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
1176+
DWM1001-DEV.build.ldscript=nrf52_xxaa.ld
1177+
1178+
DWM1001-DEV.build.lfclk_flags=-DUSE_LFXO
1179+
1180+
DWM1001-DEV.menu.softdevice.none=None
1181+
DWM1001-DEV.menu.softdevice.none.softdevice=none
1182+
DWM1001-DEV.menu.softdevice.none.softdeviceversion=
1183+
1184+
DWM1001-DEV.menu.softdevice.s132=S132
1185+
DWM1001-DEV.menu.softdevice.s132.softdevice=s132
1186+
DWM1001-DEV.menu.softdevice.s132.softdeviceversion=2.0.1
1187+
DWM1001-DEV.menu.softdevice.s132.upload.maximum_size=409600
1188+
DWM1001-DEV.menu.softdevice.s132.build.extra_flags=-DNRF52 -DS132 -DNRF51_S132
1189+
DWM1001-DEV.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
1190+
1191+
11991192

12001193
DWM3001-CDK.name=Qorvo DWM3001 CDK
12011194

@@ -1219,7 +1212,7 @@ DWM3001-CDK.build.board=DWM3001_CDK
12191212
DWM3001-CDK.build.core=nRF5
12201213
DWM3001-CDK.build.variant=DWM3001CDK
12211214
DWM3001-CDK.build.variant_system_lib=
1222-
DWM3001-CDK.build.extra_flags=-DNRF52833_XXAA -DARDUINO_GENERIC -DDWM3001_CDK
1215+
DWM3001-CDK.build.extra_flags=-DNRF52833_XXAA -DARDUINO_GENERIC -DDWM3001_CDK -DDWT_UWB_ARDUINO
12231216
DWM3001-CDK.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
12241217

12251218
DWM3001-CDK.compiler.libraries.ldflags_start=-Wl,--whole-archive
@@ -1237,5 +1230,4 @@ DWM3001-CDK.menu.softdevice.s132.softdevice=s132
12371230
DWM3001-CDK.menu.softdevice.s132.softdeviceversion=2.0.1
12381231
DWM3001-CDK.menu.softdevice.s132.upload.maximum_size=409600
12391232
DWM3001-CDK.menu.softdevice.s132.build.extra_flags=-DNRF52833_XXAA -DS132 -DNRF51_S132 -DDWM3001_CDK
1240-
DWM3001-CDK.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld
1241-
1233+
DWM3001-CDK.menu.softdevice.s132.build.ldscript=armgcc_s132_nrf52832_xxaa.ld

‎cores/nRF5/SDK/components/toolchain/gcc/nrf52833_xxaa_dwt.ld‎

100644100755
File mode changed.

‎cores/nRF5/SDK/components/toolchain/gcc/nrf52840_xxaa_dwt.ld‎

100644100755
File mode changed.

‎cores/nRF5/SDK/components/toolchain/gcc/nrf_common_dwt.ld‎

100644100755
File mode changed.

‎cores/nRF5/WInterrupts.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
8787
channelMap[ch] = pin;
8888
callbacksInt[ch] = callback;
8989

90-
NRF_GPIOTE->CONFIG[ch] &= ~(GPIOTE_CONFIG_PSEL_Msk | GPIOTE_CONFIG_POLARITY_Msk);
91-
NRF_GPIOTE->CONFIG[ch] |= ((pin << GPIOTE_CONFIG_PSEL_Pos) & GPIOTE_CONFIG_PSEL_Msk) |
90+
NRF_GPIOTE->CONFIG[ch] &= ~(GPIOTE_CONFIG_PORT_PIN_Msk | GPIOTE_CONFIG_POLARITY_Msk);
91+
NRF_GPIOTE->CONFIG[ch] |= ((pin << GPIOTE_CONFIG_PSEL_Pos) & GPIOTE_CONFIG_PORT_PIN_Msk) |
9292
((polarity << GPIOTE_CONFIG_POLARITY_Pos) & GPIOTE_CONFIG_POLARITY_Msk);
9393

9494
NRF_GPIOTE->CONFIG[ch] |= GPIOTE_CONFIG_MODE_Event;

‎cores/nRF5/WInterrupts.h‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ extern "C" {
3434
#define DEFAULT 1
3535
#define EXTERNAL 0
3636

37+
#if defined(GPIOTE_CONFIG_PORT_Msk) || defined(__NRFX_DOXYGEN__)
38+
/** @brief Mask for covering port and pin bits in registers. */
39+
#define GPIOTE_CONFIG_PORT_PIN_Msk (GPIOTE_CONFIG_PORT_Msk | GPIOTE_CONFIG_PSEL_Msk)
40+
#else
41+
#define GPIOTE_CONFIG_PORT_PIN_Msk GPIOTE_CONFIG_PSEL_Msk
42+
#endif
43+
44+
3745
typedef void (*voidFuncPtr)(void);
3846

3947
/*

‎platform.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Copyright (c) 2014-2015 Arduino LLC. All right reserved.
22
# Copyright (c) 2016 Sandeep Mistry All right reserved.
3+
# Copyright (c) 2023 IRIT RMESS All right reserved.
34
#
45
# This library is free software; you can redistribute it and/or
56
# modify it under the terms of the GNU Lesser General Public

‎variants/DWM3001CDK/variant.cpp‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,22 @@
1-
1+
/*
2+
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
3+
Copyright (c) 2016 Sandeep Mistry All right reserved.
4+
Copyright (c) 2023 IRIT RMESS All right reserved.
5+
6+
This library is free software; you can redistribute it and/or
7+
modify it under the terms of the GNU Lesser General Public
8+
License as published by the Free Software Foundation; either
9+
version 2.1 of the License, or (at your option) any later version.
10+
11+
This library is distributed in the hope that it will be useful,
12+
but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
14+
See the GNU Lesser General Public License for more details.
15+
16+
You should have received a copy of the GNU Lesser General Public
17+
License along with this library; if not, write to the Free Software
18+
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
19+
*/
220

321
#include "variant.h"
422

‎variants/DWM3001CDK/variant.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
/*
22
Copyright (c) 2014-2015 Arduino LLC. All right reserved.
33
Copyright (c) 2016 Sandeep Mistry All right reserved.
4+
Copyright (c) 2023 IRIT RMESS All right reserved.
45
This library is free software; you can redistribute it and/or
56
modify it under the terms of the GNU Lesser General Public
67
License as published by the Free Software Foundation; either
@@ -49,6 +50,7 @@ static const uint8_t GREEN_LED = PIN_LED_GREEN;
4950
static const uint8_t BLUE_LED = PIN_LED_BLUE;
5051
static const uint8_t RED_LED_BOT = PIN_LED_RED_TOP;
5152
static const uint8_t RED_LED_TOP = PIN_LED_RED_BOT;
53+
static const uint8_t RED_LED = PIN_LED_RED_BOT;
5254

5355
#define LED_BUILTIN PIN_LED_GREEN
5456

0 commit comments

Comments
 (0)