origen 0.59.5 → 0.59.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 652750db0acbd37b59e15fe487e63a85dfe2c912ac5b0c90b983b7ed0d55441b
-  data.tar.gz: 4013b7b56edfab4b6be7a6fc6a482f39bb4b0972de7a1df2efa8b05b2f75f2d9
+  metadata.gz: 7e2a028ce1b3b3fe724cb3c9cec676ed6830a40fa7ec74864a0dd3bd50611260
+  data.tar.gz: 8fe8e6c101236617832f6db76f807c346e2d41b6f3872ae33b5c1cd3de602914
 SHA512:
-  metadata.gz: 154adc77789ca4ac748afef68bff1d66228f9e4c5d819d23dd089f25f58e74ba37569cdabc455682d2c66a87adecca6e246ba8119a9face7182232208171f0f2
-  data.tar.gz: 4b6ee0ee0a47cb72e158b8e9a85f68a08821ad2c49e4ca8dc02275bf9ef3349602d8f7e342f238d58541e5273c5a84c4a854ce2b91fedbf5cc0ab5d4c0a79bfc
+  metadata.gz: cca720d7a1c5d40101d6c4bd2b5ec598993026c3980d1a814cbe86db25c6f973d1549f1ea9a58eba026e2b06aadbd687a20753ffa3ca8bcdfded6cc310e0283a
+  data.tar.gz: 1ce140605160e77ab74aca9fbd40be126cf18e07f8e74a2826a4f63289f61b57ab0200e3180d9c034b250527351a6c5b6d81bba94fc15fdbd89c0f313fe7d7b5

data/config/version.rb

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

data/lib/origen/generator/pattern_sequence.rb

@@ -200,7 +200,7 @@ module Origen
         elsif time < 1.s
           "%.#{number_decimal_places}fms" % (time * 1_000)
         else
-          "%.#{number_decimal_places}fs" % tick_time
+          "%.#{number_decimal_places}fs" % time
         end
       end
 

data/lib/origen/pins/pin.rb

@@ -23,7 +23,7 @@ module Origen
       PACKAGE_SCOPED_ATTRIBUTES = [:location, :dib_assignment, :dib_meta]
 
       # Pin Types, 'digital' and 'analog' are legacy types kept for backwards compatibility
-      TYPES = [:digital, :analog, :signal, :ground, :power, :virtual]
+      TYPES = [:analog, :digital, :signal, :ground, :power, :virtual]
 
       attr_accessor :order
       # Inverts pin states for drive and compare, can be useful if a timing set change requires clocks to drive low for example when all pattern logic has been set up to drive them high.
@@ -90,7 +90,7 @@ module Origen
         @open_drain = options[:open_drain]
         @ext_pullup = options[:ext_pullup]
         @ext_pulldown = options[:ext_pulldown]
-        @type = options[:type].nil? ? determine_type : options[:type]
+        @type = options[:type]
         @dib_assignment = [] # Array to handle multi-site testing
         @size = 1
         @value = 0
@@ -1183,17 +1183,6 @@ module Origen
 
       private
 
-      def determine_type
-        class_type = self.class.to_s.split('::').last.downcase
-        if class_type == 'pin'
-          return :signal
-        else
-          pin_type_match = class_type.match(/^(\S+)pin$/)
-          return if pin_type_match.nil?
-          pin_type_match[1].to_sym
-        end
-      end
-
       def primary_group=(group)
         @primary_group = group
       end

data/origen_app_generators/origen_app_generators.gemspec

@@ -8,16 +8,16 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.8.11".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Stephen McGinty".freeze]
-  s.date = "2020-11-25"
+  s.date = "2020-12-08"
   s.email = ["stephen.f.mcginty@gmail.com".freeze]
   s.files = ["bin/boot.rb".freeze, "config/application.rb".freeze, "config/boot.rb".freeze, "config/commands.rb".freeze, "config/shared_commands.rb".freeze, "config/version.rb".freeze, "lib/origen_app_generators.rb".freeze, "lib/origen_app_generators/application.rb".freeze, "lib/origen_app_generators/base.rb".freeze, "lib/origen_app_generators/empty_application.rb".freeze, "lib/origen_app_generators/empty_plugin.rb".freeze, "lib/origen_app_generators/new.rb".freeze, "lib/origen_app_generators/new_app_tests.rb".freeze, "lib/origen_app_generators/origen_infrastructure/app_generator_plugin.rb".freeze, "lib/origen_app_generators/plugin.rb".freeze, "lib/origen_app_generators/test_engineering/common.rb".freeze, "lib/origen_app_generators/test_engineering/stand_alone_application.rb".freeze, "lib/origen_app_generators/test_engineering/test_block.rb".freeze, "templates/app_generators".freeze, "templates/app_generators/application".freeze, "templates/app_generators/application/.gitignore".freeze, "templates/app_generators/application/.irbrc".freeze, "templates/app_generators/application/.rspec".freeze, "templates/app_generators/application/.travis.yml".freeze, "templates/app_generators/application/Gemfile".freeze, "templates/app_generators/application/Rakefile".freeze, "templates/app_generators/application/app".freeze, "templates/app_generators/application/app/blocks".freeze, "templates/app_generators/application/app/blocks/top_level.rb".freeze, "templates/app_generators/application/app/lib".freeze, "templates/app_generators/application/app/lib/module.rb".freeze, "templates/app_generators/application/app/templates".freeze, "templates/app_generators/application/app/templates/web".freeze, "templates/app_generators/application/app/templates/web/index.md.erb".freeze, "templates/app_generators/application/app/templates/web/layouts".freeze, "templates/app_generators/application/app/templates/web/layouts/_basic.html.erb".freeze, "templates/app_generators/application/app/templates/web/partials".freeze, "templates/app_generators/application/app/templates/web/partials/_navbar.html.erb".freeze, "templates/app_generators/application/app/templates/web/release_notes.md.erb".freeze, "templates/app_generators/application/config".freeze, "templates/app_generators/application/config/application.rb".freeze, "templates/app_generators/application/config/boot.rb".freeze, "templates/app_generators/application/config/commands.rb".freeze, "templates/app_generators/application/config/maillist_dev.txt".freeze, "templates/app_generators/application/config/maillist_prod.txt".freeze, "templates/app_generators/application/config/version.rb".freeze, "templates/app_generators/application/doc".freeze, "templates/app_generators/application/doc/history".freeze, "templates/app_generators/application/dot_keep".freeze, "templates/app_generators/application/origen_core_session".freeze, "templates/app_generators/application/spec".freeze, "templates/app_generators/application/spec/spec_helper.rb".freeze, "templates/app_generators/application/target".freeze, "templates/app_generators/application/target/debug.rb".freeze, "templates/app_generators/application/target/default.rb".freeze, "templates/app_generators/application/target/production.rb".freeze, "templates/app_generators/new".freeze, "templates/app_generators/new/generator.rb".freeze, "templates/app_generators/new/info.md.erb".freeze, "templates/app_generators/origen_infrastructure".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/application.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/base.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/module.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/app/lib/plugin.rb".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config".freeze, "templates/app_generators/origen_infrastructure/app_generator_plugin/config/load_generators.rb".freeze, "templates/app_generators/plugin".freeze, "templates/app_generators/plugin/Gemfile".freeze, "templates/app_generators/plugin/Rakefile".freeze, "templates/app_generators/plugin/app".freeze, "templates/app_generators/plugin/app/templates".freeze, "templates/app_generators/plugin/app/templates/web".freeze, "templates/app_generators/plugin/app/templates/web/index.md.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_external.html.erb".freeze, "templates/app_generators/plugin/app/templates/web/partials/_navbar_internal.html.erb".freeze, "templates/app_generators/plugin/config".freeze, "templates/app_generators/plugin/config/boot.rb".freeze, "templates/app_generators/plugin/gemspec.rb".freeze, "templates/app_generators/test_engineering".freeze, "templates/app_generators/test_engineering/environment".freeze, "templates/app_generators/test_engineering/environment/j750.rb".freeze, "templates/app_generators/test_engineering/environment/uflex.rb".freeze, "templates/app_generators/test_engineering/environment/v93k.rb".freeze, "templates/app_generators/test_engineering/stand_alone_application".freeze, "templates/app_generators/test_engineering/stand_alone_application/.keep".freeze, "templates/app_generators/test_engineering/test_block".freeze, "templates/app_generators/test_engineering/test_block/.keep".freeze]
   s.homepage = "http://origen-sdk.org/origen_app_generators".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
-  s.rubygems_version = "3.0.3".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "Origen application generators".freeze
 
-  s.installed_by_version = "3.0.3" if s.respond_to? :installed_by_version
+  s.installed_by_version = "3.0.1" if s.respond_to? :installed_by_version
 
   if s.respond_to? :specification_version then
     s.specification_version = 4

data/vendor/lib/models/origen/export1.rb

@@ -5,69 +5,69 @@ module Origen
     def self.extended(model)
       model.add_package :bga
       model.add_package :pcs
-      model.add_pin :pinx, type: :signal
-      model.add_pin :piny, reset: :drive_hi, direction: :output, type: :signal, meta: { a: '1', b: 2 }
-      model.add_pin :tdo, type: :signal, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
-      model.add_pin :porta31, type: :signal
-      model.add_pin :porta30, type: :signal
-      model.add_pin :porta29, type: :signal
-      model.add_pin :porta28, type: :signal
-      model.add_pin :porta27, type: :signal
-      model.add_pin :porta26, type: :signal
-      model.add_pin :porta25, type: :signal
-      model.add_pin :porta24, type: :signal
-      model.add_pin :porta23, type: :signal
-      model.add_pin :porta22, type: :signal
-      model.add_pin :porta21, type: :signal
-      model.add_pin :porta20, type: :signal
-      model.add_pin :porta19, type: :signal
-      model.add_pin :porta18, type: :signal
-      model.add_pin :porta17, type: :signal
-      model.add_pin :porta16, type: :signal
-      model.add_pin :porta15, type: :signal
-      model.add_pin :porta14, type: :signal
-      model.add_pin :porta13, type: :signal
-      model.add_pin :porta12, type: :signal
-      model.add_pin :porta11, type: :signal
-      model.add_pin :porta10, type: :signal
-      model.add_pin :porta9, type: :signal
-      model.add_pin :porta8, type: :signal
-      model.add_pin :porta7, type: :signal
-      model.add_pin :porta6, type: :signal
-      model.add_pin :porta5, type: :signal
-      model.add_pin :porta4, type: :signal
-      model.add_pin :porta3, type: :signal
-      model.add_pin :porta2, type: :signal
-      model.add_pin :porta1, type: :signal
-      model.add_pin :porta0, type: :signal
-      model.add_pin :portb0, type: :signal
-      model.add_pin :portb1, type: :signal
-      model.add_pin :portb2, type: :signal
-      model.add_pin :portb3, type: :signal
-      model.add_pin :portb4, type: :signal
-      model.add_pin :portb5, type: :signal
-      model.add_pin :portb6, type: :signal
-      model.add_pin :portb7, type: :signal
-      model.add_pin :portb8, type: :signal
-      model.add_pin :portb9, type: :signal
-      model.add_pin :portb10, type: :signal
-      model.add_pin :portb11, type: :signal
-      model.add_pin :portb12, type: :signal
-      model.add_pin :portb13, type: :signal
-      model.add_pin :portb14, type: :signal
-      model.add_pin :portb15, type: :signal
+      model.add_pin :pinx
+      model.add_pin :piny, reset: :drive_hi, direction: :output, meta: { a: '1', b: 2 }
+      model.add_pin :tdo, packages: { bga: { location: "BF32", dib_assignment: [10104] }, pcs: { location: "BF30", dib_assignment: [31808] } }
+      model.add_pin :porta31
+      model.add_pin :porta30
+      model.add_pin :porta29
+      model.add_pin :porta28
+      model.add_pin :porta27
+      model.add_pin :porta26
+      model.add_pin :porta25
+      model.add_pin :porta24
+      model.add_pin :porta23
+      model.add_pin :porta22
+      model.add_pin :porta21
+      model.add_pin :porta20
+      model.add_pin :porta19
+      model.add_pin :porta18
+      model.add_pin :porta17
+      model.add_pin :porta16
+      model.add_pin :porta15
+      model.add_pin :porta14
+      model.add_pin :porta13
+      model.add_pin :porta12
+      model.add_pin :porta11
+      model.add_pin :porta10
+      model.add_pin :porta9
+      model.add_pin :porta8
+      model.add_pin :porta7
+      model.add_pin :porta6
+      model.add_pin :porta5
+      model.add_pin :porta4
+      model.add_pin :porta3
+      model.add_pin :porta2
+      model.add_pin :porta1
+      model.add_pin :porta0
+      model.add_pin :portb0
+      model.add_pin :portb1
+      model.add_pin :portb2
+      model.add_pin :portb3
+      model.add_pin :portb4
+      model.add_pin :portb5
+      model.add_pin :portb6
+      model.add_pin :portb7
+      model.add_pin :portb8
+      model.add_pin :portb9
+      model.add_pin :portb10
+      model.add_pin :portb11
+      model.add_pin :portb12
+      model.add_pin :portb13
+      model.add_pin :portb14
+      model.add_pin :portb15
       model.add_pin_group :porta, :porta31, :porta30, :porta29, :porta28, :porta27, :porta26, :porta25, :porta24, :porta23, :porta22, :porta21, :porta20, :porta19, :porta18, :porta17, :porta16, :porta15, :porta14, :porta13, :porta12, :porta11, :porta10, :porta9, :porta8, :porta7, :porta6, :porta5, :porta4, :porta3, :porta2, :porta1, :porta0
       model.add_pin_group :portb, :portb15, :portb14, :portb13, :portb12, :portb11, :portb10, :portb9, :portb8, :portb7, :portb6, :portb5, :portb4, :portb3, :portb2, :portb1, :portb0
       model.pins(:portb).endian = :little
-      model.add_power_pin :vdd1, type: :power, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
-      model.add_power_pin :vdd2, type: :power
+      model.add_power_pin :vdd1, voltage: 3, current_limit: 0.05, meta: { min_voltage: 1.5 }
+      model.add_power_pin :vdd2
       model.add_power_pin_group :vdd, :vdd1, :vdd2
-      model.add_ground_pin :gnd1, type: :ground
-      model.add_ground_pin :gnd2, type: :ground
-      model.add_ground_pin :gnd3, type: :ground
+      model.add_ground_pin :gnd1
+      model.add_ground_pin :gnd2
+      model.add_ground_pin :gnd3
       model.add_ground_pin_group :gnd, :gnd1, :gnd2, :gnd3
-      model.add_virtual_pin :relay1, type: :virtual
-      model.add_virtual_pin :relay2, type: :virtual, packages: { bga: {} }
+      model.add_virtual_pin :relay1
+      model.add_virtual_pin :relay2, packages: { bga: {} }
 
       model.sub_block :block1, file: 'origen/export1/block1.rb', dir: "#{Origen.root!}/vendor/lib/models", lazy: true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.59.5
+  version: 0.59.6
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-04 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -749,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.11
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit