Skip to content

Commit

Permalink
Merge pull request #17 from HumbleDeer/gh-pages
Browse files Browse the repository at this point in the history
Formatting, markdown fixes (Mercury One pages)
  • Loading branch information
ZeroGDesign authored Sep 21, 2023
2 parents 894bc74 + 1045ff8 commit 15b1767
Show file tree
Hide file tree
Showing 11 changed files with 96 additions and 150 deletions.
2 changes: 1 addition & 1 deletion LICENSE.MD → LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[![Creative Commons License](https://i.creativecommons.org/l/by-nc-sa/4.0/88x31.png)](http://creativecommons.org/licenses/by-nc-sa/4.0/)
<span xmlns:dct="http://purl.org/dc/terms/" property="dct:title">ZeroG</span> by [https://zerog.one/](https://zerog.one/) is licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License](http://creativecommons.org/licenses/by-nc-sa/4.0/).
Based on a work at [https://github.com/ZeroGDesign](https://github.com/ZeroGDesign).
Based on a work at [https://github.com/ZeroGDesign](https://github.com/ZeroGDesign).
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,4 @@ Hovering an image with your mouse will show a zoom icon <i class="bi bi-zoom-in"
Lost? Need help? Not sure? Join our [Discord server <i class="bi bi-discord"></i>](https://discord.gg/zerog){:target="_blank"}, we've got a big community ready to help you out!

{: style="text-align: center" .fs-8}
[Next step <i class="bi bi-arrow-return-right"></i>](#){: .btn .btn-red }
[Next step &rarr;](#){: .btn .btn-red }
74 changes: 37 additions & 37 deletions docs/pages/manual/build/mercury_one_1/bill_of_material.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ The Bill of Materials for the Mercury One.1 is not yet complete, but it does inc
*Note: The amount of bolts includes spares.*
{: .fs-3 }

| Size | Type | Amount | Stores |
|:------|:--------------------------------|:------:|:-------------------------------------------------------:|
| M3X8 | <nobr>ISO 4762 / DIN 912</nobr> | 65 | [Click here](#m3x8_912) &emsp; <input type="checkbox"> |
| M3X12 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x12_912) &emsp; <input type="checkbox"> |
| M3X16 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x16_912) &emsp; <input type="checkbox"> |
| M3X20 | <nobr>ISO 4762 / DIN 912</nobr> | 14 | [Click here](#m3x20_912) &emsp; <input type="checkbox"> |
| M3X25 | <nobr>ISO 4762 / DIN 912</nobr> | 5 | [Click here](#m3x25_912) &emsp; <input type="checkbox">
| M3X30 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x30_912) &emsp; <input type="checkbox"> |
| M3X35 | <nobr>ISO 4762 / DIN 912</nobr> | 12 | [Click here](#m3x35_912) &emsp; <input type="checkbox"> |
| M4X20 | <nobr>ISO 4762 / DIN 912</nobr> | 8 (PLUS ONLY) | [Click here](#m4x20_912) &emsp; <input type="checkbox"> |
| M5X8 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x8_912_SHCS) &emsp; <input type="checkbox"> |
| M5X12 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x12_912) &emsp; <input type="checkbox"> |
| M5X20 | <nobr>ISO 4762 / DIN 912</nobr> | 4 | [Click here](#m5x20_912) &emsp; <input type="checkbox"> |
| M5X50 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x50_912) &emsp; <input type="checkbox"> |
| Size | Type | Amount | Stores |
|:------|:--------------------------------|:-------------:|:-----------------------------------------------------------:|
| M3x8 | <nobr>ISO 4762 / DIN 912</nobr> | 65 | [Click here](#m3x8_912) &emsp; <input type="checkbox"> |
| M3x12 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x12_912) &emsp; <input type="checkbox"> |
| M3x16 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x16_912) &emsp; <input type="checkbox"> |
| M3x20 | <nobr>ISO 4762 / DIN 912</nobr> | 14 | [Click here](#m3x20_912) &emsp; <input type="checkbox"> |
| M3x25 | <nobr>ISO 4762 / DIN 912</nobr> | 5 | [Click here](#m3x25_912) &emsp; <input type="checkbox"> |
| M3x30 | <nobr>ISO 4762 / DIN 912</nobr> | 8 | [Click here](#m3x30_912) &emsp; <input type="checkbox"> |
| M3x35 | <nobr>ISO 4762 / DIN 912</nobr> | 12 | [Click here](#m3x35_912) &emsp; <input type="checkbox"> |
| M4x20 | <nobr>ISO 4762 / DIN 912</nobr> | 8 (PLUS ONLY) | [Click here](#m4x20_912) &emsp; <input type="checkbox"> |
| M5x8 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x8_912_SHCS) &emsp; <input type="checkbox"> |
| M5x12 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x12_912) &emsp; <input type="checkbox"> |
| M5x20 | <nobr>ISO 4762 / DIN 912</nobr> | 4 | [Click here](#m5x20_912) &emsp; <input type="checkbox"> |
| M5x50 | <nobr>ISO 4762 / DIN 912</nobr> | 6 | [Click here](#m5x50_912) &emsp; <input type="checkbox"> |
{: class="transparant_table"}

### T-Nuts
Expand All @@ -51,17 +51,19 @@ The Bill of Materials for the Mercury One.1 is not yet complete, but it does inc
{: class="transparant_table"}

### Extrusions

*Note: Ender 5 (Pro) and Ender 5 Plus have different sizes for parts.*
{: .fs-3 }

| Printer | Size | Type | Amount | Stores |
|:--------------|:------|:----------------------------|:------:|:------------------------------------------------------------:|
| Ender 5 (Pro) | 370mm | <nobr>2020 Extrusion</nobr> | 1 | [Click here](#extrusion_2020) &emsp; <input type="checkbox"> |
| Ender 5 Plus | 500mm | <nobr>2020 Extrusion</nobr> | 1 | [Click here](#extrusion_2020) &emsp; <input type="checkbox"> |
| LIGHTWEIGHT GANTRY | 370mm | <nobr>READ NOTE →</nobr> | 1 | [Click here](#merc_light) &emsp; <input type="checkbox"> |
| Printer | Size | Type | Amount | Stores |
|:-------------------|:------|:----------------------------|:------:|:------------------------------------------------------------:|
| Ender 5 (Pro) | 370mm | <nobr>2020 Extrusion</nobr> | 1 | [Click here](#extrusion_2020) &emsp; <input type="checkbox"> |
| Ender 5 Plus | 500mm | <nobr>2020 Extrusion</nobr> | 1 | [Click here](#extrusion_2020) &emsp; <input type="checkbox"> |
| LIGHTWEIGHT GANTRY | 370mm | <nobr>READ NOTE →</nobr> | 1 | [Click here](#merc_light) &emsp; <input type="checkbox"> |
{: class="transparant_table"}

### Linear rails

*Note: Ender 5 (Pro) and Ender 5 Plus have different sizes for parts.*
{: .fs-3 }

Expand All @@ -72,6 +74,7 @@ The Bill of Materials for the Mercury One.1 is not yet complete, but it does inc
{: class="transparant_table"}

### Electronics

*Note: You can self source the following parts. The parts below are recommended by us.*
{: .fs-3 }

Expand All @@ -87,31 +90,28 @@ The Bill of Materials for the Mercury One.1 is not yet complete, but it does inc
| 40x40x10mm | <nobr>Brushless DC fan</nobr> | 1 | [Click here](#Gdstime_4010) &emsp; <input type="checkbox"> |
{: class="transparant_table"}


### Misc

#### Motion system

| Size | Type | Amount | Stores |
|:-----------------------|:--------------------|:-----------:|:--------------------------------------------------------------------------:|
| <nobr>M5X30mm</nobr> | Precision dowel pin | 10 | [Click here](#m5_30_Precision_dowel_pin) &emsp; <input type="checkbox"> |
| <nobr>5*13*4 Mm</nobr> | F695-2RS | 20 | [Click here](#f695_2rs_flangebearing) &emsp; <input type="checkbox"> |
| 6mm | 2GT 20T Idler | 2 | [Click here](#2gt_teeth_idler) &emsp; <input type="checkbox"> |
| 6mm | 2GT 20T Pulley | 2 | [Click here](#2gt_teeth_pulley) &emsp; <input type="checkbox"> |
| Check note in store | GATES-LL-2GT | READ NOTE → | [Click here](#gates_belts_6mm) &emsp; <input type="checkbox"> |
| Size | Type | Amount | Stores |
|:-----------------------|:--------------------|:-----------:|:-----------------------------------------------------------------------:|
| <nobr>M5X30mm</nobr> | Precision dowel pin | 10 | [Click here](#m5_30_Precision_dowel_pin) &emsp; <input type="checkbox"> |
| <nobr>5*13*4 Mm</nobr> | F695-2RS | 20 | [Click here](#f695_2rs_flangebearing) &emsp; <input type="checkbox"> |
| 6mm | 2GT 20T Idler | 2 | [Click here](#2gt_teeth_idler) &emsp; <input type="checkbox"> |
| 6mm | 2GT 20T Pulley | 2 | [Click here](#2gt_teeth_pulley) &emsp; <input type="checkbox"> |
| Check note in store | GATES-LL-2GT | READ NOTE → | [Click here](#gates_belts_6mm) &emsp; <input type="checkbox"> |
{: class="transparant_table"}

#### Other

| Size | Type | Amount | Stores |
|:------------------------------|:-----------------------------------------------------------------|:------:|:---------------------------------------------------------------:|
| <nobr>M3 X D5.0 X L4.0</nobr> | Heatset insert | 50 | [Click here](#heatset_insert) &emsp; <input type="checkbox"> |
| <nobr>M3</nobr> | Hex Nut | 10 | [Click here](#m3_hex_nut) &emsp; <input type="checkbox"> |
| M3 Washer | <nobr>Normal grade A M3 </nobr><br/><nobr>Stainless Steel </nobr> | 10 | [Click here](#plain_m3_washer) &emsp; <input type="checkbox"> |
| M5 Washer/Shim | <nobr>Normal grade A M5 </nobr><br/><nobr>Stainless Steel </nobr> | 40 | [Click here](#plain_m5_washer) &emsp; <input type="checkbox"> |
| Size | Type | Amount | Stores |
|:------------------------------|:---------------------------------------------------|:------:|:-------------------------------------------------------------:|
| <nobr>M3 X D5.0 X L4.0</nobr> | Heatset insert | 50 | [Click here](#heatset_insert) &emsp; <input type="checkbox"> |
| <nobr>M3</nobr> | Hex Nut | 10 | [Click here](#m3_hex_nut) &emsp; <input type="checkbox"> |
| M3 Washer | <nobr>Normal grade A M3<br/>Stainless Steel</nobr> | 10 | [Click here](#plain_m3_washer) &emsp; <input type="checkbox"> |
| M5 Washer/Shim | <nobr>Normal grade A M5<br/>Stainless Steel</nobr> | 40 | [Click here](#plain_m5_washer) &emsp; <input type="checkbox"> |
{: class="transparant_table"}

{: style="text-align: center" }
<span class="fs-8">
[Next step <i class="bi bi-arrow-return-right"></i>](/manual/build/mercury_eva/printed_files){: .btn .btn-red }
</span>
{: style="text-align: center" .fs-8}
[Next step &rarr;](/manual/build/mercury_eva/printed_files){: .btn .btn-red }
7 changes: 2 additions & 5 deletions docs/pages/manual/build/mercury_one_1/empty_frame.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,13 @@ permalink: /manual/build/mercury_eva/empty_frame

The first step of assembling your Mercury One.1 is all about disassembling.

1. Table of content
1. Table of contents
{:toc}

# Section One: Frame

[![Empty Ender 5 Frame](../../../assets/images/instructions/empty_frame.png)](#lightbox__item_1){: .lightbox_wrapper}


<div onclick="location.href='#section-one-frame';" id="lightbox__item_1" class="lightbox__item" style="background-image: none;">
<div class="lightbox__content">
<div class="lightbox__titlebar"></div>
Expand All @@ -39,7 +38,5 @@ So your first step is removing the X and Y motion system.
We're not going into depth on how to remove the X and Y motion system.
If you're having trouble or you would like some help please don't hesitate and ask for help in our [Discord server](https://discord.gg/zerog){:target="_blank"}.

{: style="text-align: center" }
<span class="fs-8">
{: style="text-align: center" .fs-8}
[Next step &rarr;](/manual/build/mercury_eva/sanding_dowel_pins){: .btn .btn-red }
</span>
11 changes: 3 additions & 8 deletions docs/pages/manual/build/mercury_one_1/introduction.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ img_tool: ../../../../assets/images/tools
# 1. Introduction
{: .no_toc }



Building the Mercury One.1
{: .fs-6 .fw-300 }

<dl>
<dt>Difficulty</dt>
<dd><font COLOR="#d6c01a">Moderate</font></dd>
<dd><span style="color:#d6c01a">Moderate</span></dd>
<dt>Language</dt>
<dd>English</dd>
</dl>
Expand Down Expand Up @@ -96,8 +94,5 @@ Hovering an image with your mouse will show a zoom icon <i class="bi bi-zoom-in"

Lost? Need help? Not sure? Join our [Discord server <i class="bi bi-discord"></i>](https://discord.gg/zerog){:target="_blank"}, we've got a big community ready to help you out


{: style="text-align: center" }
<span class="fs-8">
[Next step <i class="bi bi-arrow-return-right"></i>](/manual/build/mercury_eva/bill_of_material){: .btn .btn-red }
</span>
{: style="text-align: center" .fs-8}
[Next step &rarr;](/manual/build/mercury_eva/bill_of_material){: .btn .btn-red }
Loading

0 comments on commit 15b1767

Please sign in to comment.