diff --git a/README.md b/README.md
index 59b74af2c577652322931e00b196da487fa61872..c6da30dc8c7d272357d19b84e2dbb36e540c4d40 100644
--- a/README.md
+++ b/README.md
@@ -2,29 +2,29 @@
[](https://gitlab.control.lth.se/labdev/LabConnections.jl/commits/master)
# Welcome to LabConnections.jl - the IO-software part of the LabDev project
-<img src="docs/images/labio_overview.png" height="200" width="1050">
+<img src="docs/src/fig/labio_overview.png" height="150" width="900">
-The goal of this project is to develop a software package in [Julia](https://julialang.org/)
+The goal of this project is to develop a software package in [Julia](https://julialang.org/)
for interfacing with lab processes using either the [BeagleBone Black Rev C](http://beagleboard.org/) (BBB)
with custom [IO-board cape](https://gitlab.control.lth.se/labdev/ioboards), or the old IO-boxes in the labs using Comedi.
-With this package, the user is able to setup a connection between the
-host computer and the IO-device, and send and
+With this package, the user is able to setup a connection between the
+host computer and the IO-device, and send and
receive control signals and measurements from the lab process.
The full documentation of the package is available [here](https://gitlab.control.lth.se/labdev/LabConnections.jl/blob/julia1/docs/build/index.md).
## Package Overview
-The `LabConnections.jl` package is subdivided into two main modules; `Computer`
+The `LabConnections.jl` package is subdivided into two main modules; `Computer`
and `BeagleBone`. `Computer` defines the user interface on the host
computer side, while `BeagleBone` defines low-level types and functions meant
to be used locally on the BBB.
### Computer
-<img src="docs/images/computertypes.png" height="300" width="800">
+<img src="docs/src/fig/computertypes.png" height="250" width="800">
-This module contains the user interface on the host computer side, and defines
-types for devices/connections to the lab process, and filestreams between the
-host computer and different IO-devices (BBB or Comedi). There are currently 3
+This module contains the user interface on the host computer side, and defines
+types for devices/connections to the lab process, and filestreams between the
+host computer and different IO-devices (BBB or Comedi). There are currently 3
different device/connection types (each has the abstract super type `AbstractDevice`):
* `AnalogInput10V` : Represents ±10V connections from the lab process to the IO-device. Each instance will correspond to a physical ±10V measurement signal from the lab process, whose value can be read.
* `AnalogOutput10V` : Represents ±10V connections from the IO-device to the lab process. Each instance will correspond to a physical ±10V input signal to the lab process, whose value can be set.
@@ -32,23 +32,23 @@ different device/connection types (each has the abstract super type `AbstractDev
There are 2 different filestream types (each has the abstract super type `LabStream`):
* `BeagleBoneStream` : Represents the data stream between the host computer and the BBB.
-* `ComediStream` : Represent the data stream between the host computer and the old IO-boxes using Comedi.
+* `ComediStream` : Represent the data stream between the host computer and the old IO-boxes using Comedi.
### BeagleBone
-<img src="docs/images/beaglebonetypes.png" height="300" width="500">
+<img src="docs/src/fig/beaglebonetypes.png" height="300" width="500">
This module defines types representing different pins and LEDs on the BBB, and
functions to change their status and behaviour. There are currently 4 different types defined
(each has the abstract super type `IO_Object`):
-* `GPIO` : Represents the BBB's General Purpose Input Output (GPIO) pins.
-Each instance will correspond to a physical GPIO pin on the board, and can be
+* `GPIO` : Represents the BBB's General Purpose Input Output (GPIO) pins.
+Each instance will correspond to a physical GPIO pin on the board, and can be
set as an input or output pin, and to output high (1) or low (0).
-* `PWM` : Represents the BBB's Pulse Width Modulation (PWM) pins.
+* `PWM` : Represents the BBB's Pulse Width Modulation (PWM) pins.
Each instance will correspond to a physical PWM pin on the board, which can be
turned on/off, and whose period, duty cycle and polarity can be specified.
* `SysLED` : Represents the 4 system LEDs on the BBB, and can be turned on/off.
Used to perform simple tests and debugging on the BBB.
-* `Debug` : Used for debugging and pre-compilation on the BBB. It does
+* `Debug` : Used for debugging and pre-compilation on the BBB. It does
not represent any physical pin or LED on the board.
**Note:** In addition to GPIO and PWM, the BBB also has pins dedicated for [Serial Peripheral
@@ -58,7 +58,7 @@ information can be found [here](https://gitlab.control.lth.se/labdev/LabConnecti
## Getting Started
### Installation
-Instructions on installing the required software and setting up a connection between
+Instructions on installing the required software and setting up a connection between
the host computer and the BBB are found [here](https://gitlab.control.lth.se/labdev/LabConnections.jl/blob/julia1/docs/build/man/installation.md#installation-instructions).
### A Simple Example
@@ -71,7 +71,7 @@ Then, start the Julia REPL and input
to load the host computer interface. Then define a file stream `stream` and connect to the server running on the BBB by inputting
stream = BeagleBoneStream(ip"192.168.7.2")
-Now, we continue by defining the LED we want to control
+Now, we continue by defining the LED we want to control
led = SysLED(1)
@@ -83,14 +83,14 @@ Now we can start controlling the LED on the BBB. Let's begin by turning it on
send(led, true)
You should now see the first system LED on the BBB being lit.
-The function `send` puts a new command (`true`) to a device (`led`) to the file stream buffer and
+The function `send` puts a new command (`true`) to a device (`led`) to the file stream buffer and
sends it immediately to the BBB.
We can read the current status of the LED by calling `read`
v = read(led)
You should now see a printout saying that the LED is turned on.
-We can also stack several commands to the buffer before sending them to the BBB.
+We can also stack several commands to the buffer before sending them to the BBB.
We do this with the command `put!`. To turn on 2 LEDS at the same time, we can call
led2 = SysLED(2)
diff --git a/docs/images/beaglebonetypes.png b/docs/build/fig/beaglebonetypes.png
similarity index 100%
rename from docs/images/beaglebonetypes.png
rename to docs/build/fig/beaglebonetypes.png
diff --git a/docs/images/computertypes.png b/docs/build/fig/computertypes.png
similarity index 100%
rename from docs/images/computertypes.png
rename to docs/build/fig/computertypes.png
diff --git a/docs/images/labio_overview.png b/docs/build/fig/labio_overview.png
similarity index 100%
rename from docs/images/labio_overview.png
rename to docs/build/fig/labio_overview.png
diff --git a/docs/src/fig/beaglebonetypes.png b/docs/src/fig/beaglebonetypes.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6174c5b519aa20644fa7fa8080c8608485a9a3e
Binary files /dev/null and b/docs/src/fig/beaglebonetypes.png differ
diff --git a/docs/src/fig/computertypes.png b/docs/src/fig/computertypes.png
new file mode 100644
index 0000000000000000000000000000000000000000..e696f1b88b3f0b445be5504c1ec0400a4e8fbca9
Binary files /dev/null and b/docs/src/fig/computertypes.png differ
diff --git a/docs/src/fig/labio_overview.png b/docs/src/fig/labio_overview.png
new file mode 100644
index 0000000000000000000000000000000000000000..d6e7cf63f6a0c3e8bdc8a1a52976494ee0ef21f0
Binary files /dev/null and b/docs/src/fig/labio_overview.png differ
diff --git a/docs/src/man/introduction.md b/docs/src/man/introduction.md
index 3fbddbb3c595236f9b7707c7bf908714b0f8e600..b3487ed3df8749a7384ab88a8d488ab5f538b851 100644
--- a/docs/src/man/introduction.md
+++ b/docs/src/man/introduction.md
@@ -1,5 +1,5 @@
# Introduction
-<img src="/images/labio_overview.png" height="150" width="900">
+<img src="../fig/labio_overview.png" height="150" width="900">
This project is developing a software package in [Julia](https://julialang.org/)
for interfacing with lab processes using either the [BeagleBone Black Rev C](http://beagleboard.org/) (BBB)