Changeset 10565 for firmware/FAD/FACT_FAD_20MHz_VAR_PS

Timestamp:

05/04/11 14:11:13 (14 years ago)

Author:

neise

Message:

rrunnumber defaul is 0x1234abcd ... to check if it is visible in the header at all
trigger_id_reset pulse is prolonged, fron 20ns to 60ns.

File:

• firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl/w5300_modul.vhd (modified) (4 diffs)

firmware/FAD/FACT_FAD_20MHz_VAR_PS/FACT_FAD_lib/hdl/w5300_modul.vhd

@@ -125 +125 @@
         RD_3, 
         RD_4, 
-        RD_5, 
+        RD_5,
+        WAIT_FOR_TRIGGER_ID_RESET_1, WAIT_FOR_TRIGGER_ID_RESET_2,
         RD_6,
         READ_COMMAND_DATA_SECTION,
@@ -201 +202 @@
                 X"61A8", X"0000", X"0000", X"0000", X"7080", X"7080", X"7080", X"7080",                                  --<<-- DACs
                 X"0000",
-                X"0000", X"0000"
+                X"1234", X"ABCD"  -- MSword // LSword
                 );
 
@@ -893 +894 @@
                                                         when CMD_RESET_TRIGGER_ID =>
                                                                 reset_trigger_id <= '1';
-                                                                state_read_data <= RD_5;
+                                                                state_read_data <= WAIT_FOR_TRIGGER_ID_RESET_1;
                                                                 
                                                         when CMD_WRITE =>
@@ -902 +903 @@
                                                         end case;
                 -- read data
-
+                                
+                                                when WAIT_FOR_TRIGGER_ID_RESET_1 =>
+                                                        state_read_data <= WAIT_FOR_TRIGGER_ID_RESET_2;
+                                                when WAIT_FOR_TRIGGER_ID_RESET_2 =>
+                                                        state_read_data <= RD_5;
                         -- these states are beeing processed, if the 'command' was a 'write command'
                         --      so it is assumed, that some data in config RAM changed, and we need full (re)config