Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
hakuturu583 committed Oct 18, 2024
2 parents a1f45a6 + 0fc61ac commit cad4c99
Show file tree
Hide file tree
Showing 22 changed files with 38,273 additions and 26 deletions.
45 changes: 32 additions & 13 deletions .github/workflows/docker/kicad/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,37 @@
FROM linuxserver/kicad:8.0.1
FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y \
software-properties-common \
wget \
curl \
&& add-apt-repository --yes ppa:kicad/kicad-8.0-releases \
&& apt-get update && apt-get install -y \
python3-pip \
kicad \
xvfb \
x11-apps \
unzip \
git \
&& apt-get clean

ENV KICAD8_3DMODEL_DIR="/usr/share/kicad/3dmodels/"
ENV KICAD8_FOOTPRINT_DIR="/usr/share/kicad/footprints/"
ENV KICAD8_SYMBOL_DIR="/usr/share/kicad/symbols/"
RUN pip3 install kibot --no-compile

RUN mkdir kicad_libraries
WORKDIR /kicad_libraries
ADD https://github.com/ncarandini/KiCad-RP-Pico/archive/refs/heads/main.zip KiCad-RP-Pico.zip
RUN unzip KiCad-RP-Pico.zip
ADD entrypoint.sh /
RUN chmod +x /entrypoint.sh

RUN cp -r "/kicad_libraries/KiCad-RP-Pico-main/RP-Pico Libraries/Pico.wrl" ${KICAD8_3DMODEL_DIR}
RUN cp -r "/kicad_libraries/KiCad-RP-Pico-main/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.pretty" ${KICAD8_FOOTPRINT_DIR}
RUN cp -r "/kicad_libraries/KiCad-RP-Pico-main/RP-Pico Libraries/MCU_RaspberryPi_and_Boards.kicad_sym" ${KICAD8_SYMBOL_DIR}
WORKDIR /usr/share/kicad/footprints
RUN git clone https://github.com/XenGi/teensy.pretty.git

WORKDIR /
WORKDIR /usr/share/kicad/symbols
RUN git clone https://github.com/XenGi/teensy_library.git
RUN kicad-cli sym upgrade teensy_library/teensy.lib -o teensy.kicad_sym

COPY autostart /defaults/autostart
# RUN mkdir -p ~/.config/kicad/8.0
COPY fp-lib-table /root/.config/kicad/8.0
COPY sym-lib-table /root/.config/kicad/8.0

WORKDIR /workspace

COPY kibot.yaml /workspace/kibot.yaml

ENTRYPOINT ["/entrypoint.sh"]
2 changes: 0 additions & 2 deletions .github/workflows/docker/kicad/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,4 @@ cd ouxt_automation/circuits
sh start_kicad.sh
```

Open [http://localhost:3000/](http://localhost:3000/)

![kicad](https://raw.githubusercontent.com/OUXT-Polaris/ouxt_automation/refs/heads/master/.github/workflows/docker/kicad/kicad.png)
3 changes: 3 additions & 0 deletions .github/workflows/docker/kicad/entrypoint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash

exec "$@"
146 changes: 146 additions & 0 deletions .github/workflows/docker/kicad/fp-lib-table

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions .github/workflows/docker/kicad/kibot.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
kibot:
version: 1

preflight:
erc: true

outputs:
- name: print schematic
type: svg_sch_print
dir: /workspace/schematics
225 changes: 225 additions & 0 deletions .github/workflows/docker/kicad/sym-lib-table

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions .github/workflows/document.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,19 @@ jobs:
uses: actions/setup-python@v1
with:
python-version: "3.10.15"
- name: Install the latest version of uv
uses: astral-sh/setup-uv@v3
with:
version: "latest"
- name: Install
run: pip3 install mkdocs mkdocs-material fontawesome_markdown mkdocs-mermaid2-plugin pymdown-extensions plantuml-markdown python-markdown-math python-github-api mkdocs-github-dashboard pandas markdown==3.3.0
run: uv sync
- name: Set env
run: echo "GITHUB_TOKEN=${{ secrets.WAMV_TAN_BOT_SECRET }}" >> $GITHUB_ENV
- name: Run kibot
working-directory: circuits
run: sh run_kibot.sh
- name: Generate documentation
run: mkdocs build
run: uv run mkdocs build
working-directory: docs
- uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'pull_request'}}
Expand Down
1 change: 1 addition & 0 deletions .python-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.10
1 change: 1 addition & 0 deletions circuits/computer_sensor_board/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
design-backups
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
(kicad_pcb (version 20240108) (generator "pcbnew") (generator_version "8.0")
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"board": {
"active_layer": 0,
"active_layer_preset": "",
"auto_track_width": true,
"hidden_netclasses": [],
"hidden_nets": [],
"high_contrast_mode": 0,
"net_color_mode": 1,
"opacity": {
"images": 0.6,
"pads": 1.0,
"tracks": 1.0,
"vias": 1.0,
"zones": 0.6
},
"selection_filter": {
"dimensions": true,
"footprints": true,
"graphics": true,
"keepouts": true,
"lockedItems": false,
"otherItems": true,
"pads": true,
"text": true,
"tracks": true,
"vias": true,
"zones": true
},
"visible_items": [
0,
1,
2,
3,
4,
5,
8,
9,
10,
11,
12,
13,
15,
16,
17,
18,
19,
20,
21,
22,
23,
24,
25,
26,
27,
28,
29,
30,
32,
33,
34,
35,
36,
39,
40
],
"visible_layers": "fffffff_ffffffff",
"zone_display_mode": 0
},
"git": {
"repo_password": "",
"repo_type": "",
"repo_username": "",
"ssh_key": ""
},
"meta": {
"filename": "computer_sensor_board.kicad_prl",
"version": 3
},
"project": {
"files": []
}
}
Loading

0 comments on commit cad4c99

Please sign in to comment.