From 2bde548e40f787d7c0392eb442d44ea47cca2fd4 Mon Sep 17 00:00:00 2001
From: baggepinnen <cont-frb@ulund.org>
Date: Tue, 29 Aug 2017 13:20:51 +0200
Subject: [PATCH] Update install path LabConnections
---
src/LabProcesses.jl | 7 ++++---
src/interface_implementations/ballandbeam.jl | 3 +--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/LabProcesses.jl b/src/LabProcesses.jl
index ed82dd2..40b425e 100644
--- a/src/LabProcesses.jl
+++ b/src/LabProcesses.jl
@@ -1,13 +1,14 @@
# __precompile__()
installed_packages = Pkg.installed()
-if "LabConnection" ∉ keys(installed_packages)
- Pkg.clone("https://gitlab.control.lth.se/labdev/LabConnection.jl")
+if "LabConnections" ∉ keys(installed_packages)
+ Pkg.clone("https://gitlab.control.lth.se/labdev/LabConnections.jl")
+ # Pkg.checkout("LabConnection","v0.0.1")
end
module LabProcesses
-using ControlSystems, LabConnection.Computer, Parameters
+using ControlSystems, LabConnections.Computer, Parameters
include("utilities.jl")
diff --git a/src/interface_implementations/ballandbeam.jl b/src/interface_implementations/ballandbeam.jl
index a1dc73f..f42fbe0 100644
--- a/src/interface_implementations/ballandbeam.jl
+++ b/src/interface_implementations/ballandbeam.jl
@@ -38,8 +38,7 @@ const beam_system, nice_beam_controller = define_beam_system()
struct BeamSimulator <: SimulatedProcess
h::Float64
s::SysFilter
- BeamSimulator() = new(0.01, SysFilter(beam_system, 0.01))
- BeamSimulator(h::Real) = new(Float64(h), SysFilter(beam_system, h))
+ BeamSimulator(;h::Real = 0.01) = new(Float64(h), SysFilter(beam_system, h))
end
@with_kw struct BallAndBeam <: PhysicalProcess
--
GitLab