Merge remote-tracking branch 'origin/4s_widebatt' into 4s_widebatt_skids

ThunderFly-aerospace · Jul 13, 2023 · 12c4cf7 · 12c4cf7
2 parents 58629b3 + d5ebfec
commit 12c4cf7
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/printable_files.yml b/.github/workflows/printable_files.yml
@@ -14,10 +14,11 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        printer: [mini] # [mini, edee, mlab3d]
+        // printer: [mini, edee, mlab3d]
+        printer: [mini]
     env:
       OPENSCAD_BIN: xvfb-run --auto-servernum ~/OpenSCAD.AppImage
-      SLIC3R_BIN: ~/Slic3r.AppImage
+      SLIC3R_BIN: PrusaSlicer
       PRINTER: ${{ matrix.printer }}
     steps:
     - uses: FranzDiebold/github-env-vars-action@v2
@@ -31,13 +32,14 @@ jobs:
     - name: Install requirements
       run: |
         sudo apt-get update
-        wget https://github.com/slic3r/Slic3r/releases/download/1.3.0/Slic3r-1.3.0-x86_64.AppImage -O ~/Slic3r.AppImage
-        chmod +x ~/Slic3r.AppImage
+        wget https://github.com/prusa3d/PrusaSlicer/releases/download/version_2.6.0/PrusaSlicer-2.6.0+linux-x64-GTK3-202306191220.AppImage -O ~/prusa-slicer.AppImage
+        chmod +x ~/prusa-slicer.AppImage
+        sudo cp ~/prusa-slicer.AppImage /usr/local/bin/PrusaSlicer
         wget https://files.openscad.org/OpenSCAD-2021.01-x86_64.AppImage -O ~/OpenSCAD.AppImage
         chmod +x ~/OpenSCAD.AppImage
-        sudo apt-get install libc-bin python3-setuptools xvfb
+        sudo apt-get install libc-bin python3-setuptools xvfb libglu1-mesa libglu1 libegl1
         sudo python3 -m pip install --upgrade pip
-        sudo python3 -m pip install stlsort lxml
+        sudo python3 -m pip install stlsort lxml matplotlib thumby==0.2.3
         sudo python3 -m pip install git+https://github.com/ThunderFly-aerospace/yagv@a541869d11d3c094f1d7a3ed4d3c0c30489398e9
         sudo python3 -m pip install git+https://${{ secrets.AUTH_USER }}:${{ secrets.GITHUBPAT }}@github.com/ThunderFly-aerospace/processor3D.git
 

diff --git a/.gitmodules b/.gitmodules
@@ -17,7 +17,7 @@
 [submodule "CAD/slicing/3Dprinter_configs"]
 	path = CAD/slicing/3Dprinter_configs
 	url = git@github.com:ThunderFly-aerospace/3dprinter_configs.git
-	branch = master
+	branch = PrusaSlicer
 [submodule "CAD/src/lib/PrintedRotor"]
 	path = CAD/src/lib/PrintedRotor
 	url = git@github.com:ThunderFly-aerospace/PrintedRotor.git
diff --git a/CAD/slicing/3Dprinter_configs b/CAD/slicing/3Dprinter_configs
diff --git a/CAD/src/lib/NopSCAD b/CAD/src/lib/NopSCAD
diff --git a/CAD/src/lib/PrintedRotor b/CAD/src/lib/PrintedRotor
diff --git a/CAD/src/lib/Round-Anything b/CAD/src/lib/Round-Anything
diff --git a/CAD/src/lib/TFGPS01 b/CAD/src/lib/TFGPS01
diff --git a/CAD/src/lib/TFSLOT01 b/CAD/src/lib/TFSLOT01
diff --git a/utils/Makefile b/utils/Makefile
@@ -11,7 +11,7 @@ NAME_PREFIX?=''
 SLIC3R_PROFILE?=''
 PROCESSOR3D_PARAM?=
 IMG_DIR?=''
-PRINTER?=edee
+PRINTER?=mini
 
 RED=" \e[91m "
 GRN=" \e[32m "