HDLRuby 3.6.0 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705f4b6e4835c910f62b0bced03175761ce62766d976c71123fa8756d7103714
-  data.tar.gz: e72f192e90d3aad1fa9819988251223108011b3bd9e931d3349ed1dd6d7413f7
+  metadata.gz: 70c4b4aec90e44d8229a4f13990112c3599b7104e3a867cf87741b2d1e4ff246
+  data.tar.gz: 10c6957977c1df45cae0f270dd27db75824a92e51dc508b5ffa600ce4654f1a0
 SHA512:
-  metadata.gz: d92f346ae79abb3a701784861d16c162a134a2f07477657e6976d569d591cbbb38f0bff20da5b2eeff6b32efdc170b539e34f807bba1d58ac770611b1582810f
-  data.tar.gz: d84037e56a7dacfc3e43a96a8885f1813b2a708be069a128878e3cf8a54602d3a28dd0db7d04fdde976bdde6880afd7b239bd356addd37bc0bcd05abab7a45ee
+  metadata.gz: 56b18d61f3945edaaff50244ecb8ae69fa5c29058942c456ca377eb54da83bb64677004dae4047a8f2aae9b4dd2fa57972c8cf6f0fc497bfe9785c447466cfaa
+  data.tar.gz: 81e58ca1a9ae1b6ba038c5a43c857ebff9e93dd2627befe89706c0200389a5ee18e1d77261e21d13f291b547dc4cf5be2e9024d75d524e2d54d26c37f7943679

data/README.md

@@ -17,10 +17,12 @@ hdrcc --get-tuto
 
 __What's new__
 
-For HDLRuby version 3.6.0:
+For HDLRuby version 3.6.x:
 
  * Added a new element for the GUI board that allows to assign an expression to a signal on the fly while simulating.
 
+ * Added a new slider element for the GUI board (from 3.6.1).
+
 For HDLRuby version 3.5.0:
 
  * Added direct support for Verilog HDL files as input to 'hdrcc'.
@@ -2224,9 +2226,11 @@ The list of possible elements is as follows:
 
  * `bt`: represents a set of push buttons, their number is set to match the bit-width of the attached signal.
 
- * `text`: Represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named `leds`, it will be accessible as a variable.
+ * `slider`: represents an horizontal slider.
+
+ * `text`: represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named `leds`, it will be accessible as a variable.
 
- * `hook`: Attaches a signal to the board without displaying. It can be used as a variable in `text` expressions, similar to display objects.
+ * `hook`: attaches a signal to the board without displaying. It can be used as a variable in `text` expressions, similar to display objects.
 
  * `led`: represents a set of LEDs, their number is set to match the bit-width of the attached signal.
 

data/lib/HDLRuby/hdr_samples/with_board.rb

@@ -15,6 +15,12 @@ system :with_board do
     [8].inner :counter8
     signed[8].inner :scounter8
 
+    bit[8][-256].inner :mem
+    [8].inner :addr, :din, :dout
+
+    mem[addr] <= din
+    dout <= mem[addr]
+
     # Description of the board.
     # It is updated at each rising edge of +clk2+.
     board(:some_board) do
@@ -24,12 +30,16 @@ system :with_board do
         hook sw_bi: sw_b
         row
         sw  sw_a:     sw_a
-        sw  sw_b:     sw_b
+        slider sw_b:  sw_b
         led led_z:    led_z
         row
         text expr:    expr
         digit show:   show
         row
+        text addr:    addr
+        hexa dout:    dout
+        text din:     din
+        row
         digit cnt_d:  counter
         hexa  cnt_h:  counter
         digit cnt_s:  scounter8

data/lib/HDLRuby/ui/hruby_board.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'io/console'
 
 require 'rubyHDL'
 
@@ -34,7 +35,7 @@ module HDLRuby::High::Std
              '<label class="sw"><input type="checkbox" data-bit="' + 
                      (self.size-i-1).to_s + '" ' +
                      'onchange="sw_change(this)">' +
-             '<span class="slider"></span></label>\n'
+             '<span class="sw_slider"></span></label>\n'
            end.join + "</div>\\n"
       end
     end
@@ -52,6 +53,22 @@ module HDLRuby::High::Std
            end.join + "</div>\\n"
       end
     end
+    
+    ## Class describing an "analog" slide switch.
+    SLIDER = Struct.new(:id, :min, :max, :hwrite) do
+      def to_html
+        # Prepare the min, max and blank strings.
+        min = self.min.to_s
+        max = self.max.to_s
+        return "<div class=\"sliderset\" id=\"#{self.id}\" data-value=\"0\">\\n" + 
+          '<span class="name">' + self.hwrite.to_s.chop + '</span>' +
+          '<span>&nbsp;&nbsp;</span>' +
+          '<input type="range" min="' + min + '" max="' + max + 
+            '" value="' + min + '" ' +
+            'class="slider" oninput="slider_change(this)">' +
+           "</div>\\n"
+      end
+    end
 
     ## Class describing a text-based input.
     TEXT = Struct.new(:id, :size, :hwrite) do
@@ -272,6 +289,16 @@ Content-Type: text/html
     height: 40px;
   }
 
+  .sliderset {
+    display: flex;
+    flex-direction: row;
+    justify-content: center;
+    align-items: center;
+    margin-left:  8px;
+    margin-right: 8px;
+    height: 40px;
+  }
+
   .ledset {
     display: flex;
     flex-direction: row;
@@ -454,7 +481,7 @@ Content-Type: text/html
     height: 0;
   }
   
-  .slider {
+  .sw_slider {
     position: absolute;
     cursor: pointer;
     top: 0;
@@ -467,7 +494,7 @@ Content-Type: text/html
     border: solid 2px #505050;  
   }
   
-  .slider:before {
+  .sw_slider:before {
     position: absolute;
     content: "";
     height: 16px;
@@ -479,16 +506,48 @@ Content-Type: text/html
     transition: .2s;
   }
   
-  input:checked + .slider {
+  input:checked + .sw_slider {
     background-color: yellow;
   }
   
-  input:checked + .slider:before {
+  input:checked + .sw_slider:before {
     -webkit-transform: translateY(-16px);
     -ms-transform: translateY(-16px);
     transform: translateY(-16px);
   }
 
+  .slider {
+    -webkit-appearance: none;
+    width: 100%;
+    height: 25px;
+    background-color: #ccc;
+    -webkit-transition: .2s;
+    transition: .2s;
+    border: solid 2px #505050;  
+    margin: 2px;
+    box-shadow: -1px -1px 1px white, 1px 1px 1px #101010;
+    -moz-box-shadow: -1px -1px 1px white, 1px 1px 1px #101010;
+    -webkit-shadow: -1px -1px 1px white, 1px 1px 1px #101010;
+  }
+
+  .slider::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 25px;
+    height: 25px;
+    background: black;
+    border: solid 2px #505050;  
+    cursor: pointer;
+  }
+
+  .slider::-moz-range-thumb {
+    width: 25px;
+    height: 25px;
+    background: black;
+    border: solid 2px #505050;  
+    cursor: pointer;
+  }
+
   .matrix {
     font-size: 26px;
     font-family: "Lucida Console", "Courier New", monospace;
@@ -622,6 +681,7 @@ Content-Type: text/html
     // Depending of the kind of element.
     if (element.classList.contains('swset') ||
         element.classList.contains('btset') ||
+        element.classList.contains('sliderset') ||
         element.classList.contains('textset') ) {
       // Input element.
       input_ids.push(element.id);
@@ -664,6 +724,14 @@ Content-Type: text/html
     // console.log("sw value=" + swset.dataset.value);
   }
 
+  // Handler of slider change.
+  function slider_change(slider) {
+    // Get the set holding slider.
+    const sliderset = slider.parentElement;
+    sliderset.dataset.value = slider.value;
+    // console.log("slider value=" + sliderset.dataset.value);
+  }
+
   // Set the aspect of a button to clicked.
   function bt_on(bt) {
     bt.innerHTML = '<i class="bt_on"></i>';
@@ -927,6 +995,31 @@ HTMLRESPONSE
       @@http_ports << @http_port
       # Create the server
       @server = TCPServer.new(@http_port)
+
+      browse = Thread.new do
+        url = "http://localhost:#{@http_port}"
+        # Shall we try to open a page automatically:
+        puts "Shall I open a new page on your browser for the GUI? [y/n]"
+        ch = ""
+        ch = STDIN.getch while !(ch =~ /[YyNn]/)
+        unless ch =~ /[Yy]/ then
+          puts "Please open the following url manually: #{url}"
+          browse.kill
+        end
+        # Open the page if possible.
+        sleep(0.2)
+        case RUBY_PLATFORM
+        when /darwin/
+          Kernel.system("open",url)
+        when /linux/
+          Kernel.system("xdg",url)
+        when /mingw|mswin/
+          Kernel.system("start",url)
+        else
+          puts "Please open the following url on your browser: #{url}"
+        end
+      end
+
       # Create the running function.
       this = self
       Kernel.define_method(@name.to_sym) { this.run }
@@ -979,6 +1072,27 @@ HTMLRESPONSE
       @elements << BT.new(@elements.size,hport[1].type.width,:"#{hport[0]}=")
     end
 
+    # Add a new slider element attached to HDLRuby port +hport+
+    def slider(hport)
+      if !hport.is_a?(Hash) or hport.size != 1 then
+        raise UIError.new("Malformed HDLRuby port declaration: #{hport}")
+      end
+      # Create the HDLRuby program port.
+      @program.outport(hport)
+      hport = hport.first
+      # Compute the min and max values.
+      width = hport[1].type.width
+      if hport[1].type.signed? then
+        min = -2**(width-1)
+        max = 2**(width-1) - 1
+      else
+        min = 0
+        max = 2**width - 1
+      end
+      # Create the UI component.
+      @elements << SLIDER.new(@elements.size,min,max,:"#{hport[0]}=")
+    end
+
     # Add a new text input element attached to HDLRuby port +hport+
     def text(hport)
       if !hport.is_a?(Hash) or hport.size != 1 then
@@ -1111,9 +1225,6 @@ HTMLRESPONSE
       val = "0" unless val
       val = val.gsub("%20"," ")
       # Replace the names by the corresponding ports read result.
-      # val = val.gsub(/([^0-9\.A-Z][_a-z][_a-zA-Z0-9]*)/) do |str|
-      #   RubyHDL.send(Regexp.last_match[1]).to_s rescue 0
-      # end
       val = val.gsub(/([\._a-zA-Z0-9]+)/) do |str|
         if str[0] >= "a" && str[0] <= "z" then
           # Variable identifier, process it if recognized.
@@ -1130,6 +1241,7 @@ HTMLRESPONSE
         $SAFE = 2
         res = eval(val).to_i
       rescue SyntaxError => se
+      rescue StandardError => se
       end
       $SAFE = safe
       return res
@@ -1183,7 +1295,7 @@ HTMLRESPONSE
 
     # Start the ui.
     def run
-      # At first the u is not running.
+      # At first the ui is not running.
       @connected = false
       # Create the ui thread.
       @thread = Thread.new do
@@ -1209,6 +1321,7 @@ HTMLRESPONSE
       # Wait for a first connection.
       sleep(0.1) while(!@connected)
     end
+
   end
 
 

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "3.6.0"
+  VERSION = "3.6.2"
 end

data/tuto/tutorial_sw.html

@@ -3047,9 +3047,11 @@ end
 </li>
 <li><p><code>led</code>: represents a set of LEDs, their number is set to match the bit-width of the attached signal.</p>
 </li>
-<li><p><code>text</code>: Represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named <code>leds</code>, it will be accessible as a variable.</p>
+<li><p><code>slider</code>: represents an horizontal slider.</p>
 </li>
-<li><p><code>hook</code>: Attaches a signal to the board without displaying. It can be used as a variable in <code>text</code> expressions, similar to display objects.</p>
+<li><p><code>text</code>: represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named <code>leds</code>, it will be accessible as a variable.</p>
+</li>
+<li><p><code>hook</code>: attaches a signal to the board without displaying. It can be used as a variable in <code>text</code> expressions, similar to display objects.</p>
 </li>
 <li><p><code>hexa</code>: represents a hexadecimal number display, its character width is set to match the width of the largest possible value of the attached signal.</p>
 </li>

data/tuto/tutorial_sw.md

@@ -3750,9 +3750,11 @@ And the comprise the following:
 
  * `led`: represents a set of LEDs, their number is set to match the bit-width of the attached signal.
 
- * `text`: Represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named `leds`, it will be accessible as a variable.
+ * `slider`: represents an horizontal slider.
 
- * `hook`: Attaches a signal to the board without displaying. It can be used as a variable in `text` expressions, similar to display objects.
+ * `text`: represents a text input box whose content is interpreted as an expression. The syntax of the expression follows Ruby, and the available variables include the board's display objects. For example, if a set of LEDs is named `leds`, it will be accessible as a variable.
+
+ * `hook`: attaches a signal to the board without displaying. It can be used as a variable in `text` expressions, similar to display objects.
 
  * `hexa`: represents a hexadecimal number display, its character width is set to match the width of the largest possible value of the attached signal.
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.2
 platform: ruby
 authors:
 - Lovic Gauthier
 bindir: exe
 cert_chain: []
-date: 2025-01-05 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler