Commit 78fc8488 authored by Kučera, Filip's avatar Kučera, Filip 💬

microzed_apo: toplevel WIP changes, LCD display update.

parent 891c819b
......@@ -371,7 +371,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>POLARITY</spirit:name>
<spirit:value spirit:id="BUSIFPARAM_VALUE.S00_AXI_RST.POLARITY">ACTIVE_LOW</spirit:value>
<spirit:value spirit:id="BUSIFPARAM_VALUE.S00_AXI_RST.POLARITY" spirit:choiceRef="choice_list_74b5137e">ACTIVE_LOW</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:busInterface>
......@@ -419,7 +419,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>POLARITY</spirit:name>
<spirit:value spirit:id="BUSIFPARAM_VALUE.M00_AXI_RST.POLARITY">ACTIVE_LOW</spirit:value>
<spirit:value spirit:id="BUSIFPARAM_VALUE.M00_AXI_RST.POLARITY" spirit:choiceRef="choice_list_74b5137e">ACTIVE_LOW</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:busInterface>
......@@ -493,7 +493,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>viewChecksum</spirit:name>
<spirit:value>99bb521e</spirit:value>
<spirit:value>0862355c</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:view>
......@@ -509,7 +509,7 @@
<spirit:parameters>
<spirit:parameter>
<spirit:name>viewChecksum</spirit:name>
<spirit:value>99bb521e</spirit:value>
<spirit:value>0862355c</spirit:value>
</spirit:parameter>
</spirit:parameters>
</spirit:view>
......@@ -1325,6 +1325,11 @@
<spirit:name>choice_list_6fc15197</spirit:name>
<spirit:enumeration>32</spirit:enumeration>
</spirit:choice>
<spirit:choice>
<spirit:name>choice_list_74b5137e</spirit:name>
<spirit:enumeration>ACTIVE_HIGH</spirit:enumeration>
<spirit:enumeration>ACTIVE_LOW</spirit:enumeration>
</spirit:choice>
<spirit:choice>
<spirit:name>choice_pairs_ce1226b1</spirit:name>
<spirit:enumeration spirit:text="true">1</spirit:enumeration>
......@@ -1349,7 +1354,7 @@
<spirit:file>
<spirit:name>hdl/display_16bit_cmd_data_bus_v1_0.vhd</spirit:name>
<spirit:fileType>vhdlSource</spirit:fileType>
<spirit:userFileType>CHECKSUM_038ef7fd</spirit:userFileType>
<spirit:userFileType>CHECKSUM_4fe95fec</spirit:userFileType>
</spirit:file>
</spirit:fileSet>
<spirit:fileSet>
......@@ -1534,21 +1539,21 @@
<xilinx:taxonomy>AXI_Peripheral</xilinx:taxonomy>
</xilinx:taxonomies>
<xilinx:displayName>display_16bit_cmd_data_bus_v1.0</xilinx:displayName>
<xilinx:coreRevision>4</xilinx:coreRevision>
<xilinx:coreCreationDateTime>2017-02-14T13:49:08Z</xilinx:coreCreationDateTime>
<xilinx:coreRevision>5</xilinx:coreRevision>
<xilinx:coreCreationDateTime>2020-08-03T16:08:20Z</xilinx:coreCreationDateTime>
<xilinx:tags>
<xilinx:tag xilinx:name="user.org:user:display_16bit_cmd_data_bus:1.0_ARCHIVE_LOCATION">/home/pi/fpga/zynq/canbech-sw/system/ip/display_16bit_cmd_data_bus_1.0</xilinx:tag>
<xilinx:tag xilinx:name="user.org:user:display_16bit_cmd_data_bus:1.0_ARCHIVE_LOCATION">/home.nfs/kucerfi3/FrameBuffer/zynq-can-sja1000-top/system/ip/display_16bit_cmd_data_bus_1.0</xilinx:tag>
</xilinx:tags>
</xilinx:coreExtensions>
<xilinx:packagingInfo>
<xilinx:xilinxVersion>2016.1</xilinx:xilinxVersion>
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="4150380b"/>
<xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="64346dae"/>
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="493665f4"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="67328ef0"/>
<xilinx:checksum xilinx:scope="ports" xilinx:value="b78ab47f"/>
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="07a22c67"/>
<xilinx:checksum xilinx:scope="parameters" xilinx:value="6eae480a"/>
<xilinx:xilinxVersion>2018.2.2</xilinx:xilinxVersion>
<xilinx:checksum xilinx:scope="busInterfaces" xilinx:value="7896a0ad"/>
<xilinx:checksum xilinx:scope="addressSpaces" xilinx:value="55bfeea0"/>
<xilinx:checksum xilinx:scope="memoryMaps" xilinx:value="ed1368d5"/>
<xilinx:checksum xilinx:scope="fileGroups" xilinx:value="24d17e4a"/>
<xilinx:checksum xilinx:scope="ports" xilinx:value="51647bc8"/>
<xilinx:checksum xilinx:scope="hdlParameters" xilinx:value="5c167a55"/>
<xilinx:checksum xilinx:scope="parameters" xilinx:value="9ba27ed2"/>
</xilinx:packagingInfo>
</spirit:vendorExtensions>
</spirit:component>
......@@ -790,13 +790,6 @@
<spirit:configurableElementValue spirit:referenceId="bd:xciName">top_audio_single_pwm_0_0</spirit:configurableElementValue>
</spirit:configurableElementValues>
</spirit:componentInstance>
<spirit:componentInstance>
<spirit:instanceName>display_16bit_cmd_data_bus_0</spirit:instanceName>
<spirit:componentRef spirit:library="user" spirit:name="display_16bit_cmd_data_bus" spirit:vendor="user.org" spirit:version="1.0"/>
<spirit:configurableElementValues>
<spirit:configurableElementValue spirit:referenceId="bd:xciName">top_display_16bit_cmd_data_bus_0_0</spirit:configurableElementValue>
</spirit:configurableElementValues>
</spirit:componentInstance>
<spirit:componentInstance>
<spirit:instanceName>xlconcat_1</spirit:instanceName>
<spirit:componentRef spirit:library="ip" spirit:name="xlconcat" spirit:vendor="xilinx.com" spirit:version="2.1"/>
......@@ -819,6 +812,13 @@
<spirit:configurableElementValue spirit:referenceId="bd:xciName">top_dcsimpledrv_1_0</spirit:configurableElementValue>
</spirit:configurableElementValues>
</spirit:componentInstance>
<spirit:componentInstance>
<spirit:instanceName>display_16bit_cmd_data_bus_0</spirit:instanceName>
<spirit:componentRef spirit:library="user" spirit:name="display_16bit_cmd_data_bus" spirit:vendor="user.org" spirit:version="1.0"/>
<spirit:configurableElementValues>
<spirit:configurableElementValue spirit:referenceId="bd:xciName">top_display_16bit_cmd_data_bus_0_0</spirit:configurableElementValue>
</spirit:configurableElementValues>
</spirit:componentInstance>
</spirit:componentInstances>
<spirit:interconnections>
<spirit:interconnection>
......@@ -895,10 +895,10 @@
<spirit:internalPortReference spirit:componentRef="spi_leds_and_enc_0" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="audio_single_pwm_0" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="audio_single_pwm_0" spirit:portRef="m00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="m00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="dcsimpledrv_0" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="dcsimpledrv_1" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="s00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="m00_axi_aclk"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="ACLK"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="S00_ACLK"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="M00_ACLK"/>
......@@ -928,10 +928,10 @@
<spirit:internalPortReference spirit:componentRef="spi_leds_and_enc_0" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="audio_single_pwm_0" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="audio_single_pwm_0" spirit:portRef="m00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="m00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="dcsimpledrv_0" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="dcsimpledrv_1" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="s00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="display_16bit_cmd_data_bus_0" spirit:portRef="m00_axi_aresetn"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="S00_ARESETN"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="M00_ARESETN"/>
<spirit:internalPortReference spirit:componentRef="processing_system7_0_axi_periph" spirit:portRef="M01_ARESETN"/>
......
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