Skip to content

Commit b293607

Browse files
committed
Update perception model for thesis
1 parent 04f4c8e commit b293607

File tree

1 file changed

+19
-8
lines changed

1 file changed

+19
-8
lines changed

proto_mav/parts/perception_module.scad

+19-8
Original file line numberDiff line numberDiff line change
@@ -2177,7 +2177,7 @@ module gimbal_yaw_frame(show_roll_frame=1, show_yaw_motor=1, show_sbgc_frame=1)
21772177

21782178
translate([0, 0, frame_thickness])
21792179
rotate(80)
2180-
#gimbal_yaw_limiter();
2180+
gimbal_yaw_limiter();
21812181

21822182
}
21832183

@@ -2305,7 +2305,7 @@ module nuc_frame(mount_w, mount_d, show_nuc=0) {
23052305

23062306
// Show NUC
23072307
if (show_nuc) {
2308-
color([0.0, 0.0, 1.0])
2308+
color([0.0, 1.0, 0.0])
23092309
translate([0, 0, -28 + nuc_standoff_h])
23102310
rotate([90.0, 0.0, 0.0])
23112311
import("../../proto_parts/Intel_NUC7i5DN/NUC7i5DN.STL");
@@ -2926,7 +2926,8 @@ module f450_nuc_frame(show_nuc=1) {
29262926

29272927
module gimbal_assembly() {
29282928
// Gimbal frame
2929-
gimbal_frame(nuc_mount_w, nuc_mount_d, 0);
2929+
rotate(90)
2930+
gimbal_frame(nuc_mount_w, nuc_mount_d, 0);
29302931

29312932
// GM4008
29322933
yaw_motor_r = 46.0 / 2;
@@ -2943,12 +2944,13 @@ module gimbal_assembly() {
29432944

29442945
module perception_module_assembly() {
29452946
// Gimbal
2946-
translate([0, 0, 56]) {
2947+
translate([0, 0, 60]) {
29472948
gimbal_assembly();
29482949
}
29492950

29502951
// NUC
2951-
translate([0, 0, 20]) {
2952+
translate([0, 0, 24])
2953+
rotate(90) {
29522954
// NUC frame
29532955
nuc_frame(nuc_mount_w, nuc_mount_d, show_nuc=1);
29542956

@@ -2963,7 +2965,16 @@ module perception_module_assembly() {
29632965
translate([-nuc_mount_w / 2, -nuc_mount_d / 2, nuc_standoff_h + 2])
29642966
spacer(M3_SCREW_W + 3, 18.0, M3_SCREW_W);
29652967
}
2966-
utility_frame(nuc_mount_w, nuc_mount_d, show_components=1);
2968+
2969+
// Utility frame
2970+
translate([0, 0, 24])
2971+
rotate([180, 0, 90])
2972+
utility_frame(nuc_mount_w, nuc_mount_d, show_components=1);
2973+
2974+
// Second camera
2975+
translate([43, 0, 10])
2976+
rotate([0, 90, 0])
2977+
intel_realsense_frame2(show_camera=1);
29672978
}
29682979

29692980
module f450_assembly() {
@@ -3038,7 +3049,7 @@ module f450_assembly() {
30383049
}
30393050

30403051
// gimbal_assembly();
3041-
// perception_module_assembly();
3052+
perception_module_assembly();
30423053
// f450_assembly();
30433054
// f450_nuc_frame(1);
30443055

@@ -3097,4 +3108,4 @@ module f450_assembly() {
30973108
// mav_top_plate(show_arms=1, show_nuc=0);
30983109
// mav_bottom_plate(show_arms=0);
30993110
// f450_fmu_frame();
3100-
f450_nuc_frame(0);
3111+
// f450_nuc_frame(0);

0 commit comments

Comments
 (0)