]> jspc29.x-matter.uni-frankfurt.de Git - daqtools.git/commitdiff
add option of reference time output to CTS output multiplexers
authorJan Michel <michel@physik.uni-frankfurt.de>
Fri, 12 May 2023 13:47:11 +0000 (15:47 +0200)
committerJan Michel <michel@physik.uni-frankfurt.de>
Fri, 12 May 2023 13:47:43 +0000 (15:47 +0200)
web/CtsPlugins/CtsMod13.pm
xml-db/get.pl

index 1a897de195abe0c6bd09bb0fd54025a45706cf32..1d8872f98166a76c889036e800098d1deaf9ddb3 100755 (executable)
@@ -55,7 +55,10 @@ sub init {
      $enum->{$j} = "busy";
      $j++;
      }
-   
+   if ($cprop->{'trb_compiletime'} > 1683811000) {
+     $enum->{$j} = "reftime";
+     $j++;
+     }   
 # registers
    my @mux_names = ();
    for(my $i = 0; $i < $header->{'len'}; $i++) {
index 8e3b9d88573c630ccad1d78a60a5bc6109fa33fc..ea7bc3a667d3518be669e932becda1b0c68114bd 100755 (executable)
@@ -244,25 +244,25 @@ sub FormatPretty {
         }
         when ("float")    { $ret .= sprintf("$cl%.2f",$value);}
         when ("integer")  { $t    = sprintf("%i",$value);
-                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/&#8198;/g;
+                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/ /g;#&#8198;
                             $ret .= $cl.$t;
                           }
         when ("unsigned") { $t    = sprintf("%u",$value);
-                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/&#8198;/g;
+                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/ /g;#&#8198;
                             $ret .= $cl.$t;
                           }
         when ("signed")   { $t    = sprintf("%i",$value);
-                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/&#8198;/g;
+                            $t =~ s/(?<=\d)(?=(?:\d\d\d)+\b)/ /g;#&#8198;
                             $ret .= $cl.$t;}  #$ret .= sprintf("$cl%d",$value);
         when ("binary")   { $t    = sprintf("%0".$obj->{bits}."b",$value);
-                            $t =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/&#8198;/g;
+                            $t =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/ /g;#&#8198;
                             $ret .= $cl.$t;
                           }
         when ("bitmask")  { my $tmp = sprintf("%0".$obj->{bits}."b",$value);
-                            $tmp =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/ /g;
+                            $tmp =~ s/(?<=\d)(?=(?:\d\d\d\d)+\b)/ /g;#&#8198;
                             $tmp =~ s/0/\&#9633\;/g;
                             $tmp =~ s/1/\&#9632\;/g;
-                            $tmp =~ s/\s/\&#8198\;/g;
+                            $tmp =~ s/\s/ /g;#&#8198;
 
                             $ret .= $cl.$tmp;
                           }
@@ -283,7 +283,7 @@ sub FormatPretty {
     my $range = $obj->{start}+$obj->{bits}-1;
     $range .= "..".$obj->{start} if ($obj->{bits}>1);
     $ret .= " ".$obj->{unit} if exists $obj->{unit};
-    $ret .= sprintf("<span class=\"tooltip\"><b>$name</b> (Bit $range) - raw: 0x%x<br>$cstr<br>".substr($obj->{description},0,28)."</span></div>",$rawvalue);
+    $ret .= sprintf("<span class=\"tooltip\"><b>$name</b> (Bit $range) - raw: 0x%x<br>$cstr</span></div>",$rawvalue);
 
   } else {
     for ($obj->{format}) {