Skip to content

Commit

Permalink
Improved NiceGUI virtual io webpage (#50)
Browse files Browse the repository at this point in the history
* Initial commit for virtual PCB representation in NiceGUI.
Added howto export PCB fabrication data.

* Improved some styling in NiceGUI

* Improved NiceGUI representation of PCB

* Improved Display with counting variable like in the real testbed

* Fixed issue with Blowout in the virtual environment

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Apply automatic changes

* Testing github actions with unixodbc-dev

* Apply automatic changes

* Fixed typo

* Apply automatic changes

* Fixed bug with infinite pushes (testing)

* Trying to get github actions working again

* Apply automatic changes

* Apply automatic changes

---------

Co-authored-by: Matthias Niedermaier <matthias.niedermaier@googlemail.com>
Co-authored-by: mniedermaier <mniedermaier@users.noreply.github.com>
  • Loading branch information
3 people authored Aug 31, 2024
1 parent fe83afa commit fddc942
Show file tree
Hide file tree
Showing 17 changed files with 505 additions and 56 deletions.
2 changes: 1 addition & 1 deletion hardware/pcb/CybICS.kicad_pcb
Original file line number Diff line number Diff line change
Expand Up @@ -14711,7 +14711,7 @@
)
(fp_arc
(start 64.20104 22.49932)
(mid 64.054479 22.85315)
(mid 64.054473 22.853115)
(end 63.70066 22.9997)
(stroke
(width 0.12)
Expand Down
23 changes: 23 additions & 0 deletions hardware/pcb/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
### Ordering PCB at JLCPCB

Open KiCad and under "Tools" &rarr; "Plugin and Content Manager":
<table align="center"><tr><td align="center" width="9999">
<img src="doc/pluginManager.png" width=60%></img>
</td></tr></table>

Install the "Fabrication Toolkit":
<table align="center"><tr><td align="center" width="9999">
<img src="doc/fabricationToolkit.png" width=80%></img>
</td></tr></table>

Open the "PCB Editor" and click on the icon of "Fabrication Toolkit":
<table align="center"><tr><td align="center" width="9999">
<img src="doc/pcbEditor.png" width=40%></img>
</td></tr></table>

Generate the fabrication data:
<table align="center"><tr><td align="center" width="9999">
<img src="doc/generate.png" width=40%></img>
</td></tr></table>

Now you have a folder "production", with all the file to upload to JLCPCB.
Binary file added hardware/pcb/doc/fabricationToolkit.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hardware/pcb/doc/generate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hardware/pcb/doc/pcbEditor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added hardware/pcb/doc/pluginManager.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hardware/pcb/docs/CybICS-board_bottom.pdf
Binary file not shown.
Binary file modified hardware/pcb/docs/CybICS-board_top.pdf
Binary file not shown.
Binary file modified hardware/pcb/docs/CybICS-schematic.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion hardware/pcb/pcb/CybICS-top.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified hardware/pcb/pcb/CybICS_top.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions software/FUXA/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ FROM debian:12
RUN apt-get update && apt-get install -y \
npm \
curl \
unixodbc-dev \
&& rm -rf /var/lib/apt/lists/*
RUN npm install -g --unsafe-perm @frangoteam/fuxa

Expand Down
6 changes: 4 additions & 2 deletions software/hwio-virtual/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ FROM python:3
WORKDIR /CybICS
COPY requirements.txt ./
RUN pip install --no-cache-dir -r requirements.txt
RUN mkdir -p pics
COPY hardwareAbstraction.py ./
COPY CybICS_logo.png ./
COPY favicon.ico ./
COPY pics/CybICS_logo.png pics/CybICS_logo.png
COPY pics/favicon.ico pics/favicon.ico
COPY pics/pcb.png pics/pcb.png

CMD [ "python", "./hardwareAbstraction.py" ]
Loading

0 comments on commit fddc942

Please sign in to comment.