Commit 3249347e authored by Javier Serrano's avatar Javier Serrano
Browse files

*** empty log message ***


git-svn-id: svn+ssh://svn.cern.ch/reps/acc-fpga/trunk2@713 0a99fbf0-06a5-4c52-8a11-fe70044ee989
parent 14d02b13
......@@ -49,7 +49,7 @@ error15 <= (resize(currentSP, error15'length) - resize(dataInSigned, error15'len
when integrateOn='1' else (others=>'0');
-- propOutAux <= kpError(27 downto 14);
intOutAux <= integral14;
intOutAux <= kiErrorSat;
dataOutAux15 <= resize(intOutAux, dataOutAux15'length) +
resize(propOutAux, dataOutAux15'length);
......@@ -113,7 +113,7 @@ end process SetPointProcess;
Integrator: process(Clk40)
begin
if Clk40'event and Clk40='1' then
kiError <= kiSigned * error14;
kiError <= kiSigned * integral14;
if ConfigMode='0' and RFONRising='1' then
integrateOn <= '1';
elsif RFOnFalling='1' then
......@@ -124,9 +124,9 @@ begin
integral28 <= (others=>'0');
elsif integrateOn='1' then
integral15 <= resize(integral14, integral15'length) +
resize(kiErrorSat, integral15'length);
resize(error14, integral15'length);
integral28 <= resize(integral27, integral28'length) +
resize(kiErrorSat, integral28'length);
resize(error14, integral28'length);
end if;
end if;
end process Integrator;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment