William/WMU-ECE-3570-Lab
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge resolve?

Browse Source
This commit is contained in:
jose.rodriguezlabra
2019-02-15 11:53:29 -05:00
parent 1691adf1b5
commit 3378e5bfd8
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
lab2CA.cache/wt/webtalk_pa.xml
View File

@@ -3,7 +3,11 @@
<!--The data in this file is primarily intended for consumption by Xilinx tools.
The structure and the elements are likely to change over the next few releases.
This means code written to parse this file will need to be revisited each subsequent release.-->
<<<<<<< Updated upstream
<application name="pa" timeStamp="Fri Feb 8 19:07:41 2019">
=======
<application name="pa" timeStamp="Fri Feb 15 11:20:09 2019">
>>>>>>> Stashed changes
<section name="Project Information" visible="false">
<property name="ProjectID" value="a5bb1d0d02704671b324cd827417f368" type="ProjectID"/>
<property name="ProjectIteration" value="1" type="ProjectIteration"/>
@@ -17,37 +21,61 @@ This means code written to parse this file will need to be revisited each subseq
<property name="ImplStrategy" value="Vivado Implementation Defaults" type="ImplStrategy"/>
</item>
<item name="Java Command Handlers">
<<<<<<< Updated upstream
<property name="AddSources" value="4" type="JavaHandler"/>
<property name="EditDelete" value="1" type="JavaHandler"/>
<property name="NewProject" value="2" type="JavaHandler"/>
<property name="OpenProject" value="2" type="JavaHandler"/>
=======
<property name="AddSources" value="3" type="JavaHandler"/>
<property name="NewProject" value="1" type="JavaHandler"/>
<property name="OpenProject" value="3" type="JavaHandler"/>
>>>>>>> Stashed changes
<property name="SaveProjectAs" value="1" type="JavaHandler"/>
<property name="ToolsSettings" value="1" type="JavaHandler"/>
</item>
<item name="Gui Handlers">
<<<<<<< Updated upstream
<property name="BaseDialog_OK" value="7" type="GuiHandlerData"/>
<property name="CreateSrcFileDialog_FILE_NAME" value="3" type="GuiHandlerData"/>
=======
<property name="BaseDialog_CANCEL" value="1" type="GuiHandlerData"/>
<property name="BaseDialog_OK" value="3" type="GuiHandlerData"/>
<property name="ConfirmSaveTextEditsDialog_NO" value="1" type="GuiHandlerData"/>
<property name="CreateSrcFileDialog_FILE_NAME" value="1" type="GuiHandlerData"/>
>>>>>>> Stashed changes
<property name="FPGAChooser_CATEGORY" value="1" type="GuiHandlerData"/>
<property name="FPGAChooser_FAMILY" value="2" type="GuiHandlerData"/>
<property name="FPGAChooser_FPGA_TABLE" value="1" type="GuiHandlerData"/>
<property name="FPGAChooser_PACKAGE" value="1" type="GuiHandlerData"/>
<<<<<<< Updated upstream
<property name="FileSetPanel_FILE_SET_PANEL_TREE" value="36" type="GuiHandlerData"/>
<property name="FlowNavigatorTreePanel_FLOW_NAVIGATOR_TREE" value="1" type="GuiHandlerData"/>
<property name="GettingStartedView_CREATE_NEW_PROJECT" value="2" type="GuiHandlerData"/>
=======
<property name="FileSetPanel_FILE_SET_PANEL_TREE" value="14" type="GuiHandlerData"/>
<property name="GettingStartedView_CREATE_NEW_PROJECT" value="1" type="GuiHandlerData"/>
>>>>>>> Stashed changes
<property name="GettingStartedView_OPEN_PROJECT" value="2" type="GuiHandlerData"/>
<property name="MainMenuMgr_CHECKPOINT" value="3" type="GuiHandlerData"/>
<property name="MainMenuMgr_EDIT" value="4" type="GuiHandlerData"/>
<property name="MainMenuMgr_FILE" value="8" type="GuiHandlerData"/>
<property name="MainMenuMgr_FILE" value="10" type="GuiHandlerData"/>
<property name="MainMenuMgr_FLOW" value="12" type="GuiHandlerData"/>
<property name="MainMenuMgr_IP" value="1" type="GuiHandlerData"/>
<property name="MainMenuMgr_OPEN_RECENT_PROJECT" value="1" type="GuiHandlerData"/>
<property name="MainMenuMgr_PROJECT" value="6" type="GuiHandlerData"/>
<property name="MainMenuMgr_PROJECT" value="7" type="GuiHandlerData"/>
<property name="MainMenuMgr_REPORTS" value="8" type="GuiHandlerData"/>
<property name="MainMenuMgr_SETTINGS" value="2" type="GuiHandlerData"/>
<property name="MainMenuMgr_TOOLS" value="16" type="GuiHandlerData"/>
<property name="PACommandNames_ADD_SOURCES" value="3" type="GuiHandlerData"/>
<<<<<<< Updated upstream
<property name="PACommandNames_AUTO_UPDATE_HIER" value="7" type="GuiHandlerData"/>
=======
<property name="PACommandNames_AUTO_UPDATE_HIER" value="6" type="GuiHandlerData"/>
<property name="PACommandNames_OPEN_PROJECT" value="1" type="GuiHandlerData"/>
>>>>>>> Stashed changes
<property name="PACommandNames_SAVE_PROJECT_AS" value="1" type="GuiHandlerData"/>
<property name="PAViews_CODE" value="1" type="GuiHandlerData"/>
<property name="ProjectNameChooser_CHOOSE_PROJECT_LOCATION" value="1" type="GuiHandlerData"/>
<property name="ProjectNameChooser_PROJECT_NAME" value="1" type="GuiHandlerData"/>
<property name="RDICommands_CUSTOM_COMMANDS" value="4" type="GuiHandlerData"/>
@@ -55,6 +83,7 @@ This means code written to parse this file will need to be revisited each subseq
<property name="RDICommands_SETTINGS" value="1" type="GuiHandlerData"/>
<property name="SettingsProjectGeneralPage_CHOOSE_DEVICE_FOR_YOUR_PROJECT" value="1" type="GuiHandlerData"/>
<property name="SrcChooserPanel_ADD_DIRECTORIES" value="1" type="GuiHandlerData"/>
<<<<<<< Updated upstream
<property name="SrcChooserPanel_ADD_HDL_AND_NETLIST_FILES_TO_YOUR_PROJECT" value="1" type="GuiHandlerData"/>
<property name="SrcChooserPanel_CREATE_FILE" value="3" type="GuiHandlerData"/>
<property name="SrcMenu_IP_HIERARCHY" value="7" type="GuiHandlerData"/>
@@ -63,6 +92,16 @@ This means code written to parse this file will need to be revisited each subseq
<property name="GuiMode" value="1" type="GuiMode"/>
<property name="BatchMode" value="0" type="BatchMode"/>
<property name="TclMode" value="0" type="TclMode"/>
=======
<property name="SrcChooserPanel_CREATE_FILE" value="1" type="GuiHandlerData"/>
<property name="SrcMenu_IP_HIERARCHY" value="6" type="GuiHandlerData"/>
<property name="SyntheticaGettingStartedView_RECENT_PROJECTS" value="1" type="GuiHandlerData"/>
</item>
<item name="Other">
<property name="GuiMode" value="29" type="GuiMode"/>
<property name="BatchMode" value="0" type="BatchMode"/>
<property name="TclMode" value="24" type="TclMode"/>
>>>>>>> Stashed changes
</item>
</section>
</application>

4
lab2CA.srcs/sources_1/new/lab2testing.v
View File

@@ -59,8 +59,8 @@ endmodule
module register(input wire clk, reset,
input wire [1:0] En,
input wire [7:0] Din,
output reg [7:0] Dout);
input wire [8:0] Din,
output reg [8:0] Dout);
endmodule