try modified nx_data_receiver merge handler, nx clock gets priority2

diff --git a/nxyter/source/nx_data_receiver.vhd b/nxyter/source/nx_data_receiver.vhd
index 78a1ea548ad71e65797ba3f252b46b34f2bf5068..184bc4860b9285cca28cea0b47d4d0da0e1ecb48 100644 (file)
--- a/nxyter/source/nx_data_receiver.vhd
+++ b/nxyter/source/nx_data_receiver.vhd
@@ -1997,7 +1997,8 @@ begin
           case SLV_ADDR_IN is
             when x"0001" =>
               reset_handler_start_r         <= SLV_DATA_IN(0);
-              disable_resets                <= SLV_DATA_IN(2);
+              disable_adc_resets            <= SLV_DATA_IN(2);
+              disable_resets                <= SLV_DATA_IN(3);
               slv_ack_o                     <= '1';
 
             when x"0004" =>