From baf5560422562cdfa83091bcf97d0b439d4c0a4e Mon Sep 17 00:00:00 2001 From: lovebird Date: Tue, 23 Jul 2024 17:03:36 +0200 Subject: [PATCH] latest :) --- .../mechanics/Slide-40ID-52OD-60H.SLDPRT | 4 +- .../500-400/cad/900_Cabinet-500.SLDASM | 4 +- .../500-400/cad/910_EnclosureBack.SLDPRT | 4 +- .../cad/Interlocking brick.hash | 1 - .../cad/interlocking brick.html | 3 - .../templates/shared/body.md | 0 .../cad/Interlocking brick.hash | 1 - moulds/InterlockingBrick/cad/art final 1.hash | 1 - moulds/InterlockingBrick/cad/art final 2.hash | 1 - .../cad/cad-report-Default.json | 96 +++++++++++++++++++ .../templates/shared/body.md | 0 products/mech/scaffolding/joints.md | 9 -- products/mech/scaffolding/sizes.md | 7 -- .../2040_Shield_x2_1mm_INOX.SLDPRT | 4 +- .../SlideDual-20ID-40H.SLDASM | 4 +- .../SlideDual-20ID-50D-120W.SLDPRT | 4 +- vendor/cidepa/ckm/KM-110-15-7-5.sldprt | 4 +- 17 files changed, 110 insertions(+), 37 deletions(-) delete mode 100644 moulds/InterlockingBrick-2/cad/Interlocking brick.hash delete mode 100644 moulds/InterlockingBrick-2/cad/interlocking brick.html delete mode 100644 moulds/InterlockingBrick-2/templates/shared/body.md delete mode 100644 moulds/InterlockingBrick/cad/Interlocking brick.hash delete mode 100644 moulds/InterlockingBrick/cad/art final 1.hash delete mode 100644 moulds/InterlockingBrick/cad/art final 2.hash create mode 100644 moulds/InterlockingBrick/cad/cad-report-Default.json delete mode 100644 moulds/InterlockingBrick/templates/shared/body.md delete mode 100644 products/mech/scaffolding/joints.md delete mode 100644 products/mech/scaffolding/sizes.md diff --git a/components/mechanics/Slide-40ID-52OD-60H.SLDPRT b/components/mechanics/Slide-40ID-52OD-60H.SLDPRT index 32cf5bca9..26ca84dad 100644 --- a/components/mechanics/Slide-40ID-52OD-60H.SLDPRT +++ b/components/mechanics/Slide-40ID-52OD-60H.SLDPRT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1d65a7f39089a03988b61fcb432929d0890431bf628c0c4e05423cce6bce3bbd -size 251147 +oid sha256:6caba31412f5e7cd9fd90d7b661a168918b8640cbc137561b9bfbf09e2b70f31 +size 263073 diff --git a/components/shared/electronics/enclosures/500-400/cad/900_Cabinet-500.SLDASM b/components/shared/electronics/enclosures/500-400/cad/900_Cabinet-500.SLDASM index f7c29078c..a2f0fba5d 100644 --- a/components/shared/electronics/enclosures/500-400/cad/900_Cabinet-500.SLDASM +++ b/components/shared/electronics/enclosures/500-400/cad/900_Cabinet-500.SLDASM @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4e86ab4b285d8f0f9982d7010bf559178a03e9b9b8dff0e845f1c3034e73122e -size 1362094 +oid sha256:7964490cdc650fa7483d086e81bc703ade157a3676c49e68b32dcd0a94ad9d1a +size 1361889 diff --git a/components/shared/electronics/enclosures/500-400/cad/910_EnclosureBack.SLDPRT b/components/shared/electronics/enclosures/500-400/cad/910_EnclosureBack.SLDPRT index 291431662..c9e74ef3c 100644 --- a/components/shared/electronics/enclosures/500-400/cad/910_EnclosureBack.SLDPRT +++ b/components/shared/electronics/enclosures/500-400/cad/910_EnclosureBack.SLDPRT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3fe9a8c789a3b72f747b38c579afbe67413dd25e7d5ee3662cf719bf52314703 -size 341570 +oid sha256:ab5739d45715c91d95c217c8792fc1eed91b9b952171757b11874a17612735b4 +size 327280 diff --git a/moulds/InterlockingBrick-2/cad/Interlocking brick.hash b/moulds/InterlockingBrick-2/cad/Interlocking brick.hash deleted file mode 100644 index d0ca1fb61..000000000 --- a/moulds/InterlockingBrick-2/cad/Interlocking brick.hash +++ /dev/null @@ -1 +0,0 @@ -691da0415080381673103d6b9ba1c7d4d171e7f3b4817b3c3a435777f0f44259 \ No newline at end of file diff --git a/moulds/InterlockingBrick-2/cad/interlocking brick.html b/moulds/InterlockingBrick-2/cad/interlocking brick.html deleted file mode 100644 index 000db2b1e..000000000 --- a/moulds/InterlockingBrick-2/cad/interlocking brick.html +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a37e7722135d336b8ce5ab828a59ec96ae333c9aa781b04d4214acbd248d0b73 -size 8835508 diff --git a/moulds/InterlockingBrick-2/templates/shared/body.md b/moulds/InterlockingBrick-2/templates/shared/body.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/moulds/InterlockingBrick/cad/Interlocking brick.hash b/moulds/InterlockingBrick/cad/Interlocking brick.hash deleted file mode 100644 index d0ca1fb61..000000000 --- a/moulds/InterlockingBrick/cad/Interlocking brick.hash +++ /dev/null @@ -1 +0,0 @@ -691da0415080381673103d6b9ba1c7d4d171e7f3b4817b3c3a435777f0f44259 \ No newline at end of file diff --git a/moulds/InterlockingBrick/cad/art final 1.hash b/moulds/InterlockingBrick/cad/art final 1.hash deleted file mode 100644 index 1823d517f..000000000 --- a/moulds/InterlockingBrick/cad/art final 1.hash +++ /dev/null @@ -1 +0,0 @@ -e060382c566e61a183b8b12b5615bf3fdadd51d4229b1826b1bd0361e5d672ea \ No newline at end of file diff --git a/moulds/InterlockingBrick/cad/art final 2.hash b/moulds/InterlockingBrick/cad/art final 2.hash deleted file mode 100644 index 25bb67325..000000000 --- a/moulds/InterlockingBrick/cad/art final 2.hash +++ /dev/null @@ -1 +0,0 @@ -483ad8144fcceed00d52c64cb8d48c5fbfe73e043acaca460dba7a00f6cc079f \ No newline at end of file diff --git a/moulds/InterlockingBrick/cad/cad-report-Default.json b/moulds/InterlockingBrick/cad/cad-report-Default.json new file mode 100644 index 000000000..94180335d --- /dev/null +++ b/moulds/InterlockingBrick/cad/cad-report-Default.json @@ -0,0 +1,96 @@ +[ + { + "code": 0, + "command": "convert.exe --source=\"C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp\" --target=\"C:\\Users\\mc007\\Desktop\\osr\\osr-machines\\moulds\\InterlockingBrick\\cad\\art final 1.+(..SLDPRT\" --configuration=\"Default\" --view=\"*Render\" --hidden=true --width=1024 --height=1024 --swv=30 --renderer=solidworks --quality=2", + "messages": [ + "Failed to open the input file: C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp" + ], + "src": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp", + "target": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines\\moulds\\InterlockingBrick\\cad\\art final 1.+(..SLDPRT", + "failed": false, + "options": { + "src": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp", + "dst": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines\\moulds\\InterlockingBrick\\cad\\&{SRC_DIR}\\&{SRC_NAME}.+(.SLDPRT)", + "debug": false, + "verbose": true, + "dry": false, + "cache": false, + "hidden": "true", + "renderer": "Solidworks", + "alt": true, + "quality": 2, + "logLevel": "trace", + "width": "1024", + "height": "1024", + "script": "convert.exe", + "sw": 2022, + "swv": 30, + "configuration": "Default", + "report": "${SRC_DIR}/cad-report-${CONFIGURATION}.json", + "variables": { + "SRC_PATH": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp", + "SRC_DIR": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad", + "SRC_NAME": "art final 1", + "SRC_FILE_NAME": "art final 1.stp", + "SRC_FILE_EXT": "stp", + "SRC_IS_FILE": true, + "SRC_IS_FOLDER": false, + "SRC_IS_EXPRESSION": false, + "SRC_IS_GLOB": false, + "SRC_FILES": [ + "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp" + ], + "DST_PATH": "&{SRC_DIR}/&{SRC_NAME}.+(.SLDPRT)", + "DST_DIR": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines\\moulds\\InterlockingBrick\\cad", + "DST_NAME": "&{SRC_NAME}.+(", + "DST_FILE_NAME": "\\&{SRC_DIR}\\&{SRC_NAME}.+(.SLDPRT)", + "DST_FILE_EXT": "SLDPRT)", + "DST_IS_FILE": false, + "DST_IS_FOLDER": false, + "DST_IS_EXPRESSION": false, + "DST_IS_GLOB": true, + "DST_GLOB": "\\&{SRC_DIR}\\&{SRC_NAME}.+(.SLDPRT)", + "DST_GLOB_EXTENSIONS": [ + ".SLDPRT" + ], + "DST_FILES": [] + }, + "view": "Render", + "args": "", + "bom-config": "Default", + "bom-detail": 1, + "bom-type": 2, + "bom-images": false, + "srcInfo": { + "PATH": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp", + "DIR": "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad", + "NAME": "art final 1", + "FILE_NAME": "art final 1.stp", + "FILE_EXT": "stp", + "IS_FILE": true, + "IS_FOLDER": false, + "IS_EXPRESSION": false, + "IS_GLOB": false, + "FILES": [ + "C:/Users/mc007/Desktop/osr/osr-machines/moulds/InterlockingBrick/cad/art final 1.stp" + ] + }, + "dstInfo": { + "PATH": "&{SRC_DIR}/&{SRC_NAME}.+(.SLDPRT)", + "DIR": "C:\\Users\\mc007\\Desktop\\osr\\osr-machines\\moulds\\InterlockingBrick\\cad", + "NAME": "&{SRC_NAME}.+(", + "FILE_NAME": "\\&{SRC_DIR}\\&{SRC_NAME}.+(.SLDPRT)", + "FILE_EXT": "SLDPRT)", + "IS_FILE": false, + "IS_FOLDER": false, + "IS_EXPRESSION": false, + "IS_GLOB": true, + "GLOB": "\\&{SRC_DIR}\\&{SRC_NAME}.+(.SLDPRT)", + "GLOB_EXTENSIONS": [ + ".SLDPRT" + ], + "FILES": [] + } + } + } +] \ No newline at end of file diff --git a/moulds/InterlockingBrick/templates/shared/body.md b/moulds/InterlockingBrick/templates/shared/body.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/products/mech/scaffolding/joints.md b/products/mech/scaffolding/joints.md deleted file mode 100644 index 2f7605cc4..000000000 --- a/products/mech/scaffolding/joints.md +++ /dev/null @@ -1,9 +0,0 @@ -| Joint Type | Functionality | Degrees of Freedom | Specified Load (kN) | Standard | -|------------------------------|-------------------------------------|--------------------|---------------------|----------| -| Double Coupler (Right Angle) | Connects tubes at 90° | Fixed | 9.0 | BS EN 74 | -| Swivel Coupler | Connects tubes at any angle | Rotational | 6.25 | BS EN 74 | -| Putlog Coupler (Single) | Flattened end rests in structure | Some rotation | 6.25 | BS EN 74 | -| Sleeve Coupler | Connects tubes end-to-end | Fixed | 6.25 | BS EN 74 | -| Joint Pin | Expands to connect tubes internally | Fixed | -- | -- | -| Board Retaining Coupler | Secures boards to transoms | Fixed | -- | BS EN 74 | -| Girder Coupler | Connects tubes to steel beams | Some adjustment | -- | BS EN 74 | diff --git a/products/mech/scaffolding/sizes.md b/products/mech/scaffolding/sizes.md deleted file mode 100644 index 78f8a8632..000000000 --- a/products/mech/scaffolding/sizes.md +++ /dev/null @@ -1,7 +0,0 @@ -| Diameter | Wall Thickness | Length | Material | Standard | -|--------------------|----------------|-------------|----------|------------------------------------------| -| 48.3mm | 2.4mm - 4.0mm | 0.3m - 6.4m | Steel | BS EN 39, EN 10219, EN 10210 | -| 48.3mm | 3.2mm | 6.0m | Steel | BS EN 10210 - S355 | -| 48.6mm | 3.2mm - 4.0mm | 0.5m - 6.0m | Steel | JIS, Korea | -| 60.3mm, 76mm, 89mm | varies | varies | Steel | Used for shoring, propping, bridge posts | -| 48.3mm | varies | varies | Aluminum | 6061, 6082 grades | \ No newline at end of file diff --git a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/2040_Shield_x2_1mm_INOX.SLDPRT b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/2040_Shield_x2_1mm_INOX.SLDPRT index 256d1a350..a316d8852 100644 --- a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/2040_Shield_x2_1mm_INOX.SLDPRT +++ b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/2040_Shield_x2_1mm_INOX.SLDPRT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f656eca177897bca32418b17719cc8925a35687e5ca82b4da5bf3aa3cfac4f1 -size 112852 +oid sha256:ba0597e79f031f3477d103b1ef4904682399b9db2d5014173cffaa8063da0876 +size 112696 diff --git a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-40H.SLDASM b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-40H.SLDASM index 2e58375c3..3fa1d13d3 100644 --- a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-40H.SLDASM +++ b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-40H.SLDASM @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:06a6ecc16b5065e2766b190ef2d852fb3b0e25b36b01cd83f03341c4f10d4366 -size 197995 +oid sha256:814a1a98020aef4d04fca0ff898431dc8a8067c7b5b0255b6944aafa5f8ca283 +size 212992 diff --git a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-50D-120W.SLDPRT b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-50D-120W.SLDPRT index 5417bdf55..d8cf978ae 100644 --- a/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-50D-120W.SLDPRT +++ b/products/poly-mech/cad/joints/slide-clamp-20ID-80-40/SlideDual-20ID-50D-120W.SLDPRT @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a627e04bc35cfada23d844c50b9e2a169ca02cb9863345abefa1bc78d105c6ce -size 157980 +oid sha256:6539d6b6d6330935fc748a7980119b9f3ccd784b9f53d07f547701fb96042cd0 +size 165404 diff --git a/vendor/cidepa/ckm/KM-110-15-7-5.sldprt b/vendor/cidepa/ckm/KM-110-15-7-5.sldprt index 1db6bcbe3..425143ed8 100644 --- a/vendor/cidepa/ckm/KM-110-15-7-5.sldprt +++ b/vendor/cidepa/ckm/KM-110-15-7-5.sldprt @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:adc067b885996770d6bffe047112df218ef8d435e39d487a2ea8ca5e1633cb18 -size 2902580 +oid sha256:acc76a27e01c3d8a1f230e7b1a67ce2e3e95911fa4e030d35036aecabb68ce72 +size 2903706