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 432eac91 authored by Vadot Antoine's avatar Vadot Antoine

Merge branch 'PY/BoardControlPres' into 'master'

Presets button + bitstream

See merge request !9
parents dcbb4bd8 9c3099fc
library IEEE;
use IEEE.STD_LOGIC_1164.ALL;
entity BoardController is
entity BoardControllerNew is
Port (
switches : in STD_LOGIC_VECTOR (7 downto 0);
Btn_gobo : in STD_LOGIC;
......@@ -13,9 +13,9 @@ entity BoardController is
LED : out STD_LOGIC_VECTOR(7 downto 0);
output : out STD_LOGIC
);
end BoardController;
end BoardControllerNew;
architecture Behavioral of BoardController is
architecture Behavioral of BoardControllerNew is
signal goboRot1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
signal goboWheel1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
signal color1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
......@@ -155,31 +155,107 @@ Tilt : Int_Tilt PORT MAP(
Stim : process(clk)
begin
if clk'event and clk='1' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (3 downto 0);
trig_goboWheel <= '1';
else if Btn_color='1' then
color4 <= switches (3 downto 0);
trig_color <= '1';
else if Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
else if Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
else if Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
if switches(0)='0' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (4 downto 1);
trig_goboWheel <= '1';
elsif Btn_color='1' then
color4 <= switches (4 downto 1);
trig_color <= '1';
elsif Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
elsif Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
elsif Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
if Btn_gobo='1' then
goboRot8 <= "00000000";
trig_goboRot <= '1';
goboWheel4 <= "0000";
trig_goboWheel <= '1';
color4 <= "0000";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "10000000";
trig_tilt <= '1';
elsif Btn_color='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0001";
trig_goboWheel <= '1';
color4 <= "0001";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "01000000";
trig_tilt <= '1';
elsif Btn_shutter='1' then
goboRot8 <= "11101000";
trig_goboRot <= '1';
goboWheel4 <= "0011";
trig_goboWheel <= '1';
color4 <= "1000";
trig_color <= '1';
shutter8 <= "10001000";
trig_shutter <= '1';
pan8 <= "11000000";
trig_pan <= '1';
tilt8 <= "01010000";
trig_tilt <= '1';
elsif Btn_pan='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0101";
trig_goboWheel <= '1';
color4 <= "0111";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00010000";
trig_pan <= '1';
tilt8 <= "11010000";
trig_tilt <= '1';
elsif Btn_tilt='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0111";
trig_goboWheel <= '1';
color4 <= "0101";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "10010000";
trig_pan <= '1';
tilt8 <= "10010000";
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
end if;
end if;
end process;
end architecture;
end Behavioral;
......@@ -155,31 +155,107 @@ Tilt : Int_Tilt PORT MAP(
Stim : process(clk)
begin
if clk'event and clk='1' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (3 downto 0);
trig_goboWheel <= '1';
elsif Btn_color='1' then
color4 <= switches (3 downto 0);
trig_color <= '1';
elsif Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
elsif Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
elsif Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
if switches(0)='0' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (4 downto 1);
trig_goboWheel <= '1';
elsif Btn_color='1' then
color4 <= switches (4 downto 1);
trig_color <= '1';
elsif Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
elsif Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
elsif Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
if Btn_gobo='1' then
goboRot8 <= "00000000";
trig_goboRot <= '1';
goboWheel4 <= "0000";
trig_goboWheel <= '1';
color4 <= "0000";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "10000000";
trig_tilt <= '1';
elsif Btn_color='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0001";
trig_goboWheel <= '1';
color4 <= "0001";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "01000000";
trig_tilt <= '1';
elsif Btn_shutter='1' then
goboRot8 <= "11101000";
trig_goboRot <= '1';
goboWheel4 <= "0011";
trig_goboWheel <= '1';
color4 <= "1000";
trig_color <= '1';
shutter8 <= "10001000";
trig_shutter <= '1';
pan8 <= "11000000";
trig_pan <= '1';
tilt8 <= "01010000";
trig_tilt <= '1';
elsif Btn_pan='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0101";
trig_goboWheel <= '1';
color4 <= "0111";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00010000";
trig_pan <= '1';
tilt8 <= "11010000";
trig_tilt <= '1';
elsif Btn_tilt='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0111";
trig_goboWheel <= '1';
color4 <= "0101";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "10010000";
trig_pan <= '1';
tilt8 <= "10010000";
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
end if;
end if;
end process;
end Behavioral;
library IEEE;
use IEEE.STD_LOGIC_1164.ALL;
entity BoardController is
entity BoardControllerNew is
Port (
switches : in STD_LOGIC_VECTOR (7 downto 0);
Btn_gobo : in STD_LOGIC;
......@@ -13,9 +13,9 @@ entity BoardController is
LED : out STD_LOGIC_VECTOR(7 downto 0);
output : out STD_LOGIC
);
end BoardController;
end BoardControllerNew;
architecture Behavioral of BoardController is
architecture Behavioral of BoardControllerNew is
signal goboRot1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
signal goboWheel1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
signal color1 : STD_LOGIC_VECTOR (7 downto 0):="00000000";
......@@ -155,31 +155,107 @@ Tilt : Int_Tilt PORT MAP(
Stim : process(clk)
begin
if clk'event and clk='1' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (3 downto 0);
trig_goboWheel <= '1';
else if Btn_color='1' then
color4 <= switches (3 downto 0);
trig_color <= '1';
else if Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
else if Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
else if Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
if switches(0)='0' then
if Btn_gobo='1' then
goboRot8 <= switches;
trig_goboRot <= '1';
goboWheel4 <= switches (4 downto 1);
trig_goboWheel <= '1';
elsif Btn_color='1' then
color4 <= switches (4 downto 1);
trig_color <= '1';
elsif Btn_shutter='1' then
shutter8 <= switches;
trig_shutter <= '1';
elsif Btn_pan='1' then
pan8 <= switches;
trig_pan <= '1';
elsif Btn_tilt='1' then
tilt8 <= switches;
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
if Btn_gobo='1' then
goboRot8 <= "00000000";
trig_goboRot <= '1';
goboWheel4 <= "0000";
trig_goboWheel <= '1';
color4 <= "0000";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "10000000";
trig_tilt <= '1';
elsif Btn_color='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0001";
trig_goboWheel <= '1';
color4 <= "0001";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00000000";
trig_pan <= '1';
tilt8 <= "01000000";
trig_tilt <= '1';
elsif Btn_shutter='1' then
goboRot8 <= "11101000";
trig_goboRot <= '1';
goboWheel4 <= "0011";
trig_goboWheel <= '1';
color4 <= "1000";
trig_color <= '1';
shutter8 <= "10001000";
trig_shutter <= '1';
pan8 <= "11000000";
trig_pan <= '1';
tilt8 <= "01010000";
trig_tilt <= '1';
elsif Btn_pan='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0101";
trig_goboWheel <= '1';
color4 <= "0111";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "00010000";
trig_pan <= '1';
tilt8 <= "11010000";
trig_tilt <= '1';
elsif Btn_tilt='1' then
goboRot8 <= "11001000";
trig_goboRot <= '1';
goboWheel4 <= "0111";
trig_goboWheel <= '1';
color4 <= "0101";
trig_color <= '1';
shutter8 <= "10000000";
trig_shutter <= '1';
pan8 <= "10010000";
trig_pan <= '1';
tilt8 <= "10010000";
trig_tilt <= '1';
else
trig_goboRot <= '0';
trig_goboWheel <= '0';
trig_color <= '0';
trig_shutter <= '0';
trig_pan <= '0';
trig_tilt <= '0';
end if;
end if;
end if;
end process;
end architecture;
end Behavioral;
......@@ -20,6 +20,7 @@
<Option Name="TargetLanguage" Val="VHDL"/>
<Option Name="SimulatorLanguage" Val="VHDL"/>
<Option Name="BoardPart" Val="em.avnet.com:zed:part0:1.3"/>
<Option Name="SourceMgmtMode" Val="DisplayOnly"/>
<Option Name="ActiveSimSet" Val="sim_1"/>
<Option Name="DefaultLib" Val="xil_defaultlib"/>
<Option Name="ProjectType" Val="Default"/>
......@@ -132,84 +133,72 @@
</File>
<File Path="$PSRCDIR/sources_1/new/Int_Address.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/RxFSM.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/RxOverlayer.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/RxSystem.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/UART.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/Main.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/TxFSM.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/TxSystem.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/SandBox.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<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>
<File Path="$PSRCDIR/sources_1/new/Board_Controller.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sources_1/new/GlobalComponent.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
......@@ -242,28 +231,24 @@
</File>
<File Path="$PSRCDIR/sim_1/new/TB_FSMBreakMAB.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sim_1/new/TB_Sandbox.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sim_1/new/TB_global_file.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
</File>
<File Path="$PSRCDIR/sim_1/new/TB_int_color.vhd">
<FileInfo>
<Attr Name="AutoDisabled" Val="1"/>
<Attr Name="UsedIn" Val="synthesis"/>
<Attr Name="UsedIn" Val="simulation"/>
</FileInfo>
......
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