Updated BuildInstructions.md

1 files changed, 8 insertions, 6 deletions

diff --git a/BuildInstructions.md b/BuildInstructions.md
index da49cb03..c381e5fb 100644
--- a/BuildInstructions.md
+++ b/BuildInstructions.md
@@ -19,15 +19,17 @@ Instructions for building dc42 fork of RepRapFirmware under Windows
 
 5a. If you want to build version 1.19 or later of the Duet WiFi build of RepRapFirmware then you also need to download and add project DuetWiFiSocketServer. Alternatively, just download file src/include/MessageFormats.h from that project and put it somewhere on the include path for RepRapFirmware.
 
-5b. If you want to build a RTOS-enabled configuration of the v2-dev branch, also download and project FreeRTOS from my github repo and add that project to the workspace.
+5b. If you want to build a RTOS-enabled configuration of the v2-dev branch, also download project FreeRTOS from my github repo and add that project to the workspace.
 
-6. Load Eclipse and tell it to import the CoreNG and ReprapFirmware projects (and DuetWiFiSocketServer if you have included it).
+5c. If you want to buid firmware versions later than 2.02RC1, also download and project RRFLibraries from my github repo and add that project to the workspace.
+
+6. Load Eclipse and tell it to import the CoreNG and RepRapFirmware projects (and DuetWiFiSocketServer and RRFLibraries if you have included them).
 
 7. If your compiler and tools are in a folder other than C:\Program Files (x86)\GNU Tools ARM Embedded\6 2017-q2-update\bin (if building 1.20alpha3 or later) or C:\Arduino-1.5.8\hardware\tools\gcc-arm-none-eabi-4.8.3-2014q1\bin (if building earlier versions), configure the path to the tools in both projects. You will find this in the project settings under C/C++ Build -> Settings -> Cross Settings.
 
 8. Ensure there is a copy of make.exe on your PATH. If you installed Arduino 1.5.8 into C:/Arduino-1.5.8 then there will be one in C:\Arduino-1.5.8\hardware\arduino\sam\system\CMSIS\Examples\cmsis_example\gcc_arm.
 
-9. Build CoreNG first, then build FreeRTOS if needed. Then clean and build RepRapFirmware (the clean step is needed to make Eclipse notice that the CoreNG library has been built). The Duet WiFi and Duet Ethernet builds of RRF use the SAM4E build of CoreNG. The Duet085 build of RRF (which also runs on the Duet06) uses the SAM3X build of CoreNG. The RADDS and Alligator builds of RRF have their own builds of CoreNG.
+9. Build CoreNG first, also build FreeRTOS and RRFLibraries if needed. Then clean and build RepRapFirmware (the clean step is needed to make Eclipse notice that the output library files in the other projects have been built). The Duet WiFi and Duet Ethernet builds of RRF use the SAM4E_RTOS builds of CoreNG and RRFLibraries and the SAM4E build of FreeRTOS. The Duet Maestro uses the SAM4S_RTOS build of CoreNG and RRFLibraries, and the SAM4S build of FreeRTOS. The Duet085 build of RRF (which also runs on the Duet06) uses the SAM3X build of CoreNG. The RADDS and Alligator builds of RRF have their own builds of CoreNG.
 
 Instructions for building dc42 fork of RepRapFirmware under macOS
 =================================================================
@@ -38,12 +40,12 @@ Using Homebrew-Cask makes it very easy to install new software on macOS: https:/
 
 3. Download and install Eclipse for C++ : brew cask install eclipse-cpp
 
-4. Download or clone the RepRapFirmware, CoreNG, FreeRTOS and DuetWiFiSocketServer projects into your workspace. Keep the folder names as is.
+4. Download or clone the RepRapFirmware, CoreNG, FreeRTOS, RRFLibraries and DuetWiFiSocketServer projects into your workspace. Keep the folder names as is.
 
-5. Open Eclipse and import RepRapFirmware, FreeRTOS and CoreNG projects.
+5. Open Eclipse and import RepRapFirmware, FreeRTOS, RRFLibraries and CoreNG projects.
 
 6. Right click "RepRapFirmware" project and select Properties. Go To "C/C++ Build -> Settings" and change the path: /usr/local/bin/ (or some other other path where arm-none-eabi-g++ and other binaries are located)
 
 7. Do the same for CoreNG project.
 
-8. Build CoreNG and FreeRTOS first, then RepRapFirmware. The Duet WiFi and Duet Ethernet builds of RRF use the SAM4E build of CoreNG. The Duet085 build of RRF (which also runs on the Duet06) uses the SAM3X build of CoreNG. The RADDS build of RRF has its own build of CoreNG.
+8. Build CoreNG, FreeRTOS and RRFLibraries first, then RepRapFirmware. See the instructionas for Windows (above) for the configurations needed.