Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
processes
LabProcesses.jl
Commits
96705a7a
Commit
96705a7a
authored
Aug 29, 2017
by
Fredrik Bagge Carlson
Browse files
Move constructors to outer
parent
5dbfdbe8
Pipeline
#529
failed with stage
in 1 minute and 32 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/interface_implementations/ballandbeam.jl
View file @
96705a7a
...
...
@@ -37,7 +37,7 @@ function Beam(;
stream
::
LabStream
=
ComediStream
(),
measure
::
AnalogInput10V
=
AnalogInput10V
(
0
),
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
)
p
end
...
...
@@ -66,7 +66,7 @@ function BallAndBeam(;
measure1
::
AnalogInput10V
=
AnalogInput10V
(
0
),
measure2
::
AnalogInput10V
=
AnalogInput10V
(
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
)
p
end
...
...
src/interface_implementations/eth_helicopter.jl
View file @
96705a7a
...
...
@@ -38,7 +38,7 @@ function ETHHelicopter(;
measure2
::
AnalogInput10V
=
AnalogInput10V
(
1
),
control1
::
AnalogOutput10V
=
AnalogOutput10V
(
0
),
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
)
p
end
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment