Skip to content
Snippets Groups Projects
Commit 96705a7a authored by Fredrik Bagge Carlson's avatar Fredrik Bagge Carlson
Browse files

Move constructors to outer

parent 5dbfdbe8
Branches
Tags
No related merge requests found
...@@ -37,7 +37,7 @@ function Beam(; ...@@ -37,7 +37,7 @@ function Beam(;
stream::LabStream = ComediStream(), stream::LabStream = ComediStream(),
measure::AnalogInput10V = AnalogInput10V(0), measure::AnalogInput10V = AnalogInput10V(0),
control::AnalogOutput10V = AnalogOutput10V(1)) control::AnalogOutput10V = AnalogOutput10V(1))
p = new(Float64(h),Float64(bias),stream,measure,control) p = Beam(Float64(h),Float64(bias),stream,measure,control)
init_devices!(p.stream, p.measure, p.control) init_devices!(p.stream, p.measure, p.control)
p p
end end
...@@ -66,7 +66,7 @@ function BallAndBeam(; ...@@ -66,7 +66,7 @@ function BallAndBeam(;
measure1::AnalogInput10V = AnalogInput10V(0), measure1::AnalogInput10V = AnalogInput10V(0),
measure2::AnalogInput10V = AnalogInput10V(1), measure2::AnalogInput10V = AnalogInput10V(1),
control::AnalogOutput10V = AnalogOutput10V(1)) control::AnalogOutput10V = AnalogOutput10V(1))
p = new(h,bias,stream,measure1,measure2,control) p = BallAndBeam(h,bias,stream,measure1,measure2,control)
init_devices!(p.stream, p.measure1, p.measure2, p.control) init_devices!(p.stream, p.measure1, p.measure2, p.control)
p p
end end
......
...@@ -38,7 +38,7 @@ function ETHHelicopter(; ...@@ -38,7 +38,7 @@ function ETHHelicopter(;
measure2::AnalogInput10V = AnalogInput10V(1), measure2::AnalogInput10V = AnalogInput10V(1),
control1::AnalogOutput10V = AnalogOutput10V(0), control1::AnalogOutput10V = AnalogOutput10V(0),
control2::AnalogOutput10V = AnalogOutput10V(1)) control2::AnalogOutput10V = AnalogOutput10V(1))
p = new(h,bias,stream,measure1,measure2,control1,control2) p = ETHHelicopter(h,bias,stream,measure1,measure2,control1,control2)
init_devices!(p.stream, p.measure1, p.measure2, p.control1, p.control2) init_devices!(p.stream, p.measure1, p.measure2, p.control1, p.control2)
p p
end end
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment