Diffusion TAZ-Quiver 1078ad1ad9f3

Merge branch 'master' into T4715
1078ad1ad9f3
Actions

Authored by Steven on Jan 8 2019, 1:38 PM.

Description

Merge branch 'master' into T4715

Details

Committed

Steven

Jan 8 2019, 1:38 PM

Pushed

Steven

Jan 8 2019, 1:41 PM

Parents

rTAZQUIVER3f08b0042d05: Merge branch 'master' into T4727
rTAZQUIVERc5cfbeeda735: Standardize ground lug strip length to 4mm T4715

Branches

Unknown

Tags

Unknown

Event Timeline

Steven committed rTAZQUIVER1078ad1ad9f3: Merge branch 'master' into T4715 (authored by Steven).Jan 8 2019, 1:38 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
3f08b0042d05	Steven	Merge branch 'master' into T4727	Jan 8
e91c22b5bd58	Steven	Merge branch 'master' into T4665	Jan 8
e6c5f5209bf0	kent	Add version number for updated printed part	Jan 7
d73dcf0f3830	kent	Merge branch 'master' into T4806	Jan 7
3d19af4782c0	kent	Merge branch 'master' into T4650	Jan 7
dfc2ecf554a8	kent	Merge branch 'master' into T4624	Jan 7
e99673b2fe17	kent	Merge branch 'master' into T5011	Jan 3
76f8fb92cc49	kent	Merge branch 'master' into T4862	Jan 3
a40558ba05a8	kent	Merge branch 'master' into T5026	Jan 3
470ddff60d3a	kent	Merge branch 'master' into T5066	Jan 3
998b758e9f80	kent	Merge branch 'master' into T5059	Jan 3
397cd7f70851	west	Add 5x m3x10 bhcs sst HD-BT0234 to bom remove 5x M3x8 bhcs sst HD-BT0104 from…	Jan 3
6a868127bf57	west	Add 0.5mm to lcd board standoff T5066	Jan 3
bbcf42ba79c1	kent	Updating part number and descriptions for new revs of boards on the BoM	Jan 3
e87c1ce74621	kent	Merge branch 'master' into T5049	Jan 3
0a1657a656ac	kent	Merge branch 'master' into T4981	Jan 3
f6440d422955	DaniAO	Update BoM with new Board part numbers T5049	Jan 3
15f3721f5c8a	kent	Merge branch 'master' into T5013	Jan 3
601173cf7644	west	Add ground path to internal bed harness el-hr0155 T5059	Jan 2
c3dc5fcbb180	kent	Merge branch 'master' into T4958	Jan 2
bc55ef5aa0f8	west	Add 2x fanguards el-hr0170 8x hd-bt0204 m3x22 fhcs remove hd-bt0039 m3x12 shcs	Jan 2
e6c964a2113c	west	Remove fan cover printed part	Jan 2
e2c26c6bcd56	DaniAO	Update BoM with new board numbers	Jan 2
1a9606abea75	west	Add fillets to filament holes for more smooth feeding T5026	Dec 27 2018
fff3386c5443	west	Add y motor ground extension drawing and drawing bom	Dec 27 2018
9b83d5cccd07	west	Add fan cover to directory T4862	Dec 27 2018
2290ad245021	west	Add contents of AS-pk0029 and as-pk0030 to bom T4981	Dec 27 2018
2a562091c78c	west	Shorten ground wires YZ harness internal T5013	Dec 27 2018
58e2f9039a17	west	Add grounding to yz harness update drawing bom T5011	Dec 26 2018
c51f372c8f53	west	Add esd protection to harnesses	Dec 26 2018
ce9e8bcfa6d9	west	Change quantity of pp-gp0238 to 4 add 4 pp-gp0409 frame foot T4958	Dec 19 2018
befd3ff8f357	west	Add extra length to x motor harness and y harness add heatshrink to clean up…	Dec 17 2018
9d79ddec6a03	west	Add pdf format of harness drawings for igus	Dec 17 2018
b8953f8209aa	Steven	Merge branch 'master' into T4735	Dec 13 2018
57025ff72405	Steven	Remove duplicates in BOM and re-add change that was removed in merge from master	Dec 13 2018
b939499d866a	Steven	Merge branch 'master' into T4752	Dec 13 2018
d63d30aa540f	west	Remove duplicate hd-ms0446	Dec 12 2018
523b2ca51554	Steven	Merge branch 'master' into T4737	Dec 12 2018
1b85c397e790	Steven	Merge branch 'master' into T4752	Dec 12 2018
073c40b169c7	Steven	Fix BOM.csv that was not saved as a csv T4752	Dec 12 2018
930a165ca16a	Steven	Fix BOM csv formatting	Dec 12 2018
c99bc53c63d2	Steven	Merge branch 'master' into T4759	Dec 12 2018
7562b8db9d82	west	Change bom format to text	Dec 12 2018
96912645e1bd	kent	Merge branch 'master' into T4735	Dec 12 2018
67fa97a4f13f	kent	Merge branch 'master' into T4818	Dec 12 2018
348cbd32734a	west	Remove actuator pn and add actuator pre assembled pn	Dec 12 2018
9ff07eee1437	kent	Merge branch 'master' into T4721	Dec 11 2018
8c77d9f95cce	kent	Merge branch 'master' into T4739	Dec 11 2018
ec4eea6fe197	west	Change bom format to text	Dec 11 2018
16d3ded6930c	west	Change bom format to text	Dec 11 2018

Changes (35)

		Path
M		production_docs/BOM.csv
M		production_parts/electronics/external_harness/EL-HR0140_bed_harness.odg
P		production_parts/electronics/external_harness/EL-HR0140_bed_harness.pdf Copied from production_parts/electronics/external_harness/EL-HR0141_extruder_x_harness.odg
P		production_parts/electronics/external_harness/EL-HR0141_extruder_x_harness.odg Copied to multiple locations: production_parts/electronics/external_harness/EL-HR0140_bed_harness.pdf production_parts/electronics/external_harness/EL-HR0141_extruder_x_harness.pdf
P		production_parts/electronics/external_harness/EL-HR0141_extruder_x_harness.pdf Copied from production_parts/electronics/external_harness/EL-HR0141_extruder_x_harness.odg
M		production_parts/electronics/external_harness/EL-HR0143_Y-Z_Harness.odg
P		production_parts/electronics/external_harness/Y_motor_ground_extension.odg Copied from production_parts/jigs/tooling/CB_test_stand/cable_harnesses/internal_harnesses/Z-Max_Internal.odg
M		production_parts/electronics/internal_harness/EL-HR0149_CB_Y-Z_Harness.odg
M		production_parts/electronics/internal_harness/EL-HR0155_CB_Bed_harness.odg
V		production_parts/electronics/toolhead/cable_drawings/{AS-CB0095_actuator_assembly_revA.odg ← AS-CB0095_actuator_assembly_revIR.odg}
V		production_parts/electronics/toolhead/cable_drawings/{AS-CB0095_actuator_assembly_revIR.odg → AS-CB0095_actuator_assembly_revA.odg}
M		production_parts/electronics/toolhead/cable_drawings/EL-HR0161_E2_thermotground_harness_RevIR.odg
M		production_parts/electronics/toolhead/cable_drawings/EL-HR0166_Mirrored_Aero_Extruder_harness.odg
A	(dir)	production_parts/machined_parts/feed_tube/
P		production_parts/machined_parts/feed_tube/9.5mm_cut_feed_tube.odg Copied from production_parts/jigs/tooling/CB_test_stand/cable_harnesses/internal_harnesses/Z-Max_Internal.odg
M		production_parts/printed_parts/dual_tube_clamp/dual_tube_clamp_v1.1.fcstd
M		production_parts/printed_parts/dual_tube_clamp/dual_tube_clamp_v1.1.stl
D		production_parts/printed_parts/heatsink_mount/heatsink_mount.fcstd
D		production_parts/printed_parts/heatsink_mount/heatsink_mount.stl
A		production_parts/printed_parts/heatsink_mount/heatsink_mount_0.2.stl
A		production_parts/printed_parts/heatsink_mount/heatsink_mount_v0.2.fcstd
M		production_parts/printed_parts/lcd_back/LCD_back_V0.2.2.fcstd
M		production_parts/printed_parts/lcd_back/LCD_back_V0.2.2.stl
D		production_parts/printed_parts/z_lower_left/Z_lower_leftv2.3.fcstd
D		production_parts/printed_parts/z_lower_left/Z_lower_leftv2.3.stl
A		production_parts/printed_parts/z_lower_left/Z_lower_leftv2.4.fcstd
A		production_parts/printed_parts/z_lower_left/Z_lower_leftv2.4.stl
D		production_parts/printed_parts/z_lower_right/Z_lower_rightv2.3.fcstd
D		production_parts/printed_parts/z_lower_right/Z_lower_rightv2.3.stl
A		production_parts/printed_parts/z_lower_right/Z_lower_rightv2.4.fcstd
A		production_parts/printed_parts/z_lower_right/Z_lower_rightv2.4.stl
D		production_parts/printed_parts/z_max_cable_cover/Z_max_cable_cover_v1.1.fcstd
D		production_parts/printed_parts/z_max_cable_cover/Z_max_cable_cover_v1.1.stl
A		production_parts/printed_parts/z_max_cable_cover/Z_max_cable_cover_v1.2.fcstd
A		production_parts/printed_parts/z_max_cable_cover/Z_max_cable_cover_v1.2.stl