chip-gpio 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8af98f1f1873ef8bd513eed9a2546b20b449513
-  data.tar.gz: b6e7064d8fed34237b3d6de85eb1660195f1457f
+  metadata.gz: d2bd88f0fd76071fd6292675337841d22465f029
+  data.tar.gz: ce6a49044b5748da33d16d5af5a2dfb7369668c2
 SHA512:
-  metadata.gz: 9cb2f46f63722d1b27d51e04216f44bf041140685acafa0170df1dd4a6f2bf95b18632fc75a4aab8121faf97b9161cae51ebe2b4fcc61b649e6ceee133cc23c1
-  data.tar.gz: 28db799c54d20387fb94c8542678d53ac3eae0ccfeac56f3f20a2056e3c149e20c3764a7e89c6c23c61b290f905a6a676f7e25dc1127d56cead64477149d495c
+  metadata.gz: ff287ee4e02d61680d5b1c927b56eb3ee64420d81bab7c8b5e8b8846da44d25774fe96839455f25e12d19f251514856dd8ce28b11001e07052e93a873b06fc5e
+  data.tar.gz: 2819b7e2d8f00def73258b74b66a821bedcdaca2afaa58eaf4b81a016d304ea431a90ec895af434e3e32ac01dffd6b84e1e1b489028bc0aaeded86e0a4d472f7

data/lib/chip-gpio/Pin.rb

@@ -67,47 +67,28 @@ module ChipGPIO
 
   end
 
-  def self.chip_version
-    default_version = :v4_4
-
-    begin
-      version_string = File.read('/proc/version')
-
-      #grab the major and minor version of the Linux string; only match on NTC versions
-      #since custom builds will be weird
-      match = /Linux version ([0-9]+)\.([0-9]+).+-ntc.*/.match(version_string)
-      throw "Unable to parse /proc/version string" if match.nil? 
-      throw "Unable to parse /proc/version string - could not find version numbers" if match.captures.size != 2
-
-      major = match.captures[0]
-      minor = match.captures[1]
-
-      if major == "4" && minor == "3" 
-        return :v4_3
-      elsif  major== "4" && minor == "4"
-        return :v4_4
-      else
-        throw "Unrecognized version #{major}.#{minor}"
+  def self.get_xio_base
+    labels = Dir::glob("/sys/class/gpio/*/label")
+    labels.each do |label|
+      value = File.read(label).strip
+      if value == "pcf8574a"
+        base_path = File.dirname(label)
+        base_path = File.join(base_path, 'base')
+        base = File.read(base_path).strip
+        return base.to_i
       end
-    rescue
-      puts "Unable to read version from /proc/version; using #{default_version} as default"
-      version = default_version
     end
 
-    return version
+    throw "Could not find XIO base"
   end
 
   def self.get_pins
-      v = chip_version
       cis = [132, 133, 134, 135, 136, 137, 138, 139 ]
+      xio = []
 
-      case chip_version
-      when :v4_3
-        xio = [408, 409, 410, 411, 412, 413, 414, 415]
-      when :v4_4
-        xio = [1016, 1017, 1018, 1019, 1020, 1021, 1022, 1023]
-      end
-
+      xio_base = get_xio_base()
+      (0..7).each { |i| xio << (xio_base + i) }
+      
       pins = {}
 
       cis.each_with_index { |gpio, index| pins["CSI#{index}".to_sym] = Pin::Pin.new(gpio) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chip-gpio
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - James Williams