origen 0.7.31 → 0.7.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fac3698db2dd4c2f9e76c4d69e4c3978a3afba2
-  data.tar.gz: c012add50e18d3e3514349108d2a728068c6404a
+  metadata.gz: 7799e384862e6d6c36e40876e3fb519bf557260a
+  data.tar.gz: 2fcb7098f5ee2c4fc4c5afd5809a01950196193a
 SHA512:
-  metadata.gz: b68dd0a476af5fe6ac816bf54f2135ee23abdf68bbac1e13002db30ce25518522a4d97a9b3398cbe4a7ad860b91baa8a7c8d390d70ad0f4baa57e0c2c2874372
-  data.tar.gz: fd66ca810a030294c6bccfbd86af22053ceb418738e75856475ed52b0285e9a6b8fa0ab8aac6c838d47637bac4f5feb27e83ed865f69edd15277162fd6570dae
+  metadata.gz: 2a0a31dd7643e2fc3f053aadd60ae1f972a9f95a0ab2b9b6a1e33aecd2f2951a1ed7d2dcc0d4045556cb79fc7f229e2109a0284ab4c0d29814a575c6a960c72a
+  data.tar.gz: 39a9cf84746217211cbae45bfe8b49bc8d77aa6fd2865e8bb737be18c6524a9ee5927dd0dd09d371b2dc56e12a52ee9033fabd4c84f0ebb1c2174aa92059d7de

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 31
+  BUGFIX = 32
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/pins.rb

@@ -176,6 +176,7 @@ module Origen
     autoload :PinClock,      'origen/pins/pin_clock'
     autoload :PowerPin,      'origen/pins/power_pin'
     autoload :GroundPin,     'origen/pins/ground_pin'
+    autoload :OtherPin,      'origen/pins/other_pin'
     autoload :VirtualPin,    'origen/pins/virtual_pin'
     autoload :FunctionProxy, 'origen/pins/function_proxy'
 
@@ -215,6 +216,7 @@ module Origen
       power_pin = options.delete(:power_pin)
       ground_pin = options.delete(:ground_pin)
       virtual_pin = options.delete(:virtual_pin)
+      other_pin = options.delete(:other_pin)
       if options[:size] && options[:size] > 1
         group = PinCollection.new(self, options.merge(placeholder: true))
         group.id = id if id
@@ -231,6 +233,8 @@ module Origen
             group[i] = GroundPin.new(i, self, options)
           elsif virtual_pin
             group[i] = VirtualPin.new(i, self, options)
+          elsif other_pin
+            group[i] = OtherPin.new(i, self, options)
           else
             group[i] = Pin.new(i, self, options)
           end
@@ -253,6 +257,8 @@ module Origen
           pin = GroundPin.new(id || :temp, self, options)
         elsif virtual_pin
           pin = VirtualPin.new(id || :temp, self, options)
+        elsif other_pin
+          pin = OtherPin.new(id || :temp, self, options)
         else
           pin = Pin.new(id || :temp, self, options)
         end
@@ -281,6 +287,15 @@ module Origen
     end
     alias_method :add_ground_pins, :add_ground_pin
 
+    def add_other_pin(id = nil, options = {}, &block)
+      id, options = nil, id if id.is_a?(Hash)
+      options = {
+        other_pin: true
+      }.merge(options)
+      add_pin(id, options, &block)
+    end
+    alias_method :add_other_pins, :add_other_pin
+
     def add_virtual_pin(id = nil, options = {}, &block)
       id, options = nil, id if id.is_a?(Hash)
       options = {
@@ -399,6 +414,11 @@ module Origen
     end
     alias_method :has_ground_pins?, :has_ground_pin?
 
+    def has_other_pin?(id)
+      !!Origen.pin_bank.find(id, other_pin: true)
+    end
+    alias_method :has_other_pins?, :has_other_pin?
+
     # Equivalent to the has_pin? method but considers virtual pins rather than regular pins
     def has_virtual_pin?(id)
       !!Origen.pin_bank.find(id, virtual_pin: true)
@@ -412,7 +432,6 @@ module Origen
         options = {}
       end
       # check if this is a pin group alias
-
       found = false
       group = nil
       unless options[:pins_only] == true
@@ -478,6 +497,18 @@ module Origen
       add_pin_group(id, *pins, options, &block)
     end
 
+    def add_other_pin_group(id, *pins, &block)
+      if pins.last.is_a?(Hash)
+        options = pins.pop
+      else
+        options = {}
+      end
+      options = {
+        other_pin: true
+      }.merge(options)
+      add_pin_group(id, *pins, options, &block)
+    end
+
     def add_virtual_pin_group(id, *pins, &block)
       if pins.last.is_a?(Hash)
         options = pins.pop
@@ -521,6 +552,15 @@ module Origen
       end
     end
 
+    # Equivalent to the all_pins method but considers other pins rather than regular pins
+    def all_other_pins(id = nil, _options = {}, &_block)
+      if id
+        pin = Origen.pin_bank.find(id, ignore_context: true, other_pin: true)
+      else
+        Origen.pin_bank.all_other_pins
+      end
+    end
+
     # Equivalent to the all_pins method but considers ground pins rather than regular pins
     def all_virtual_pins(id = nil, _options = {}, &_block)
       if id
@@ -595,6 +635,28 @@ If you meant to define the ground_pin_group then use the add_ground_pin_group me
     end
     alias_method :ground_pin_group, :ground_pin_groups
 
+    # Equivalent to the pin_groups method but considers other pins rather than regular pins
+    def other_pin_groups(id = nil, options = {}, &_block)
+      id, options = nil, id if id.is_a?(Hash)
+      if id
+        pin = Origen.pin_bank.find(id, options.merge(other_pin: true))
+        unless pin
+          puts <<-END
+    You have tried to reference other_pin_group :#{id} within #{self.class} but it does not exist, this could be
+    because the pin group has not been defined yet or it is an alias that is not available in the current context.
+
+    If you meant to define the other_pin_group then use the add_other_pin_group method instead.
+
+          END
+          fail 'Other pin group not found'
+        end
+        pin
+      else
+        Origen.pin_bank.other_pin_groups(options)
+      end
+    end
+    alias_method :other_pin_group, :other_pin_groups
+
     # Equivalent to the pin_groups method but considers virtual pins rather than regular pins
     def virtual_pin_groups(id = nil, options = {}, &_block)
       id, options = nil, id if id.is_a?(Hash)
@@ -645,6 +707,8 @@ If you meant to define the pin then use the add_pin method instead.
           Origen.pin_bank.ground_pins
         elsif options[:virtual_pin]
           Origen.pin_bank.virtual_pins
+        elsif options[:other_pin]
+          Origen.pin_bank.other_pins
         else
           Origen.pin_bank.pins
         end
@@ -670,6 +734,15 @@ If you meant to define the pin then use the add_pin method instead.
       pins(id, options, &block)
     end
 
+    # Equivalent to the pins method but considers other pins rather than regular pins
+    def other_pins(id = nil, options = {}, &block)
+      id, options = nil, id if id.is_a?(Hash)
+      options = {
+        other_pin: true
+      }.merge(options)
+      pins(id, options, &block)
+    end
+
     # Equivalent to the pins method but considers virtual pins rather than regular pins
     def virtual_pins(id = nil, options = {}, &block)
       id, options = nil, id if id.is_a?(Hash)

data/lib/origen/pins/other_pin.rb

@@ -0,0 +1,6 @@
+module Origen
+  module Pins
+    class OtherPin < Pin
+    end
+  end
+end

data/lib/origen/pins/pin.rb

@@ -39,6 +39,9 @@ module Origen
       # Pin RTL name, short term solution for products that do not get full HDL path for pins
       attr_accessor :rtl_name
 
+      attr_accessor :description
+      attr_accessor :notes
+
       # Should be instantiated through the HasPins macros
       def initialize(id, owner, options = {}) # :nodoc:
         options = {

data/lib/origen/pins/pin_bank.rb

@@ -25,6 +25,8 @@ module Origen
           bank = all_ground_pins
         elsif pin.is_a?(VirtualPin)
           bank = all_virtual_pins
+        elsif pin.is_a?(OtherPin)
+          bank = all_other_pins
         else
           bank = all_pins
         end
@@ -75,6 +77,12 @@ module Origen
         end
       end
 
+      def other_pins(options = {})
+        all_other_pins.select do |_id, pin|
+          pin.enabled?(options)
+        end
+      end
+
       def virtual_pins(options = {})
         all_virtual_pins.select do |_id, pin|
           pin.enabled?(options)
@@ -102,6 +110,13 @@ module Origen
         end
       end
 
+      # Returns a hash containing all ground_pin_groups available in the current context stored by their primary ID
+      def other_pin_groups(options = {})
+        current_pin_group_store(all_other_pin_groups, options).select do |_id, group|
+          group.enabled?(options)
+        end
+      end
+
       # Returns a hash containing all virtual_pin_groups available in the current context stored by their primary ID
       def virtual_pin_groups(options = {})
         current_pin_group_store(all_virtual_pin_groups, options).select do |_id, group|
@@ -129,6 +144,11 @@ module Origen
         @all_ground_pins ||= {}
       end
 
+      # Returns a hash containing all other pins stored by their primary ID
+      def all_other_pins
+        @all_other_pins ||= {}
+      end
+
       # Returns a hash containing all virtual pins stored by their primary ID
       def all_virtual_pins
         @all_virtual_pins ||= {}
@@ -144,6 +164,11 @@ module Origen
         @all_ground_pin_groups ||= {}
       end
 
+      # Returns a hash containing all other pin groups stored by context
+      def all_other_pin_groups
+        @all_other_pin_groups ||= {}
+      end
+
       # Returns a hash containing all virtual pin groups stored by context
       def all_virtual_pin_groups
         @all_virtual_pin_groups ||= {}
@@ -157,6 +182,8 @@ module Origen
           pin = all_ground_pins[id] || find_pin_group(id, options)
         elsif options[:virtual_pin]
           pin = all_virtual_pins[id] || find_pin_group(id, options)
+        elsif options[:other_pin]
+          pin = all_other_pins[id] || find_pin_group(id, options)
         else
           pin = all_pins[id] || find_by_alias(id, options) || find_pin_group(id, options)
         end
@@ -175,6 +202,8 @@ module Origen
           base = all_power_pin_groups
         elsif options[:ground_pin]
           base = all_ground_pin_groups
+        elsif options[:other_pin]
+          base = all_other_pin_groups
         elsif options[:virtual_pin]
           base = all_virtual_pin_groups
         else
@@ -209,6 +238,8 @@ module Origen
           bank = all_power_pins
         elsif pin.is_a?(GroundPin)
           bank = all_ground_pins
+        elsif pin.is_a?(OtherPin)
+          bank = all_other_pins
         elsif pin.is_a?(VirtualPin)
           bank = all_virtual_pins
         else
@@ -240,6 +271,8 @@ module Origen
           base = all_power_pin_groups
         elsif group.ground_pins?
           base = all_ground_pin_groups
+        elsif group.other_pins?
+          base = all_other_pin_groups
         elsif group.virtual_pins?
           base = all_virtual_pin_groups
         else
@@ -285,6 +318,8 @@ module Origen
           base = all_power_pin_groups
         elsif group.ground_pins?
           base = all_ground_pin_groups
+        elsif group.other_pins?
+          base = all_other_pin_groups
         elsif group.virtual_pins?
           base = all_virtual_pin_groups
         else
@@ -367,10 +402,12 @@ module Origen
         @all_pins = nil
         @all_power_pins = nil
         @all_ground_pins = nil
+        @all_other_pins = nil
         @all_virtual_pins = nil
         @all_pin_groups = nil
         @all_power_pin_groups = nil
         @all_ground_pin_groups = nil
+        @all_other_pin_groups = nil
         @all_virtual_pin_groups = nil
       end
 

data/lib/origen/pins/pin_collection.rb

@@ -8,6 +8,7 @@ module Origen
 
       attr_accessor :endian
       attr_accessor :description
+      attr_accessor :group
 
       def initialize(owner, *pins)
         options = pins.last.is_a?(Hash) ? pins.pop : {}
@@ -17,6 +18,7 @@ module Origen
         @power_pins = options.delete(:power_pin) || options.delete(:power_pins)
         @ground_pins = options.delete(:ground_pin) || options.delete(:ground_pins)
         @virtual_pins = options.delete(:virtual_pin) || options.delete(:virtual_pins)
+        @other_pins = options.delete(:other_pin) || options.delete(:other_pins)
         @endian = options[:endian]
         @description = options[:description] || options[:desc]
         @options = options
@@ -87,6 +89,11 @@ module Origen
         @virtual_pins
       end
 
+      # Returns true if the pin collection contains other pins rather than regular pins
+      def other_pins?
+        @other_pins
+      end
+
       def id
         @id
       end
@@ -182,14 +189,14 @@ module Origen
             pin = owner.power_pins(pin)
           elsif ground_pins?
             pin = owner.ground_pins(pin)
+          elsif other_pins?
+            pin = owner.other_pins(pin)
           elsif virtual_pins?
             pin = owner.virtual_pins(pin)
           else
             pin = owner.pins(pin)
           end
-          if @store.include?(pin)
-            fail "Pin collection #{id} already contains pin #{pin.id}!"
-          else
+          unless @store.include?(pin)
             pin.invalidate_group_cache
             @store.push(pin)
           end

data/lib/origen/specs/note.rb

@@ -22,6 +22,9 @@ module Origen
       # Plain text of the note.  No Mark-up allowed in this field.
       attr_accessor :text
 
+      # Note Number.  Optional.  If not set, then DITA will make the number
+      attr_accessor :number
+
       # Markup of the text field.  Currently markup has been tested with
       #
       # * DITA
@@ -46,6 +49,7 @@ module Origen
         @text = options[:text]
         @markup = options[:markup]
         @internal_comment = options[:internal_comment]
+        @number = options[:number]
       end
     end
   end

data/lib/origen/specs/power_supply.rb

@@ -42,6 +42,21 @@ module Origen
         @input_display_name = ''
         @output_display_name = ''
       end
+
+      def update_input
+        @input_display_name = change_subscript('IN')
+      end
+
+      def update_output
+        @output_display_name = change_subscript('OUT')
+      end
+
+      def change_subscript(new_subscript)
+        temp_display_name = @display_name.dup
+        sub_input = temp_display_name.at_css 'sub'
+        sub_input.content = new_subscript unless sub_input.nil?
+        temp_display_name
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.31
+  version: 0.7.32
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -464,6 +464,7 @@ files:
 - lib/origen/pins.rb
 - lib/origen/pins/function_proxy.rb
 - lib/origen/pins/ground_pin.rb
+- lib/origen/pins/other_pin.rb
 - lib/origen/pins/pin.rb
 - lib/origen/pins/pin_bank.rb
 - lib/origen/pins/pin_clock.rb