beaglebone 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68eaf4ade8ad13496f5398d406cb224abb91bdb8
-  data.tar.gz: ca0aac0679b26ea1307c469d552406478754c863
+  metadata.gz: 55046e8cad71090664e27203de1fe74cb6111e71
+  data.tar.gz: f3690c4cb8d86a7c8e640a531c9cf4f501e45a8b
 SHA512:
-  metadata.gz: 9bc2e2a6e7e4bd32084faa96dd12a4d4fa6f7f6bcaafecaa151a824c04721d9445b24f1041069da6f6807e7fa8245116578c10f56ce635673b575428104b66bc
-  data.tar.gz: 3c1ca6528e16c2e8a771d6baa18e07be2d209b5f2b5e21a7be20793d506d5876f6c573b923191dbc941f1c94fb230c63c1937a74d72cfd768d2e8d581e768b81
+  metadata.gz: 61e7091c7b1cc1ff8ed255228f3813ebf9cdc8b26d25efd6bda76dafac0ab65214f54c644b876a975f68480f4558ab3b8585673daf3dd89ed2b57eff391f4768
+  data.tar.gz: 73c4924d8e245f5eee866b913ffae1d89d24b897d196a6534525ee99280f65748563349bf66b4a16a516e8432a2227a2fafb2ed533f7c52b97762260e70b4b0c

data/beaglebone.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'beaglebone'
-  s.version     = '1.2.2'
-  s.date        = '2014-08-01'
+  s.version     = '1.2.3'
+  s.date        = '2014-10-04'
   s.summary     = 'Beaglebone IO Gem'
   s.description = 'A Full Featured Beaglebone IO Gem'
   s.author      = 'Rob Mosher'

data/lib/beaglebone/uart.rb

@@ -15,6 +15,47 @@ module Beaglebone #:nodoc:
     class << self
       attr_accessor :uartstatus, :uartmutex
 
+      # dts template for UART3 device
+      UARTTEMPLATE = []
+      UARTTEMPLATE[3] = '
+/dts-v1/;
+/plugin/;
+
+/ {
+  compatible = "ti,beaglebone", "ti,beaglebone-black";
+
+  /* identification */
+  part-number = "BB-UART3";
+  version = "00A0";
+
+  /* state the resources this cape uses */
+  exclusive-use =
+    /* the pin header uses */
+    "P9.42",  /* uart3_txd */
+    /* the hardware ip uses */
+    "uart3";
+
+  fragment@0 {
+    target = <&am33xx_pinmux>;
+    __overlay__ {
+      bb_uart3_pins: pinmux_bb_uart3_pins {
+        pinctrl-single,pins = <
+          0x164 0x01 
+        >;
+      };
+    };
+  };
+
+  fragment@1 {
+    target = <&uart4>;  /* really uart3 */
+    __overlay__ {
+      status = "okay";
+      pinctrl-names = "default";
+      pinctrl-0 = <&bb_uart3_pins>;
+    };
+  };
+};
+'
 
       # Initialize a UART device
       #
@@ -32,6 +73,9 @@ module Beaglebone #:nodoc:
 
         uartinfo = UARTS[uart]
 
+        #ensure we have a dtb to load
+        create_device_tree(uart)
+
         #ensure dtb is loaded
         Beaglebone::device_tree_load("#{TREES[:UART][:pin]}#{uartinfo[:id]}")
 
@@ -392,12 +436,16 @@ module Beaglebone #:nodoc:
         raise ArgumentError, "Invalid UART Specified #{uart.to_s}" unless UARTS[uart]
         uartinfo = UARTS[uart.to_sym]
 
-        unless uartinfo[:tx] && [nil,:uart].include?(Beaglebone::get_pin_status(uartinfo[:tx], :type))
-          raise StandardError, "TX Pin for #{uart.to_s} in use"
+        if uartinfo[:tx]
+          unless [nil,:uart].include?(Beaglebone::get_pin_status(uartinfo[:tx], :type))
+            raise StandardError, "TX Pin for #{uart.to_s} in use"
+          end
         end
 
-        unless uartinfo[:rx] && [nil,:uart].include?(Beaglebone::get_pin_status(uartinfo[:rx], :type))
-          raise StandardError, "RX Pin for #{uart.to_s} in use"
+        if uartinfo[:rx]
+          unless [nil,:uart].include?(Beaglebone::get_pin_status(uartinfo[:rx], :type))
+            raise StandardError, "RX Pin for #{uart.to_s} in use"
+          end
         end
 
       end
@@ -439,6 +487,33 @@ module Beaglebone #:nodoc:
 
       end
 
+      def create_device_tree(uart, force = false)
+        uartinfo = UARTS[uart]
+
+        #ensure valid uart, and a template to create this exists
+        return unless uartinfo
+
+        uartnum =  uartinfo[:id]
+
+        return unless uartnum && UARTTEMPLATE[uartnum]
+
+        dts = UARTTEMPLATE[uartinfo[:id]].clone
+
+        filename = "/lib/firmware/#{TREES[:UART][:pin]}#{uartnum}-00A0"
+        dts_fn = "#{filename}.dts"
+        dtb_fn = "#{filename}.dtbo"
+
+        # if we've already built this file, we don't need to do it again
+        return if File.exists?(dtb_fn) && !force
+
+        dts_file = File.open(dts_fn, 'w')
+        dts_file.write(dts)
+        dts_file.close
+
+        system("dtc -O dtb -o #{dtb_fn} -b 0 -@ #{dts_fn}")
+
+      end
+
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaglebone
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Rob Mosher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-10-04 00:00:00.000000000 Z
 dependencies: []
 description: A Full Featured Beaglebone IO Gem
 email: nyt-rubygems@countercultured.net
@@ -39,18 +39,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Beaglebone IO Gem
 test_files: []
+has_rdoc: