From 8a6a6be54feb090b751aa1d3901bcd8d14daed6c Mon Sep 17 00:00:00 2001
From: Simon Brooke <simon@journeyman.cc>
Date: Sun, 7 Sep 2025 08:27:31 +0100
Subject: [PATCH] This is tentative: I've moved the subframe back to the origin
 of the grid in its own model, although I haven't yet lifted it so that its
 wheel sits on the ground plane. I've rescaled it so that the wheel is the
 correct size.

I think each individual model should be build to the grid origin within its own
file, but that major components (subframe, fourbar) should be at the correct
vertical height for final assembly.
---
 model/subframe.scad | 39 ++++++++++++++++++---------------------
 model/tricycle.scad |  3 ++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/model/subframe.scad b/model/subframe.scad
index 5098bc3..aefe693 100644
--- a/model/subframe.scad
+++ b/model/subframe.scad
@@ -11,53 +11,50 @@ include <epicyclic.scad>
 
 module subframe () {
     // front leg (supports cross-shaft, epicyclic, motor
-    translate([-25, 1820, -550])
+    translate([-25, 886, -50])
         color("silver")
-        cube([50, 25, 230]);
+        cube([50, 25, 329]);
     // bottom bracket leg
-    translate([-25, 1690, -578])
+    translate([-25, 700, -90])
         color("silver")
-        cube([50, 25, 310]);
+        cube([50, 25, 443]);
     // wheel leg
-    translate([-70, 1430, -593])
-        rotate([0, 5, 0])
+    translate([-100, 345, -111])
+        rotate([0, 7, 0])
         color("silver")
-        cube([25, 75, 363]);
+        cube([25, 75, 519]);
     // front upper
-    translate([-25, 2000, -385])
+    translate([-25, 1143, 186])
         rotate([70, 0, 0])
         color("silver")
-        cube([50, 25, 330]);
+        cube([50, 25, 471]);
     // central upper
-    translate([-25, 1700, -275])
+    translate([-25, 714, 343])
         rotate([82, 0, 0])
         color("silver")
-        cube([50, 25, 370]);
+        cube([50, 25, 529]);
     // rear leg
-    translate([-25, 1200, -515])
+    translate([-25, 0, 0])
         rotate([-23, 0, 0])
         color("silver")
-        cube([50, 25, 344]);
+        cube([50, 25, 491]);
     
     // wheel
-    translate([0, 1467.5, -450])
+    translate([0, 382, 93])
         rotate([0, 0, 90])
-        // Pierre Rouzeau's wheel is beautifully modelled and parameterised, but it doesn't seem to be scaled as I'd expect...
-        scale([0.70, 0.70, 0.70])
         wheel(rim=451, spoke_nbr=0);
         
-    translate([-30, 1467.5, -450])
+    translate([-42, 382, 93])
         rotate([0, 90, 0])
         color("grey")
         sprocket(teeth=30, roller=7.9, pitch=12.7);
-
         
     rotate([90, 0, 90])
-        translate([1680, -410, -40])
+        translate([680, 105, -40])
         chainset( teeth=82, crank=140);
         
-     rotate([0,90,0])
-        translate([450, 1900, 24])
+    rotate([0,90,0])
+        translate([-93, 960, 24])
         epicyclic();   
         
 }
diff --git a/model/tricycle.scad b/model/tricycle.scad
index 17cc077..75f8ed4 100644
--- a/model/tricycle.scad
+++ b/model/tricycle.scad
@@ -11,8 +11,9 @@ include <fourbar.scad>
 // include <hull.scad>
 
 rotate([0, 0, 270])
-translate([0, 0, 400])
+translate([0, 1200, 180])
 subframe();
+translate([0,-50, 320])
 fourbar(700, 100, 30, 35, 650);
 
 //hull();