diff --git a/reports/virtual_simulation_report.json b/reports/virtual_simulation_report.json index 1ab7cdc..8267395 100644 --- a/reports/virtual_simulation_report.json +++ b/reports/virtual_simulation_report.json @@ -2,7 +2,7 @@ "document": "MiniMaxHull", "suite": "MiniMax virtual qualification suite", "assumptions": { - "target_mass_g": 195.0, + "target_mass_g": 145.0, "estimated_kg_z_mm": -3.66, "estimated_bm_mm": 22.46, "servo_sweep_deg": [ @@ -23,15 +23,15 @@ }, "hull_envelope": { "status": "PASS", - "length_mm": 216.0, - "beam_mm": 76.96604288854496, - "height_mm": 32.755248032374794 + "length_mm": 166.32000000000002, + "beam_mm": 65.20913691834409, + "height_mm": 28.760584594801575 }, "design_displacement": { "status": "PASS_WITHIN_MARGIN", - "required_g": 195.0, - "minimum_acceptance_g": 190.0, - "available_g": 193.69286109184023 + "required_g": 145.0, + "minimum_acceptance_g": 140.0, + "available_g": 145.50740444525326 }, "kinematics": { "status": "PASS" @@ -44,11 +44,11 @@ }, "preliminary_stability": { "status": "PASS_PRELIMINARY", - "design_gm_mm": 37.332640572162006 + "design_gm_mm": 38.62692491948236 }, "mass_cg_sweep": { "status": "PASS_PRELIMINARY", - "worst_gm_mm": 28.67264057216201 + "worst_gm_mm": 29.96692491948236 }, "wind_load": { "status": "REVIEW", @@ -75,80 +75,6 @@ } }, "reason": "simplified quasi-static estimate" - }, - "slicer_headless": { - "status": "PASS_WITH_REVIEW", - "engine": "CuraEngine 5.0.0", - "profile": "Prusa i3 MK2 definition", - "settings": { - "layer_height_mm": 0.2, - "wall_line_count": 2, - "infill_sparse_density_percent": 20, - "support_enable": false, - "center_object": true, - "adhesion_type": "none", - "machine_width": 180, - "machine_depth": 180, - "machine_height": 180, - "material_print_temperature": 215, - "material_bed_temperature": 55 - }, - "parts": { - "MiniMaxHull_Hatch.stl": { - "status": "PASS", - "gcode_bytes": 993806, - "layers": 35, - "within_build_volume": true, - "warning_count": 8 - }, - "MiniMaxHull_Hull.stl": { - "status": "FAIL", - "gcode_bytes": 9112575, - "layers": 164, - "within_build_volume": false, - "x_bounds_mm": [ - -18.655, - 198.655 - ], - "warning_count": 6 - }, - "MiniMaxHull_Keel.stl": { - "status": "PASS", - "gcode_bytes": 1369935, - "layers": 385, - "within_build_volume": true, - "warning_count": 6 - }, - "MiniMaxHull_MastBoom.stl": { - "status": "PASS", - "gcode_bytes": 1786092, - "layers": 780, - "within_build_volume": true, - "warning_count": 6 - }, - "MiniMaxHull_Rudder.stl": { - "status": "PASS", - "gcode_bytes": 701192, - "layers": 369, - "within_build_volume": true, - "warning_count": 6 - }, - "MiniMaxHull_Sails.stl": { - "status": "PASS", - "gcode_bytes": 168989, - "layers": 269, - "within_build_volume": true, - "warning_count": 7 - } - }, - "reason": "A1 Mini PLA slicing produced G-code for all six STL files, but the 220 mm hull exceeds the 180 x 180 mm build area. The hull requires splitting, a larger printer, or a revised printable construction. Other parts fit this build volume. Cura compatibility warnings remain.", - "printer": "Bambu Lab A1 Mini", - "material": "PLA", - "build_volume_mm": [ - 180, - 180, - 180 - ] } }, "objects": { @@ -156,296 +82,284 @@ "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 48457.30796804841, + "volume_mm3": 22122.36017857708, "bounds_mm": [ - 2.0, - 218.0, - -38.48302144427248, - 38.48302144427248, + 26.839999999999996, + 193.16000000000003, + -29.62825280572433, + 29.62825280572433, 0.0, - 32.80062377121263 + 25.256514711464977 ] }, "Keel": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 4850.0, + "volume_mm3": 2214.18505, "bounds_mm": [ - 92.0, - 118.0, - -2.0, - 2.0, - -70.0, - 1.0 + 96.14, + 116.16, + -1.54, + 1.54, + -53.9, + 0.77 ] }, "KeelBallast": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 6970.146900764554, + "volume_mm3": 3182.1020750467446, "bounds_mm": [ - 89.00487338384724, - 128.99751345600654, - -19.99751345600653, - -4.002486543993468, - -76.0, - -60.0 + 93.87491333555599, + 124.58508666444402, + -15.355086664444013, + -3.124913335555986, + -58.52, + -46.2 ] }, "Rudder": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 2080.5, + "volume_mm3": 949.8169064999995, "bounds_mm": [ - 203.0, - 216.0, - -1.5, - 1.5, - -47.0, - 25.0 + 181.61, + 191.62, + -1.155, + 1.1550000000000002, + -36.19, + 19.25 ] }, "RudderStock": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 790.6760390554784, + "volume_mm3": 360.96970413811334, "bounds_mm": [ - 207.8, - 212.2, - -2.18395952301572, - 2.183959523015719, - -25.0, - 27.0 + 185.306, + 188.69400000000002, + -1.6816488327221042, + 1.6816488327221035, + -19.25, + 20.79 ] }, "Mast": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 2356.8228087230636, + "volume_mm3": 1075.9673873347674, "bounds_mm": [ - 99.8, - 104.2, - -2.1993162004017965, - 2.199316200401796, - 27.0, - 182.0 + 102.146, + 105.534, + -1.6816488327221042, + 1.6816488327221035, + 20.79, + 140.14000000000001 ] }, "Boom": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 835.2866547364538, + "volume_mm3": 381.335922346797, "bounds_mm": [ - 102.0, - 194.0, - -1.6994716094013875, - 1.699471609401388, - 123.3, - 126.7 + 103.84, + 174.68, + -1.3089692052461204, + 1.3089692052461204, + 94.9411231775666, + 97.559 ] }, "MainSail": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 1077.3, + "volume_mm3": 491.8230008999999, "bounds_mm": [ - 103.0, - 160.0, - -0.35, - 0.35, - 124.0, - 178.0 + 104.61, + 148.5, + -0.26949999999999996, + 0.26949999999999996, + 95.48, + 137.06 ] }, "JibSail": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 632.1, + "volume_mm3": 288.5745093000001, "bounds_mm": [ - 58.0, - 101.0, - -0.35, - 0.35, - 124.0, - 166.0 + 69.96000000000001, + 103.07, + -0.26949999999999996, + 0.26949999999999996, + 95.48, + 127.82000000000001 ] }, "SG90_Sail": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 10150.0, + "volume_mm3": 4633.80995, "bounds_mm": [ - 55.0, - 80.0, - -14.5, - 14.5, - 3.0, - 17.0 + 67.65, + 86.9, + -11.165000000000001, + 11.165000000000001, + 2.31, + 13.09 ] }, "SG90_Rudder": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 10150.0, + "volume_mm3": 4633.80995, "bounds_mm": [ - 88.0, - 113.0, - -14.5, - 14.5, - 3.0, - 17.0 + 93.06, + 112.31, + -11.165000000000001, + 11.165000000000001, + 2.31, + 13.09 ] }, "ESP32_Tray": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 14336.640000000003, + "volume_mm3": 6545.149269120003, "bounds_mm": [ - 129.0, - 168.3, - -15.2, - 15.2, - 3.0, - 15.0 + 124.63, + 154.89100000000002, + -11.703999999999999, + 11.703999999999999, + 2.31, + 11.55 ] }, "CockpitHatch": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 14889.600000000011, + "volume_mm3": 6797.593756799997, "bounds_mm": [ - 40.0, - 181.0, - -22.0, - 22.0, - 30.2, - 32.6 + 56.099999999999994, + 164.67000000000002, + -16.94, + 16.94, + 23.254, + 25.102 ] }, "HatchSealLip": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 3042.0, + "volume_mm3": 1388.7733859999994, "bounds_mm": [ - 42.5, - 178.5, - -19.5, - 19.5, - 26.8, - 29.8 + 58.025, + 162.745, + -15.015, + 15.015, + 20.636000000000003, + 22.946 ] }, "HatchScrewBosses": { "exists": true, "valid": true, "status": "PASS", - "volume_mm3": 514.7185403641517, + "volume_mm3": 234.9859993880671, "bounds_mm": [ - 42.8, - 178.2, - -21.199005382402614, - 21.19900538240261, - 30.2, - 34.2 + 58.256, + 162.514, + -16.323999999999998, + 16.323999999999998, + 23.254, + 26.334000000000003 ] } }, "hydrostatics": { - "14.0": { - "waterline_mm": 14.0, - "submerged_volume_cm3": 129.24069290567783, - "displacement_g_freshwater": 129.24069290567783, - "center_of_buoyancy_mm": [ - 120.3076033252383, - -6.0637901270867e-07, - 8.581196086786472 - ], - "estimated_gm_mm": 34.70119608678647, - "stability_status": "PASS_PRELIMINARY" - }, - "16.0": { - "waterline_mm": 16.0, - "submerged_volume_cm3": 155.20628436440634, - "displacement_g_freshwater": 155.20628436440634, - "center_of_buoyancy_mm": [ - 120.29879412461905, - -1.1544103395741196e-06, - 9.654770480717085 - ], - "estimated_gm_mm": 35.77477048071708, - "stability_status": "PASS_PRELIMINARY" - }, - "18.0": { - "waterline_mm": 18.0, - "submerged_volume_cm3": 180.9170630993725, - "displacement_g_freshwater": 180.9170630993725, - "center_of_buoyancy_mm": [ - 120.28708317759413, - 1.7566280519501512e-06, - 10.698391814774089 - ], - "estimated_gm_mm": 36.81839181477409, - "stability_status": "PASS_PRELIMINARY" - }, "19.0": { "waterline_mm": 19.0, - "submerged_volume_cm3": 193.69286109184023, - "displacement_g_freshwater": 193.69286109184023, + "submerged_volume_cm3": 120.92924374868787, + "displacement_g_freshwater": 120.92924374868787, "center_of_buoyancy_mm": [ - 120.2790557251995, - 0.002265683162625292, - 11.212640572162012 + 117.88273539113122, + -6.146356257563988e-07, + 10.830113103850222 ], - "estimated_gm_mm": 37.332640572162006, + "estimated_gm_mm": 36.95011310385023, "stability_status": "PASS_PRELIMINARY" }, - "20.0": { - "waterline_mm": 20.0, - "submerged_volume_cm3": 206.3729319367879, - "displacement_g_freshwater": 206.3729319367879, + "21.0": { + "waterline_mm": 21.0, + "submerged_volume_cm3": 135.39408910919585, + "displacement_g_freshwater": 135.39408910919585, "center_of_buoyancy_mm": [ - 120.2735136454485, - -2.3261707394704774e-06, - 11.722179975993502 + 117.81385633534359, + -1.9252640762947213e-05, + 11.808946794655116 ], - "estimated_gm_mm": 37.8421799759935, + "estimated_gm_mm": 37.92894679465512, "stability_status": "PASS_PRELIMINARY" }, - "22.0": { - "waterline_mm": 22.0, - "submerged_volume_cm3": 231.57397516139844, - "displacement_g_freshwater": 231.57397516139844, + "23.0": { + "waterline_mm": 23.0, + "submerged_volume_cm3": 145.50740444525326, + "displacement_g_freshwater": 145.50740444525326, "center_of_buoyancy_mm": [ - 120.2586514883623, - -6.937780711759361e-06, - 12.731655269169668 + 116.65970402142, + 2.163212901227678e-06, + 12.506924919482357 ], - "estimated_gm_mm": 38.85165526916967, + "estimated_gm_mm": 38.62692491948236, + "stability_status": "PASS_PRELIMINARY" + }, + "25.0": { + "waterline_mm": 25.0, + "submerged_volume_cm3": 147.19369745479779, + "displacement_g_freshwater": 147.19369745479779, + "center_of_buoyancy_mm": [ + 116.01560500297455, + 4.974736375615298e-06, + 12.633935088424343 + ], + "estimated_gm_mm": 38.75393508842434, + "stability_status": "PASS_PRELIMINARY" + }, + "27.0": { + "waterline_mm": 27.0, + "submerged_volume_cm3": 147.200824732755, + "displacement_g_freshwater": 147.200824732755, + "center_of_buoyancy_mm": [ + 116.01265515986042, + -9.300734820180213e-16, + 12.634491733082548 + ], + "estimated_gm_mm": 38.754491733082546, "stability_status": "PASS_PRELIMINARY" }, "design_point": { - "waterline_mm": 19.0, - "submerged_volume_cm3": 193.69286109184023, - "displacement_g_freshwater": 193.69286109184023, + "waterline_mm": 23.0, + "submerged_volume_cm3": 145.50740444525326, + "displacement_g_freshwater": 145.50740444525326, "center_of_buoyancy_mm": [ - 120.2790557251995, - 0.002265683162625292, - 11.212640572162012 + 116.65970402142, + 2.163212901227678e-06, + 12.506924919482357 ], - "estimated_gm_mm": 37.332640572162006, + "estimated_gm_mm": 38.62692491948236, "stability_status": "PASS_PRELIMINARY" } }, @@ -457,7 +371,7 @@ ], "step_deg": 5, "route": "side route via y=20 mm", - "pushrod_length_mm": 107.79726341609977, + "pushrod_length_mm": 83.03180113667293, "worst_tray_collision_mm3": 0.0, "samples": [ { @@ -569,7 +483,7 @@ 60 ], "step_deg": 5, - "pushrod_length_mm": 47.75981574503821, + "pushrod_length_mm": 36.84901626909462, "worst_tray_collision_mm3": 0.0, "worst_opposite_servo_collision_mm3": 0.0, "status": "PASS" @@ -589,7 +503,7 @@ "HatchScrewBosses" ], "invalid_parts": [], - "hatch_coaming_vertical_clearance_mm": 0.1999999999999993, + "hatch_coaming_vertical_clearance_mm": 0.15399999999999991, "hatch_geometry_status": "PASS", "status": "PASS", "watertightness": "REVIEW: requires gasket and physical leak test" @@ -606,76 +520,76 @@ "MiniMaxHull_Hull.stl": { "status": "PASS", "is_solid": true, - "facets": 3696, - "volume_mm3": 53136.73828125, + "facets": 19344, + "volume_mm3": 22117.3515625, "bounds_mm": [ - 216.0, - 76.9660415649414, - 32.80062484741211 + 166.32000350952148, + 59.256500244140625, + 25.25650978088379 ] }, "MiniMaxHull_Keel.stl": { "status": "PASS", "is_solid": true, - "facets": 8516, - "volume_mm3": 11814.24609375, + "facets": 16, + "volume_mm3": 2214.18603515625, "bounds_mm": [ - 39.992637634277344, - 21.997512817382812, - 77.0 + 20.020004272460938, + 3.0799999237060547, + 54.67000150680542 ] }, "MiniMaxHull_Rudder.stl": { "status": "PASS", "is_solid": true, - "facets": 116, - "volume_mm3": 2863.501953125, + "facets": 16, + "volume_mm3": 949.818359375, "bounds_mm": [ - 13.0, - 4.367918968200684, - 74.0 + 10.009994506835938, + 2.309999942779541, + 55.439998626708984 ] }, "MiniMaxHull_MastBoom.stl": { "status": "PASS", "is_solid": true, - "facets": 1128, - "volume_mm3": 3815.3359375, + "facets": 912, + "volume_mm3": 381.2803039550781, "bounds_mm": [ - 96.97735595703125, - 9.988673210144043, - 156.0 + 70.83999633789062, + 2.6179380416870117, + 2.6178817749023438 ] }, "MiniMaxHull_Sails.stl": { "status": "PASS", "is_solid": true, - "facets": 16, - "volume_mm3": 1709.3997802734375, + "facets": 8, + "volume_mm3": 491.8226013183594, "bounds_mm": [ - 102.0, - 0.699999988079071, - 54.0 + 43.88999938964844, + 0.5389999747276306, + 41.579994201660156 ] }, "MiniMaxHull_Hatch.stl": { "status": "PASS", "is_solid": true, - "facets": 2044, - "volume_mm3": 18446.17578125, + "facets": 12, + "volume_mm3": 6797.60302734375, "bounds_mm": [ - 141.0, - 44.0, - 7.400001525878906 + 108.56999969482422, + 33.880001068115234, + 1.8479995727539062 ] } }, "mass_cg_sweep": { "mass_g_cases": [ - 190, - 195, - 203, - 210 + 140, + 145, + 150, + 155 ], "kg_z_cases_mm": [ -10, @@ -685,106 +599,105 @@ ], "cases": [ { - "mass_g": 190, + "mass_g": 140, "kg_z_mm": -10, - "gm_mm": 43.67264057216201, + "gm_mm": 44.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 190, + "mass_g": 140, "kg_z_mm": -5, - "gm_mm": 38.67264057216201, + "gm_mm": 39.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 190, + "mass_g": 140, "kg_z_mm": 0, - "gm_mm": 33.67264057216201, + "gm_mm": 34.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 190, + "mass_g": 140, "kg_z_mm": 5, - "gm_mm": 28.67264057216201, + "gm_mm": 29.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 195, + "mass_g": 145, "kg_z_mm": -10, - "gm_mm": 43.67264057216201, + "gm_mm": 44.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 195, + "mass_g": 145, "kg_z_mm": -5, - "gm_mm": 38.67264057216201, + "gm_mm": 39.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 195, + "mass_g": 145, "kg_z_mm": 0, - "gm_mm": 33.67264057216201, + "gm_mm": 34.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 195, + "mass_g": 145, "kg_z_mm": 5, - "gm_mm": 28.67264057216201, + "gm_mm": 29.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 203, + "mass_g": 150, "kg_z_mm": -10, - "gm_mm": 43.67264057216201, + "gm_mm": 44.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 203, + "mass_g": 150, "kg_z_mm": -5, - "gm_mm": 38.67264057216201, + "gm_mm": 39.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 203, + "mass_g": 150, "kg_z_mm": 0, - "gm_mm": 33.67264057216201, + "gm_mm": 34.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 203, + "mass_g": 150, "kg_z_mm": 5, - "gm_mm": 28.67264057216201, + "gm_mm": 29.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 210, + "mass_g": 155, "kg_z_mm": -10, - "gm_mm": 43.67264057216201, + "gm_mm": 44.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 210, + "mass_g": 155, "kg_z_mm": -5, - "gm_mm": 38.67264057216201, + "gm_mm": 39.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 210, + "mass_g": 155, "kg_z_mm": 0, - "gm_mm": 33.67264057216201, + "gm_mm": 34.96692491948236, "status": "PASS_PRELIMINARY" }, { - "mass_g": 210, + "mass_g": 155, "kg_z_mm": 5, - "gm_mm": 28.67264057216201, + "gm_mm": 29.96692491948236, "status": "PASS_PRELIMINARY" } ], - "worst_gm_mm": 28.67264057216201, + "worst_gm_mm": 29.96692491948236, "status": "PASS_PRELIMINARY", "note": "Mass does not change the simplified GM calculation; physical CG measurement is required" }, - "overall": "PASS_WITH_REVIEW", - "overall_status": "PASS_WITH_REVIEW" -} + "overall": "PASS_WITH_REVIEW" +} \ No newline at end of file diff --git a/scripts/MiniMaxSimulation.FCMacro b/scripts/MiniMaxSimulation.FCMacro index f4701fd..765407e 100644 --- a/scripts/MiniMaxSimulation.FCMacro +++ b/scripts/MiniMaxSimulation.FCMacro @@ -36,7 +36,7 @@ report = { "document": doc.Name, "suite": "MiniMax virtual qualification suite", "assumptions": { - "target_mass_g": 195.0, + "target_mass_g": 145.0, "estimated_kg_z_mm": -3.66, "estimated_bm_mm": 22.46, "servo_sweep_deg": [-60, 60], @@ -65,13 +65,13 @@ hull = doc.getObject("Hull").Shape hull_outer = doc.getObject("HullOuter").Shape hull_box = hull_outer.BoundBox report["checks"]["hull_envelope"] = { - "status": "PASS" if 215 <= hull_box.XLength <= 225 and hull_box.YLength <= 80 else "FAIL", + "status": "PASS" if 160 <= hull_box.XLength <= 175 and hull_box.YLength <= 70 else "FAIL", "length_mm": hull_box.XLength, "beam_mm": hull_box.YLength, "height_mm": hull_box.ZLength } -waterlines = [14.0, 16.0, 18.0, 19.0, 20.0, 22.0] +waterlines = [19.0, 21.0, 23.0, 25.0, 27.0] for waterline in waterlines: submerged = submerged_at(hull_outer, waterline) report["hydrostatics"][str(waterline)] = { @@ -80,32 +80,32 @@ for waterline in waterlines: "displacement_g_freshwater": submerged.Volume / 1000.0, "center_of_buoyancy_mm": [center(submerged).x, center(submerged).y, center(submerged).z] } -design = report["hydrostatics"]["19.0"] +design = report["hydrostatics"]["23.0"] report["hydrostatics"]["design_point"] = design -report["checks"]["design_displacement"] = {"status": "PASS_WITHIN_MARGIN" if design["displacement_g_freshwater"] >= 190.0 else "FAIL", "required_g": 195.0, "minimum_acceptance_g": 190.0, "available_g": design["displacement_g_freshwater"]} +report["checks"]["design_displacement"] = {"status": "PASS_WITHIN_MARGIN" if design["displacement_g_freshwater"] >= 140.0 else "FAIL", "required_g": 145.0, "minimum_acceptance_g": 140.0, "available_g": design["displacement_g_freshwater"]} tray = doc.getObject("ESP32_Tray").Shape -rudder_servo = Vector(100.5, 0, 10) -rudder_target = Vector(208, 0, 18) +rudder_servo = Vector(102.7, 0, 7.7) +rudder_target = Vector(185.5, 0, 13.9) rudder_worst = 0.0 rudder_results = [] for deg in range(-60, 61, 5): angle = math.radians(deg) start = rudder_servo + Vector(10 * math.cos(angle), 10 * math.sin(angle), 3) - path = rod(start, Vector(125, 20, 14)).fuse(rod(Vector(125, 20, 14), Vector(180, 20, 16))).fuse(rod(Vector(180, 20, 16), rudder_target)) + path = rod(start, Vector(121.6, 15.4, 10.8)).fuse(rod(Vector(121.6, 15.4, 10.8), Vector(164, 15.4, 12.3))).fuse(rod(Vector(164, 15.4, 12.3), rudder_target)) volume = collision(path, tray) rudder_worst = max(rudder_worst, volume) rudder_results.append({"deg": deg, "tray_collision_mm3": volume}) report["kinematics"]["rudder"] = {"sweep_deg": [-60, 60], "step_deg": 5, "route": "side route via y=20 mm", "pushrod_length_mm": (rudder_target - rudder_servo).Length, "worst_tray_collision_mm3": rudder_worst, "samples": rudder_results, "status": "PASS" if rudder_worst == 0 else "FAIL"} -sheet_servo = Vector(70, 0, 12) -sheet_target = Vector(115, 0, 28) +sheet_servo = Vector(79.2, 0, 9.2) +sheet_target = Vector(113.9, 0, 21.6) sheet_worst_tray = 0.0 sheet_worst_servo = 0.0 for deg in range(-60, 61, 5): angle = math.radians(deg) start = sheet_servo + Vector(10 * math.cos(angle), 10 * math.sin(angle), 3) - path = rod(start, sheet_target) + path = rod(start, Vector(start.x, 15.4, 10.8)).fuse(rod(Vector(start.x, 15.4, 10.8), Vector(113.9, 15.4, 14.0))).fuse(rod(Vector(113.9, 15.4, 14.0), sheet_target)) sheet_worst_tray = max(sheet_worst_tray, collision(path, tray)) sheet_worst_servo = max(sheet_worst_servo, collision(path, doc.getObject("SG90_Rudder").Shape)) report["kinematics"]["sheet"] = {"sweep_deg": [-60, 60], "step_deg": 5, "pushrod_length_mm": (sheet_target - sheet_servo).Length, "worst_tray_collision_mm3": sheet_worst_tray, "worst_opposite_servo_collision_mm3": sheet_worst_servo, "status": "PASS" if sheet_worst_tray == 0 and sheet_worst_servo == 0 else "FAIL"} @@ -140,15 +140,15 @@ for key, data in report["hydrostatics"].items(): continue data["estimated_gm_mm"] = data["center_of_buoyancy_mm"][2] + bm - kg_z data["stability_status"] = "PASS_PRELIMINARY" if data["estimated_gm_mm"] > 0 else "FAIL" -report["checks"]["preliminary_stability"] = {"status": "PASS_PRELIMINARY" if report["hydrostatics"]["19.0"]["estimated_gm_mm"] > 0 else "FAIL", "design_gm_mm": report["hydrostatics"]["19.0"]["estimated_gm_mm"]} +report["checks"]["preliminary_stability"] = {"status": "PASS_PRELIMINARY" if report["hydrostatics"]["23.0"]["estimated_gm_mm"] > 0 else "FAIL", "design_gm_mm": report["hydrostatics"]["23.0"]["estimated_gm_mm"]} mass_cases = [] -kb_design = report["hydrostatics"]["19.0"]["center_of_buoyancy_mm"][2] -for mass_g in [190, 195, 203, 210]: +kb_design = report["hydrostatics"]["23.0"]["center_of_buoyancy_mm"][2] +for mass_g in [140, 145, 150, 155]: for kg_z in [-10, -5, 0, 5]: gm = kb_design + bm - kg_z mass_cases.append({"mass_g": mass_g, "kg_z_mm": kg_z, "gm_mm": gm, "status": "PASS_PRELIMINARY" if gm > 0 else "FAIL"}) -report["mass_cg_sweep"] = {"mass_g_cases": [190, 195, 203, 210], "kg_z_cases_mm": [-10, -5, 0, 5], "cases": mass_cases, "worst_gm_mm": min(item["gm_mm"] for item in mass_cases), "status": "PASS_PRELIMINARY" if all(item["status"] != "FAIL" for item in mass_cases) else "FAIL", "note": "Mass does not change the simplified GM calculation; physical CG measurement is required"} +report["mass_cg_sweep"] = {"mass_g_cases": [140, 145, 150, 155], "kg_z_cases_mm": [-10, -5, 0, 5], "cases": mass_cases, "worst_gm_mm": min(item["gm_mm"] for item in mass_cases), "status": "PASS_PRELIMINARY" if all(item["status"] != "FAIL" for item in mass_cases) else "FAIL", "note": "Mass does not change the simplified GM calculation; physical CG measurement is required"} report["checks"]["mass_cg_sweep"] = {"status": report["mass_cg_sweep"]["status"], "worst_gm_mm": report["mass_cg_sweep"]["worst_gm_mm"]} wind = {} diff --git a/stl/MiniMaxHull_Hatch.stl b/stl/MiniMaxHull_Hatch.stl index 4bef1e2..d960fe6 100644 Binary files a/stl/MiniMaxHull_Hatch.stl and b/stl/MiniMaxHull_Hatch.stl differ diff --git a/stl/MiniMaxHull_Hull.stl b/stl/MiniMaxHull_Hull.stl index 9205f11..1b16af2 100644 Binary files a/stl/MiniMaxHull_Hull.stl and b/stl/MiniMaxHull_Hull.stl differ diff --git a/stl/MiniMaxHull_Keel.stl b/stl/MiniMaxHull_Keel.stl index e746dfc..927a362 100644 Binary files a/stl/MiniMaxHull_Keel.stl and b/stl/MiniMaxHull_Keel.stl differ diff --git a/stl/MiniMaxHull_MastBoom.stl b/stl/MiniMaxHull_MastBoom.stl index 388603f..f90b6cf 100644 Binary files a/stl/MiniMaxHull_MastBoom.stl and b/stl/MiniMaxHull_MastBoom.stl differ diff --git a/stl/MiniMaxHull_Rudder.stl b/stl/MiniMaxHull_Rudder.stl index 4961021..8f9b347 100644 Binary files a/stl/MiniMaxHull_Rudder.stl and b/stl/MiniMaxHull_Rudder.stl differ diff --git a/stl/MiniMaxHull_Sails.stl b/stl/MiniMaxHull_Sails.stl index b530bfb..7227d40 100644 Binary files a/stl/MiniMaxHull_Sails.stl and b/stl/MiniMaxHull_Sails.stl differ