Merge branch 'fixes-v3.1' into 'master'

Fixes v3.1 Closes #53 and #58 See merge request librespacefoundation/satnogs/satnogs-rotator!53
2018-08-19 19:49:25 +00:00 · 2018-08-19 19:49:25 +00:00 · 91a1a8f755
parent 1807bf5f82 be703c309f
commit 91a1a8f755
117 changed files with 2 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,3 @@
-*.blend1
-*.blend2
-*.gcode
+# Backup Files
 *.fcstd1
-*.stl
+.~*
--- a/assemblies/A1001-1_frame.fcstd
+++ b/assemblies/A1001-1_frame.fcstd
--- a/assemblies/A1001-3_frame.fcstd
+++ b/assemblies/A1001-3_frame.fcstd
--- a/assemblies/A1010-1_worm_gear.fcstd
+++ b/assemblies/A1010-1_worm_gear.fcstd
--- a/assemblies/A1011-1_worm_mount.fcstd
+++ b/assemblies/A1011-1_worm_mount.fcstd
--- a/assemblies/A1011-2_worm_mount.fcstd
+++ b/assemblies/A1011-2_worm_mount.fcstd
--- a/assemblies/A1020-1_shaft_collar.fcstd
+++ b/assemblies/A1020-1_shaft_collar.fcstd
--- a/assemblies/A1030-1_rotator_axis.fcstd
+++ b/assemblies/A1030-1_rotator_axis.fcstd
--- a/assemblies/A1030-3_rotator_axis.fcstd
+++ b/assemblies/A1030-3_rotator_axis.fcstd
--- a/assemblies/A1031-1_bearing_side.fcstd
+++ b/assemblies/A1031-1_bearing_side.fcstd
--- a/assemblies/A1032-1_bearing_side.fcstd
+++ b/assemblies/A1032-1_bearing_side.fcstd
--- a/assemblies/A1033-1_encoder_gear.fcstd
+++ b/assemblies/A1033-1_encoder_gear.fcstd
--- a/assemblies/A1040-1_symmetric_module.fcstd
+++ b/assemblies/A1040-1_symmetric_module.fcstd
--- a/assemblies/A1040-3_assymetric_module.fcstd
+++ b/assemblies/A1040-3_assymetric_module.fcstd
--- a/assemblies/A1050-1_az_el_rotator.fcstd
+++ b/assemblies/A1050-1_az_el_rotator.fcstd
--- a/assemblies/A1060-1_dc_motor.fcstd
+++ b/assemblies/A1060-1_dc_motor.fcstd
--- a/assemblies/A1070-1_motor_mount.fcstd
+++ b/assemblies/A1070-1_motor_mount.fcstd
--- a/assemblies/as5601_mount_assembly.fcstd
+++ b/assemblies/as5601_mount_assembly.fcstd
--- a/assemblies/axis_flange_assembly.fcstd
+++ b/assemblies/axis_flange_assembly.fcstd
--- a/assemblies/axis_gear_assembly.fcstd
+++ b/assemblies/axis_gear_assembly.fcstd
--- a/assemblies/axis_side_assembly.fcstd
+++ b/assemblies/axis_side_assembly.fcstd
--- a/assemblies/dc_motor_assembly.fcstd
+++ b/assemblies/dc_motor_assembly.fcstd
--- a/assemblies/frame.fcstd
+++ b/assemblies/frame.fcstd
--- a/assemblies/switch_endstop_assembly.fcstd
+++ b/assemblies/switch_endstop_assembly.fcstd
--- a/assemblies/worm_gear_assembly.fcstd
+++ b/assemblies/worm_gear_assembly.fcstd
--- a/cover/cover_bottom.fcstd
+++ b/cover/cover_bottom.fcstd
--- a/cover/cover_side_mirror.fcstd
+++ b/cover/cover_side_mirror.fcstd
--- a/electronics/as5601_assembly.fcstd
+++ b/electronics/as5601_assembly.fcstd
--- a/electronics/as5601_axis_assembly.fcstd
+++ b/electronics/as5601_axis_assembly.fcstd
--- a/electronics/as5601_case_1.fcstd
+++ b/electronics/as5601_case_1.fcstd
--- a/electronics/as5601_case_2.fcstd
+++ b/electronics/as5601_case_2.fcstd
--- a/electronics/as5601_case_3.fcstd
+++ b/electronics/as5601_case_3.fcstd
--- a/electronics/as5601_magnet_base.fcstd
+++ b/electronics/as5601_magnet_base.fcstd
--- a/electronics/as5601_pcb.fcstd
+++ b/electronics/as5601_pcb.fcstd
--- a/electronics/electronics_case.fcstd
+++ b/electronics/electronics_case.fcstd
--- a/electronics/electronics_case_bottom.fcstd
+++ b/electronics/electronics_case_bottom.fcstd
--- a/electronics/electronics_case_pcb_mount.fcstd
+++ b/electronics/electronics_case_pcb_mount.fcstd
--- a/electronics/electronics_case_top.fcstd
+++ b/electronics/electronics_case_top.fcstd
--- a/electronics/encoder_magnet.fcstd
+++ b/electronics/encoder_magnet.fcstd
--- a/electronics/holder_as5601.fcstd
+++ b/electronics/holder_as5601.fcstd
--- a/electronics/off_axis_gear_as5601.fcstd
+++ b/electronics/off_axis_gear_as5601.fcstd
--- a/part-number-list.ods
+++ b/part-number-list.ods
--- a/rotator-bom.ods
+++ b/rotator-bom.ods
--- a/rotator_parts/C1001-1_symmetric_tube.fcstd
+++ b/rotator_parts/C1001-1_symmetric_tube.fcstd
--- a/rotator_parts/C1001-3_asymmetric_tube.fcstd
+++ b/rotator_parts/C1001-3_asymmetric_tube.fcstd
--- a/rotator_parts/C1010-3.fcstd
+++ b/rotator_parts/C1010-3.fcstd
--- a/rotator_parts/C1011-3.fcstd
+++ b/rotator_parts/C1011-3.fcstd
--- a/rotator_parts/C1020-1_shaft_gear.fcstd
+++ b/rotator_parts/C1020-1_shaft_gear.fcstd
--- a/rotator_parts/C1021-1_shaft_collar.fcstd
+++ b/rotator_parts/C1021-1_shaft_collar.fcstd
--- a/rotator_parts/C1022-3.fcstd
+++ b/rotator_parts/C1022-3.fcstd
--- a/rotator_parts/C1030-1_motor_mount.fcstd
+++ b/rotator_parts/C1030-1_motor_mount.fcstd
--- a/rotator_parts/C1040-1_encoder_gear.fcstd
+++ b/rotator_parts/C1040-1_encoder_gear.fcstd
--- a/rotator_parts/C1041-1_homing_pin.fcstd
+++ b/rotator_parts/C1041-1_homing_pin.fcstd
--- a/rotator_parts/C1042-1_endstop_mount.fcstd
+++ b/rotator_parts/C1042-1_endstop_mount.fcstd
--- a/rotator_parts/C1043-1_encoder_mount.fcstd
+++ b/rotator_parts/C1043-1_encoder_mount.fcstd
--- a/rotator_parts/C1050-1_tslot6_100.fcstd
+++ b/rotator_parts/C1050-1_tslot6_100.fcstd
--- a/rotator_parts/C1050-5.fcstd
+++ b/rotator_parts/C1050-5.fcstd
--- a/rotator_parts/C1060-1_worm_shaft.fcstd
+++ b/rotator_parts/C1060-1_worm_shaft.fcstd
--- a/rotator_parts/C1061-3.fcstd
+++ b/rotator_parts/C1061-3.fcstd
--- a/rotator_parts/C1061-4.fcstd
+++ b/rotator_parts/C1061-4.fcstd
--- a/rotator_parts/C1062-1_worm_gear.fcstd
+++ b/rotator_parts/C1062-1_worm_gear.fcstd
--- a/rotator_parts/C1070-1_dc_motor_adapter.fcstd
+++ b/rotator_parts/C1070-1_dc_motor_adapter.fcstd
--- a/rotator_parts/C1071-1_dc_motor_cover.fcstd
+++ b/rotator_parts/C1071-1_dc_motor_cover.fcstd
--- a/rotator_parts/C1072-1_dc_motor_cover.fcstd
+++ b/rotator_parts/C1072-1_dc_motor_cover.fcstd
--- a/rotator_parts/C1080-1_cover_bottom.fcstd
+++ b/rotator_parts/C1080-1_cover_bottom.fcstd
--- a/rotator_parts/C1081-1_cover_top.fcstd
+++ b/rotator_parts/C1081-1_cover_top.fcstd
--- a/rotator_parts/C1082-1_cover_side.fcstd
+++ b/rotator_parts/C1082-1_cover_side.fcstd
--- a/rotator_parts/C1082-3_cover_side.fcstd
+++ b/rotator_parts/C1082-3_cover_side.fcstd
--- a/rotator_parts/C1083-1_shaft_seal.fcstd
+++ b/rotator_parts/C1083-1_shaft_seal.fcstd
--- a/rotator_parts/axis_gear.fcstd
+++ b/rotator_parts/axis_gear.fcstd
--- a/rotator_parts/axis_gear_flange.fcstd
+++ b/rotator_parts/axis_gear_flange.fcstd
--- a/rotator_parts/axis_pipe_40mm.fcstd
+++ b/rotator_parts/axis_pipe_40mm.fcstd
--- a/rotator_parts/axis_side.fcstd
+++ b/rotator_parts/axis_side.fcstd
--- a/rotator_parts/axis_spacer.fcstd
+++ b/rotator_parts/axis_spacer.fcstd
--- a/rotator_parts/ball_bearing_housing.fcstd
+++ b/rotator_parts/ball_bearing_housing.fcstd
--- a/rotator_parts/motor_mount_flange.fcstd
+++ b/rotator_parts/motor_mount_flange.fcstd
--- a/rotator_parts/motor_mount_plastic.fcstd
+++ b/rotator_parts/motor_mount_plastic.fcstd
--- a/rotator_parts/switch_endstop_holder.fcstd
+++ b/rotator_parts/switch_endstop_holder.fcstd
--- a/rotator_parts/t_slot20_100.fcstd
+++ b/rotator_parts/t_slot20_100.fcstd
--- a/rotator_parts/t_slot20_160.fcstd
+++ b/rotator_parts/t_slot20_160.fcstd
--- a/rotator_parts/t_slot20_connector.fcstd
+++ b/rotator_parts/t_slot20_connector.fcstd
--- a/rotator_parts/worm_axis.fcstd
+++ b/rotator_parts/worm_axis.fcstd
--- a/rotator_parts/worm_mount.fcstd
+++ b/rotator_parts/worm_mount.fcstd
--- a/rotator_parts/worm_mount_mirror.fcstd
+++ b/rotator_parts/worm_mount_mirror.fcstd
--- a/satnogs-mechanical-bom.ods
+++ b/satnogs-mechanical-bom.ods
--- a/shared/H1001-1_dc_motor.fcstd
+++ b/shared/H1001-1_dc_motor.fcstd
--- a/shared/H1002-1_motor_mount.fcstd
+++ b/shared/H1002-1_motor_mount.fcstd
--- a/shared/H1003-1_stepper_motor_nema17.fcstd
+++ b/shared/H1003-1_stepper_motor_nema17.fcstd
--- a/shared/ball_bearing_625ZZ.fcstd
+++ b/shared/ball_bearing_625ZZ.fcstd
--- a/shared/ball_bearing_6008ZZ.fcstd
+++ b/shared/ball_bearing_6008ZZ.fcstd
--- a/shared/Inner_bracket_20_steel_B-Type_slot6.fcstd
+++ b/shared/Inner_bracket_20_steel_B-Type_slot6.fcstd
--- a/shared/H1021-1_bType_nut
+++ b/shared/H1021-1_bType_nut
--- a/shared/H1030-1_nut_M5_din934.fcstd
+++ b/shared/H1030-1_nut_M5_din934.fcstd
--- a/shared/H1031-1_washer_M5_din125.fcstd
+++ b/shared/H1031-1_washer_M5_din125.fcstd
--- a/shared/H1040-1_pulley_gt2_36T.fcstd
+++ b/shared/H1040-1_pulley_gt2_36T.fcstd
--- a/shared/H1041-1_pulley_gt2_20T.fcstd
+++ b/shared/H1041-1_pulley_gt2_20T.fcstd
--- a/shared/H1041-3_pulley_gt2_20T.fcstd
+++ b/shared/H1041-3_pulley_gt2_20T.fcstd
--- a/shared/H1050-1_switch_SS0505.fcstd
+++ b/shared/H1050-1_switch_SS0505.fcstd
--- a/shared/H1060-1_pg9_cable_gland.fcstd
+++ b/shared/H1060-1_pg9_cable_gland.fcstd
--- a/shared/H1070-1_nut_M3_din934.fcstd
+++ b/shared/H1070-1_nut_M3_din934.fcstd
--- a/Show More
+++ b/Show More