origen 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40391053371e047fa27346b149db5b2ff484918a
-  data.tar.gz: 3f50782d9a9a343ed66b4a7394617f17abf0142e
+  metadata.gz: 5515909ec26db7a8a2f402e66f46972f79ff4d62
+  data.tar.gz: f338f5a5fad2f8a92ba5035e7670a692e6bda8c4
 SHA512:
-  metadata.gz: 346f223195d1f35d701b68939c50d4af4f83e2860bc3f831a06e34f9b4c1eb1f22b5ac4b67c9fbcad545e97557c985716a5c0e8314914824bd7d64026d4184ae
-  data.tar.gz: 25dac8be070f239281329c89a6b45ac480ca2105513c82b71fa7be66ad6f5961441e4f2da3ca7f5285544af9326e66623e57d00e2b5009743599c5eec0229746
+  metadata.gz: 9386d160c9873e09742484e479b5ebde00332a106e20d52a3907a5c8a93ef567ef45e9e7fe2a8c9e5fcb6431de1e52e7dd05f386c1093f53a3bb3d99857ced92
+  data.tar.gz: 74f6309577983523713fc70b08bacc6cd06bba02bb6b8864e803e20b0dd02892a728faec5729c1a84a9d8db3dc97eb110c0b9c3092716110355d8bf4e51bce04

data/config/version.rb

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

data/lib/origen/controller.rb

@@ -96,6 +96,10 @@ module Origen
       result
     end
 
+    def to_json(*args)
+      model.to_json(*args)
+    end
+
     # Used to proxy all method and attribute requests not implemented on the controller
     # to the model.
     #

data/lib/origen/model.rb

@@ -1,5 +1,6 @@
 require 'active_support/concern'
 require 'origen/memory'
+require 'json'
 module Origen
   # Include this module to identify it as an SoC IP Block, this will automatically
   # include common modules such as Pin and Register support
@@ -327,6 +328,23 @@ module Origen
       end
     end
 
+    def to_json(*args)
+      JSON.pretty_generate({
+                             name:      name,
+                             address:   base_address,
+                             path:      path,
+                             blocks:    sub_blocks.map do |name, block|
+                               {
+                                 name:    name,
+                                 address: block.base_address
+                               }
+                             end,
+                             registers: regs.map do |name, reg|
+                               reg
+                             end
+                           }, *args)
+    end
+
     private
 
     def _initialized

data/lib/origen/registers.rb

@@ -254,6 +254,10 @@ module Origen
       def contains_bits?
         true
       end
+
+      def to_json(*args)
+        materialize.to_json(*args)
+      end
     end
 
     class Collector

data/lib/origen/registers/reg.rb

@@ -1,3 +1,4 @@
+require 'json'
 module Origen
   module Registers
     # The register class can be used to represent not only h/ware resgisters,
@@ -363,8 +364,8 @@ module Origen
             desc[0] = desc.first.sub(/\s*\*\*\s*#{escape_special_char(full_name(bitname))}\s*\*\*\s*-?\s*/, '')
           end
         end
-        desc.shift if desc.first && desc.first.strip.empty?
-        desc.pop if desc.last && desc.last.strip.empty?
+        desc.shift while desc.first && desc.first.strip.empty?
+        desc.pop while desc.last && desc.last.strip.empty?
         desc
       end
       alias_method :descriptions, :description
@@ -1368,6 +1369,36 @@ module Origen
         end
       end
 
+      def to_json(*args)
+        JSON.pretty_generate({
+                               name:        name,
+                               full_name:   full_name,
+                               address:     address,
+                               offset:      offset,
+                               size:        size,
+                               path:        path,
+                               reset_value: reset_value,
+                               description: description(include_name: false, include_bit_values: false),
+                               bits:        named_bits.map do |name, bit|
+                                 {
+                                   name:        name,
+                                   full_name:   bit.full_name,
+                                   position:    bit.position,
+                                   size:        bit.size,
+                                   reset_value: bit.reset_value,
+                                   access:      bit.access,
+                                   description: bit.description(include_name: false, include_bit_values: false),
+                                   bit_values:  bit.bit_value_descriptions.map do |val, desc|
+                                     {
+                                       value:       val,
+                                       description: desc
+                                     }
+                                   end
+                                 }
+                               end
+                             }, *args)
+      end
+
       private
 
       def _state_desc(bits)

data/templates/nanoc/Rules

@@ -36,7 +36,7 @@ compile '*' do
              coderay: {css: :style}
       filter :codeblocks
     end
-    unless ["xml", "js", "css"].include?(item[:extension]) || item[:layout] == "none" || item[:layout] == "None"
+    unless ["xml", "js", "css", "json"].include?(item[:extension]) || item[:layout] == "none" || item[:layout] == "None"
       item[:layout] = "bootstrap" if item[:layout] == "bootstrap3"
       filter :bootstrap
       layout item[:layout] || 'bootstrap'
@@ -53,7 +53,7 @@ end
 #end
 
 route '*' do
-  if item.binary? || ["xml", "js", "css"].include?(item[:extension])
+  if item.binary? || ["xml", "js", "css", "json"].include?(item[:extension])
     # Write item with identifier /foo/ to /foo.ext
     item.identifier.chop + '.' + item[:extension]
   else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - Stephen McGinty
@@ -652,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The Semiconductor Developer's Kit