Merge branch 'PSDR_F7' of https://github.com/MichaelRColton/PSDR into PSDR_F7

Conflicts:
	Hardware/Enclosure/PSDR2.SLDASM
This commit is contained in:
Michael Colton 2016-11-03 09:57:48 -06:00
commit dfa2858888
6 changed files with 26 additions and 0 deletions

26
.gitignore vendored
View file

@ -21,3 +21,29 @@ Hardware/STM32F756_Config.ioc
Source/STM32F4 Test.launch Source/STM32F4 Test.launch
Hardware/Enclosure/~$PSDR2.SLDDRW Hardware/Enclosure/~$PSDR2.SLDDRW
Hardware/Enclosure/Face Cover.x_t Hardware/Enclosure/Face Cover.x_t
Hardware/Enclosure/~$2.2in_LCD_Module.SLDPRT
Hardware/Enclosure/~$604561 Battery.SLDPRT
Hardware/Enclosure/~$7x3x3 Bearing.SLDPRT
Hardware/Enclosure/~$92029A208_TYPE 316 STAINLESS STEEL CUP POINT SET SCREW.SLDPRT
Hardware/Enclosure/~$92095A185_18-8 SS BUTTON-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$92095A471_18-8 SS BUTTON-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$93395A213_TYPE 316 SS FLAT-HEAD SOCKET CAP SCREW.SLDPRT
Hardware/Enclosure/~$94205A220_TYPE 316 STAINLESS STEEL NYLON-INSERT LOCKNUT.SLDPRT
Hardware/Enclosure/~$BNC_Adapter.SLDPRT
Hardware/Enclosure/~$Battery Connector.SLDPRT
Hardware/Enclosure/~$BottomHalf2.sldprt
Hardware/Enclosure/~$Earphone_Jack.SLDPRT
Hardware/Enclosure/~$Encoder.SLDPRT
Hardware/Enclosure/~$EncoderBoard.SLDPRT
Hardware/Enclosure/~$Face Cover.SLDPRT
Hardware/Enclosure/~$GPS_Antenna.SLDPRT
Hardware/Enclosure/~$LCD_Standoff.SLDPRT
Hardware/Enclosure/~$LeeSpring-LTL015B08S.SLDPRT
Hardware/Enclosure/~$PSDR2.SLDASM
Hardware/Enclosure/~$PSDR26PCB.SLDPRT
Hardware/Enclosure/~$SMA_Connector.SLDPRT
Hardware/Enclosure/~$Slotted_Knob2.SLDPRT
Hardware/Enclosure/~$Speaker.SLDPRT
Hardware/Enclosure/~$USB_Connector.SLDPRT
Hardware/Enclosure/~$paddle.SLDPRT
Hardware/Enclosure/~$paddle_Mirrored.SLDPRT

Binary file not shown.

Binary file not shown.

Binary file not shown.