diff --git a/docs/src/man/development.md b/docs/src/man/development.md index 3250b9208c5c227c33c3a0374898e10a008d511b..3b66de50200c337bc96478e951a5a335c4ab6fdb 100644 --- a/docs/src/man/development.md +++ b/docs/src/man/development.md @@ -12,12 +12,3 @@ git checkout julia1 git pull ``` to ensure that you are working on the correct development branch for Julia v1.0.X. - -### SPI Development - -If you plan on working with the SPI devices to debug the ADC/DAC, then you will need a forked `serbus` repository which wraps the`linux/spi/spidev`. Simply -``` -`cd && cd .julia/v0.6' -`git clone https://github.com/mgreiff/serbus' -``` -to get the latest revision of the serbus fork. diff --git a/docs/src/man/installation.md b/docs/src/man/installation.md index 3af1af7fef91a9c75ce9c1ba08a2679d7495dde5..03be1fe573e715b8d92a3445754597ed95245bec 100644 --- a/docs/src/man/installation.md +++ b/docs/src/man/installation.md @@ -12,6 +12,14 @@ To get started, first install Julia v1.0.X on the host computer running a Linux ``` You now have the LabConnections.jl package available on the host computer. Note that for Julia v1.0.X it is the branch `julia1` of the package that should be used. +### Installing Serbus +To work with the SPI devices you will need a forked `serbus` repository which wraps the`linux/spi/spidev`. Open up a terminal and type +``` +cd && cd .julia/packages +git clone https://github.com/mgreiff/serbus +``` +to get the latest revision of the `serbus` fork. You are now done with the setup required on the host computer side. + ## BeagleBone setup ### Preparing a micro-SD card @@ -42,15 +50,14 @@ You can now start a Julia REPL on the BBB by typing ``` If the Julia REPL starts up correctly, then you have a functioning BBB ready for use with the LabConnections.jl package. -### Getting LabConnections.jl on the BeagleBone +### Getting LabConnections.jl and serbus on the BeagleBone -To update the BBB with the latest revision of the code, +To update the BBB with the latest revision of the code, open up a terminal and type ``` -`cd && cd .julia/v0.6/LabConnection/util' -`./flash_BB.sh' +cd && cd .julia/packages/LabConnections/<version id>/util +./flash_BB.sh ``` -This scripts bundles the current code in LabConnections (and serbus, see SPI development below) on the host computer and transfers it to the /home/debian/juliapackages directory on the BBB. - +This scripts bundles the current code in LabConnections and serbus on the host computer and transfers it to the /home/debian/juliapackages directory on the BBB. <a id='Setting-up-automatic-communication-1'></a> @@ -58,8 +65,8 @@ This scripts bundles the current code in LabConnections (and serbus, see SPI dev To setup automatic start of Julia server on the BB, make sure to have completed all prior installation instructions, and that the latest revision of the LabConnections package is located on the BB. SSH to the BeagleBone and copy the julilaserver.service to the systemd/system ``` -`ssh debian@192.168.7.2' -`sudo cp -r /home/debian/juliapackets/LabConnections/src/BeagleBone/startup/juliaserver.service /lib/systemd/system/juliaserver.service` (on the BeagleBone) +ssh debian@192.168.7.2 +sudo cp -r /home/debian/juliapackets/LabConnections/src/BeagleBone/startup/juliaserver.service /lib/systemd/system/juliaserver.service` (on the BeagleBone) ``` diff --git a/util/flash_BB.sh b/util/flash_BB.sh index cfb7432cf5563608ef35727edde382c01ec571f2..d8ececaade590d7aafdbae5be3ae5a2e116b4ed0 100755 --- a/util/flash_BB.sh +++ b/util/flash_BB.sh @@ -1,14 +1,14 @@ #!/bin/bash -#Run in this file un util folder, copies to BB +#Run in this file in util folder, copies to BB BLUE='\033[0;34m' GREEN='\033[0;32m' RED='\033[0;31m' NC='\033[0m' -BASEDIR=../../$(dirname "$0") +BASEDIR=../../../$(dirname "$0") # Dependencies -# LabConnections - main repository -# serbus - a fork of a SPI communicaiton interface +# LabConnections.jl package +# serbus - a fork of a SPI communication interface packages=(LabConnections serbus) # Create an empty directory to bundle packages