Ce serveur Gitlab sera éteint le 30 juin 2020, pensez à migrer vos projets vers les serveurs gitlab-research.centralesupelec.fr et gitlab-student.centralesupelec.fr !

Commit 4f6703dc authored by Hachemin Pierre-Yves's avatar Hachemin Pierre-Yves

add clock event to int blocks

parent e6aabf45
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_Address is
Port (
clk : in STD_LOGIC;
trig_address : in STD_LOGIC;
address9 : in STD_LOGIC_VECTOR (8 downto 0);
address : out STD_LOGIC_VECTOR (8 downto 0));
......@@ -14,7 +15,7 @@ begin
address <=mem_address;
memory : process(trig_address)
begin
If trig_address'event and trig_address='1' then
If clk'event and trig_address='1' then
mem_address <= address9;
end if;
end process;
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_Color is
Port (
clk : in STD_LOGIC;
trig_color : in STD_LOGIC;
color4 : in STD_LOGIC_VECTOR (3 downto 0);
color : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
color <=mem_color;
memory : process(trig_color)
begin
If trig_color'event and trig_color='1' then
If clk'event and trig_color='1' then
CASE color4 IS
WHEN "0000" =>
mem_color <= "00001111"; --15 white
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_GoboRot is
Port (
clk : in STD_LOGIC;
trig_goboRot : in STD_LOGIC;
goboRot8 : in STD_LOGIC_VECTOR (7 downto 0);
goboRot : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
goboRot <=mem_goboRot;
memory : process(mem_goboRot)
begin
If trig_goboRot'event and trig_goboRot='1' then
If clk'event and trig_goboRot='1' then
mem_goboRot <=goboRot8;
end if;
end process;
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_GoboWheel is
Port (
clk : in STD_LOGIC;
trig_goboWheel : in STD_LOGIC;
goboWheel4 : in STD_LOGIC_VECTOR (3 downto 0);
goboWheel : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
goboWheel <=mem_goboWheel;
memory : process(trig_goboWheel)
begin
If trig_goboWheel'event and trig_goboWheel='1' then
If clk'event and trig_goboWheel='1' then
CASE goboWheel4 IS
WHEN "0000" =>
mem_goboWheel <= "00100000"; --32 open
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_Pan is
Port (
clk : in STD_LOGIC;
trig_pan : in STD_LOGIC;
pan8 : in STD_LOGIC_VECTOR (7 downto 0);
pan : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
pan <=mem_pan;
memory : process(trig_pan)
begin
If trig_pan'event and trig_pan='1' then
If clk'event and trig_pan='1' then
mem_pan <= pan8;
end if;
end process;
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_Shutter is
Port (
clk : in STD_LOGIC;
trig_shutter : in STD_LOGIC;
shutter8 : in STD_LOGIC_VECTOR (7 downto 0);
shutter : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
shutter <=mem_shutter;
memory : process(trig_shutter)
begin
If trig_shutter'event and trig_shutter='1' then
If clk'event and trig_shutter='1' then
mem_shutter <= shutter8;
end if;
end process;
......
......@@ -3,6 +3,7 @@ use IEEE.STD_LOGIC_1164.ALL;
entity Int_Tilt is
Port (
clk : in STD_LOGIC;
trig_tilt : in STD_LOGIC;
tilt8 : in STD_LOGIC_VECTOR (7 downto 0);
tilt : out STD_LOGIC_VECTOR (7 downto 0));
......@@ -14,7 +15,7 @@ begin
tilt <=mem_tilt;
memory : process(trig_tilt)
begin
If trig_tilt'event and trig_tilt='1' then
If clk'event and trig_tilt='1' then
mem_tilt <= tilt8;
end if;
end process;
......
......@@ -143,6 +143,13 @@
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/BoardController.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<Config>
<Option Name="DesignMode" Val="RTL"/>
<Option Name="TopModule" Val="SandBox"/>
......
Markdown is supported
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