]> jspc29.x-matter.uni-frankfurt.de Git - padiwa.git/commitdiff
Padiwa_Amps: Discharge on leading edge of FAST until trailing edge of SLOW
authorAndreas Neiser <neiser@kph.uni-mainz.de>
Thu, 6 Feb 2014 12:24:34 +0000 (13:24 +0100)
committerAndreas Neiser <neiser@kph.uni-mainz.de>
Thu, 6 Feb 2014 12:24:34 +0000 (13:24 +0100)
padiwa_amps.vhd

index 7baae55ce4221e798d18ee555d48ff2df404d765..bbe1d776b2dc42a602d0221306bb31a7017d81c9 100644 (file)
@@ -599,7 +599,7 @@ DISCHARGE(i) <= 'Z'                               when  discharge_highz(i) = '1'
                 (DELAY_C_IN(i) and slow_input(i)) when  discharge_disable(i) = '0' else
                 discharge_override(i)             when  discharge_disable(i) = '1';
                 
-DELAY_C_OUT(i) <= slow_input(i) xor delay_invert(i);
+DELAY_C_OUT(i) <= (fast_input(i) or slow_input(i)) xor delay_invert(i);
 end generate;
                 
 fast_input <= inp_gated(14) & inp_gated(12) & inp_gated(10) & inp_gated(8) & inp_gated(6) & inp_gated(4) & inp_gated(2) & inp_gated(0);