Merge pull request opulo-inc#721 from opulo-inc/cad-staging

Merges cad-staging into main for v3.2.1 release prep
franctank · Mar 12, 2024 · b4763ea · b4763ea
2 parents 8fe60f7 + e86d651
commit b4763ea
Show file tree

Hide file tree

Showing 14 changed files with 538 additions and 20 deletions.
diff --git a/.github/workflows/export-mcad.yaml b/.github/workflows/export-mcad.yaml
@@ -31,8 +31,8 @@ jobs:
       uses: dsaltares/fetch-gh-release-asset@master
       with:
         repo: "FreeCAD/FreeCAD"
-        version: "tags/0.21.1"
-        file: "FreeCAD_0.21.1-Linux-x86_64.AppImage"
+        version: "tags/0.21.2"
+        file: "FreeCAD-0.21.2-Linux-x86_64.AppImage"
         target: "FreeCAD.AppImage"
         token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -65,20 +65,16 @@ jobs:
         cd .github/workflows/scripts/stl-export
         zip -9 -j /home/runner/work/lumenpnp/lumenpnp/LumenPnP-STLs-${{ github.event.release.tag_name }}.zip *.stl
         cd ../csm-export
-
-    - name: Compress STL and DXF files for Artifacts
-      if: github.event_name != 'release'
-      run: |
-        cd .github/workflows/scripts/stl-export
-        zip -9 -j ~/LumenPnP-STLs.zip *.stl
-        cd /home/runner/work/lumenpnp/lumenpnp/.github/workflows/scripts/csm-export
+        if [ -f "*.dxf" ]; then
+        zip -9 -j /home/runner/work/lumenpnp/lumenpnp/LumenPnP-DXFs-${{ github.event.release.tag_name }}.zip *.dxf
+        fi
 
     - name: Upload STLs as Artifacts
       if: github.event_name != 'release'
       uses: actions/upload-artifact@v2
       with:
         name: LumenPnP-STLs
-        path: ~/LumenPnP-STLs.zip
+        path: .github/workflows/scripts/stl-export/*.stl
         if-no-files-found: error
         retention-days: 60
 
@@ -87,12 +83,15 @@ jobs:
       uses: actions/upload-artifact@v2
       with:
         name: LumenPnP-DXFs
-        path: ~/LumenPnP-DXFs.zip
+        path: .github/workflows/scripts/csm-export/*.dxf
         if-no-files-found: warn
         retention-days: 60
 
     - name: Upload STLs and DXFs Release
       uses: softprops/action-gh-release@v1
       if: github.event_name == 'release'
       with:
-        files: LumenPnP-STLs-${{ github.event.release.tag_name }}.zip
+        files: |
+          LumenPnP-STLs-${{ github.event.release.tag_name }}.zip
+          LumenPnP-DXFs-${{ github.event.release.tag_name }}.zip
+        fail_on_unmatched_files: false
diff --git a/bom.csv b/bom.csv
@@ -51,7 +51,7 @@ board-support,,8,FDM,Download all 3D printed parts at the link at the top of the
 adj-strip-feeder,,-,FDM,Download all 3D printed parts at the link at the top of the page.,,Optional,This 2-piece part can be mounted to the staging plate and adjusted to hold varying widths of tape (32mm+). Each side uses 2x M3x10mm-ultra-low-profile-button-head screws and 2x M3 wing nuts for attachment.
 cp40-nozzle-camera-mask,,-,FDM,Download all 3D printed parts at the link at the top of the page.,,Optional,This part can be pressed onto the CP40 nozzle holder to prevent any bright objects above the machine from interfering with bottom vision. Should be printed in a dark color.
 PLA-filament ,https://90a1c75758623581b3f8-5c119c3de181c9857fcb2784776b17ef.ssl.cf2.rackcdn.com/611532_989269_03_front_zoom.jpg,1.2,FIL,https://www.microcenter.com/product/611532/inland-175mm-black-pla-3d-printer-filament-1kg-spool-(22-lbs),,,Units in kg. Print both nozzle-rack and 2x z-gantry in a black color. Print top-light-mount and bottom-light-mount in a white color.
-PETG-filament,https://90a1c75758623581b3f8-5c119c3de181c9857fcb2784776b17ef.ssl.cf2.rackcdn.com/503741_715474_01_front_zoom.jpg,0.004,FIL,https://www.microcenter.com/product/503741/inland-175mm-white-petg-3d-printer-filament-1kg-spool-%2822-lbs%29,,,Units in kg. Use a white material. Use for universal PCB fixture components.
+PETG-filament,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/filament.png?v=1686314492,0.004,FIL,https://www.microcenter.com/product/503741/inland-175mm-white-petg-3d-printer-filament-1kg-spool-%2822-lbs%29,,,Units in kg. Use a white material. Use for universal PCB fixture components.
 M5-tslot-nut,https://m.media-amazon.com/images/I/51AI2rmWaML._AC_SX466_.jpg,60,FST,https://amzn.to/3b1d14V,,,
 M3-cap-nut,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/M3-cap-nut.png?v=1696266636,3,FST,https://www.mcmaster.com/94000A330,,,
 M3-hex-nut,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/M3-hex-nut.png?v=1696266635,23,FST,https://www.mcmaster.com/90592A085/,,,ISO4032
@@ -99,9 +99,9 @@ z-limit-harness,,1,CHA,,,,Click link above to download source
 down-light-harness,,1,CHA,,,,Click link above to download source
 up-light-harness,,1,CHA,,,,Click link above to download source
 pump-harness,,2,CHA,,,,Click link above to download source
-mobo-to-slot1-harness,,1,CHA,https://www.mouser.com/ProductDetail/Samtec/FFSD-03-D-13.00-01?qs=PB6%2FjmICvI1f3Ok8%2FnZ2SA%3D%3D,,,320mm in length with a 2x3 1.27mm pitch IDC connector at both ends
-slot25-to-slot26-harness,,1,CHA,https://www.mouser.com/ProductDetail/Samtec/FFSD-03-D-13.00-01?qs=PB6%2FjmICvI1f3Ok8%2FnZ2SA%3D%3D,,,720mm in length with a 2x3 1.27mm pitch IDC connector at both ends
-blade-jumper-harness,,2,CHA,,,,30mm in length with a 2x3 1.27mm pitch IDC connector at both ends
+mobo-to-slot1-harness,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/mobo-to-slot1-harness.jpg?v=1710186450,1,CHA,https://www.mouser.com/ProductDetail/Samtec/FFSD-03-D-13.00-01?qs=PB6%2FjmICvI1f3Ok8%2FnZ2SA%3D%3D,,,320mm in length with a 2x3 1.27mm pitch IDC connector at both ends
+slot25-to-slot26-harness,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/slot25-to-slot26-harness.jpg?v=1710186601,1,CHA,https://www.mouser.com/ProductDetail/Samtec/FFSD-03-D-13.00-01?qs=PB6%2FjmICvI1f3Ok8%2FnZ2SA%3D%3D,,,720mm in length with a 2x3 1.27mm pitch IDC connector at both ends
+blade-jumper-harness,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/blade-jumper-harness.jpg?v=1710186746,2,CHA,,,,30mm in length with a 2x3 1.27mm pitch IDC connector at both ends
 usb-b-to-usb-a-cable,https://m.media-amazon.com/images/I/71bhL-Kx6+L._AC_SL1500_.jpg,1,CHA,https://a.co/d/gq71q7P,,,A cable between 1-2m in length is recommended.
 vslot-extrusion-20mmx20mmx600mm,https://i5.walmartimages.com/asr/2e0cf04c-2ff3-49aa-80cb-8f5a66d72a9c.e854f9777be16e51343f11e4f4cb7f11.jpeg,7,MISC,https://www.amazon.com/gp/product/B085BMVZM7/ref=ppx_yo_dt_b_search_asin_title?ie=UTF8&psc=1,,,
 corner-bracket,https://www.mcmaster.com/mvD/Contents/gfx/ImageCache/553/5537T498p1-h03a-digitall@4x_637057412454218652.png?ver=ImageNotFound,6,MISC,https://www.mcmaster.com/5537T498/,,,
@@ -110,7 +110,7 @@ NEMA11-hollow-shaft-stepper,https://www.robotdigg.com/crab/image/2016/09/24/4667
 LML9B-linear-rail-100mm,https://m.media-amazon.com/images/I/51WG8VNpIYL._AC_SX466_.jpg,2,MISC,https://amzn.to/2Y2p8vJ,,,
 525mm-MGN12H,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/MGN12H-525mm.png?v=1693326600,1,MISC,https://www.printedsolid.com/products/ldo-linear-rail-mgn12h-with-one-carriage-in-300-400-500-700mm-lengths,,,500mm is OK if 525mm is hard to source.
 550mm-MGN12H,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/MGN12H-550mm.png?v=1693326513,2,MISC,https://www.zyltech.com/zyltech-mgn12-h-type-linear-rail-with-single-or-double-carriage-block/,,,
-m3_t-nut_bar-525mm,,3,MISC,,,,This is custom made by LDO for Opulo. Individuals self-sourcing their v3.1 can instead use an additional 36x m3-t-nut.
+m3_t-nut_bar-525mm,,3,MISC,,,Optional,This is custom made by LDO for Opulo. Individuals self-sourcing their machine should instead buy an additional 36x m3-t-nut.
 GT2-idler,https://cdn.reprapworld.com/images/default/dynamic/products/details/imgprd1273_2128908372.jpg,4,MISC,https://www.amazon.com/WINSINN-Aluminum-Timing-Pulley-Printer/dp/B07BPGYX3G/ref=psdc_16411441_t1_B078SD2XGL,,,
 GT2-pulley,https://cdn.reprapworld.com/images/default/dynamic/products/productoverview/imgprd1269_129687697.jpg,4,MISC,https://www.amazon.com/WINSINN-Aluminum-Synchronous-Timing-Printer/dp/B077GNZK3J/ref=psdc_16411441_t1_B07JJLZTLV?th=1,,,
 GT2-timing-belt,https://cdn11.bigcommerce.com/s-itwgldve/images/stencil/1280x1280/products/161/3703/profile_picture__60204.1540579835.png?c=2,4.2,MISC,https://www.amazon.com/Mercurry-Meters-timing-Rostock-GT2-6mm/dp/B071K8HYB4/ref=sr_1_3?crid=1HKUJHXOT3UPI&dchild=1&keywords=gt2+timing+belt&qid=1595949621&s=industrial&sprefix=gt2+timing+%2Cindustrial%2C144&sr=1-3,,,"Units in meters. Amount listed is the exact QTY required, we suggest ordering 5m for slack length."
@@ -120,10 +120,16 @@ vacuum-pump,https://sc04.alicdn.com/kf/H1b9f842676a343bcb7e4decfded9bcc9H.jpg,2,
 solenoid-valve,https://ae01.alicdn.com/kf/Hafe8a28e79b74bfd869df5bc6ba64cb3d.jpg,2,MISC,https://opulo.io/products/vacuum-pump-and-valve-set,,,
 pneumatic-y-adapter,https://cdn.automationdirect.com/images/products/medium/m_ury6m4m.jpg,2,MISC,https://www.automationdirect.com/adc/shopping/catalog/pneumatic_components/push-to-connect_union_pneumatic_fittings_(thermoplastic)/union_y_reducer/ury6m-4m,,,
 rotary-pneumatic-adapter,https://us.misumi-ec.com/vona2/detail/221006294602/?HissuCode=KSH04-M5,2,MISC,,,,
-pneumatic-tubing-4mmOD,https://cdn.automationdirect.com/images/products/large/l_pu532blk100.jpg,4.05,MISC,https://www.automationdirect.com/adc/shopping/catalog/pneumatic_components/flexible_pneumatic_tubing_-a-_hoses/straight_polyurethane_(pur)_tubing/5-z-32_inch_(4_mm)/pu532blk100,,,Units in meters.
-pneumatic-tubing-6mmOD,https://cdn.automationdirect.com/images/products/medium/m_pu6mblk100.jpg,0.6,MISC,https://www.automationdirect.com/adc/shopping/catalog/pneumatic_components/flexible_pneumatic_tubing_-a-_hoses/straight_polyurethane_(pur)_tubing/6_mm/pu6mblk100,,,Units in meters.
+pneumatic-tubing-4mmOD,https://cdn.automationdirect.com/images/products/large/l_pu532blk100.jpg,4.05,MISC,https://www.automationdirect.com/adc/shopping/catalog/pneumatic_components/flexible_pneumatic_tubing_-a-_hoses/straight_polyurethane_(pur)_tubing/5-z-32_inch_(4_mm)/pu532blk100,,,Units in meters
+pneumatic-tubing-6mmOD,https://cdn.automationdirect.com/images/products/medium/m_pu6mblk100.jpg,0.6,MISC,https://www.automationdirect.com/adc/shopping/catalog/pneumatic_components/flexible_pneumatic_tubing_-a-_hoses/straight_polyurethane_(pur)_tubing/6_mm/pu6mblk100,,,Units in meters
 24v-power-supply,https://avacomtech.com/pub/media/catalog/product/cache/image/1000x1320/e9c3970ab036de70892d86c6d221abfe/w/e/web1_2.png,1,MISC,,,,A power supply that can output at least 6A @ 24v DC is recommended. Assumed that any requisite AC power cord is included.
-cp40-holder,https://www.robotdigg.com/crab/image/2016/09/24/2dc797b0066ef492441f43c2f25c37a9-300-300.jpeg,2,MISC,https://opulo.io/products/wired-toolhead-assembly,https://www.robotdigg.com/product/799/OpenPnP-CP40-Holder,,
+nozzle-holder,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/nozzle-holder.jpg?v=1710185336,2,MISC,https://opulo.io/products/wired-toolhead-assembly,https://www.robotdigg.com/product/799/OpenPnP-CP40-Holder,,
+nozzle-holder-inner-body,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/nozzle-holder-inner-body.jpg?v=1710185336,2,MISC,,,Optional,Click link above to download source
+nozzle-holder-outer-body,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/nozzle-holder-outer-body.jpg?v=1710185336,2,MISC,,,Optional,Click link above to download source
+nozzle-holder-spring,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/spr-0002.png?v=1710185336,2,MISC,https://www.leespring.com/compression-springs?search=LCM050C03M,,Optional,Click link above to download source
+4mmIDx0.6mmCS-o-ring,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/4mmIDx0.6mmCS-o-ring.jpg?v=1710185336,4,MISC,https://www.polymax.co.uk/o-ring-4mm-id-x-0-6mm-cs-nitrile-70-sha,,Optional,Click link above to download source
+2mm-pin,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/2mm-pin.jpg?v=1710185481,2,MISC,https://www.mcmaster.com/97049A101/,,Optional,ISO 2338-H8 undersized 2mm dowel pin
+precision-machine-oil,https://cdn.shopify.com/s/files/1/0570/4256/7355/files/DeoxIT_X10S_Precison_Oil.jpg?v=1710185336,0.02,MISC,https://www.mcmaster.com/2278N13/,,Optional,Unit in milliliters
 N045-CP40-nozzle-tip,https://www.robotdigg.com/crab/image/2016/09/24/ccdb354070f2d1d75e808806046dd125-300-300.jpeg,1,MISC,https://opulo.io/products/cp40-pnp-nozzle,https://www.robotdigg.com/product/800/OpenPnP-nozzle-CP40LV,,
 N08-CP40-nozzle-tip,https://www.robotdigg.com/crab/image/2016/09/24/ccdb354070f2d1d75e808806046dd125-300-300.jpeg,1,MISC,https://opulo.io/products/cp40-pnp-nozzle,https://www.robotdigg.com/product/800/OpenPnP-nozzle-CP40LV,,
 N14-CP40-nozzle-tip,https://www.robotdigg.com/crab/image/2016/09/24/ccdb354070f2d1d75e808806046dd125-300-300.jpeg,1,MISC,https://opulo.io/products/cp40-pnp-nozzle,https://www.robotdigg.com/product/800/OpenPnP-nozzle-CP40LV,,