HDLRuby 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc400e683cbefc6a77e8e6c4394f67e88df74fccd3bcb4ba420f6babc2542c8
-  data.tar.gz: e4619579f4ef6703c38cb1ee5cc95197b37b929eb630f93497a4b7bde0a4955f
+  metadata.gz: 160a8c6607e6dd20282a50fa26e0d472e055992ebce5f7cdf62d39e8c6bf7db5
+  data.tar.gz: 2c44f4edc3e4fdd76d64c2cb349f7083a255b68b1a18c6f41bef77c6d82138ab
 SHA512:
-  metadata.gz: 581b6f3029bc63108c0408495dcebaf6305f61697099985c7b2f043f3250d377e5640f0db7305f62ed2a4430f60f6dfc85495a382e84f89a1d595ac5519cebaa
-  data.tar.gz: 1821cb1ee95bb0abfdfd8d99318b1a5a103baabc3c3d3c58e50cd965f54059d0636b3cd352f1c9e726c7c04d3282f06820896cc9cf74e92b6e7a721bcd254560
+  metadata.gz: 234d4901bc7ae389c1e0893ad19a7a2aff93c2bc2851066a80ce07b778787a1fa25950af60dd30d32d7e77a8804f0ef4dbc2c43bdf2f026f7b725cd15a943c84
+  data.tar.gz: 774369895db9a9f30b7a85061aba5190d3e45f962f6ca28e2cee7fe77d7c02c049570dd6e2a0f730640f687bc8069f19e433ea6d4bb2f79b6cb7875a6ef423a4

data/lib/HDLRuby/ui/hruby_board.rb

@@ -63,7 +63,8 @@ module HDLRuby::High::Std
     end
 
     ## Class describing a digit display.
-    DIGIT = Struct.new(:id, :size, :hread) do
+    #  Need to know the data type since signed is supported.
+    DIGIT = Struct.new(:id, :size, :type, :hread) do
       def to_html
         return '<div class="digitset" id=' + self.id.to_s +
               ' data-width="' + self.size.to_s + '" data-value="0" >' +
@@ -559,6 +560,9 @@ Content-Type: text/html
   const cartouche = document.getElementById("cartouche");
   const panel     = document.getElementById("panel");
 
+  // The current time stamp.
+  var time_stamp = 0;
+
   // The input and output elements' ids.
   const input_ids = [];
   const output_ids = [];
@@ -689,7 +693,7 @@ Content-Type: text/html
   function digitset_update(digitset,value) {
     // Update the digiset value.
     digitset.dataset.value = value;
-    // Unsigned case.
+    // Update its display.
     const num = digitset.dataset.width;
     digitset.lastElementChild.innerHTML = String(value).padStart(num,"\u00A0");
   }
@@ -704,7 +708,9 @@ Content-Type: text/html
   }
 
   // Update an oscilloscope.
-  function scope_update(scope,value) {
+  function scope_update(scope,value,new_time_stamp) {
+    // Compute the advance in time.
+    let diff_time_stamp = new_time_stamp - time_stamp;
     // Get the canvas.
     const canvas = scope.lastElementChild;
     // Shall we set up its size?
@@ -775,21 +781,21 @@ Content-Type: text/html
       // Draw a line to the new position.
       cxt.beginPath();
       cxt.moveTo(toPx(pos),   toPy(previous));
-      cxt.lineTo(toPx(pos+1), toPy(value)); 
+      cxt.lineTo(toPx(pos+diff_time_stamp), toPy(value)); 
       cxt.stroke();
       /* Update the values. */
       scope.dataset.previous = value;
-      scope.dataset.pos = pos + 1;
+      scope.dataset.pos = pos + diff_time_stamp;
     }
   }
 
   // Update a general display element.
-  function element_update(element,value) {
+  function element_update(element,value,new_time_stamp) {
     if(element.classList.contains('ledset'))  { ledset_update(element,value); }
     if(element.classList.contains('digitset')){ digitset_update(element,value); }
     if(element.classList.contains('signedset')){signedset_update(element,value);}
     if(element.classList.contains('hexaset')) { hexaset_update(element,value); }
-    if(element.classList.contains('scope'))   { scope_update(element,value); }
+    if(element.classList.contains('scope'))   { scope_update(element,value,new_time_stamp); }
   }
 
 
@@ -799,19 +805,25 @@ Content-Type: text/html
     xhttp.onreadystatechange = function() {
       // console.log("response=" + this.responseText);
       if (this.readyState == 4 && this.status == 200) {
-        if (/[0-9]+:[0-9]/.test(this.responseText)) {
+        if (/^[0-9]+;[0-9]+:-?[0-9]/.test(this.responseText)) {
           // There is a real response.
           // Update the interface with the answer.
           const commands = this.responseText.split(';');
+          // Get the new time stamp.
+          let new_time_stamp = commands.shift();
+          // console.log("new_time_stamp=" + new_time_stamp);
+          // Process the other commands.
           for(command of commands) {
              const toks = command.split(':');
-             element_update(document.getElementById(toks[0]),toks[1]);
+             element_update(document.getElementById(toks[0]),toks[1],new_time_stamp);
           }
+          // Update the time stamp
+          time_stamp = new_time_stamp
         }
       }
     };
     // Builds the action from the state of the input elements.
-    act = '';
+    let act = '';
     for(id of input_ids) {
       act += id + ':' + document.getElementById(id).dataset.value + ';';
     }
@@ -824,8 +836,9 @@ Content-Type: text/html
   // First call of synchronisation.
   hruby_sync();
 
-  // Then periodic synchronize.
-  setInterval(function() { hruby_sync(); }, 100);
+  // Moved to the Ruby constructor to allow setting the time intervals.
+  // // Then periodic synchronize.
+  // setInterval(function() { hruby_sync(); }, 100);
 
 </script>
 
@@ -850,9 +863,14 @@ HTMLRESPONSE
 
     # Create a new board named +name+ accessible on HTTP port +http_port+
     # and whose content is describe in +hdlruby_block+.
-    def initialize(name, http_port = 8000, &hdlruby_block)
+    def initialize(name, http_port: 8000, refresh_rate: 100,
+                   &hdlruby_block)
       # Set the name.
       @name = name.to_s
+      # Set the refresh rate.
+      @refresh_rate = refresh_rate.to_i
+      # Tell the interface is to be built.
+      @first = true
       # Check and set the port.
       http_port = http_port.to_i
       if (@@http_ports.include?(http_port)) then
@@ -869,13 +887,17 @@ HTMLRESPONSE
       # Initialize the list of board elements to empty.
       @elements = []
       @out_elements = []
+      # Initialize the time stamp.
+      @time_stamp = 0
       # And build the board.
       # Create the namespace for the program.
       @namespace = Namespace.new(self)
       # Build the program object.
       High.space_push(@namespace)
       pr = nil
-      High.top_user.instance_eval { pr = program(:ruby, @name.to_sym) {} }
+      High.top_user.instance_eval do
+        pr = program(:ruby, @name.to_sym) { }
+      end
       @program = pr
       # Fill it.
       High.top_user.instance_eval(&hdlruby_block)
@@ -936,6 +958,7 @@ HTMLRESPONSE
       # Createthe ui component.
       @elements << DIGIT.new(@elements.size, 
               Math.log10(2**hport[1].type.width - 1).to_i + (sign ? 2 : 1),
+              hport[1].type,
               hport[0])
       @out_elements << @elements[-1]
     end
@@ -1018,9 +1041,13 @@ HTMLRESPONSE
     # Generate a response to a request to the server.
     def make_response(request)
       # puts "request=#{request}"
-      if (request.empty?) then
+      if (@first) then
+        @first = false
         # First or re-connection, generate the UI.
-        return UI_header + "\n<script>\n" + 
+        return UI_header + 
+          "\n<script>\n" + 
+          "// Then periodic synchronize.\n" + 
+          "setInterval(function() { hruby_sync(); }, #{@refresh_rate});\n" + 
           "set_cartouche('#{@name}');\n" +
           @elements.map do |elem|
             "add_element('#{elem.to_html}');"
@@ -1030,11 +1057,13 @@ HTMLRESPONSE
         # This should be an AJAX request, process it.
         commands = request.split(";")
         commands.each do |command|
+          next unless command.include?(":")
           id, val = command.split(":").map {|t| t.to_i}
           self.update_port(id,val)
         end
         # And generate the response: an update of each board output element.
-        return UI_response + @out_elements.each.map do |e|
+        return UI_response + "#{@time_stamp};" + 
+          @out_elements.each.map do |e|
           # puts "resp=" + "#{e.id}:#{RubyHDL.send(e.hread)}"
           "#{e.id}:#{RubyHDL.send(e.hread)}"
         end.join(";")
@@ -1057,6 +1086,8 @@ HTMLRESPONSE
             session.print self.make_response(path[1..-1])
             # And tell the ui has been connected.
             @connected = true
+            # Then advance the time stamp.
+            @time_stamp += 1
           else
             session.print 'Connection Refuse'
           end
@@ -1072,8 +1103,11 @@ HTMLRESPONSE
 
   # Create a new board named +name+ accessible on HTTP port +http_port+
   # and whose content is describe in +block+.
-  def board(name, http_port = 8000, &block)
-    return Board.new(name,http_port,&block)
+  def board(name, http_port: 8000, refresh_rate: 100, &block)
+    # puts "name=#{name} http_port=#{http_port} refresh_rate=#{refresh_rate} block=#{block}"
+    return Board.new(name,
+                     http_port: http_port, refresh_rate: refresh_rate,
+                     &block)
   end
 
 end

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-27 00:00:00.000000000 Z
+date: 2024-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -476,7 +476,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.13
+rubygems_version: 3.5.17
 signing_key:
 specification_version: 4
 summary: HDLRuby is a library for describing and simulating digital electronic systems.