HPi 0.3.0 → 0.4.0

raw patch · 2 files changed

+10/−4 lines, 2 files

Files

• HPi.cabal +1/−1
• System/RaspberryPi/GPIO.hs +9/−3

@@ -2,7 +2,7 @@ -- see http://haskell.org/cabal/users-guide/
 
 name:                HPi
-version:             0.3.0
+version:             0.4.0
 synopsis:            GPIO and I2C functions for the Raspberry Pi.
 description:         This package is a FFI wrapper around the bcm2835 library by Mike McCauley, it also includes a few utility functions for easier use of the imported functions.
 homepage:            https://github.com/WJWH/HPi

@@ -34,7 +34,8 @@ import Foreign.C
 import Foreign.C.String
 import qualified Data.ByteString as BS
--- import qualified Data.ByteString.Char8 as BSC
+import Data.Maybe
+import Data.Tuple
 import GHC.IO.Exception
 
 ------------------------------------------------------------------------------------------------------------------------------------
@@ -49,8 +50,13 @@             PinV1_22|PinV1_23|PinV1_24|PinV1_26
             deriving (Eq,Show)
 
--- |A GPIO pin can be either set to input or output mode.
-data PinMode = Input | Output deriving (Eq,Enum,Show)
+-- |A GPIO pin can be either set to input mode, output mode or an alternative mode.
+data PinMode = Input | Output | Alt0 | Alt1 | Alt2 | Alt3 | Alt4 | Alt5 deriving (Eq,Show)
+
+instance Enum PinMode where -- bit strange, but just deriving Enum doesn't work because the numbers don't monotonically ascend
+    fromEnum = fromJust . flip lookup table
+    toEnum = fromJust . flip lookup (map swap table)
+table = [(Input, 0), (Output, 1), (Alt0, 4), (Alt1, 5), (Alt2, 6), (Alt3, 7), (Alt4, 3), (Alt5, 2)]
 
 -- |This describes the address of an I2C slave.
 type Address = Word8 --adress of an I2C slave