Skip to content

Commit

Permalink
add sqlite bom handling
Browse files Browse the repository at this point in the history
  • Loading branch information
pkucmus committed Jun 4, 2021
1 parent f7dce0b commit 72106be
Show file tree
Hide file tree
Showing 12 changed files with 302 additions and 66 deletions.
42 changes: 0 additions & 42 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,45 +1,3 @@
[submodule "eva-docs-builder"]
path = eva-docs-builder
url = [email protected]:EVA-3D/eva-docs-builder.git
[submodule "docs/drives/bowden"]
path = docs/drives/bowden
url = [email protected]:EVA-3D/eva-bowden.git
[submodule "docs/drives/bmg"]
path = docs/drives/bmg
url = [email protected]:EVA-3D/eva-bmg.git
[submodule "docs/drives/titan"]
path = docs/drives/titan
url = [email protected]:EVA-3D/eva-titan.git
[submodule "docs/addons/x_endstop"]
path = docs/addons/x_endstop
url = [email protected]:EVA-3D/addon-endstops.git
[submodule "docs/addons/mgn15"]
path = docs/addons/mgn15
url = [email protected]:EVA-3D/addon-mgn15.git
[submodule "docs/drives/aero"]
path = docs/drives/aero
url = [email protected]:EVA-3D/eva-aero.git
[submodule "docs/addons/fan-ducts"]
path = docs/addons/fan-ducts
url = [email protected]:EVA-3D/addon-fan-ducts.git
[submodule "docs/addons/cartesian_idex"]
path = docs/addons/cartesian_idex
url = [email protected]:EVA-3D/addon-cartesian-idex.git
[submodule "libs/mkdocs-material-insiders"]
path = libs/mkdocs-material-insiders
url = https://github.com/squidfunk/mkdocs-material-insiders.git
[submodule "docs/drives/hemera"]
path = docs/drives/hemera
url = [email protected]:EVA-3D/eva-hemera.git
[submodule "docs/addons/probes"]
path = docs/addons/probes
url = [email protected]:EVA-3D/addon-probes.git
[submodule "docs/drives/orbiter"]
path = docs/drives/orbiter
url = [email protected]:EVA-3D/eva-orbiter.git
[submodule "docs/drives/nimble"]
path = docs/drives/nimble
url = [email protected]:EVA-3D/eva-nimble.git
[submodule "docs/drives/lgx"]
path = docs/drives/lgx
url = [email protected]:EVA-3D/eva-lgx.git
8 changes: 6 additions & 2 deletions docs/hotends/copperhead/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ contributors:
cad_url: https://cad.onshape.com/documents/980a8bb4514542eeb90c5c21/w/fd1e2bf7da865e46d00cc945/e/7a40b6f26ab1209ef8f4cf56
satisfies:
- hotend
boms:
- id: Copperhead
source: ./bom/Copperhead.csv
namespace: hotends
---

# Copperhead
Expand All @@ -20,10 +24,10 @@ satisfies:


<add-bom-button name="{{ meta.uid }}">
{{ bom_to_json("Copperhead.csv") }}
{{ get_bom("Copperhead").json()|b64encode }}
</add-bom-button>

{{ bom_to_md_table("Copperhead.csv", 4) }}
{{ get_bom("Copperhead").md_table(4) }}

## Links

Expand Down
8 changes: 6 additions & 2 deletions docs/hotends/dragon/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ contributors:
cad_url: https://cad.onshape.com/documents/1765b04fac582f6c1c470bd3/w/1cc31596374d6ce51cd23fa9/e/7469266a17bbe063b78e3d31
satisfies:
- hotend
boms:
- id: Dragon
source: ./bom/Dragon.csv
namespace: hotends
---

# Dragon
Expand All @@ -20,10 +24,10 @@ satisfies:


<add-bom-button name="{{ meta.uid }}">
{{ bom_to_json("Dragon.csv") }}
{{ get_bom("Dragon").json()|b64encode }}
</add-bom-button>

{{ bom_to_md_table("Dragon.csv", 4) }}
{{ get_bom("Dragon").md_table(4) }}

## Links

Expand Down
8 changes: 6 additions & 2 deletions docs/hotends/mosquito/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ contributors:
cad_url: https://cad.onshape.com/documents/1765b04fac582f6c1c470bd3/w/1cc31596374d6ce51cd23fa9/e/2a1118238518a84a214f8af2
satisfies:
- hotend
boms:
- id: Mosquito
source: ./bom/Mosquito.csv
namespace: hotends
---

# Mosquito
Expand All @@ -20,10 +24,10 @@ satisfies:


<add-bom-button name="{{ meta.uid }}">
{{ bom_to_json("Mosquito.csv") }}
{{ get_bom("Mosquito").json()|b64encode }}
</add-bom-button>

{{ bom_to_md_table("Mosquito.csv", 4) }}
{{ get_bom("Mosquito").md_table(4) }}

## Links

Expand Down
8 changes: 6 additions & 2 deletions docs/hotends/v6/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ contributors:
cad_url: https://cad.onshape.com/documents/1765b04fac582f6c1c470bd3/w/1cc31596374d6ce51cd23fa9/e/e2fc56d355d28a162332ce38
satisfies:
- hotend
boms:
- id: V6
source: ./bom/V6.csv
namespace: hotends
---

# E3D V6
Expand All @@ -20,10 +24,10 @@ satisfies:


<add-bom-button name="{{ meta.uid }}">
{{ bom_to_json("V6.csv") }}
{{ get_bom("V6").json()|b64encode }}
</add-bom-button>

{{ bom_to_md_table("V6.csv", 4) }}
{{ get_bom("V6").md_table(4) }}

## Links

Expand Down
13 changes: 12 additions & 1 deletion docs/js/extra.js
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,18 @@ var boxLink = new Vue({

Vue.component('add-bom-button', {
props: ['name'],
template: "#add-to-box-template",
template: ```
<a
class="md-button md-button--primary add-to-box"
v-bind:class="{ 'in-the-box': inBox }"
v-on:click="add()"
>
{{ inBox ? 'In the box' : 'Add to box' }}
<span class="twemoji">
{% include ".icons/fontawesome/solid/box-open.svg" %}
</span>
</a>
```,
beforeCreate() { this.$store.commit('initialiseStore');},
computed: {
inBox () {
Expand Down
2 changes: 1 addition & 1 deletion eva-docs-builder
5 changes: 5 additions & 0 deletions mkdocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ repo_name: EVA-3D / eva-main
repo_url: https://github.com/EVA-3D/eva-main
version: 2.3.0

vendors:
- name: Rat Rig
mapping_file: vendors/mappings/ratrig.csv
out_file: vendors/superboms/ratrig.csv

theme:
logo: assets/logo_white_outline.svg
favicon: assets/logo_white_outline.svg
Expand Down
14 changes: 0 additions & 14 deletions overrides/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,8 @@


{% block scripts %}
<script>window.CI360 = { notInitOnLoad: true }</script>
<script>const docsVersion = "{{ config.version }}";</script>

<script type="text/x-template" id="add-to-box-template">{% raw %}
<a
class="md-button md-button--primary add-to-box"
v-bind:class="{ 'in-the-box': inBox }"
v-on:click="add()"
>
{{ inBox ? 'In the box' : 'Add to box' }}{% endraw %}
<span class="twemoji">
{% include ".icons/fontawesome/solid/box-open.svg" %}
</span>
</a>
</script>

{{ super() }}

<!-- Global site tag (gtag.js) - Google Analytics -->
Expand Down
106 changes: 106 additions & 0 deletions vendors/mappings/ratrig.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
eva_part_name,eva_part_type,vendor_part_name,vendor_sku,vendor_ignore
4010 FAN,,Fan - 40mm Axial Brushless 24V DC,HW2044EC,
5015 fan,,Fan - 50mm Blower Type 24V DC,HW2045EC,
BLTouch,,BLTouch v3.1 - Genuine Antclabs Auto Bed Leveling Sensor,HW2086EC,
BMG_Extruder,,Bondtech BMG Extruder - 1.75mm - Standard Orientation,HW2032EC,
COP-P010 hot block,,,,Y
COP-P02_ heat sink_WITH SCREW MOUNT 1.75,,,,Y
COP-P03_ heat break shank_STANDARD,,,,Y
COP-P04_ heat break bushing_1.75,,,,Y
COP-P05_ heat break tubes_1.75,,,,Y
Copperhead - AccuGroup SSCL-M3-5-A2 low head socket cap screw,,,,Y
Copperhead - John Guest MM2804N half cartridge for 4mm tube_1.75,,,,Y
Copperhead - John Guest PM1804R collet clip for 4mm tube_1.75,,,,Y
Copperhead - Misumi WSIS-STCB-M2.5 flat washer,,,,Y
Copperhead - NZL-P___ nozzle_1.75 0.4 VANADIUM,,,,Y
Copperhead - Newport Fasteners 341487-1000 socket head cap screw,,,,Y
DIN 912 M2 10 mm,hardware,Cap Head Screw M2 (Single) (Length: 10mm),HW1283SC,
DIN 912 M2.5 10 mm,hardware,Cap Head Screw M2.5 (Single) (Length: 10mm),HW2346SC,
DIN 912 M2.5 12 mm,hardware,Cap Head Screw M2.5 (Single) (Length: 12mm),HW2347SC,
DIN 912 M3 10 mm,hardware,Cap Head Screw M3 (Single) (Length: 10mm),HW1505SC,
DIN 912 M3 12 mm,hardware,Cap Head Screw M3 (Single) (Length: 12mm),HW1292SC,
DIN 912 M3 16 mm,hardware,Cap Head Screw M3 (Single) (Length: 16mm),HW1507SC,
DIN 912 M3 20 mm,hardware,Cap Head Screw M3 (Single) (Length: 20mm),HW1504SC,
DIN 912 M3 25 mm,hardware,Cap Head Screw M3 (Single) (Length: 25mm),HW1290SC,
DIN 912 M3 30 mm,hardware,Cap Head Screw M3 (Single) (Length: 30mm),HW1227SK,
DIN 912 M3 35 mm,hardware,Cap Head Screw M3 (Single) (Length: 35mm),HW1868SC,
DIN 912 M3 40 mm,hardware,Cap Head Screw M3 (Single) (Length: 40mm),HW1869SC,
DIN 912 M3 6 mm,hardware,Cap Head Screw M3 (Single) (Length: 6mm),HW2348SC,
DIN 912 M3 8 mm,hardware,Cap Head Screw M3 (Single) (Length: 8mm),HW1502SC,
DIN 912 M5 45 mm,hardware,Cap Head Screw M5 (Single) (Length: 45mm),HW2074SC,
Dragon hotend,,,,Y
Duct v2.1 Angled 13.2deg,printed,,,
Duct v2.1 Straight,printed,,,
E3D Titan,,E3D TITAN Extruder - Direct Drive - Standard Orientation,HW2031EC,Y
HEMERA-175-SINK_1_1_1_1,,,,Y
Housing 1.5,,,,Y
LGX with copperhead screwmount,,,,Y
M3 Hex nut,hardware,Hex Locking Nut - M3,HW1251NC,
M3s nut,hardware,Flat Square Nut - M3 (5.5mm x 5.5mm x 1.8mm),HW2010NC,
M5 Hex nut Nyloc,hardware,Hex Locking Nut - M5,HW1039NC,
Micro Limit Switch,,Micro Limit Switch,HW1071EC,
PC4-M6,,,,Y
PTFE 60mm,,,,Y
PTFE 65mm,,,,Y
PTFE 75mm,,,,Y
SOCK,,,,Y
SSX_tensioner_thing_2426505,printed,,,
TITAN-SINK-175-RH,,,,Y
V6-175-BREAK,,,,Y
V6-175-SINK,,,,Y
V6-BLOCK-CARTRIDGE,,,,Y
V6-NOZZLE-ALL,,,,Y
aero_face,printed,,,
aero_front_probe,printed,,,
aero_front_probe_blank,printed,,,
aero_support,printed,,,
back_cartesian,printed,,,
back_corexy,printed,,,
bl_touch_mount,printed,,,
bl_touch_mount_alt,printed,,,
bl_touch_mount_alt_volcano,printed,,,
bl_touch_mount_volcano,printed,,,
bottom_mgn12_aero,printed,,,
bottom_mgn12_hemera,printed,,,
bottom_mgn12_short_duct,printed,,,
bottom_mgn15,printed,,,
bottom_mgn15_aero,printed,,,
bottom_mgn15_hemera,printed,,,
cable_holder,printed,,,
cartesian_cable_fin,printed,,,
copperhead_face,printed,,,
copperhead_support_a,printed,,,
copperhead_support_b,printed,,,
dragon_face,printed,,,
face_belt_grabber,printed,,,
hemera_face,printed,,,
hemera_probe_adapter,printed,,,
mosquito_face,printed,,,
mosquito_support,printed,,,
press fit,printed,,,
shroud,printed,,,
tension_slider_6mm_belt_M3s,printed,,,
tension_slider_9mm_belt_M5,printed,,,
top_angled_endstop_plug_mgn15,printed,,,
top_bmg_mgn12,printed,,,
top_bmg_mgn15,printed,,,
top_endstop_angled,printed,,,
top_endstop_openbuilds,printed,,,
top_endstop_openbuilds_mgn15,printed,,,
top_endstop_plug_mgn12,printed,,,
top_endstop_plug_mgn15,printed,,,
top_lgx_mgn12_a,printed,,,
top_lgx_mgn12_b,printed,,,
top_lgx_mgn15_a,printed,,,
top_lgx_mgn15_b,printed,,,
top_mgn12,printed,,,
top_mgn15,printed,,,
top_orbiter_mgn12,printed,,,
top_orbiter_mgn15,printed,,,
top_titan_mgn12,printed,,,
top_titan_mgn15,printed,,,
universal_face,printed,,,
unversal_cable_mount,printed,,,
v6_face,printed,,,
v6_face_clamp,printed,,,
v6_support,printed,,,
23 changes: 23 additions & 0 deletions vendors/superboms/ratrig.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
namespace,eva_part_name,qty,type,vendor_part_name,vendor_sku
4010 FAN,1,hardware,Fan - 40mm Axial Brushless 24V DC,HW2044EC
5015 fan,2,hardware,Fan - 50mm Blower Type 24V DC,HW2045EC
BLTouch,1,hardware,BLTouch v3.1 - Genuine Antclabs Auto Bed Leveling Sensor,HW2086EC
BMG_Extruder,1,hardware,Bondtech BMG Extruder - 1.75mm - Standard Orientation,HW2032EC
DIN 912 M2 10 mm,2,hardware,Cap Head Screw M2 (Single) (Length: 10mm),HW1283SC
DIN 912 M2.5 10 mm,2,hardware,Cap Head Screw M2.5 (Single) (Length: 10mm),HW2346SC
DIN 912 M2.5 12 mm,2,hardware,Cap Head Screw M2.5 (Single) (Length: 12mm),HW2347SC
DIN 912 M3 10 mm,9,hardware,Cap Head Screw M3 (Single) (Length: 10mm),HW1505SC
DIN 912 M3 12 mm,6,hardware,Cap Head Screw M3 (Single) (Length: 12mm),HW1292SC
DIN 912 M3 16 mm,4,hardware,Cap Head Screw M3 (Single) (Length: 16mm),HW1507SC
DIN 912 M3 20 mm,6,hardware,Cap Head Screw M3 (Single) (Length: 20mm),HW1504SC
DIN 912 M3 25 mm,7,hardware,Cap Head Screw M3 (Single) (Length: 25mm),HW1290SC
DIN 912 M3 30 mm,4,hardware,Cap Head Screw M3 (Single) (Length: 30mm),HW1227SK
DIN 912 M3 35 mm,5,hardware,Cap Head Screw M3 (Single) (Length: 35mm),HW1868SC
DIN 912 M3 40 mm,3,hardware,Cap Head Screw M3 (Single) (Length: 40mm),HW1869SC
DIN 912 M3 6 mm,3,hardware,Cap Head Screw M3 (Single) (Length: 6mm),HW2348SC
DIN 912 M3 8 mm,7,hardware,Cap Head Screw M3 (Single) (Length: 8mm),HW1502SC
DIN 912 M5 45 mm,2,hardware,Cap Head Screw M5 (Single) (Length: 45mm),HW2074SC
M3 Hex nut,34,hardware,Hex Locking Nut - M3,HW1251NC
M3s nut,1,hardware,Flat Square Nut - M3 (5.5mm x 5.5mm x 1.8mm),HW2010NC
M5 Hex nut Nyloc,2,hardware,Hex Locking Nut - M5,HW1039NC
Micro Limit Switch,1,hardware,Micro Limit Switch,HW1071EC
Loading

0 comments on commit 72106be

Please sign in to comment.