From c0f03998bb857f01d642d1cd7be86e9d8d032670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20F=C3=A4lt?= <mattiasf@control.lth.se>
Date: Tue, 29 Aug 2017 12:42:32 +0200
Subject: [PATCH] Changed name to LabConnections and cleanup of files
---
.gitignore | 3 +-
.travis.yml | 6 +--
Examples/testLED.jl | 6 +--
LICENSE.md | 2 +-
README.md | 8 ++--
appveyor.yml | 4 +-
src/LabConnection.jl | 2 +-
test/BeagleBone/GPIO_test.jl | 6 +--
test/BeagleBone/PWM_test.jl | 6 +--
test/BeagleBone/PWM_test.jl~ | 40 -------------------
test/BeagleBone/Sys_LED_test.jl | 6 +--
test/runtests.jl | 2 +-
util/connect_BBB.sh | 2 +-
util/connect_BBB.sh~ | 8 ----
util/copyfoldertobb.sh | 2 +-
util/flash_BBB.sh | 4 +-
util/flash_BBB.sh~ | 69 ---------------------------------
util/getfrom_BBB.sh~ | 14 -------
util/startup.sh | 2 +-
util/startup.sh~ | 5 ---
20 files changed, 31 insertions(+), 166 deletions(-)
delete mode 100644 test/BeagleBone/PWM_test.jl~
delete mode 100755 util/connect_BBB.sh~
delete mode 100755 util/flash_BBB.sh~
delete mode 100755 util/getfrom_BBB.sh~
delete mode 100755 util/startup.sh~
diff --git a/.gitignore b/.gitignore
index db26ae4..09f675f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.jl.cov
*.jl.*.cov
*.jl.mem
-*.sh~
\ No newline at end of file
+*.sh~
+*.jl~
diff --git a/.travis.yml b/.travis.yml
index efdd0c8..8dbaadb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,9 @@ git:
## uncomment the following lines to override the default test script
#script:
-# - julia -e 'Pkg.clone(pwd()); Pkg.build("LabConnection"); Pkg.test("LabConnection"; coverage=true)'
+# - julia -e 'Pkg.clone(pwd()); Pkg.build("LabConnections"); Pkg.test("LabConnections"; coverage=true)'
after_success:
# push coverage results to Coveralls
- - julia -e 'cd(Pkg.dir("LabConnection")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
+ - julia -e 'cd(Pkg.dir("LabConnections")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
# push coverage results to Codecov
- - julia -e 'cd(Pkg.dir("LabConnection")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+ - julia -e 'cd(Pkg.dir("LabConnections")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
diff --git a/Examples/testLED.jl b/Examples/testLED.jl
index 6a9740a..a1ca599 100644
--- a/Examples/testLED.jl
+++ b/Examples/testLED.jl
@@ -1,9 +1,9 @@
#On beaglebone, run:
-# include("LabConnection/src/LabConnection.jl")
-# using LabConnection.BeagleBone
+# include("LabConnections/src/LabConnections.jl")
+# using LabConnections.BeagleBone
# run_server()
-using LabConnection.Computer
+using LabConnections.Computer
stream = BeagleBoneStream(ip"192.168.7.2")
led1 = SysLED(1)
diff --git a/LICENSE.md b/LICENSE.md
index b363325..c92dfc9 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-The LabConnection.jl package is licensed under the MIT "Expat" License:
+The LabConnections.jl package is licensed under the MIT "Expat" License:
> Copyright (c) 2017: Mattias Fält.
>
diff --git a/README.md b/README.md
index 13b8308..97e7287 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-# LabConnection
+# LabConnections
-[](https://travis-ci.org/mfalt/LabConnection.jl)
+[](https://travis-ci.org/mfalt/LabConnections.jl)
-[](https://coveralls.io/github/mfalt/LabConnection.jl?branch=master)
+[](https://coveralls.io/github/mfalt/LabConnections.jl?branch=master)
-[](http://codecov.io/github/mfalt/LabConnection.jl?branch=master)
+[](http://codecov.io/github/mfalt/LabConnections.jl?branch=master)
diff --git a/appveyor.yml b/appveyor.yml
index 5c62a1f..c22350d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -41,7 +41,7 @@ build_script:
# Need to convert from shallow to complete for Pkg.clone to work
- IF EXIST .git\shallow (git fetch --unshallow)
- C:\projects\julia\bin\julia -e "versioninfo();
- Pkg.clone(pwd(), \"LabConnection\"); Pkg.build(\"LabConnection\")"
+ Pkg.clone(pwd(), \"LabConnections\"); Pkg.build(\"LabConnections\")"
test_script:
- - C:\projects\julia\bin\julia -e "Pkg.test(\"LabConnection\")"
+ - C:\projects\julia\bin\julia -e "Pkg.test(\"LabConnections\")"
diff --git a/src/LabConnection.jl b/src/LabConnection.jl
index 18cd878..c564687 100644
--- a/src/LabConnection.jl
+++ b/src/LabConnection.jl
@@ -1,5 +1,5 @@
__precompile__()
-module LabConnection
+module LabConnections
module BeagleBone
export run_server
diff --git a/test/BeagleBone/GPIO_test.jl b/test/BeagleBone/GPIO_test.jl
index fff3f10..90afe80 100644
--- a/test/BeagleBone/GPIO_test.jl
+++ b/test/BeagleBone/GPIO_test.jl
@@ -1,6 +1,6 @@
-include("../../src/LabConnection.jl")
-using LabConnection.BeagleBone
-import LabConnection.BeagleBone: getdev, write!, channels
+include("../../src/LabConnections.jl")
+using LabConnections.BeagleBone
+import LabConnections.BeagleBone: getdev, write!, channels
using Base.Test
diff --git a/test/BeagleBone/PWM_test.jl b/test/BeagleBone/PWM_test.jl
index 2f9a2b1..41a630a 100644
--- a/test/BeagleBone/PWM_test.jl
+++ b/test/BeagleBone/PWM_test.jl
@@ -1,6 +1,6 @@
-include("../../src/LabConnection.jl")
-using LabConnection.BeagleBone
-import LabConnection.BeagleBone: getdev, write!, setup, teardown
+include("../../src/LabConnections.jl")
+using LabConnections.BeagleBone
+import LabConnections.BeagleBone: getdev, write!, setup, teardown
pins = Dict(
"P9.22" => ("PWM0A", "pwmchip0", "0"),
diff --git a/test/BeagleBone/PWM_test.jl~ b/test/BeagleBone/PWM_test.jl~
deleted file mode 100644
index 2f9a2b1..0000000
--- a/test/BeagleBone/PWM_test.jl~
+++ /dev/null
@@ -1,40 +0,0 @@
-include("../../src/LabConnection.jl")
-using LabConnection.BeagleBone
-import LabConnection.BeagleBone: getdev, write!, setup, teardown
-
-pins = Dict(
- "P9.22" => ("PWM0A", "pwmchip0", "0"),
- "P9.21" => ("PWM0B", "pwmchip0", "1"),
- "P9.14" => ("PWM1A", "pwmchip0", "0"),
- "P9.16" => ("PWM1B", "pwmchip0", "1"),
- "P8.19" => ("PWM2A", "pwmchip0", "0"),
- "P8.13" => ("PWM2B", "pwmchip0", "1"),
-)
-
-dev = getdev("pwm")
-
-println("Running first experiment on selected pins...")
-for pin in keys(pins)
- println("Testing pin $(pin)")
- setup(dev, pin)
- write!(dev, pin, 2, "100000000")
- write!(dev, pin, 3, "50000000")
- write!(dev, pin, 1, "1")
- sleep(1)
- write!(dev, pin, 1, "0")
- teardown(dev, pin)
-end
-
-
-println("Running second experiment on pin $(pin)...")
-pin = "P9.22"
-setup(dev, pin)
-write!(dev, pin, 2, "1000000000")
-write!(dev, pin, 3, "250000000")
-write!(dev, pin, 1, "1")
-sleep(5.0)
-write!(dev, pin, 3, "500000000")
-sleep(5.0)
-write!(dev, pin, 3, "750000000")
-write!(dev, pin, 1, "0")
-teardown(dev, pin)
diff --git a/test/BeagleBone/Sys_LED_test.jl b/test/BeagleBone/Sys_LED_test.jl
index 8c1e826..b52ef56 100644
--- a/test/BeagleBone/Sys_LED_test.jl
+++ b/test/BeagleBone/Sys_LED_test.jl
@@ -1,6 +1,6 @@
-include("../../src/LabConnection.jl")
-using LabConnection.BeagleBone
-import LabConnection.BeagleBone: getdev, write!
+include("../../src/LabConnections.jl")
+using LabConnections.BeagleBone
+import LabConnections.BeagleBone: getdev, write!
using Base.Test
diff --git a/test/runtests.jl b/test/runtests.jl
index 0f19484..833ef75 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -1,4 +1,4 @@
-using LabConnection
+using LabConnections
using Base.Test
# write your own tests here
diff --git a/util/connect_BBB.sh b/util/connect_BBB.sh
index 3b412bb..fa8a340 100755
--- a/util/connect_BBB.sh
+++ b/util/connect_BBB.sh
@@ -5,4 +5,4 @@
#
# The code may be executed from anywhere on the HOST computer.
###############################################################################
-ssh -t debian@192.168.7.2 "./LabConnection.jl/util/startup.sh; bash -l"
+ssh -t debian@192.168.7.2 "./LabConnections.jl/util/startup.sh; bash -l"
diff --git a/util/connect_BBB.sh~ b/util/connect_BBB.sh~
deleted file mode 100755
index 3b412bb..0000000
--- a/util/connect_BBB.sh~
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-###############################################################################
-# This line of code connects to the BBB via ssh, runs the startup file and
-# remains in the shell of the BBB after executing startup.sh on the BBB
-#
-# The code may be executed from anywhere on the HOST computer.
-###############################################################################
-ssh -t debian@192.168.7.2 "./LabConnection.jl/util/startup.sh; bash -l"
diff --git a/util/copyfoldertobb.sh b/util/copyfoldertobb.sh
index 1bf6138..a9c9d05 100755
--- a/util/copyfoldertobb.sh
+++ b/util/copyfoldertobb.sh
@@ -8,7 +8,7 @@ printf "${BLUE}Updating project${NC}\n..."
codeHost=gitlab.control.lth.se
codeUser=labdev
-projects=LabConnection
+projects=LabConnections
flag=false
printf "${BLUE}Initializing Transferring files to BBB${NC}\n"
diff --git a/util/flash_BBB.sh b/util/flash_BBB.sh
index f8102e1..ef9bde0 100755
--- a/util/flash_BBB.sh
+++ b/util/flash_BBB.sh
@@ -15,7 +15,7 @@ printf "${BLUE}Updating project${NC}\n..."
codeHost=gitlab.control.lth.se
codeUser=labdev
-projects=(LabConnection.jl)
+projects=(LabConnections.jl)
flag=false
for project in "${projects[@]}"; do
@@ -63,7 +63,7 @@ done
printf "${BLUE}Connecting to the BBB...${NC}\n"
{
- ssh -t debian@192.168.7.2 "./LabConnection.jl/util/startup.sh; bash -l"
+ ssh -t debian@192.168.7.2 "./LabConnections.jl/util/startup.sh; bash -l"
} || {
printf "${RED}Could Connect to the BBB!${NC}\n"
}
diff --git a/util/flash_BBB.sh~ b/util/flash_BBB.sh~
deleted file mode 100755
index f8102e1..0000000
--- a/util/flash_BBB.sh~
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-###############################################################################
-# This code clones or upps the most recent code from github and transfers it to
-# the BBB before connecting to it and running the startup file on the BBB.
-#
-# The code may be executed from anywhere on the HOST computer.
-###############################################################################
-
-BLUE='\033[0;34m'
-GREEN='\033[0;32m'
-RED='\033[0;31m'
-NC='\033[0m'
-
-printf "${BLUE}Updating project${NC}\n..."
-
-codeHost=gitlab.control.lth.se
-codeUser=labdev
-projects=(LabConnection.jl)
-flag=false
-
-for project in "${projects[@]}"; do
- {
- if [ -d "${project}" ]; then
- # Try to clone repository
- printf "${GREEN}Pulling /${project}...${NC}\n"
- cd "${project}"
- echo $(ls)
- git pull "https://${codeHost}/${codeUser}/${project}.git"
- cd ".."
- else
- printf "${GREEN}Cloning /${project}...${NC}\n"
- git clone "https://${codeHost}/${codeUser}/${project}.git"
- fi
- } || { # catch
- # save log for exception
- flag=false
- printf "${RED}Could not udate repository /${project}${NC}, aborting.\n"
- }
-done
-
-printf "${BLUE}Initializing Transferring files to BBB${NC}\n"
-if [ "{flag}"=true ]; then
- for project in "${projects[@]}"; do
- {
- printf "${GREEN}Transferring /${project}...${NC}\n"
- scp -r ${project} debian@192.168.7.2:/home/debian
- } || { # catch
- # save log for exception
- flag=false
- printf "${RED}Could not send project /${project} to the BBB, aborting!${NC}\n"
- }
- done
-fi
-
-printf "${BLUE}Deleting temporary files...${NC}\n"
-for project in "${projects[@]}"; do
- {
- rm -rf ${project}
- } || {
- printf "${RED}Could not delete project /${project}, aborting!${NC}\n"
-}
-done
-
-printf "${BLUE}Connecting to the BBB...${NC}\n"
-{
- ssh -t debian@192.168.7.2 "./LabConnection.jl/util/startup.sh; bash -l"
-} || {
- printf "${RED}Could Connect to the BBB!${NC}\n"
-}
diff --git a/util/getfrom_BBB.sh~ b/util/getfrom_BBB.sh~
deleted file mode 100755
index 0024684..0000000
--- a/util/getfrom_BBB.sh~
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-###############################################################################
-# This pice of tries to scp files from the BBB to a directory $PWD/temp
-#
-# The code may be executed from anywhere on the HOST computer.
-###############################################################################
-{
- if [ ! -d "temp" ]; then
- mkdir temp
- fi
- sudo scp -r debian@192.168.7.2:/home/debian/$1 $PWD/temp
-} || {
- echo "Could not find or transfer $1, check that the file exists on the BBB"
-}
diff --git a/util/startup.sh b/util/startup.sh
index d556f1b..f7fd68d 100755
--- a/util/startup.sh
+++ b/util/startup.sh
@@ -1,4 +1,4 @@
#!/bin/sh
ls
-cd "LabConnection.jl/test/BeagleBone"
+cd "LabConnections.jl/test/BeagleBone"
sudo /home/debian/julia-903644385b/bin/julia
diff --git a/util/startup.sh~ b/util/startup.sh~
deleted file mode 100755
index 78a8c75..0000000
--- a/util/startup.sh~
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-ls
-cd "LabConnection.jl/test/BeagleBone"
-sudo /home/debian/julia-903644385b/bin/julia
-
--
GitLab