Commit 1349c82f authored by Anders Blomdell's avatar Anders Blomdell
Browse files

Merge branch 'cont-frb/moberg-review'

parents f0f5f0fd ee5e8457
...@@ -7,16 +7,16 @@ mutable struct AnalogIn ...@@ -7,16 +7,16 @@ mutable struct AnalogIn
moberg::Moberg moberg::Moberg
index::UInt32 index::UInt32
channel::AnalogInChannel channel::AnalogInChannel
AnalogIn(moberg::Moberg, index::Unsigned) = ( function AnalogIn(moberg::Moberg, index::Unsigned)
channel = AnalogInChannel(0,0); channel = AnalogInChannel(0,0)
checkOK(ccall((:moberg_analog_in_open, "libmoberg"), checkOK(ccall((:moberg_analog_in_open, "libmoberg"),
Status, Status,
(Moberg, Cint, Ref{AnalogInChannel}), (Moberg, Cint, Ref{AnalogInChannel}),
moberg, index, channel)); moberg, index, channel))
self = new(moberg, index, channel); self = new(moberg, index, channel)
finalizer(close, self); finalizer(close, self)
self self
) end
end end
function close(ain::AnalogIn) function close(ain::AnalogIn)
...@@ -35,4 +35,3 @@ function read(ain::AnalogIn) ...@@ -35,4 +35,3 @@ function read(ain::AnalogIn)
ain.channel.context, result)) ain.channel.context, result))
return result[] return result[]
end end
...@@ -7,16 +7,16 @@ mutable struct AnalogOut ...@@ -7,16 +7,16 @@ mutable struct AnalogOut
moberg::Moberg moberg::Moberg
index::UInt32 index::UInt32
channel::AnalogOutChannel channel::AnalogOutChannel
AnalogOut(moberg::Moberg, index::Unsigned) = ( function AnalogOut(moberg::Moberg, index::Unsigned)
channel = AnalogOutChannel(0,0); channel = AnalogOutChannel(0,0)
checkOK(ccall((:moberg_analog_out_open, "libmoberg"), checkOK(ccall((:moberg_analog_out_open, "libmoberg"),
Status, Status,
(Moberg, Cint, Ref{AnalogOutChannel}), (Moberg, Cint, Ref{AnalogOutChannel}),
moberg, index, channel)); moberg, index, channel));
self = new(moberg, index, channel); self = new(moberg, index, channel)
finalizer(close, self); finalizer(close, self)
self self
) end
end end
function close(aout::AnalogOut) function close(aout::AnalogOut)
...@@ -25,7 +25,7 @@ function close(aout::AnalogOut) ...@@ -25,7 +25,7 @@ function close(aout::AnalogOut)
Status, Status,
(Moberg, Cint, AnalogOutChannel), (Moberg, Cint, AnalogOutChannel),
aout.moberg, aout.index, aout.channel)) aout.moberg, aout.index, aout.channel))
end; end
function write(aout::AnalogOut, value::Cdouble) function write(aout::AnalogOut, value::Cdouble)
checkOK(ccall(aout.channel.write, checkOK(ccall(aout.channel.write,
......
...@@ -7,16 +7,16 @@ mutable struct DigitalIn ...@@ -7,16 +7,16 @@ mutable struct DigitalIn
moberg::Moberg moberg::Moberg
index::UInt32 index::UInt32
channel::DigitalInChannel channel::DigitalInChannel
DigitalIn(moberg::Moberg, index::Unsigned) = ( function DigitalIn(moberg::Moberg, index::Unsigned)
channel = DigitalInChannel(0,0); channel = DigitalInChannel(0,0)
checkOK(ccall((:moberg_digital_in_open, "libmoberg"), checkOK(ccall((:moberg_digital_in_open, "libmoberg"),
Status, Status,
(Moberg, Cint, Ref{DigitalInChannel}), (Moberg, Cint, Ref{DigitalInChannel}),
moberg, index, channel)); moberg, index, channel));
self = new(moberg, index, channel); self = new(moberg, index, channel)
finalizer(close, self); finalizer(close, self)
self self
) end
end end
function close(din::DigitalIn) function close(din::DigitalIn)
...@@ -35,4 +35,3 @@ function read(din::DigitalIn) ...@@ -35,4 +35,3 @@ function read(din::DigitalIn)
din.channel.context, result)) din.channel.context, result))
return result[] != 0 return result[] != 0
end end
...@@ -7,16 +7,16 @@ mutable struct DigitalOut ...@@ -7,16 +7,16 @@ mutable struct DigitalOut
moberg::Moberg moberg::Moberg
index::UInt32 index::UInt32
channel::DigitalOutChannel channel::DigitalOutChannel
DigitalOut(moberg::Moberg, index::Unsigned) = ( function DigitalOut(moberg::Moberg, index::Unsigned)
channel = DigitalOutChannel(0,0); channel = DigitalOutChannel(0,0)
checkOK(ccall((:moberg_digital_out_open, "libmoberg"), checkOK(ccall((:moberg_digital_out_open, "libmoberg"),
Status, Status,
(Moberg, Cint, Ref{DigitalOutChannel}), (Moberg, Cint, Ref{DigitalOutChannel}),
moberg, index, channel)); moberg, index, channel))
self = new(moberg, index, channel); self = new(moberg, index, channel)
finalizer(close, self); finalizer(close, self)
self self
) end
end end
function close(dout::DigitalOut) function close(dout::DigitalOut)
...@@ -25,7 +25,7 @@ function close(dout::DigitalOut) ...@@ -25,7 +25,7 @@ function close(dout::DigitalOut)
Status, Status,
(Moberg, Cint, DigitalOutChannel), (Moberg, Cint, DigitalOutChannel),
dout.moberg, dout.index, dout.channel)) dout.moberg, dout.index, dout.channel))
end; end
function write(dout::DigitalOut, value::Bool) function write(dout::DigitalOut, value::Bool)
checkOK(ccall(dout.channel.write, checkOK(ccall(dout.channel.write,
......
...@@ -7,16 +7,16 @@ mutable struct EncoderIn ...@@ -7,16 +7,16 @@ mutable struct EncoderIn
moberg::Moberg moberg::Moberg
index::UInt32 index::UInt32
channel::EncoderInChannel channel::EncoderInChannel
EncoderIn(moberg::Moberg, index::Unsigned) = ( function EncoderIn(moberg::Moberg, index::Unsigned)
channel = EncoderInChannel(0,0); channel = EncoderInChannel(0,0)
checkOK(ccall((:moberg_encoder_in_open, "libmoberg"), checkOK(ccall((:moberg_encoder_in_open, "libmoberg"),
Status, Status,
(Moberg, Cint, Ref{EncoderInChannel}), (Moberg, Cint, Ref{EncoderInChannel}),
moberg, index, channel)); moberg, index, channel))
self = new(moberg, index, channel); self = new(moberg, index, channel)
finalizer(close, self); finalizer(close, self)
self self
) end
end end
function close(ein::EncoderIn) function close(ein::EncoderIn)
...@@ -35,4 +35,3 @@ function read(ein::EncoderIn) ...@@ -35,4 +35,3 @@ function read(ein::EncoderIn)
ein.channel.context, result)) ein.channel.context, result))
return result[] return result[]
end end
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment