Update for latest pin numbers.

Author: shepting

examples/a.out

@@ -7,22 +7,11 @@ 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 
-
-    // This is the offset of just the GPIO configuration registers
-    // from the base peripheral address
-    let gpioBaseOffset = 0x200000
-
-    // We only really care about the memory from this point
-    let gpioBaseAddress = peripheralsBaseAddress + gpioBaseOffset
-
     // 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 {
+    guard let rawPointer = mmap(nil, 1024 * 4, PROT_READ | PROT_WRITE, MAP_SHARED, file, 0x3f200000) else {
         perror("Cannot mmap bytes for path")
         return
     }
@@ -32,7 +21,7 @@ func loopGPIO() {
 
     // Configure GPIO pin 4 & 6 as output (3 bits/pin) 
     // pin numbers:           6  5  4  3  2  1  0
-    basePointer.pointee = 0b001000001000000000000
+    basePointer.pointee = 0b001001000000000000000
 
     // Set up set/clear pointer objects
     // Offsets from docs were given in byte-size values
@@ -52,11 +41,11 @@ func loopGPIO() {
     // Loop through and show the LED turning on and off
     for i in 0...5 {
         print("High \(setPointer)")
-        setPointer.pointee = 0b1010000 // Pin 6 & 4
+        setPointer.pointee = 0b1100000 // Pin 6 & 4
         usleep(500000)
         print("Counter: \(i)")
         print("Low \(clearPointer)")
-        clearPointer.pointee = 0b1010000 // Pin 6 & 4
+        clearPointer.pointee = 0b1100000 // Pin 6 & 4
         usleep(500000)
     }
 }

examples/direct

@@ -0,0 +1 @@
+print("Hello Swift Summit")

examples/directMemory.swift

@@ -1,6 +1,12 @@
 {
   "autoPin": true,
   "pins": [
+    {
+      "package": "DS18B20",
+      "reason": null,
+      "repositoryURL": "https://github.com/uraimo/DS18B20.swift.git",
+      "version": "1.0.3"
+    },
     {
       "package": "SwiftyGPIO",
       "reason": null,

examples/direct_old

@@ -14,5 +14,6 @@ let package = Package(
     ],
     dependencies: [
         .Package(url: "https://github.com/uraimo/SwiftyGPIO.git", majorVersion: 0),
+        .Package(url: "https://github.com/uraimo/DS18B20.swift.git", majorVersion: 1),
     ]
 )

examples/hello

@@ -33,6 +33,7 @@ namespace :log do
     system_and_log 'aws cloudwatch put-metric-data --metric-name ProcessorTemperatureCelcius --namespace RaspberrySwift --unit Count --value $(expr `cat /sys/class/thermal/thermal_zone0/temp` / 1000)'
   end
 
+  desc 'Log the GPU temperature to Cloudwatch'
   task :gpu_temp do
     require 'open3'
     temp_string, success = Open3.capture2e('/opt/vc/bin/vcgencmd', 'measure_temp')
@@ -41,6 +42,7 @@ namespace :log do
     system_and_log command
   end
 
+  desc 'Log boot event to Cloudwatch'
   task :boot do
     system_and_log 'aws cloudwatch put-metric-data --metric-name Boot --namespace RaspberrySwift --unit Count --value 1'
   end

examples/hello.swift

@@ -1,54 +1,25 @@
 
 import Foundation
 import SwiftyGPIO
+import DS18B20
 
 func shortSleep() {
     usleep(100000)
 }
 
 public struct AnalogReader {
-    let dataStore = DataStore()
-    let i2c: SysFSI2C
-
+    let ds: DS18B20
     public init() {
-        let i2cs = SwiftyGPIO.hardwareI2Cs(for:.RaspberryPi3)!
-        i2c = i2cs[1] as! SysFSI2C
+        let onewires = SwiftyGPIO.hardware1Wires(for:.RaspberryPi3)!
+        print("One wires: \(onewires)")
+        let onewire = onewires[0]
+        // let slaveId = onewire.getSlaves()[]
+        print("Slaves: \(onewire.getSlaves())")
+        ds = DS18B20(onewire, slaveId: "28-0000097eb360")
+        // GPIO16
     }
 
-    public func readValue() {
-        // sleep(1)
-
-        // let values: [UInt8] = [0xC3, 0xA3]
-        // let values: [UInt8] = [0xA3, 0xC3]
-        // let values: [UInt8] = [195, 163]
-        // print("195: ", 195.hex()) // c3
-        // print("163: ", 163.hex()) // a3
-
-        // i2cset 1 0x48 0x01 0xc3a3 w
-        // i2cget 1 0x48 0x0 w // 0x3bf5
-        // i2cdump 1 0x48 b
-
-        // Write config data
-
-        // let values = [195, 163]
-        i2c.writeWord(0x48, command: 1, value: (195 << 8 | 163))
-        // i2c.writeData(0x48, command: 1, values: [195, 163])
-        // print("Write: \(i2c.writeData(0x48, command: 1, values:values))")
-        // print("Write: \(i2c.writeWord(0x48, command: 1, value: 0xc3a5))")
-
-        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
-
-        // let value = i2c.readData(0x48, command: 0)
-        // let high: UInt16 = UInt16(value[0]) << 8
-        // let low: UInt16 = UInt16(value[1])
-        // let calculated = Double(high | low) * 4096 / 32768.0
-        // print("Calculated: \(calculated)")
-
-        // print("Read: \(i2c.readWord(0x48, command: 0).hex())")
+    public func readValue() -> Float {
+        return ds.Temperature
     }
 }

examples/memory

@@ -1,27 +1,35 @@
 import SwiftyGPIO
 
 public struct LightSwitch {
-    let gpio4: GPIO // LED
-    let gpio6: GPIO // Relay
+    let ledPin: GPIO // LED
+    let relayPin: GPIO // Relay
 
     public init?() {
-        print("New light switch.")
+        // Create the pins
         let gpios = SwiftyGPIO.GPIOs(for:.RaspberryPi3)
-        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
+        guard let ledPin = gpios[.P5] else { print("Invalid GPIO: .P5"); return nil }
+        guard let relayPin = gpios[.P6] else { print("Invalid GPIO: .P6"); return nil }
+        self.ledPin = ledPin
+        self.relayPin = relayPin
+
+        // Set the pins to be outputs
+        ledPin.direction = .OUT
+        relayPin.direction = .OUT
     }
 
+    // Turn all of the pins on
     public func on() {
-        gpio4.value = 1
-        gpio6.value = 1
+        print("🌕 On")
+        ledPin.value = 1
+        relayPin.value = 1
     }
 
+    // Turn all of the pins off
     public func off() {
-        gpio4.value = 0
-        gpio6.value = 0
+        print("🌒 Off")
+        ledPin.value = 0
+        relayPin.value = 0
     }
 }
+
+

source/Package.pins

@@ -3,33 +3,22 @@
 //
 
 import Foundation
-import SwiftyGPIO
 import Home
 
-public func i2c() {
-    let analogReader = AnalogReader()
-
-    for _ in 1...12 {    
-        analogReader.readValue()
-        sleep(1)
-    }
-}
-
 func switch_toggle() {
     guard let light = LightSwitch() else { print("Failed to create switch"); return }
+    let reader = AnalogReader()
 
+    print("Temperature: \(reader.readValue())")
     for _ in 1...5 {
-        print("On.")
         light.on()
-        sleep(1)
-        print("Off.")
+        usleep(500_000)
         light.off()
-        sleep(1)
+        sleep(500_000)
     }
 }
 
 switch_toggle()
-//i2c()
 
 func main() -> Int {
     print("Main")