Updated SPM logic.

Author: shepting

examples/directMemory.swift

@@ -7,7 +7,6 @@ func loopGPIO() {
     let file = open("/dev/mem", O_RDWR | O_SYNC);
     defer { close(file) }
 
-    
     // This is the base memory address for *all* peripherals of the
     // Rasbperry Pi (I2C, SPI, GPIO, UART, etc)
     let peripheralsBaseAddress = 0x3f000000 
@@ -22,6 +21,7 @@ func loopGPIO() {
     // Open the /dev/mem file (all memory) with read and write
     // privileges (we want to turn on output pins) at the proper
     // offset (we don't care about the rest of the addresses)
+    // 0x3f200000
     guard let rawPointer = mmap(nil, 1024 * 4, PROT_READ | PROT_WRITE, MAP_SHARED, file, gpioBaseAddress) else {
         perror("Cannot mmap bytes for path")
         return

source/Package.pins

@@ -1,7 +1,12 @@
 {
   "autoPin": true,
   "pins": [
-
+    {
+      "package": "SwiftyGPIO",
+      "reason": null,
+      "repositoryURL": "https://github.com/uraimo/SwiftyGPIO.git",
+      "version": "0.9.11"
+    }
   ],
   "version": 1
 }

source/Sources/Home/AnalogReader.swift

@@ -38,6 +38,7 @@ public struct AnalogReader {
 
         shortSleep()
         let value = i2c.readWord(0x48, command: 0)
+        print("Value: \(value)")
         // let values = i2c.readData(0x48, command:0)
         // let high = value & 0xFF
         // let low = (value >> 8) & 0xFF

source/Sources/Home/LightSwitch.swift

@@ -1,25 +1,27 @@
 import SwiftyGPIO
 
 public struct LightSwitch {
-    let pin13: GPIO
-    let pin7: GPIO
+    let gpio4: GPIO // LED
+    let gpio6: GPIO // Relay
 
-    public init() {
+    public init?() {
         print("New light switch.")
         let gpios = SwiftyGPIO.GPIOs(for:.RaspberryPi3)
-        pin13 = gpios[.P27]!
-        pin7 = gpios[.P4]!
-        pin13.direction = .OUT
-        pin7.direction = .OUT
+        guard let gpio4 = gpios[.P4] else { print("Invalid GPIO: .P4"); return nil }
+        self.gpio4 = gpio4
+        guard let gpio6 = gpios[.P6] else { print("Invalid GPIO: .P6"); return nil }
+        self.gpio6 = gpio6
+        gpio4.direction = .OUT
+        gpio6.direction = .OUT
     }
 
     public func on() {
-        pin13.value = 1
-        pin7.value = 1
+        gpio4.value = 1
+        gpio6.value = 1
     }
 
     public func off() {
-        pin13.value = 0
-        pin7.value = 0
+        gpio4.value = 0
+        gpio6.value = 0
     }
 }

source/Sources/RaspberrySwift/main.swift

@@ -1,33 +1,11 @@
+//
+// main.swift
+//
 
 import Foundation
 import SwiftyGPIO
 import Home
 
-extension UInt8 {
-    func hex() -> String {
-        return String(format: "%02x", self)
-    }
-}
-
-extension Int {
-    func hex() -> String {
-        return String(format: "%02x", self)
-    }
-}
-extension UInt16 {
-    func hex() -> String {
-        // 0x4e07
-        let low = self & 0xFF
-        let high = (self >> 8) & 0xFF
-        return "0x" + String(format: "%02x", high) + String(format: "%02x", low)
-        // return "0x" + String(high, radix: 16, uppercase: true) + String(low, radix: 16, uppercase: true)
-    }
-}
-
-func shortSleep() {
-    usleep(100000)
-}
-
 public func i2c() {
     let analogReader = AnalogReader()
 
@@ -38,7 +16,7 @@ public func i2c() {
 }
 
 func switch_toggle() {
-    let light = LightSwitch()
+    guard let light = LightSwitch() else { print("Failed to create switch"); return }
 
     for _ in 1...5 {
         print("On.")
@@ -50,10 +28,10 @@ func switch_toggle() {
     }
 }
 
-// switch_toggle()
-i2c()
+switch_toggle()
+//i2c()
 
 func main() -> Int {
-    print("Hey yo. Hi.")
+    print("Main")
     return 0
 }