more functional handling of Quantity

modular-recipes/recipes/peristaltic-pump/bearing_roller.toml

@@ -1,5 +1,5 @@
 [outputs]
-bearing_roller = {quantity=1}
+bearing_roller = {quantity={amount=1}}
 
 # inputs list, similar to a cargo.toml file
 [inputs]
@@ -9,25 +9,25 @@ bearing_hub = {version=0.1, type="printed"}
 # alternate representation of an element of the inputs list
 [inputs.m4_20_shcs]
 type = "M4x20 SHCS"
-quantity = 3
+quantity = { amount=3 }
 comment = """These will hold the bearing rollers.  Possibly Button Heads
 Cap Screws would be better?  Probably either will work fine."""
 
 [inputs.m4_washer]
 type = "M4 washer"
-quantity = 6
+quantity = { amount=6 }
 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.bearing_624]
 type = "624 bearing"
-quantity = 6
+quantity = { amount=6 }
 comments = "13mm OD, 4mm ID, 5mm wide"
 
 [inputs.m4_nuts]
 type = "M4 nuts"
-quantity = 3
+quantity = { amount=3 }
 
 [dependencies]
 tools = [

modular-recipes/recipes/peristaltic-pump/peristaltic_pump.toml

@@ -1,24 +1,24 @@
 [inputs]
-pump_housing_front_with_stepper = {quantity=1}
-bearing_roller = {quantity=1}
-pump_housing_rear_with_stepper = {quantity=1}
-tube_support = {quantity=1}
+pump_housing_front_with_stepper = {quantity={amount=1}}
+bearing_roller = {quantity={amount=1}}
+pump_housing_rear_with_stepper = {quantity={amount=1}}
+tube_support = {quantity={amount=1}}
 
 [inputs.silicone_tubing]
 type = "silicone tubing, 6mm OD, 4mm ID"
-amount = "1 meter"
+quantity = { amount = 1, unit="Meter" }
 comment = "PVC tube isn't flexible enough.  Adjust quantity to suit your application."
 
 [inputs.m4_25_bhcs]
 name = "m4_25_bhcs"
 type = "M4x25 BHCS"
-quantity = 4
+quantity = { amount = 4 }
 comment = """BHCS is preferred over SHCS so the screw heads sit recessed
 below the surface of the pump body."""
 
 [inputs.m4_nuts]
 type = "M4 nuts"
-quantity = 4
+quantity = { amount = 4 }
 
 [dependencies]
 tools = [ "3 mm hex driver" ]

modular-recipes/recipes/peristaltic-pump/print/bearing_hub.toml

@@ -1,5 +1,5 @@
 [outputs]
-bearing_hub={version=0.1, quantity=1, type="printed"}
+bearing_hub={version=0.1, quantity={amount=1}, type="printed"}
 
 [inputs]
 filament={}

modular-recipes/recipes/peristaltic-pump/print/bearing_hub_top.toml

@@ -1,5 +1,5 @@
 [outputs]
-bearing_hub_top={version=0.1, quantity=1, type="printed"}
+bearing_hub_top={version=0.1, quantity={amount=1}, type="printed"}
 
 [inputs]
 filament={}

modular-recipes/recipes/peristaltic-pump/print/pump_housing_front_untapped.toml

@@ -1,5 +1,5 @@
 [outputs]
-pump_housing_front_untapped={version=0.1, quantity=1, type="printed"}
+pump_housing_front_untapped={version=0.1, quantity={amount=1}, type="printed"}
 
 [inputs]
 filament={}

modular-recipes/recipes/peristaltic-pump/print/pump_housing_rear_untapped.toml

@@ -1,5 +1,5 @@
 [outputs]
-pump_housing_rear_untapped={version=0.1, quantity=1, type="printed"}
+pump_housing_rear_untapped={version=0.1, quantity={amount=1}, type="printed"}
 
 [inputs]
 filament={}

modular-recipes/recipes/peristaltic-pump/print/tube_support.toml

@@ -1,5 +1,5 @@
 [outputs]
-tube_support={version=0.1, quantity=1, type="printed"}
+tube_support={version=0.1, quantity={amount=1}, type="printed"}
 
 [inputs]
 filament={}

modular-recipes/recipes/peristaltic-pump/pump_housing_front.toml

@@ -1,5 +1,5 @@
 [outputs]
-pump_housing_front={quantity=1}
+pump_housing_front={quantity={amount=1}}
 
 [inputs]
 pump_housing_front_untapped={version=0.1, type="printed"}

modular-recipes/recipes/peristaltic-pump/pump_housing_front_with_stepper.toml

@@ -1,10 +1,10 @@
 [outputs]
-pump_housing_front_with_stepper={quantity=1}
+pump_housing_front_with_stepper={quantity={amount=1}}
 
 [inputs]
-pump_housing_front={version=0.1, quantity=1}
-m4_5_shcs={quantity=2, description="M4x5 SHCS"}
-stepper_28byj_48={quantity=1}
+pump_housing_front={version=0.1, quantity={amount=1}}
+m4_5_shcs={quantity={amount=2}, description="M4x5 SHCS"}
+stepper_28byj_48={quantity={amount=1}}
 
 [dependencies]
 tools = [ "3 mm hex driver" ]

modular-recipes/recipes/peristaltic-pump/pump_housing_rear.toml

@@ -1,8 +1,8 @@
 [outputs]
-pump_housing_rear = {quantity=1}
+pump_housing_rear = {quantity={amount=1}}
 
 [inputs]
-pump_housing_rear_untapped = {quantity=1}
+pump_housing_rear_untapped = {quantity={amount=1}}
 
 [dependencies]
 tools = [ "M4 tap" ]

modular-recipes/recipes/peristaltic-pump/pump_housing_rear_with_stepper.toml

@@ -1,10 +1,10 @@
 [outputs]
-pump_housing_rear_with_stepper = {quantity=1}
+pump_housing_rear_with_stepper = {quantity={amount=1}}
 
 [inputs]
-pump_housing_rear = {version=0.1, quantity=1}
-m4_5_shcs = {quantity=2}
-stepper_28byj_48={quantity=1}
+pump_housing_rear = {version=0.1, quantity={amount=1}}
+m4_5_shcs = {quantity={amount=2}}
+stepper_28byj_48={quantity={amount=1}}
 
 [dependencies]
 tools = [ "3 mm hex driver" ]