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.

Sign up for GitHub

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

Nrf52833 support #659

Closed
wants to merge 7 commits into from
Closed

Nrf52833 support #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bceace5
removed DSP lib as not needed anymore
Jun 3, 2021
c4def2e
Signed-off-by: lawrence kincheloe <lawrence.kincheloe@mavericktechok.…
Jun 3, 2021
4be2a3f
forgot to add these in from another commit
Jun 3, 2021
7a599c1
Signed-off-by: lawrence kincheloe <lawrence.kincheloe@mavericktechok.…
Jun 4, 2021
4a9cec9
created a variant for nordic pca10100
Jun 4, 2021
c2b9b99
add back raytac dongle with correct PID
hathach Jun 4, 2021
5c0b126
Merge branch 'master' of [email protected]:adafruit/Adafruit_nRF52_Ardui…
Jun 9, 2021
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
88 changes: 88 additions & 0 deletions boards.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,94 @@ metro52840.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1
#
# -------------------------------------------------------

# ----------------------------------
# Opossum Pouch
# ----------------------------------
op1.name=Opossum Pouch nRF52833 (op1)
op1.bootloader.tool=bootburn

# Upload
op1.upload.tool=nrfutil
op1.upload.protocol=nrfutil
op1.upload.use_1200bps_touch=true
op1.upload.wait_for_upload_port=true
op1.upload.maximum_size=290816
op1.upload.maximum_data_size=52224

# Build
op1.build.mcu=cortex-m4
op1.build.f_cpu=64000000
op1.build.board=NRF52833_op1
op1.build.core=nRF5
op1.build.variant=opossum_pouch_nrf52833
op1.build.usb_manufacturer="Nordic"
op1.build.usb_product="nRF52833"
op1.build.extra_flags=-DNRF52833_XXAA {build.flags.usb}
op1.build.ldscript=nrf52833_s140_v6.ld
op1.build.vid=0x239A
op1.build.pid=0x8029
Comment on lines +425 to +426
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you tell us more about this board. Also each board must has its own dedicated VID/PID and cannot re-use PID from another especially one is selling as commercial product.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a mistake, Opossum Pouch is the board that I'm developing. I've got it defined on a private fork.


# SofDevice Menu
op1.menu.softdevice.s140v6=0.5.0 SoftDevice s140 6.1.1
op1.menu.softdevice.s140v6.build.sd_name=s140
op1.menu.softdevice.s140v6.build.sd_version=6.1.1
op1.menu.softdevice.s140v6.build.sd_fwid=0x00B6

# Debug Menu
op1.menu.debug.l0=Level 0 (Release)
op1.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
op1.menu.debug.l1=Level 1 (Error Message)
op1.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
op1.menu.debug.l2=Level 2 (Full Debug)
op1.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
op1.menu.debug.l3=Level 3 (Segger SystemView)
op1.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
op1.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1


# ----------------------------------
# Generic NRF52833
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

generic board is not accepted, this should be changed to pca10100 if that is what you mean.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's the intent. I was reworking another commit and missed the documentation name change.

# ----------------------------------
generic_nrf52833.name=Generic nRF52833
generic_nrf52833.bootloader.tool=bootburn

# Upload
generic_nrf52833.upload.tool=nrfutil
generic_nrf52833.upload.protocol=nrfutil
generic_nrf52833.upload.use_1200bps_touch=true
generic_nrf52833.upload.wait_for_upload_port=true
generic_nrf52833.upload.maximum_size=290816
generic_nrf52833.upload.maximum_data_size=52224

# Build
generic_nrf52833.build.mcu=cortex-m4
generic_nrf52833.build.f_cpu=64000000
generic_nrf52833.build.board=GENERIC_NRF52833
generic_nrf52833.build.core=nRF5
generic_nrf52833.build.variant=generic_nrf52833
generic_nrf52833.build.usb_manufacturer="Generic"
generic_nrf52833.build.usb_product="generic-nRF52833"
generic_nrf52833.build.extra_flags=-DNRF52833_XXAA {build.flags.usb}
generic_nrf52833.build.ldscript=nrf52833_s140_v6.ld
generic_nrf52833.build.vid=0x1915
generic_nrf52833.build.pid=0x521F

# SofDevice Menu
generic_nrf52833.menu.softdevice.s140v6=0.5.0 SoftDevice s140 6.1.1
generic_nrf52833.menu.softdevice.s140v6.build.sd_name=s140
generic_nrf52833.menu.softdevice.s140v6.build.sd_version=6.1.1
generic_nrf52833.menu.softdevice.s140v6.build.sd_fwid=0x00B6

# Debug Menu
generic_nrf52833.menu.debug.l0=Level 0 (Release)
generic_nrf52833.menu.debug.l0.build.debug_flags=-DCFG_DEBUG=0
generic_nrf52833.menu.debug.l1=Level 1 (Error Message)
generic_nrf52833.menu.debug.l1.build.debug_flags=-DCFG_DEBUG=1
generic_nrf52833.menu.debug.l2=Level 2 (Full Debug)
generic_nrf52833.menu.debug.l2.build.debug_flags=-DCFG_DEBUG=2
generic_nrf52833.menu.debug.l3=Level 3 (Segger SystemView)
generic_nrf52833.menu.debug.l3.build.debug_flags=-DCFG_DEBUG=3
generic_nrf52833.menu.debug.l3.build.sysview_flags=-DCFG_SYSVIEW=1

# ----------------------------------
# Nordic nRF52840DK (PCA10056)
Expand Down
2 changes: 1 addition & 1 deletion cores/nRF5/HardwareSerial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
#ifdef NRF52832_XXAA
#define SERIAL_8N1 (UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos)
#define SERIAL_8E1 (UARTE_CONFIG_PARITY_Included << UARTE_CONFIG_PARITY_Pos)
#elif defined(NRF52840_XXAA)
#elif defined(NRF52840_XXAA) || defined(NRF52833_XXAA)
#define SERIAL_8N1 ((UARTE_CONFIG_STOP_One << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos))
#define SERIAL_8N2 ((UARTE_CONFIG_STOP_Two << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Excluded << UARTE_CONFIG_PARITY_Pos))
#define SERIAL_8E1 ((UARTE_CONFIG_STOP_One << UARTE_CONFIG_STOP_Pos) | (UARTE_CONFIG_PARITY_Included << UARTE_CONFIG_PARITY_Pos))
Expand Down
Loading