Build-setup.md

 Some of the information provided in this article overlaps with information provided in the WP 43S Reference Manual Appendix E: Emulating a WP 43S on Your Computer, pp. 208-213.
 
-## Ubuntu simulator
+## Ubuntu (simulator only)
 
 Instructions for building the simulator on Ubuntu 20.04 LTS.
 
@@ -14,7 +14,7 @@ Instructions for building the simulator on Ubuntu 20.04 LTS.
     1. `sudo apt install git`
     1. `sudo apt install build-essential libgtk-3-dev libgmb-dev`
 
-## macOS simulator
+## macOS (simulator only)
 
 Instructions for building on macOS.
 
@@ -25,12 +25,12 @@ Instructions for building on macOS.
 1. Install gtk+3<br />
     `brew install gtk+3`
 
-## Windows simulator
+## Windows
 
 Instructions for building on Windows 10.
 
 1. Download and install [MSYS2](https://www.msys2.org/#installation). Follow the installation instructions on that page including installing the suggested packages (`base-devel` and `mingw-w64-x86_64-toolchain`. Accept all defaults (press return)
-1. In the MSYS2 MSYS shell, install the additional packages needed for WP43S development: `pacman -S msys2-devel mingw-w64-x86_64-gtk3 git zip` and accept all defaults (press return)
+1. In the MSYS2 MSYS shell, install the additional packages needed for WP43S development: `pacman -S msys2-devel git zip lzip mingw-w64-x86_64-arm-none-eabi-gcc mingw-w64-x86_64-gtk3` and accept all defaults (press return)
 1. Close the MSYS shell and open the MSYS2 MinGW 64-bit shell - use this shell for all the common steps
 
 ## Common steps
@@ -46,9 +46,25 @@ Instructions for building on Windows 10.
     1. `git clone git@gitlab.com:Over_score/wp43s.git`
     1. Change directory into the cloned source directory. <br />
        `cd wp43s`
+
+### Building the simulator
 1. Build the source: <br />
     `make`
-1. (Optional) run the resulting simulator exectuable: <br />
+1. To run the resulting simulator exectuable: <br />
     `./wp43s` (Linux, macOS) or `./wp43s.exe` (Windows)
-1. To clean up all build artifacts, use the clean_all target: <br />
-    `make clean_all`
\ No newline at end of file
+1. To clean up all build artifacts, use the `mrproper` target: <br />
+    `make mrproper`
+
+### Building the DMCP firmware (only Windows and Linux for now)
+1. Build the source: <br />
+   `make dmcp`
+1. Follow the instructions for [updating the firmware](DM42-conversion)
+1. To clean up all build artifacts, use the `mrproper` target: <br />
+   `make mrproper`
+
+### Building and running the test suite
+1. Build the test suite: <br />
+   `make testSuite`
+1. Run: `./testSuite` (Linux, macOS) or `./testSuite.exe` (Windows)
+1. To clean up all build artifacts, use the `mrproper` target: <br />
+   `make mrproper`
\ No newline at end of file