Deploy 2.0.0

EVA-3D · Sep 12, 2021 · d5bb5a6 · d5bb5a6
1 parent 3e01d9a
commit d5bb5a6
Show file tree

Hide file tree

Showing 76 changed files with 777 additions and 564 deletions.
diff --git a/docs/.pages b/docs/.pages
@@ -1,5 +1,6 @@
 nav:
     - index.md
+    - versions
     - endstops.md
     - EVA 2: https://eva-3d.github.io/eva-main/
 
diff --git a/docs/assets/EasyMod_isolated.png b/docs/assets/EasyMod_isolated.png
diff --git a/docs/assets/X_endstop.png b/docs/assets/X_endstop.png
diff --git a/docs/assets/em.png b/docs/assets/em.png
diff --git a/docs/assets/em_X gantry_a.png b/docs/assets/em_X gantry_a.png
diff --git a/docs/assets/em_X gantry_b.png b/docs/assets/em_X gantry_b.png
diff --git a/docs/assets/em_white_bg.png b/docs/assets/em_white_bg.png
diff --git a/docs/assets/em_zoom.png b/docs/assets/em_zoom.png
diff --git a/docs/assets/em_zoom_white_bg.png b/docs/assets/em_zoom_white_bg.png
diff --git a/docs/assets/images/banner.png b/docs/assets/images/banner.png
diff --git a/docs/assets/print_orientation/0001.png b/docs/assets/print_orientation/0001.png
diff --git a/docs/assets/print_orientation/0002.png b/docs/assets/print_orientation/0002.png
diff --git a/docs/assets/print_orientation/0003.png b/docs/assets/print_orientation/0003.png
diff --git a/docs/assets/print_orientation/0004.png b/docs/assets/print_orientation/0004.png
diff --git a/docs/assets/print_orientation/0005.png b/docs/assets/print_orientation/0005.png
diff --git a/docs/assets/print_orientation/0006.png b/docs/assets/print_orientation/0006.png
diff --git a/docs/assets/print_orientation/0007.png b/docs/assets/print_orientation/0007.png
diff --git a/docs/assets/print_orientation/0008.png b/docs/assets/print_orientation/0008.png
diff --git a/docs/assets/print_orientation/0009.png b/docs/assets/print_orientation/0009.png
diff --git a/docs/assets/print_orientation/0010.png b/docs/assets/print_orientation/0010.png
diff --git a/docs/assets/print_orientation/0011.png b/docs/assets/print_orientation/0011.png
diff --git a/docs/assets/print_orientation/0012.png b/docs/assets/print_orientation/0012.png
diff --git a/docs/assets/print_orientation/0013.png b/docs/assets/print_orientation/0013.png
diff --git a/docs/assets/print_orientation/0014.png b/docs/assets/print_orientation/0014.png
diff --git a/docs/assets/print_orientation/0015.png b/docs/assets/print_orientation/0015.png
diff --git a/docs/assets/print_orientation/0016.png b/docs/assets/print_orientation/0016.png
diff --git a/docs/assets/print_orientation/0017.png b/docs/assets/print_orientation/0017.png
diff --git a/docs/assets/print_orientation/0018.png b/docs/assets/print_orientation/0018.png
diff --git a/docs/assets/print_orientation/0019.png b/docs/assets/print_orientation/0019.png
diff --git a/docs/assets/print_orientation/0020.png b/docs/assets/print_orientation/0020.png
diff --git a/docs/assets/print_orientation/0021.png b/docs/assets/print_orientation/0021.png
diff --git a/docs/assets/print_orientation/0022.png b/docs/assets/print_orientation/0022.png
diff --git a/docs/assets/print_orientation/0023.png b/docs/assets/print_orientation/0023.png
diff --git a/docs/assets/print_orientation/0024.png b/docs/assets/print_orientation/0024.png
diff --git a/docs/assets/print_orientation/0025.png b/docs/assets/print_orientation/0025.png
diff --git a/docs/assets/print_orientation/0026.png b/docs/assets/print_orientation/0026.png
diff --git a/docs/assets/print_orientation/0027.png b/docs/assets/print_orientation/0027.png
diff --git a/docs/assets/print_orientation/0028.png b/docs/assets/print_orientation/0028.png
diff --git a/docs/assets/print_orientation/0029.png b/docs/assets/print_orientation/0029.png
diff --git a/docs/assets/print_orientation/0030.png b/docs/assets/print_orientation/0030.png
diff --git a/docs/assets/print_orientation/0031.png b/docs/assets/print_orientation/0031.png
diff --git a/docs/assets/print_orientation/0032.png b/docs/assets/print_orientation/0032.png
diff --git a/docs/assets/print_orientation/0033.png b/docs/assets/print_orientation/0033.png
diff --git a/docs/assets/print_orientation/0034.png b/docs/assets/print_orientation/0034.png
diff --git a/docs/assets/print_orientation/0035.png b/docs/assets/print_orientation/0035.png
diff --git a/docs/assets/print_orientation/0036.png b/docs/assets/print_orientation/0036.png
diff --git a/docs/assets/x_endstop.png b/docs/assets/x_endstop.png
diff --git a/docs/assets/x_gantry_slice.png b/docs/assets/x_gantry_slice.png
diff --git a/docs/assets/x_gantry_slice_features.png b/docs/assets/x_gantry_slice_features.png
diff --git a/docs/css/extra.css b/docs/css/extra.css
@@ -41,9 +41,9 @@
     margin: 0 .8rem 0;
 }
 
-.md-content__inner> :last-child {
+/* .md-content__inner> :last-child {
     margin-bottom: -0.8rem;
-}
+} */
 
 .badge {
     line-height: 0.6;

diff --git a/docs/endstops.md b/docs/endstops.md
@@ -1,6 +1,6 @@
 # Endstops
 
-Easy Mod does not come with mechanical switch endstops but I will still share the parts that I use. 
+Easy Mod does not come with mechanical switch endstops but here are some simple solutions that address the problem.
 
 ## Y min/max 
 
@@ -10,10 +10,10 @@ There's a simple part that can act as a mount to the "angled endstops" [AliExpre
 
 ## X endstop block
 
-A simple block that EVA's endstop can bump against. It has holes that can receive a screw to adjust the X min position - this should be redundant on EVA 2. The block is screwed on the XY Joiner.
+Much like on V-Core 3 you can use a simple stop block for an EVA endstop to bump against.
 
-![XS_endstop](assets/X_endstop.png)
+![XS_endstop](assets/x_endstop.png)
 
 ## Combined BOM
 
-{{ bom("bom/BOM_Endstops.csv", 0) }}
+{{ bom_to_md_table("BOM_Endstops.csv", 0) }}
diff --git a/docs/index.md b/docs/index.md
@@ -27,42 +27,7 @@ You can print the parts with 0.2mm or even 0.3mm layer height. Use 4 perimeters
 
 ### Roadmap
 
-#### 2.0.0 (Future)
 
-This release is going to be around reducing the weight of the X gantry of V-core Pro by shifting to a MGN12 rail.
-
-#### 1.2.1 (Current)
-
-This version gives back the Y space that Easy Mod originally stole. To regain that Y one needs to do one of two things:
-
-1. use the included `bed_corner` parts that move the bed -10mm in Y
-2. move the whole gantry -10mm in Y (this will be difficult on 3 axis V-core)
-
-I used those `bed_corner` parts for a very long time on my V-core - nothing melted (PETG).
-
-##### Upgrade from 1.2.0
-
-The `xy_joiner` parts did not change. The `corner` and `bed` parts are new. 
-
-##### BOM
-
-{{ bom("bom/1.2.1.csv", 0) }}
-
-#### 1.2.0
-
-Added compatibility with the new EVA 2 belt mounting system. 
-
-##### Upgrade from 1.1.0
-
-To upgrade one needs to reprint the `xy_joiner` parts. No hardware requirements change in this release.
-
-##### BOM
-
-{{ bom("bom/BOM_X gantry.csv", 0) }}
-
-#### 1.1.0 (Obsolete)
-
-Easy Mod 1.0.0 - 1.1.0 is compatible with EVA up to it's version 2.0.0. If you are planning on using EVA 2 on V-core Pro, you need to update to Easy Mod 1.2.0. Visit [:octicons-mark-github-16: tag: 1.1.0](https://github.com/EVA-3D/Easy-Mod/tree/1.1.0) for the old files.
 
 ## Attributions
 
@@ -77,4 +42,4 @@ In case of issues or ideas please file an issue here: https://github.com/EVA-3D/
 
 If you need a more direct contact I'm on the [Rat Rig Unofficial Discord Server](https://discord.gg/DcCEk8u).
 
-![](assets/Easy Mod.png)
+![](assets/em.png)
diff --git a/docs/stls/bed_corner.stl b/docs/stls/bed_corner.stl
diff --git a/docs/stls/corner_right.stl b/docs/stls/corner_right.stl
diff --git a/docs/stls/endstop_block.stl b/docs/stls/endstop_block.stl
diff --git a/docs/stls/x_endstop_block.stl b/docs/stls/x_endstop_block.stl
diff --git a/docs/stls/xy_joiner_left.stl b/docs/stls/xy_joiner_left.stl
diff --git a/docs/stls/xy_joiner_left_a.stl b/docs/stls/xy_joiner_left_a.stl
diff --git a/docs/stls/xy_joiner_left_b.stl b/docs/stls/xy_joiner_left_b.stl
diff --git a/docs/stls/xy_joiner_right.stl b/docs/stls/xy_joiner_right.stl
diff --git a/docs/stls/xy_joiner_right_a.stl b/docs/stls/xy_joiner_right_a.stl
diff --git a/docs/stls/xy_joiner_right_b.stl b/docs/stls/xy_joiner_right_b.stl
diff --git a/docs/stls/y_endstop.stl b/docs/stls/y_endstop.stl
diff --git a/docs/versions/.pages b/docs/versions/.pages
@@ -0,0 +1,6 @@
+nav:
+    - 2.0.0.md
+    - 1.2.1.md
+    - 1.2.0.md
+    - 1.1.0.md
+
diff --git a/docs/versions/1.1.0.md b/docs/versions/1.1.0.md
@@ -0,0 +1,5 @@
+# 1.1.0 
+
+> Compatibility: EVA < 2.0.0
+
+Easy Mod 1.0.0 - 1.1.0 is compatible with EVA up to it's version 2.0.0. If you are planning on using EVA 2 on V-core Pro, you need to update to Easy Mod 1.2.0. Visit [:octicons-mark-github-16: tag: 1.1.0](https://github.com/EVA-3D/Easy-Mod/tree/1.1.0) for the old files.
diff --git a/docs/versions/1.2.0.md b/docs/versions/1.2.0.md
@@ -0,0 +1,17 @@
+# 1.2.0
+
+> Compatibility: EVA < 2.4.0
+
+!!! warning
+
+    To get the files from this version visit the [1.2.0](https://github.com/EVA-3D/easy-mod/tree/release/1.2.0/docs/stls) tag on GitHub.
+
+Added compatibility with the new EVA 2 belt mounting system. 
+
+## Upgrade from 1.1.0
+
+To upgrade one needs to reprint the `xy_joiner` parts. No hardware requirements change in this release.
+
+## BOM
+
+{{ bom_to_md_table("1.2.1.csv", 0) }}
diff --git a/docs/versions/1.2.1.md b/docs/versions/1.2.1.md
@@ -0,0 +1,22 @@
+# 1.2.1 
+
+> Compatibility: EVA < 2.4.0
+
+!!! warning
+
+    To get the files from this version visit the [1.2.1](https://github.com/EVA-3D/easy-mod/tree/1.2.1/docs/stls) tag on GitHub.
+
+This version gives back the Y space that Easy Mod originally stole. To regain that Y one needs to do one of two things:
+
+1. use the included `bed_corner` parts that move the bed -10mm in Y
+2. move the whole gantry -10mm in Y (this will be difficult on 3 axis V-core)
+
+I used those `bed_corner` parts for a very long time on my V-core - nothing melted (PETG).
+
+## Upgrade from 1.2.0
+
+The `xy_joiner` parts did not change. The `corner` and `bed` parts are new. 
+
+## BOM
+
+{{ bom_to_md_table("1.2.1.csv", 0) }}
diff --git a/docs/versions/2.0.0.md b/docs/versions/2.0.0.md
@@ -0,0 +1,56 @@
+# 2.0.0 
+
+> Compatibility: EVA >= 2.4.0
+
+An MGN12 rail is ~60% of the weight of a MGN15 rail. EVA is dropping support for MGN15 in version 2.4.0 for that and other reasons like easier maintenance. 
+
+Now to leave V-Core Pro users locked from EVA updates this *final* version of Easy Mod is prepared.
+
+## Two variants
+
+To make the transition to MGN12 easier and hopefuly cheaper two variats of the `xy_joiner` parts are made.
+
+### Variant A
+
+![](../assets/em_X%20gantry_a.png)
+
+This one is made in hope that a 400mm rail will be available more easily then a 420mm one, does require a new 2020 extrusion though. 
+
+| Hardware         | Length     | Comment              |
+| ---------------- | ---------- | -------------------- |
+| 2020 extrusion   | 420mm      | Need to buy          |
+| MGN12 rail       | 400mm      | Available at Rat Rig |
+
+#### BOM
+
+{{ bom_to_md_table("2.0.0_A.csv", 0) }}
+
+### Variant B
+
+This one reuses the same 394mm 2020 extrusion but requires a 420mm rail that might be harder to get.
+
+![](../assets/em_X%20gantry_b.png)
+
+| Hardware         | Length     | Comment              |
+| ---------------- | ---------- | -------------------- |
+| 2020 extrusion   | 394mm      | Same as V-Core Pro   |
+| MGN12 rail       | 420mm      | Need to buy          |
+
+#### BOM
+
+{{ bom_to_md_table("2.0.0_B.csv", 0) }}
+
+## XY idlers
+
+Those did not change from the previous version.
+
+## Features
+
+Optional `M5x20mm` screws was added to where the 2020 extrusion ends meet the `xy_joiners`
+
+![](../assets/x_gantry_slice_features.png)
+
+The whole design is based of the V-Core 3 design (V-Core 3 ideas started with Easy Mod so it's a full circle now :smile:). With that we have the single M5 bolt on the top of the part, much like on V-Core 3 but due do the differences between the two printers and the B variant 100% compatibility was not achieved.
+
+![](../assets/x_gantry_slice.png)
+
diff --git a/docs/bom/BOM_X gantry.csv → docs/versions/bom/1.2.0.csv b/docs/bom/BOM_X gantry.csv → docs/versions/bom/1.2.0.csv
@@ -1,16 +1,16 @@
-Item No.,Quantity,Name,Material
-1,1,xy_joiner_left,PETG
-2,1,xy_joiner_right,PETG
-3,2,xy_joiner_plate,- None -
-4,1,2020 394 mm,- None -
-5,4,v slot slide nut M5,- None -
-6,4,openbuilds_idler_wheel,- None -
-7,8,625 2RS,- None -
-8,4,nylon_spacer,- None -
-9,4,DIN 912 M5 45 mm,- None -
-10,8,DIN 912 M3 8 mm,- None -
-11,12,Spacer 1 millimeter,- None -
-12,8,Spacer 6 millimeter,- None -
-13,1,MGN15 rail 420mm,- None -
-14,1,MGN15C carriage body,- None -
-15,4,M5  Hex nut Nyloc,- None -
+Item No.,Quantity,Name,Material
+1,1,xy_joiner_left,- None -
+2,1,xy_joiner_right,- None -
+3,2,xy_joiner_plate,- None -
+4,1,2020 394 mm,- None -
+5,4,v slot slide nut M5,- None -
+6,4,openbuilds_idler_wheel,- None -
+7,8,625 2RS,- None -
+8,4,nylon_spacer,- None -
+9,4,DIN 912 M5 45 mm,- None -
+10,8,DIN 912 M3 8 mm,- None -
+11,12,Spacer 1 millimeter,- None -
+12,8,Spacer 6 millimeter,- None -
+13,1,MGN15 rail 420mm,- None -
+14,1,MGN15C carriage body,- None -
+15,4,M5  Hex nut Nyloc,- None -
diff --git a/docs/bom/1.2.1.csv → docs/versions/bom/1.2.1.csv b/docs/bom/1.2.1.csv → docs/versions/bom/1.2.1.csv
@@ -1,9 +1,9 @@
 Item No.,Quantity,Name,Material
-1,1,xy_joiner_left,PETG
-2,1,xy_joiner_right,PETG
-3,1,corner_left,PETG
-4,1,corner_right,PETG
-5,4,bed_corner,PETG
+1,1,xy_joiner_left,- None -
+2,1,xy_joiner_right,- None -
+3,1,corner_left,- None -
+4,1,corner_right,- None -
+5,4,bed_corner,- None -
 6,2,xy_joiner_plate,- None -
 7,1,2020 394 mm,- None -
 8,4,v slot slide nut M5,- None -

diff --git a/docs/versions/bom/2.0.0_A.csv b/docs/versions/bom/2.0.0_A.csv
@@ -0,0 +1,21 @@
+Item,Quantity,Name,Material
+1,1,2020 420 mm,- None -
+2,4,DIN 912 M5 45 mm,Hardened Alloy Steel
+3,4,openbuilds_idler_wheel,- None -
+4,8,625 2RS,- None -
+5,4,nylon_spacer,- None -
+6,4,v slot slide nut M5,- None -
+7,2,xy_joiner_plate,Aluminum
+8,1,xy_joiner_left_a,PETG
+9,8,DIN 912 M3 8 mm,Hardened Alloy Steel
+10,12,Spacer 1 millimeter,- None -
+11,8,Spacer 6 millimeter,- None -
+12,6,M5  Hex nut Nyloc,Hardened Alloy Steel
+13,2,ISO 898-1 M5 20 mm,- None -
+14,2,ISO 898-1 M5 12 mm,- None -
+15,2,DIN 912 M5 20 mm,Hardened Alloy Steel
+16,1,DIN 912 M5 12 mm,Hardened Alloy Steel
+17,1,x_endstop_block,PETG
+18,1,MGN12 rail 400mm,- None -
+19,1,MGN12C carriage body,- None -
+20,1,xy_joiner_right_a,PETG
diff --git a/docs/versions/bom/2.0.0_B.csv b/docs/versions/bom/2.0.0_B.csv
@@ -0,0 +1,21 @@
+Item,Quantity,Name,Material
+1,1,2020 394 mm,- None -
+2,4,DIN 912 M5 45 mm,Hardened Alloy Steel
+3,4,openbuilds_idler_wheel,- None -
+4,8,625 2RS,- None -
+5,4,nylon_spacer,- None -
+6,4,v slot slide nut M5,- None -
+7,2,xy_joiner_plate,Aluminum
+8,1,xy_joiner_left_b,PETG
+9,8,DIN 912 M3 8 mm,Hardened Alloy Steel
+10,12,Spacer 1 millimeter,- None -
+11,8,Spacer 6 millimeter,- None -
+12,6,M5  Hex nut Nyloc,Hardened Alloy Steel
+13,2,ISO 898-1 M5 20 mm,- None -
+14,2,ISO 898-1 M5 12 mm,- None -
+15,2,DIN 912 M5 20 mm,Hardened Alloy Steel
+16,1,DIN 912 M5 12 mm,Hardened Alloy Steel
+17,1,x_endstop_block,PETG
+18,1,MGN12 rail 420mm,- None -
+19,1,MGN12C carriage body,- None -
+20,1,xy_joiner_right_b,PETG
diff --git a/eva-docs-builder b/eva-docs-builder
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -42,15 +42,16 @@ theme:
     accent: amber
   features:
     - navigation.instant
+    - navigation.expand
+    - navigation.tracking
+    - navigation.top
 
 plugins:
   - search
   - minify:
       minify_html: true
   - awesome-pages
   - eva-3d-plugin
-  - macros:
-      modules: [eva_3d.bom]
 
 extra_css:
   - css/extra.css
+10 −33		eva_3d/__main__.py
+0 −48		eva_3d/bom.py
+55 −0		eva_3d/models.py
+106 −7		eva_3d/plugin.py
+93 −0		eva_3d/unpacker.py
+74 −0		eva_3d/utils.py
+235 −111		poetry.lock
+3 −0		pyproject.toml