diff --git a/game_of_life/game_of_life.cache/wt/project.wpc b/game_of_life/game_of_life.cache/wt/project.wpc index 9b342093142bd1b298b4af63bdebdead3a3ef56e..6888edec1ac73923cacb7d6dea38f6663dae769b 100644 --- a/game_of_life/game_of_life.cache/wt/project.wpc +++ b/game_of_life/game_of_life.cache/wt/project.wpc @@ -1,3 +1,3 @@ version:1 -6d6f64655f636f756e7465727c4755494d6f6465:1 +6d6f64655f636f756e7465727c4755494d6f6465:2 eof: diff --git a/game_of_life/game_of_life.srcs/sources_1/new/game_of_life.vhd b/game_of_life/game_of_life.srcs/sources_1/new/game_of_life.vhd index 8e5b25568e80a0fcc718ec75780d94b985d26e78..47b6f07b9a30201547bd324a55b912baef383426 100644 --- a/game_of_life/game_of_life.srcs/sources_1/new/game_of_life.vhd +++ b/game_of_life/game_of_life.srcs/sources_1/new/game_of_life.vhd @@ -50,7 +50,16 @@ port ); end component; -signal locked, inner_clk : STD_LOGIC; +component one_second_clock +port + ( + clock_in : in STD_LOGIC; + locked : in STD_LOGIC; + clock_out : out STD_LOGIC + ); +end component; + +signal locked, inner_clk, one_sec_clk : STD_LOGIC; begin @@ -64,6 +73,14 @@ tic_toc : clk_wiz_0 clk_in1 => clk_sys ); +one_hertz_gen : one_second_clock + port map + ( + clock_in => inner_clk, + locked => locked, + clock_out => one_sec_clk +); + synchron : process(inner_clk) begin -- diff --git a/game_of_life/game_of_life.xpr b/game_of_life/game_of_life.xpr index 4d3fef02146182b5304f6fad81403acba5bfce8c..c140a4718b33d670a4573ce2bfb280b4494cb327 100644 --- a/game_of_life/game_of_life.xpr +++ b/game_of_life/game_of_life.xpr @@ -3,7 +3,7 @@ <!-- --> <!-- Copyright 1986-2017 Xilinx, Inc. All Rights Reserved. --> -<Project Version="7" Minor="35" Path="/home/vagle/fpga_project/game_of_life/game_of_life.xpr"> +<Project Version="7" Minor="35" Path="/home/link/Documents/ppke/fpga/fpga_project/game_of_life/game_of_life.xpr"> <DefaultLaunch Dir="$PRUNDIR"/> <Configuration> <Option Name="Id" Val="371a98f33a2a4b6a881ffa6392349aed"/> @@ -57,15 +57,14 @@ <FileSets Version="1" Minor="31"> <FileSet Name="sources_1" Type="DesignSrcs" RelSrcDir="$PSRCDIR/sources_1"> <Filter Type="Srcs"/> - <File Path="$PSRCDIR/sources_1/new/game_of_life.vhd"> + <File Path="$PSRCDIR/sources_1/new/one_second_clock.vhd"> <FileInfo> <Attr Name="UsedIn" Val="synthesis"/> <Attr Name="UsedIn" Val="simulation"/> </FileInfo> </File> - <File Path="$PSRCDIR/sources_1/new/one_second_clock.vhd"> + <File Path="$PSRCDIR/sources_1/new/game_of_life.vhd"> <FileInfo> - <Attr Name="AutoDisabled" Val="1"/> <Attr Name="UsedIn" Val="synthesis"/> <Attr Name="UsedIn" Val="simulation"/> </FileInfo> @@ -89,6 +88,7 @@ </Config> </FileSet> <FileSet Name="sim_1" Type="SimulationSrcs" RelSrcDir="$PSRCDIR/sim_1"> + <Filter Type="Srcs"/> <Config> <Option Name="DesignMode" Val="RTL"/> <Option Name="TopModule" Val="game_of_life"/> @@ -137,9 +137,7 @@ <Runs Version="1" Minor="10"> <Run Id="synth_1" Type="Ft3:Synth" SrcSet="sources_1" Part="xc7z020clg484-1" ConstrsSet="constrs_1" Description="Vivado Synthesis Defaults" WriteIncrSynthDcp="false" State="current" IncludeInArchive="true"> <Strategy Version="1" Minor="2"> - <StratHandle Name="Vivado Synthesis Defaults" Flow="Vivado Synthesis 2017"> - <Desc>Vivado Synthesis Defaults</Desc> - </StratHandle> + <StratHandle Name="Vivado Synthesis Defaults" Flow="Vivado Synthesis 2017"/> <Step Id="synth_design"/> </Strategy> <ReportStrategy Name="Vivado Synthesis Default Reports" Flow="Vivado Synthesis 2017"/> @@ -147,9 +145,7 @@ </Run> <Run Id="clk_wiz_0_synth_1" Type="Ft3:Synth" SrcSet="clk_wiz_0" Part="xc7z020clg484-1" ConstrsSet="clk_wiz_0" Description="Vivado Synthesis Defaults" WriteIncrSynthDcp="false" Dir="$PRUNDIR/clk_wiz_0_synth_1" IncludeInArchive="true"> <Strategy Version="1" Minor="2"> - <StratHandle Name="Vivado Synthesis Defaults" Flow="Vivado Synthesis 2017"> - <Desc>Vivado Synthesis Defaults</Desc> - </StratHandle> + <StratHandle Name="Vivado Synthesis Defaults" Flow="Vivado Synthesis 2017"/> <Step Id="synth_design"/> </Strategy> <GeneratedRun Dir="$PRUNDIR" File="gen_run.xml"/> @@ -158,9 +154,7 @@ </Run> <Run Id="impl_1" Type="Ft2:EntireDesign" Part="xc7z020clg484-1" ConstrsSet="constrs_1" Description="Default settings for Implementation." WriteIncrSynthDcp="false" State="current" SynthRun="synth_1" IncludeInArchive="true"> <Strategy Version="1" Minor="2"> - <StratHandle Name="Vivado Implementation Defaults" Flow="Vivado Implementation 2017"> - <Desc>Default settings for Implementation.</Desc> - </StratHandle> + <StratHandle Name="Vivado Implementation Defaults" Flow="Vivado Implementation 2017"/> <Step Id="init_design"/> <Step Id="opt_design"/> <Step Id="power_opt_design"/> @@ -176,9 +170,7 @@ </Run> <Run Id="clk_wiz_0_impl_1" Type="Ft2:EntireDesign" Part="xc7z020clg484-1" ConstrsSet="clk_wiz_0" Description="Default settings for Implementation." WriteIncrSynthDcp="false" SynthRun="clk_wiz_0_synth_1" IncludeInArchive="false"> <Strategy Version="1" Minor="2"> - <StratHandle Name="Vivado Implementation Defaults" Flow="Vivado Implementation 2017"> - <Desc>Default settings for Implementation.</Desc> - </StratHandle> + <StratHandle Name="Vivado Implementation Defaults" Flow="Vivado Implementation 2017"/> <Step Id="init_design"/> <Step Id="opt_design"/> <Step Id="power_opt_design"/>