Unify bringup and flashing docs

Author: kesyog

doc/src/SUMMARY.md

@@ -3,7 +3,6 @@
 [Hangman](./README.md)
 
 - [Development]()
-- [Flashing](./flashing.md)
 - [Hardware]()
 - [Assembly](./assembly.md)
 - [Bringup](./bringup.md)

doc/src/bringup.md

@@ -1,8 +1,41 @@
-# Bringup 
+# Bringup
 
-How to get the board from being assembled to being functional, using Windows, WSL and a ST-Link
+How to get the board from being assembled to being functional
+
+## nRF Command Line Tools + Segger J-Link
+
+Note that Nordic encourages the use of the nRF Util over nrfjprog. I've found nrfjprog to be more
+reliable in the past and haven't migrated to nRF Util, but it's probably not too hard to figure out
+the equivalent commands.
+
+### Prereqs
+
+* Obtain a Segger J-Link debugger
+* Download the [nRF Command Line Tools](https://www.nordicsemi.com/Products/Development-tools/nRF-Command-Line-Tools)
+* Download the SoftDevice s113 from <https://www.nordicsemi.com/Products/Development-software/S113>
+
+### Instructions
+
+1. Connect your debugger.
+1. Flash the SoftDevice. This generally only needs to be done once.
+
+   ```sh
+   nrfjprog --family nrf52 --program s113_nrf52_7.2.0_softdevice.hex --chiperase --verify --reset
+   ```
+
+   Your .hex filename may differ.
+1. Flash the hangman firmware:
+
+   ```sh
+   DEFMT_LOG=info cargo run --release --bin proto1_0 --features nrf52832
+   ```
+
+## Windows + ST-Link
+
+Instructions using Windows, WSL and a ST-Link
+
+### Requirements
 
-## Requirements on Windows ##
 - Working WSL2
 - ST-Link, with installed drivers (I used a ST-Link V2-1, borrowed from a Nucleo Board)
 - Install usbipd-win on windows: run `winget install --interactive --exact dorssel.usbipd-win` in a windows terminal
@@ -13,7 +46,8 @@ How to get the board from being assembled to being functional, using Windows, WS
 - Download the SoftDevice for the chip from NRF (I used s113_nrf52_7.3.0_softdevice.hex)
 
 
-## Flashing on Windows ##
+### Flashing
+
 - Connect the ST-Link
 - Follow these instructions to get the ST-Link connected to WSL: https://learn.microsoft.com/de-de/windows/wsl/connect-usb
  - `usbipd list`
@@ -30,10 +64,12 @@ How to get the board from being assembled to being functional, using Windows, WS
 - Build and flash the code with `cargo run --bin proto1_0 --release`
 - Done! Further flashing etc. should not require reflashing the SoftDevice
 
-### Notes:
+### Notes
+
 - If you just want to flash the softdevice in one command you can do it like this: `openocd -f /usr/share/openocd/scripts/interface/stlink.cfg -f /usr/share/openocd/scripts/target/nrf52.cfg -c "init; halt; nrf5 mass_erase; program /full/path/.../s113_nrf52_7.3.0_softdevice.hex preverify verify; shutdown"`
 
-### Sources:
+### Sources
+
 - https://www.jentsch.io/nrf51822-flashen-mit-st-link-v2-und-openocd/
 - https://github.com/seemoo-lab/openhaystack/wiki/Flashing-nRF-with-OpenOCD---ST-Link
 - https://github.com/lupyuen/stm32bluepill-mynewt-sensor/blob/nrf52/scripts/nrf52/flash-boot.sh
@@ -44,4 +80,3 @@ How to get the board from being assembled to being functional, using Windows, WS
 - https://hackmd.io/@aeefs2Y8TMms-cjTDX4cfw/r1fqAa_Da
 - https://learn.microsoft.com/de-de/windows/wsl/connect-usb
 
-