From 92ac5497e4953b2b2429d76022a5ea0556ffa309 Mon Sep 17 00:00:00 2001 From: Sebastian Kuzminsky Date: Fri, 17 Jan 2025 21:58:22 -0700 Subject: [PATCH] add missing vitamins, minor tweak to peristaltic pump This compiles, try: `$ cargo run -- --repo ../modular-recipes/recipes/ peristaltic_pump` --- .../peristaltic-pump/bearing_roller.toml | 2 +- .../print/pump_housing_rear_untapped.toml | 14 ++++++++++++++ .../pump_housing_front_with_stepper.toml | 2 +- .../peristaltic-pump/pump_housing_rear.toml | 2 +- ...oml => pump_housing_rear_with_stepper.toml} | 2 +- .../recipes/purchase/bearing_624.toml | 14 ++++++++++++++ modular-recipes/recipes/purchase/filament.toml | 13 +++++++++++++ .../recipes/purchase/m4_20_shcs.toml | 13 +++++++++++++ .../recipes/purchase/m4_25_bhcs.toml | 13 +++++++++++++ .../recipes/purchase/m4_5_shcs.toml | 13 +++++++++++++ modular-recipes/recipes/purchase/m4_nuts.toml | 13 +++++++++++++ .../recipes/purchase/m4_washer.toml | 14 ++++++++++++++ .../recipes/purchase/purchase_stepper.toml | 14 -------------- .../recipes/purchase/silicone_tubing.toml | 13 +++++++++++++ .../recipes/purchase/stepper_28byj_48.toml | 18 ++++++++++++++++++ 15 files changed, 142 insertions(+), 18 deletions(-) create mode 100644 modular-recipes/recipes/peristaltic-pump/print/pump_housing_rear_untapped.toml rename modular-recipes/recipes/peristaltic-pump/{pump_housing_rear_with_stepper.toml.toml => pump_housing_rear_with_stepper.toml} (87%) create mode 100644 modular-recipes/recipes/purchase/bearing_624.toml create mode 100644 modular-recipes/recipes/purchase/filament.toml create mode 100644 modular-recipes/recipes/purchase/m4_20_shcs.toml create mode 100644 modular-recipes/recipes/purchase/m4_25_bhcs.toml create mode 100644 modular-recipes/recipes/purchase/m4_5_shcs.toml create mode 100644 modular-recipes/recipes/purchase/m4_nuts.toml create mode 100644 modular-recipes/recipes/purchase/m4_washer.toml delete mode 100644 modular-recipes/recipes/purchase/purchase_stepper.toml create mode 100644 modular-recipes/recipes/purchase/silicone_tubing.toml create mode 100644 modular-recipes/recipes/purchase/stepper_28byj_48.toml diff --git a/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml b/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml index 47e8c63..39e859c 100644 --- a/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml +++ b/modular-recipes/recipes/peristaltic-pump/bearing_roller.toml @@ -20,7 +20,7 @@ dimensions = "12 mm OD, 4.4 mm ID, 1 mm thick" comment = """The upstream repo calls for 12 mm OD but i think that's too big, it hits the outer race of the bearings. Use 8mm OD instead.""" -[inputs.624_bearing] +[inputs.bearing_624] type = "624 bearing" quantity = 6 comments = "13mm OD, 4mm ID, 5mm wide" diff --git a/modular-recipes/recipes/peristaltic-pump/print/pump_housing_rear_untapped.toml b/modular-recipes/recipes/peristaltic-pump/print/pump_housing_rear_untapped.toml new file mode 100644 index 0000000..7009dbd --- /dev/null +++ b/modular-recipes/recipes/peristaltic-pump/print/pump_housing_rear_untapped.toml @@ -0,0 +1,14 @@ +[outputs] +pump_housing_rear_untapped={version=0.1, quantity=1, type="printed"} + +[inputs] +filament={} + +[dependencies] +tools=["fdm-printer"] + +[config] +model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/CheapPump.STL" + +[action] +print={} diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml index e59780b..f9c50e4 100644 --- a/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml +++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml @@ -4,7 +4,7 @@ pump_housing_front_with_stepper={quantity=1} [inputs] pump_housing_front={version=0.1, quantity=1} m4_5_shcs={quantity=2, description="M4x5 SHCS"} -stepper={quantity=1, type="J8ByJ-48"} +stepper_28byj_48={quantity=1} [dependencies] tools = [ "3 mm hex driver" ] diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml index 055addf..6202293 100644 --- a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml +++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml @@ -2,7 +2,7 @@ pump_housing_rear = {quantity=1} [inputs] -pump_housing_rear_untapped = {version=0.1, type="printed", quantity=1, model="https://github.com/DerSchultze/Peristaltic-Controller@92a4d9b:stl/CheapPump.STL"} +pump_housing_rear_untapped = {quantity=1} [dependencies] tools = [ "M4 tap" ] diff --git a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml similarity index 87% rename from modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml rename to modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml index c41f528..8ed01ef 100644 --- a/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml.toml +++ b/modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml @@ -4,7 +4,7 @@ pump_housing_rear_with_stepper = {quantity=1} [inputs] pump_housing_rear = {version=0.1, quantity=1} m4_5_shcs = {quantity=2} -stepper = {type="J8BYJ-48", quantity=1} +stepper_28byj_48={quantity=1} [dependencies] tools = [ "3 mm hex driver" ] diff --git a/modular-recipes/recipes/purchase/bearing_624.toml b/modular-recipes/recipes/purchase/bearing_624.toml new file mode 100644 index 0000000..6c7cfd8 --- /dev/null +++ b/modular-recipes/recipes/purchase/bearing_624.toml @@ -0,0 +1,14 @@ +[outputs.bearing_624] +quantity=10 +comments = "13mm OD, 4mm ID, 5mm wide" + +[inputs] +capital={amount="8.99 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/162442914585" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/filament.toml b/modular-recipes/recipes/purchase/filament.toml new file mode 100644 index 0000000..684e02f --- /dev/null +++ b/modular-recipes/recipes/purchase/filament.toml @@ -0,0 +1,13 @@ +[outputs] +filament = {amount="1 kg"} + +[inputs] +capital={amount="23.99 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.hatchbox3d.com/collections/abs-1-75mm/products/3d-abs-1kg1-75-red" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/m4_20_shcs.toml b/modular-recipes/recipes/purchase/m4_20_shcs.toml new file mode 100644 index 0000000..657259b --- /dev/null +++ b/modular-recipes/recipes/purchase/m4_20_shcs.toml @@ -0,0 +1,13 @@ +[outputs] +m4_20_shcs = {quantity=100} + +[inputs] +capital={amount="15.49 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/116208880820?var=416418584796" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/m4_25_bhcs.toml b/modular-recipes/recipes/purchase/m4_25_bhcs.toml new file mode 100644 index 0000000..91628ec --- /dev/null +++ b/modular-recipes/recipes/purchase/m4_25_bhcs.toml @@ -0,0 +1,13 @@ +[outputs] +m4_25_bhcs = {quantity=100} + +[inputs] +capital={amount="18.45 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/116208880863?var=416418791413" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/m4_5_shcs.toml b/modular-recipes/recipes/purchase/m4_5_shcs.toml new file mode 100644 index 0000000..727355a --- /dev/null +++ b/modular-recipes/recipes/purchase/m4_5_shcs.toml @@ -0,0 +1,13 @@ +[outputs] +m4_20_shcs = {quantity=100} + +[inputs] +capital={amount="13.65 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/116208880820?var=416418584787" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/m4_nuts.toml b/modular-recipes/recipes/purchase/m4_nuts.toml new file mode 100644 index 0000000..0e7087a --- /dev/null +++ b/modular-recipes/recipes/purchase/m4_nuts.toml @@ -0,0 +1,13 @@ +[outputs] +m4_nuts = {quantity=100} + +[inputs] +capital={amount="1.35 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/116208880811?var=416418360544" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/m4_washer.toml b/modular-recipes/recipes/purchase/m4_washer.toml new file mode 100644 index 0000000..8f39e76 --- /dev/null +++ b/modular-recipes/recipes/purchase/m4_washer.toml @@ -0,0 +1,14 @@ +[outputs.m4_washer] +quantity=100 +comments = "4.4 mm ID, 8.8 mm OD, 0.8 mm thick" + +[inputs] +capital={amount="7.18 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/116208880905?var=416418468720" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/purchase_stepper.toml b/modular-recipes/recipes/purchase/purchase_stepper.toml deleted file mode 100644 index 7f24ccd..0000000 --- a/modular-recipes/recipes/purchase/purchase_stepper.toml +++ /dev/null @@ -1,14 +0,0 @@ -[[outputs]] -stepper = {type="J8BYJ-48"} - -[[inputs]] -capital={type="usd"} - -[[dependencies]] -operator = {skill="vendor interaction"} - -[[action.purchase]] -retailers = ["https://www.mouser.com/datasheet/2/758/stepd-01-data-sheet-1143075.pdf", - "https://components101.com/motors/28byj-48-stepper-motor"] - -process = "contact retailer and provide capital in exchange for vitamins. then think about how you can produce those vitamins for your enclave." \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/silicone_tubing.toml b/modular-recipes/recipes/purchase/silicone_tubing.toml new file mode 100644 index 0000000..9f8c7b4 --- /dev/null +++ b/modular-recipes/recipes/purchase/silicone_tubing.toml @@ -0,0 +1,13 @@ +[outputs] +silicone_tubing = {amount="3 m"} + +[inputs] +capital={amount="18.75 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/134871649335" +] \ No newline at end of file diff --git a/modular-recipes/recipes/purchase/stepper_28byj_48.toml b/modular-recipes/recipes/purchase/stepper_28byj_48.toml new file mode 100644 index 0000000..cf502be --- /dev/null +++ b/modular-recipes/recipes/purchase/stepper_28byj_48.toml @@ -0,0 +1,18 @@ +[outputs] +stepper_28byj_48 = {quantity=1} + +[inputs] +capital={amount="1.35 usd"} + +[dependencies] +operator = {skills=["vendor interaction"]} + +[action.purchase] +vendor = [ + "https://www.ebay.com/itm/224283233677" +] + +documentation = [ + "https://www.mouser.com/datasheet/2/758/stepd-01-data-sheet-1143075.pdf", + "https://components101.com/motors/28byj-48-stepper-motor" +] \ No newline at end of file