Merge remote-tracking branch 'FreeCAD/master'

2018-02-11 13:35:51 +01:00 · 2018-02-11 13:35:51 +01:00 · be3644b4e1
commit be3644b4e1
parent fd24c86874 0b0fff9019
359 changed files with 1083123 additions and 2 deletions
--- a/Parts/Construction
+++ b/Parts/Construction
--- a/Parts/Doors/Generic/README.md
+++ b/Parts/Doors/Generic/README.md
--- a/Parts/Doors/Glass/README.md
+++ b/Parts/Doors/Glass/README.md
--- a/Parts/Doors/Metal/README.md
+++ b/Parts/Doors/Metal/README.md
--- a/Parts/Doors/Shutter/README.md
+++ b/Parts/Doors/Shutter/README.md
--- a/Parts/Doors/Wood/README.md
+++ b/Parts/Doors/Wood/README.md
--- a/equipment/README.md
+++ b/equipment/README.md
--- a/equipment/README.md
+++ b/equipment/README.md
--- a/Parts/Roof/README.md
+++ b/Parts/Roof/README.md
--- a/Parts/Windows/Casement/README.md
+++ b/Parts/Windows/Casement/README.md
--- a/Parts/Windows/Fixed/README.md
+++ b/Parts/Windows/Fixed/README.md
--- a/Parts/Windows/Glass-skin/README.md
+++ b/Parts/Windows/Glass-skin/README.md
--- a/Parts/Windows/Maxim-Air/README.md
+++ b/Parts/Windows/Maxim-Air/README.md
--- a/Parts/Windows/Sash/README.md
+++ b/Parts/Windows/Sash/README.md
--- a/Parts/Windows/Sliding/README.md
+++ b/Parts/Windows/Sliding/README.md
--- a/Parts/Windows/Tilting/README.md
+++ b/Parts/Windows/Tilting/README.md
--- a/Construction/Slab
+++ b/Construction/Slab
--- a/Construction/Slab
+++ b/Construction/Slab
--- a/Construction/Slab
+++ b/Construction/Slab
--- a/Construction/Slab
+++ b/Construction/Slab
--- a/Parts/Batteries/R6_bat.FCStd
+++ b/Parts/Batteries/R6_bat.FCStd
--- a/Parts/Batteries/R6_bat.stl
+++ b/Parts/Batteries/R6_bat.stl
--- a/Parts/Batteries/README.md
+++ b/Parts/Batteries/README.md
--- a/Parts/Batteries/battery_lipo_3_7v_240mAh.step
+++ b/Parts/Batteries/battery_lipo_3_7v_240mAh.step
--- a/Parts/Batteries/battery_lipo_3_7v_240mah.fcstd
+++ b/Parts/Batteries/battery_lipo_3_7v_240mah.fcstd
--- a/Switches/EmergencyButton-Disk_LAY37.png
+++ b/Switches/EmergencyButton-Disk_LAY37.png
--- a/Switches/EmergencyButton-Disk_LAY37.step
+++ b/Switches/EmergencyButton-Disk_LAY37.step
--- a/Switches/EmergencyButton-Disk_LAY37.stl
+++ b/Switches/EmergencyButton-Disk_LAY37.stl
--- a/Switches/EmergencyButton-noDisk_LAY37.png
+++ b/Switches/EmergencyButton-noDisk_LAY37.png
--- a/Switches/EmergencyButton-noDisk_LAY37.step
+++ b/Switches/EmergencyButton-noDisk_LAY37.step
--- a/Switches/EmergencyButton-noDisk_LAY37.stl
+++ b/Switches/EmergencyButton-noDisk_LAY37.stl
--- a/Switches/EmergencyButton_LAY37.fcstd
+++ b/Switches/EmergencyButton_LAY37.fcstd
--- a/Switches/README.md
+++ b/Switches/README.md
@ -0,0 +1,5 @@
+# Electrical Switches
+
+## Emergency Push Button
+### LAY37
+<img src="EmergencyButton-Disk_LAY37.png" width="200"> <img src="EmergencyButton-noDisk_LAY37.png" width="200">
--- a/Parts/Endstop/README.md
+++ b/Parts/Endstop/README.md
--- a/Parts/Hotend/README.md
+++ b/Parts/Hotend/README.md
--- a/Parts/Motors/28BYJ-48_Stepper_Motor/README.md
+++ b/Parts/Motors/28BYJ-48_Stepper_Motor/README.md
--- a/Parts/Motors/README.md
+++ b/Parts/Motors/README.md
--- a/Parts/README.md
+++ b/Parts/README.md
--- a/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.fcstd
+++ b/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.fcstd
--- a/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.iges
+++ b/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.iges
@ -0,0 +1,8 @@
+                                                                        S0000001
+,,31HOpen CASCADE IGES processor 7.1,13HFilename.iges,                  G0000001
+16HOpen CASCADE 7.1,31HOpen CASCADE IGES processor 7.1,32,308,15,308,15,G0000002
+,1.,2,2HMM,1,0.01,15H20171216.103231,,,,,11,0,15H20171216.103231,;      G0000003
+     402       1       0       0       0       0       0       000000000D0000001
+     402       0       0       1       1                               0D0000002
+402,0;                                                           0000001P0000001
+S      1G      3D      2P      1                                        T0000001
--- a/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.step
+++ b/Parts/Raspberry/Cameras/Wide-170-Angle-Raspi-Camera.step
--- a/Parts/Servos/Accesories/README.md
+++ b/Parts/Servos/Accesories/README.md
--- a/Parts/Servos/Emax-ES08A/README.md
+++ b/Parts/Servos/Emax-ES08A/README.md
--- a/Parts/Servos/Futaba3003/README.md
+++ b/Parts/Servos/Futaba3003/README.md
--- a/Parts/Servos/README.md
+++ b/Parts/Servos/README.md
--- a/Parts/Servos/SG-90/README.md
+++ b/Parts/Servos/SG-90/README.md
--- a/Parts/Servos/SpringRC-SM-S4303R/README.md
+++ b/Parts/Servos/SpringRC-SM-S4303R/README.md
--- a/Parts/boards/README.md
+++ b/Parts/boards/README.md
--- a/Parts/boards/radio/README.md
+++ b/Parts/boards/radio/README.md
--- a/Parts/boards/shields/README.md
+++ b/Parts/boards/shields/README.md
--- a/Parts/boards/shields/nano_expansion_shield.fcstd
+++ b/Parts/boards/shields/nano_expansion_shield.fcstd
--- a/Parts/boards/shields/nano_expansion_shield.step
+++ b/Parts/boards/shields/nano_expansion_shield.step
--- a/Parts/boards/shields/nano_expansion_shield.stl
+++ b/Parts/boards/shields/nano_expansion_shield.stl
--- a/Parts/electronic-components/Audio-connectors/README.md
+++ b/Parts/electronic-components/Audio-connectors/README.md
--- a/Parts/electronic-components/Buzzer/README.md
+++ b/Parts/electronic-components/Buzzer/README.md
--- a/Parts/electronic-components/Component_IR/README.md
+++ b/Parts/electronic-components/Component_IR/README.md
--- a/Parts/electronic-components/Electronic
+++ b/Parts/electronic-components/Electronic
--- a/Parts/electronic-components/Electronic
+++ b/Parts/electronic-components/Electronic
--- a/Parts/electronic-components/Electronic
+++ b/Parts/electronic-components/Electronic
--- a/Parts/electronic-components/Ethernet-connectors/README.md
+++ b/Parts/electronic-components/Ethernet-connectors/README.md
--- a/Parts/electronic-components/Fiducials/README.md
+++ b/Parts/electronic-components/Fiducials/README.md
--- a/Parts/electronic-components/HDD/README.md
+++ b/Parts/electronic-components/HDD/README.md
--- a/Parts/electronic-components/HDMI-connectors/README.md
+++ b/Parts/electronic-components/HDMI-connectors/README.md
--- a/Parts/electronic-components/IC/README.md
+++ b/Parts/electronic-components/IC/README.md
--- a/Parts/electronic-components/IC/smd/README.md
+++ b/Parts/electronic-components/IC/smd/README.md
--- a/Parts/electronic-components/IC/smd/xtal-2016.fcstd
+++ b/Parts/electronic-components/IC/smd/xtal-2016.fcstd
--- a/Parts/electronic-components/Inductors/README.md
+++ b/Parts/electronic-components/Inductors/README.md
--- a/Parts/electronic-components/Inductors/smd/README.md
+++ b/Parts/electronic-components/Inductors/smd/README.md
--- a/Parts/electronic-components/LED/README.md
+++ b/Parts/electronic-components/LED/README.md
--- a/Parts/electronic-components/LED/through-hole/README.md
+++ b/Parts/electronic-components/LED/through-hole/README.md
--- a/Parts/electronic-components/MaxSonar/MB1010/README.md
+++ b/Parts/electronic-components/MaxSonar/MB1010/README.md
--- a/Parts/electronic-components/MaxSonar/README.md
+++ b/Parts/electronic-components/MaxSonar/README.md
--- a/Parts/electronic-components/Photoresistor/README.md
+++ b/Parts/electronic-components/Photoresistor/README.md
--- a/Parts/electronic-components/Potentiometer/Piher/PT-10LH01/README.md
+++ b/Parts/electronic-components/Potentiometer/Piher/PT-10LH01/README.md
--- a/Parts/electronic-components/Potentiometer/Piher/PT-10LV10/README.md
+++ b/Parts/electronic-components/Potentiometer/Piher/PT-10LV10/README.md
--- a/Parts/electronic-components/Potentiometer/Piher/README.md
+++ b/Parts/electronic-components/Potentiometer/Piher/README.md
--- a/Parts/electronic-components/Potentiometer/README.md
+++ b/Parts/electronic-components/Potentiometer/README.md
--- a/Parts/electronic-components/SATA-connectors/README.md
+++ b/Parts/electronic-components/SATA-connectors/README.md
--- a/Parts/electronic-components/SHARP/0A41SK/README.md
+++ b/Parts/electronic-components/SHARP/0A41SK/README.md
--- a/Parts/electronic-components/SHARP/2Y0A02/README.md
+++ b/Parts/electronic-components/SHARP/2Y0A02/README.md
--- a/Parts/electronic-components/SHARP/README.md
+++ b/Parts/electronic-components/SHARP/README.md
--- a/Parts/electronic-components/USB-connectors/README.md
+++ b/Parts/electronic-components/USB-connectors/README.md
--- a/Parts/electronic-components/USB-connectors/smd/README.md
+++ b/Parts/electronic-components/USB-connectors/smd/README.md
--- a/Parts/electronic-components/Ultrasonic
+++ b/Parts/electronic-components/Ultrasonic
--- a/Parts/electronic-components/Ultrasonic
+++ b/Parts/electronic-components/Ultrasonic
--- a/Parts/electronic-components/Ultrasonic
+++ b/Parts/electronic-components/Ultrasonic
--- a/Parts/electronic-components/capacitors/README.md
+++ b/Parts/electronic-components/capacitors/README.md
--- a/Parts/electronic-components/capacitors/smd/README.md
+++ b/Parts/electronic-components/capacitors/smd/README.md
--- a/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector-2.png
+++ b/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector-2.png
--- a/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.fcstd
+++ b/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.fcstd
--- a/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.png
+++ b/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.png
--- a/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.step
+++ b/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.step
--- a/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.stl
+++ b/Parts/electronic-components/connectors/female/3pin-buckled-female-2.54mm-connector.stl
--- a/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector-2.png
+++ b/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector-2.png
--- a/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.fcstd
+++ b/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.fcstd
--- a/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.png
+++ b/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.png
--- a/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.step
+++ b/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.step
--- a/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.stl
+++ b/Parts/electronic-components/connectors/female/3pin-female-2.54mm-connector.stl
--- a/Parts/electronic-components/connectors/female/README.md
+++ b/Parts/electronic-components/connectors/female/README.md
@ -0,0 +1,11 @@
+* **3 pin female 2.54mm connector**
+
+![](3pin-female-2.54mm-connector.png)
+
+![](3pin-female-2.54mm-connector-2.png)
+
+* **3 pin buckled female 2.5mm connector**
+
+![](3pin-buckled-female-2.54mm-connector.png)
+
+![](3pin-buckled-female-2.54mm-connector-2.png)
--- a/Parts/electronic-components/connectors/rj11.fcstd
+++ b/Parts/electronic-components/connectors/rj11.fcstd
--- a/Show more
+++ b/Show more