update encoder lookup table: send default value instead of 0x3ff.

diff --git a/releases/tdc_v2.3/Encoder_288_Bit.vhd b/releases/tdc_v2.3/Encoder_288_Bit.vhd
index 45cb2d9e92093e8c0de05152779faa8a6697c4be..19ff016582a59af4a8b9ba36971eb3452e26bf9b 100644 (file)
--- a/releases/tdc_v2.3/Encoder_288_Bit.vhd
+++ b/releases/tdc_v2.3/Encoder_288_Bit.vhd
@@ -143,7 +143,7 @@ begin
   begin  -- The interval number with the 0-1 transition is converted from 1-of-N code to decimal
     -- code for the control of the MUX.
     if rising_edge(CLK) then
-      if start_pipeline(1) = '1' or start_pipeline(0) = '1' then
+--       if start_pipeline(1) = '1' or start_pipeline(0) = '1' then
         mux_control(0) <= P_mux(0) or P_mux(2) or P_mux(4) or P_mux(6) or P_mux(8) or P_mux(10) or
                           P_mux(12) or P_mux(14) or P_mux(16) or P_mux(18) or P_mux(20) or P_mux(22) or
                           P_mux(24) or P_mux(26) or P_mux(28) or P_mux(30) or P_mux(32) or P_mux(34);
@@ -160,9 +160,9 @@ begin
                           P_mux(21) or P_mux(22) or P_mux(23) or P_mux(24) or P_mux(25) or P_mux(26) or
                           P_mux(27) or P_mux(28) or P_mux(29) or P_mux(30);
         mux_control(5) <= P_mux(31) or P_mux(32) or P_mux(33) or P_mux(34);
-      else
-        mux_control <= (others => '0');
-      end if;
+--       else
+--         mux_control <= (others => '0');
+--       end if;
     end if;
   end process Interval_Number_to_Decimal;
 
@@ -218,7 +218,7 @@ end generate;
           else
             DECIMAL_CODE_OUT <= (others => '1');
           end if;
-          ENCODER_INFO_OUT <= info(0) or info_reg(0);
+          ENCODER_INFO_OUT <= info_2reg(0) or info_reg(0);
         end if;
 
         FINISHED_OUT   <= conv_finished;

diff --git a/releases/tdc_v2.3/rom_encoder/ecp5/ROM_encoder_4/ROM_encoder_4.vhd b/releases/tdc_v2.3/rom_encoder/ecp5/ROM_encoder_4/ROM_encoder_4.vhd
index c3df7b1972f2f829652e15ad2a30e49bd55cd16d..a8c9593025cfda77657e1d73b4506875faaecca2 100644 (file)
--- a/releases/tdc_v2.3/rom_encoder/ecp5/ROM_encoder_4/ROM_encoder_4.vhd
+++ b/releases/tdc_v2.3/rom_encoder/ecp5/ROM_encoder_4/ROM_encoder_4.vhd
@@ -41,70 +41,70 @@ begin
 
     ROM_encoder_4_0_0_0: DP16KD
         generic map (INIT_DATA=> "STATIC", ASYNC_RESET_RELEASE=> "SYNC", 
-        INITVAL_3F=> "0x00000000800008000081000000008100081000820000000000000000008200000000830008300083", 
-        INITVAL_3E=> "0x00000000800000000000000000008200083000830000000000000000008300000000840000000084", 
-        INITVAL_3D=> "0x00000000000000000000000000008200000000830000000000000000000000000000830000000084", 
-        INITVAL_3C=> "0x00000000000000000000000000000000000000830000000000000000000000000000850000000085", 
-        INITVAL_3B=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_3A=> "0x00000000000000000000000000008300000000840000000000000000000000000000000000000085", 
-        INITVAL_39=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_38=> "0x00000000000000000000000860008300000000000000000000000000000000000000860000000086", 
-        INITVAL_37=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_36=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000085", 
-        INITVAL_35=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_34=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000086", 
-        INITVAL_33=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_32=> "0x00000000000000000086000000000000000000000000000000000000000000000000000000000086", 
-        INITVAL_31=> "0x00000000000000000000000000000000000000000000000000000000000000000000870000000000", 
-        INITVAL_30=> "0x00000000000000000000000000008700000000870000000000000000000000000000870000000087", 
-        INITVAL_2F=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_2E=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_2D=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_2C=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_2B=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_2A=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_29=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_28=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_27=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_26=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_25=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_24=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_23=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_22=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_21=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_20=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_1F=> "0x00087000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_1E=> "0x00000000000000000000000000000000087000000000000000000000000000000000000000000000", 
-        INITVAL_1D=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_1C=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_1B=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_1A=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_19=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_18=> "0x00000000000000000000000820000000000000000000000000000000000000000000000000000000", 
-        INITVAL_17=> "0x00087000000000000000000860000000000000000000000000000000000000000000000000000000", 
-        INITVAL_16=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_15=> "0x00086000000000000000000000000000000000000008500000000000000000000000000000000000", 
-        INITVAL_14=> "0x00000000000000000000000000000000000000000000000000000000000000000000850000000000", 
-        INITVAL_13=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_12=> "0x00084000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_11=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_10=> "0x00000000000000000000000820008100000000000000000000000000000000081000800000000000", 
-        INITVAL_0F=> "0x00087000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_0E=> "0x00087000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_0D=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_0C=> "0x00085000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_0B=> "0x00086000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_0A=> "0x00085000000000000000000840000000000000000000000000000000000000000000000000000000", 
-        INITVAL_09=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_08=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_07=> "0x00086000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_06=> "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_05=> "0x00085000000000000000000840000000000000000008400000000840000000000000000000000000", 
-        INITVAL_04=> "0x00000000000000000000000820000000000000000000000000000000000000000000000000000000", 
-        INITVAL_03=> "0x00085000000000000000000000000000000000000000000000000000000000000000000000000000", 
-        INITVAL_02=> "0x00084000840000000000000830008300000000000000000000000000000000083000000000000000", 
-        INITVAL_01=> "0x00084000000000000000000830000000000000000008300000000820000000082000000008200000", 
-        INITVAL_00=> "0x00083000830000000000000820008200000000000008200082000810000000081000800008000000", 
+        INITVAL_3F=> "0x000c4000800008000081000c4000810008100082000c4000c4000c400082000c4000830008300083", 
+        INITVAL_3E=> "0x000c400080000c4000c4000c4000820008300083000c4000c4000c400083000c400084000c400084", 
+        INITVAL_3D=> "0x000c4000c4000c4000c4000c400082000c400083000c4000c4000c4000c4000c400083000c400084", 
+        INITVAL_3C=> "0x000c4000c4000c4000c4000c4000c4000c400083000c4000c4000c4000c4000c400085000c400085", 
+        INITVAL_3B=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_3A=> "0x000c4000c4000c4000c4000c400083000c400084000c4000c4000c4000c4000c4000c4000c400085", 
+        INITVAL_39=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_38=> "0x000c4000c4000c4000c40008600083000c4000c4000c4000c4000c4000c4000c400086000c400086", 
+        INITVAL_37=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_36=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c400085", 
+        INITVAL_35=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_34=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c400086", 
+        INITVAL_33=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_32=> "0x000c4000c4000c400086000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c400086", 
+        INITVAL_31=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c400087000c4000c4", 
+        INITVAL_30=> "0x000c4000c4000c4000c4000c400087000c400087000c4000c4000c4000c4000c400087000c400087", 
+        INITVAL_2F=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_2E=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_2D=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_2C=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_2B=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_2A=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_29=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_28=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_27=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_26=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_25=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_24=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_23=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_22=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_21=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_20=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1F=> "0x00087000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1E=> "0x000c4000c4000c4000c4000c4000c400087000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1D=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1C=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1B=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_1A=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_19=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_18=> "0x000c4000c4000c4000c400082000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_17=> "0x00087000c4000c4000c400086000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_16=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_15=> "0x00086000c4000c4000c4000c4000c4000c4000c400085000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_14=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c400085000c4000c4", 
+        INITVAL_13=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_12=> "0x00084000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_11=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_10=> "0x000c4000c4000c4000c40008200081000c4000c4000c4000c4000c4000c40008100080000c4000c4", 
+        INITVAL_0F=> "0x00087000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_0E=> "0x00087000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_0D=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_0C=> "0x00085000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_0B=> "0x00086000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_0A=> "0x00085000c4000c4000c400084000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_09=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_08=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_07=> "0x00086000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_06=> "0x000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_05=> "0x00085000c4000c4000c400084000c4000c4000c400084000c400084000c4000c4000c4000c4000c4", 
+        INITVAL_04=> "0x000c4000c4000c4000c400082000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_03=> "0x00085000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4000c4", 
+        INITVAL_02=> "0x0008400084000c4000c40008300083000c4000c4000c4000c4000c4000c400083000c4000c4000c4", 
+        INITVAL_01=> "0x00084000c4000c4000c400083000c4000c4000c400083000c400082000c400082000c400082000c4", 
+        INITVAL_00=> "0x0008300083000c4000c40008200082000c4000c4000820008200081000c4000810008000080000c4", 
         CSDECODE_B=> "0b111", CSDECODE_A=> "0b000", WRITEMODE_B=> "NORMAL", 
         WRITEMODE_A=> "NORMAL", GSR=> "ENABLED", RESETMODE=> "SYNC", 
         REGMODE_B=> "NOREG", REGMODE_A=> "OUTREG", DATA_WIDTH_B=>  18,