search

Logicademy / PYNQ-SoC-Builder

This project automates process of creating a PYNQ Z1/Z2 Overlay in Vivado, generates a custom Juypter Notebook template and uploads to a target PYNQ FPGA.
GNU Affero General Public License v3.0
3 stars 2 forks source link

Extended IO #28

Closed lukecanny closed 2 months ago

lukecanny commented 2 months ago

Hi Aidan,

In this update I've added support for more I/O (Buttons, switches and RGB LEDs) I want to merge with your branch before merging into main to make sure both of our work is all compatible together.

I have updated the Jupyter Notebook to visualize the new I/O ports

image

Not very pretty but it does the job.

I also added a few SoC Builder GUI stuff but this should not have any issue when merging:

image

GitHub seems content enough to merge without conflict too.

image

lukecanny commented 2 months ago

I merged your latest branch as of 8 minutes ago into mine and it solved merge conflict