Lambdaya 0.2.0.0.1 → 0.3.0.0.0
raw patch · 4 files changed
+10/−7 lines, 4 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
- System.RedPitaya.Arm: type FpgaArm = ReaderT FpgaPtr IO
+ System.RedPitaya.Arm: data FpgaArm a
+ System.RedPitaya.Arm: instance Control.Monad.IO.Class.MonadIO System.RedPitaya.Arm.FpgaArm
+ System.RedPitaya.Arm: instance Control.Monad.Reader.Class.MonadReader System.RedPitaya.Arm.FpgaPtr System.RedPitaya.Arm.FpgaArm
+ System.RedPitaya.Arm: instance GHC.Base.Applicative System.RedPitaya.Arm.FpgaArm
+ System.RedPitaya.Arm: instance GHC.Base.Functor System.RedPitaya.Arm.FpgaArm
+ System.RedPitaya.Arm: instance GHC.Base.Monad System.RedPitaya.Arm.FpgaArm
- System.RedPitaya.Fpga: class (Monad m) => FpgaSetGet m where fpgaGet off = fmap head $ fpgaGetArray off 1 fpgaSet off v = fpgaSetArray off [v] fpgaGetArray off len = sequence $ map fpgaGet [off, off + 4 .. (off + (4 * len))] fpgaSetArray off d = sequence_ $ zipWith fpgaSet [off, off + 4 .. ] d
+ System.RedPitaya.Fpga: class (Monad m) => FpgaSetGet m where fpgaGet off = fmap head $ fpgaGetArray off 1 fpgaSet off v = fpgaSetArray off [v] fpgaGetArray off len = sequence $ map fpgaGet $ take len [off, off + 4 .. ] fpgaSetArray off d = sequence_ $ zipWith fpgaSet [off, off + 4 .. ] d
- System.RedPitaya.Fpga: setAsgAmplitudeOffset :: FpgaSetGet a => Channel -> Registry -> a ()
+ System.RedPitaya.Fpga: setAsgAmplitudeOffset :: FpgaSetGet a => Channel -> Word32 -> a ()
- System.RedPitaya.Fpga: setAsgAmplitudeScale :: FpgaSetGet a => Channel -> Registry -> a ()
+ System.RedPitaya.Fpga: setAsgAmplitudeScale :: FpgaSetGet a => Channel -> Word32 -> a ()
- System.RedPitaya.Fpga: setExpDir :: (ToBool b, FpgaSetGet m) => GpioType -> b -> Int -> m ()
+ System.RedPitaya.Fpga: setExpDir :: (FpgaSetGet m, ToBool b) => GpioType -> b -> Int -> m ()
- System.RedPitaya.Fpga: setExpOut :: (ToBool b, FpgaSetGet m) => GpioType -> b -> Int -> m ()
+ System.RedPitaya.Fpga: setExpOut :: (FpgaSetGet m, ToBool b) => GpioType -> b -> Int -> m ()
Files
- Lambdaya.cabal +1/−1
- src/System/RedPitaya/Arm.hs +4/−3
- src/System/RedPitaya/Fpga.hs +1/−1
- src/System/RedPitaya/Tcp.hs +4/−2
Lambdaya.cabal view
@@ -11,7 +11,7 @@ -- | | +----- non-breaking API additions -- | | | +--- code changes with no API change -- | | | | +- doc update-version: 0.2.0.0.1+version: 0.3.0.0.0 -- A short (one-line) description of the package. synopsis: Library for RedPitaya
src/System/RedPitaya/Arm.hs view
@@ -31,15 +31,16 @@ type FpgaPtr = Ptr ()+type FA a = ReaderT FpgaPtr IO a -- | FpgaSetGet get for running on Arm-type FpgaArm = ReaderT FpgaPtr IO-+newtype FpgaArm a = FpgaArm {unFA :: FA a}+ deriving(Functor, Applicative,Monad,MonadIO,MonadReader FpgaPtr) #ifdef arm_HOST_ARCH runArm :: FpgaArm a -> FpgaPtr -> IO a-runArm = runReaderT+runArm = runReaderT . unFA instance FpgaSetGet FpgaArm where
src/System/RedPitaya/Fpga.hs view
@@ -123,7 +123,7 @@ -- user can provide only one set and one get if requred fpgaGet off = fmap head $ fpgaGetArray off 1 fpgaSet off v = fpgaSetArray off [v]- fpgaGetArray off len = sequence $ map fpgaGet [off, off+4 .. (off + (4*len))]+ fpgaGetArray off len = sequence $ map fpgaGet $ take len [off, off+4 .. ] fpgaSetArray off d = sequence_ $ zipWith fpgaSet [off, off+4 .. ] d
src/System/RedPitaya/Tcp.hs view
@@ -64,9 +64,11 @@ >> putWord32be a put (ReadArray len addr) = putWord32be cReadArray + >> putWord32be len >> putWord32be addr - put (RespSingle reg) = putWord32be cRespSingle >> putWord32be reg+ put (RespSingle reg) = putWord32be cRespSingle + >> putWord32be reg put (RespArray len arr) = putWord32be cRespArray >> putWord32be len@@ -122,7 +124,7 @@ handle (WriteSingle addr reg) = lift $ ( fpgaSet (frInt addr) reg ) handle (WriteArray len addr arr) = lift $ fpgaSetArray (frInt addr) arr handle (ReadSingle addr ) = lift (fpgaGet (frInt addr)) >>= (yield . RespSingle )- handle (ReadArray len addr ) = lift (fpgaGetArray (frInt len) (frInt addr) ) + handle (ReadArray len addr ) = lift (fpgaGetArray (frInt addr) (frInt len)) >>= yield . RespArray len handle _ = yield Error