diff --git a/libtest.png b/libtest.png index 515a5cd..27b3f38 100644 Binary files a/libtest.png and b/libtest.png differ diff --git a/readme.md b/readme.md index 395f798..32d0154 100644 --- a/readme.md +++ b/readme.md @@ -3608,7 +3608,10 @@ Tubing and sleeving. The internal diameter can be forced to stretch it over some | 1 | ```tubing(NEOP85)``` | Neoprene tubing OD 8mm ID 5mm x 15mm | | 1 | ```tubing(PTFE07)``` | PTFE sleeving OD 1.2mm ID 0.71mm x 15mm | | 1 | ```tubing(PTFE20)``` | PTFE sleeving OD 2.6mm ID 2mm x 15mm | +| 1 | ```tubing(PTFE2_3)``` | PTFE tubing OD 3mm ID 2mm x 15mm | | 1 | ```tubing(PF7)``` | PTFE tubing OD 4.6mm ID 3.84mm x 15mm | +| 1 | ```tubing(PTFE2_4)``` | PTFE tubing OD 4mm ID 2mm x 15mm | +| 1 | ```tubing(PTFE4_6)``` | PTFE tubing OD 6mm ID 4mm x 15mm | | 1 | ```tubing(PVC64)``` | PVC aquarium tubing OD 6mm ID 4mm x 15mm | | 1 | ```tubing(PVC85)``` | PVC aquarium tubing OD 8mm ID 5mm x 15mm | diff --git a/tests/png/tubings.png b/tests/png/tubings.png index a6a703c..4231573 100644 Binary files a/tests/png/tubings.png and b/tests/png/tubings.png differ diff --git a/vitamins/tubings.scad b/vitamins/tubings.scad index 68e004a..f6bbc3c 100644 --- a/vitamins/tubings.scad +++ b/vitamins/tubings.scad @@ -20,20 +20,21 @@ // // Tubing and sleeving // -tubing_colour = [0.8, 0.8, 0.8, 0.75 ]; - -PVC64 = ["PVC64", "PVC aquarium tubing", 6, 4, tubing_colour]; -PVC85 = ["PVC85", "PVC aquarium tubing", 8, 5, tubing_colour]; +PVC64 = ["PVC64", "PVC aquarium tubing", 6, 4, [0.8, 0.8, 0.8, 0.75 ]]; +PVC85 = ["PVC85", "PVC aquarium tubing", 8, 5, [0.8, 0.8, 0.8, 0.75 ]]; NEOP85 = ["NEOP85", "Neoprene tubing", 8, 5, [0.2,0.2,0.2]]; -PTFE07 = ["PTFE07", "PTFE sleeving", 1.2, 0.71, tubing_colour]; -PTFE20 = ["PTFE20", "PTFE sleeving", 2.6, 2, tubing_colour]; -PF7 = ["PF7", "PTFE tubing", 46/10, 3.84, tubing_colour]; +PTFE07 = ["PTFE07", "PTFE sleeving", 1.2, 0.71, [0.95, 0.95, 0.95, 0.9]]; +PTFE20 = ["PTFE20", "PTFE sleeving", 2.6, 2, [0.95, 0.95, 0.95, 0.9]]; +PTFE2_4 = ["PTFE2_4", "PTFE tubing", 4, 2, [0.95, 0.95, 0.95, 0.9]]; +PTFE2_3 = ["PTFE2_3", "PTFE tubing", 3, 2, [0.95, 0.95, 0.95, 0.9]]; +PTFE4_6 = ["PTFE4_6", "PTFE tubing", 6, 4, [0.95, 0.95, 0.95, 0.9]]; +PF7 = ["PF7", "PTFE tubing", 46/10, 3.84, [0.95, 0.95, 0.95, 0.9]]; HSHRNK16 = ["HSHRNK16", "Heatshrink sleeving", 2.0, 1.6, "grey"]; HSHRNK24 = ["HSHRNK24", "Heatshrink sleeving", 2.8, 2.4, "grey"]; HSHRNK32 = ["HSHRNK32", "Heatshrink sleeving", 3.6, 3.2, "grey"]; HSHRNK64 = ["HSHRNK64", "Heatshrink sleeving", 6.8, 6.4, "grey"]; HSHRNK100 = ["HSHRNK100", "Heatshrink sleeving",10.4, 10.0, [0.2,0.2,0.2]]; -tubings = [PVC64, PVC85, NEOP85, PTFE07, PTFE20, PF7, HSHRNK16, HSHRNK24, HSHRNK64, HSHRNK100]; +tubings = [PVC64, PVC85, NEOP85, PTFE07, PTFE20, PF7, PTFE2_3, PTFE2_4, PTFE4_6, HSHRNK16, HSHRNK24, HSHRNK64, HSHRNK100]; use