Merge pull request #7 from oresat/cleanup

Merge Cleanup into Master
oresat · May 18, 2017 · 4e3a85c · 4e3a85c
2 parents 2c56d45 + f67a265
commit 4e3a85c
Show file tree

Hide file tree

Showing 432 changed files with 26 additions and 1,185,626 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@
 
 # SW backup files
 ~$*
+
+# Windows thumbnails, presumably...
+Thumbs.db
diff --git a/v0.5_migrated/Backplane/temp.md → Backplane/temp.md b/v0.5_migrated/Backplane/temp.md → Backplane/temp.md
diff --git a/..._migrated/COTS/100211587UGM000_B.2.sldprt → COTS/100211587UGM000_B.2.sldprt b/..._migrated/COTS/100211587UGM000_B.2.sldprt → COTS/100211587UGM000_B.2.sldprt
diff --git a/..._migrated/COTS/100211647UGM000_B.1.sldprt → COTS/100211647UGM000_B.1.sldprt b/..._migrated/COTS/100211647UGM000_B.1.sldprt → COTS/100211647UGM000_B.1.sldprt
diff --git a/...ted/COTS/100211647UGM000_B.1_40pin.sldprt → COTS/100211647UGM000_B.1_40pin.sldprt b/...ted/COTS/100211647UGM000_B.1_40pin.sldprt → COTS/100211647UGM000_B.1_40pin.sldprt
diff --git a/v0.5_migrated/COTS/12pin_connector.SLDPRT → COTS/12pin_connector.SLDPRT b/v0.5_migrated/COTS/12pin_connector.SLDPRT → COTS/12pin_connector.SLDPRT
diff --git a/...COTS/18-8x4mmBUTTON-HEAD_CAP_SCREW.SLDPRT → COTS/18-8x4mmBUTTON-HEAD_CAP_SCREW.SLDPRT b/...COTS/18-8x4mmBUTTON-HEAD_CAP_SCREW.SLDPRT → COTS/18-8x4mmBUTTON-HEAD_CAP_SCREW.SLDPRT
diff --git a/v0.5_migrated/COTS/M2.5x10mm_18-8.SLDPRT → COTS/M2.5x10mm_18-8.SLDPRT b/v0.5_migrated/COTS/M2.5x10mm_18-8.SLDPRT → COTS/M2.5x10mm_18-8.SLDPRT
diff --git a/...MCX_CONNECTOR_PLUG_rfMaleConnector.SLDPRT → ...MCX_CONNECTOR_PLUG_rfMaleConnector.SLDPRT b/...MCX_CONNECTOR_PLUG_rfMaleConnector.SLDPRT → ...MCX_CONNECTOR_PLUG_rfMaleConnector.SLDPRT
diff --git a/...TS/MMCX_FEMALE_1_rfFemaleConnector.SLDPRT → COTS/MMCX_FEMALE_1_rfFemaleConnector.SLDPRT b/...TS/MMCX_FEMALE_1_rfFemaleConnector.SLDPRT → COTS/MMCX_FEMALE_1_rfFemaleConnector.SLDPRT
diff --git a/...d/Card_Modules/100211647UGM000_B.1.sldprt → CardModules/100211647UGM000_B.1.sldprt b/...d/Card_Modules/100211647UGM000_B.1.sldprt → CardModules/100211647UGM000_B.1.sldprt
diff --git a/...es/MODULE PLACEHOLDER PCB WITHRF 3.SLDPRT → ...es/MODULE PLACEHOLDER PCB WITHRF 3.SLDPRT b/...es/MODULE PLACEHOLDER PCB WITHRF 3.SLDPRT → ...es/MODULE PLACEHOLDER PCB WITHRF 3.SLDPRT
diff --git a/...es/MODULE PLACEHOLDER PCB WITHRF 4.SLDPRT → ...es/MODULE PLACEHOLDER PCB WITHRF 4.SLDPRT b/...es/MODULE PLACEHOLDER PCB WITHRF 4.SLDPRT → ...es/MODULE PLACEHOLDER PCB WITHRF 4.SLDPRT
diff --git a/...rated/Card_Modules/MOD_PLCHLDR_RF3.SLDASM → CardModules/MOD_PLCHLDR_RF3.SLDASM b/...rated/Card_Modules/MOD_PLCHLDR_RF3.SLDASM → CardModules/MOD_PLCHLDR_RF3.SLDASM
diff --git a/...rated/Card_Modules/MOD_PLCHLDR_RF4.SLDASM → CardModules/MOD_PLCHLDR_RF4.SLDASM b/...rated/Card_Modules/MOD_PLCHLDR_RF4.SLDASM → CardModules/MOD_PLCHLDR_RF4.SLDASM
diff --git a/cds_rev13_final2.pdf → CubesatDesignSpec.pdf b/cds_rev13_final2.pdf → CubesatDesignSpec.pdf
diff --git a/v0.5_migrated/CARD_GENERIC.SLDASM → Generic/CARD_GENERIC.SLDASM b/v0.5_migrated/CARD_GENERIC.SLDASM → Generic/CARD_GENERIC.SLDASM
diff --git a/...CEHOLDER_PCB_WITHRF_2_standardCard.SLDDRW → ...CEHOLDER_PCB_WITHRF_2_standardCard.SLDDRW b/...CEHOLDER_PCB_WITHRF_2_standardCard.SLDDRW → ...CEHOLDER_PCB_WITHRF_2_standardCard.SLDDRW
diff --git a/...CEHOLDER_PCB_WITHRF_2_standardCard.SLDPRT → ...CEHOLDER_PCB_WITHRF_2_standardCard.SLDPRT b/...CEHOLDER_PCB_WITHRF_2_standardCard.SLDPRT → ...CEHOLDER_PCB_WITHRF_2_standardCard.SLDPRT
diff --git a/...PLACEHOLDER_PCB_WITHRF_2_standardCard.pdf → ...PLACEHOLDER_PCB_WITHRF_2_standardCard.pdf b/...PLACEHOLDER_PCB_WITHRF_2_standardCard.pdf → ...PLACEHOLDER_PCB_WITHRF_2_standardCard.pdf
diff --git a/Generic/README.md b/Generic/README.md
@@ -0,0 +1,3 @@
+This is the generic PCB. Most of the boards in OreSat will look like this.
+
+Of course, boards that don't need RF i/o are welcome to omit MMCX connectors. Just be aware that the male connectors will still be sticking out from the backplane. 
diff --git a/Rev v0.5/Helical card/16-turn_helix.SLDPRT → HelicalCard/16-turn_helix.SLDPRT b/Rev v0.5/Helical card/16-turn_helix.SLDPRT → HelicalCard/16-turn_helix.SLDPRT
diff --git a/.../HelicalCard/HELICAL_CAN_MAINPLATE.SLDPRT → HelicalCard/HELICAL_CAN_MAINPLATE.SLDPRT b/.../HelicalCard/HELICAL_CAN_MAINPLATE.SLDPRT → HelicalCard/HELICAL_CAN_MAINPLATE.SLDPRT
diff --git a/...ted/HelicalCard/HELICAL_CARD_LOWER.SLDPRT → HelicalCard/HELICAL_CARD_LOWER.SLDPRT b/...ted/HelicalCard/HELICAL_CARD_LOWER.SLDPRT → HelicalCard/HELICAL_CARD_LOWER.SLDPRT
diff --git a/...ted/HelicalCard/HELICAL_CARD_UPPER.SLDPRT → HelicalCard/HELICAL_CARD_UPPER.SLDPRT b/...ted/HelicalCard/HELICAL_CARD_UPPER.SLDPRT → HelicalCard/HELICAL_CARD_UPPER.SLDPRT
diff --git a/v0.5_migrated/OreSat.SLDASM → OreSat.SLDASM b/v0.5_migrated/OreSat.SLDASM → OreSat.SLDASM
diff --git a/README.md b/README.md
@@ -6,16 +6,16 @@ CAD requires <a href="https://github.com/oresat/reaction-wheels">Reaction-Wheels
 ## TODO:  
 ### CAD migration
 _Please start at the top of the list. Lower items in the CAD migration typically depend on higher items._
-- [ ] Organize file structure into something reasonable
+- [X] Organize file structure into something reasonable
 - [ ] Identify which parts have already been migrated.
 	- [ ] `Cards/Solar/Board.sldprt`
 	- [ ] `Cards/Solar/12pin_connector.sldprt`
 	- [ ] `Cards/Solar/ALTA-FIVE-CELL-THROUGH-SLOT.sldprt`
-- [ ] migrate individual CAD files into Solidworks.  
+- [X] migrate individual CAD files into Solidworks.  
 _(open `Rev 0.5/2u_cubesat_v0_5.stp` and export each part to the appropriate spot in `Rev 0.5 Migrated/`)_
 	- REACTION WHEELS  
 	_(These parts should come from the reaction wheels repo. They are also going to change at some point, so don't stress too much about mating them to the OreSat assembly.)_
-		- [ ] Add `oresat/reaction-wheels` as a submodule?  
+		- [ ] ~~Add `oresat/reaction-wheels` as a submodule?~~   
 		_I'm not sure if it's better to add it as a submodule or just have the SW assemblies link outside of the structure repo. The submodule is marginally more learning curve for the MME types, but the other way is less self-contained._
 		- [ ] Link to the appropriate parts and/or subassemblies in the OreSat SolidWorks assembly.
 	- HELICAL CAN _(This will have to be modified, so it's not super necessary to migrate.)_
@@ -77,3 +77,20 @@ _(open `Rev 0.5/2u_cubesat_v0_5.stp` and export each part to the appropriate spo
 ### general
 - [ ] Discuss endcap mounting.
 - [ ] Form subgroup to work on antenna deployment.
+- [ ] Get the UO team to choose a camera!
+
+## Structure
+- Backplane  
+_The hub which provides power and data to all the boards_
+- COTS  
+_Any Commercial-Off-The-Shelf parts -- screws, connectors, et cetera._
+- OreSat.SLDASM  
+_The complete assembly of OreSat_
+- Rack  
+_The required CDS rails and the 'rack mount' panels -- the actual structure, per se_
+- Solar  
+_Solar panel modules_
+- Zneg  
+_The feet of the unicorn_
+- Zpos  
+_The horn of the unicorn_
diff --git a/v0.5_migrated/Rack/Cuberail_back.SLDPRT → Rack/Cuberail_back.SLDPRT b/v0.5_migrated/Rack/Cuberail_back.SLDPRT → Rack/Cuberail_back.SLDPRT
diff --git a/v0.5_migrated/Rack/Cuberail_front.SLDPRT → Rack/Cuberail_front.SLDPRT b/v0.5_migrated/Rack/Cuberail_front.SLDPRT → Rack/Cuberail_front.SLDPRT
diff --git a/v0.5_migrated/Rack/Cuberail_side.SLDPRT → Rack/Cuberail_side.SLDPRT b/v0.5_migrated/Rack/Cuberail_side.SLDPRT → Rack/Cuberail_side.SLDPRT
diff --git a/v0.5_migrated/Rack/Rail_assembly.SLDASM → Rack/Rail_assembly.SLDASM b/v0.5_migrated/Rack/Rail_assembly.SLDASM → Rack/Rail_assembly.SLDASM
diff --git a/Rev v0.1/2U_CubeSat_v0.1.SLDASM b/Rev v0.1/2U_CubeSat_v0.1.SLDASM
diff --git a/Rev v0.1/2U_CubeSat_v0.1.STEP b/Rev v0.1/2U_CubeSat_v0.1.STEP
diff --git a/Rev v0.1/Board_Rail_Ym.SLDPRT b/Rev v0.1/Board_Rail_Ym.SLDPRT
diff --git a/Rev v0.1/Board_Rail_Yp.SLDPRT b/Rev v0.1/Board_Rail_Yp.SLDPRT
diff --git a/Rev v0.1/Board_plate.SLDPRT b/Rev v0.1/Board_plate.SLDPRT
diff --git a/Rev v0.1/Board_rail.SLDPRT b/Rev v0.1/Board_rail.SLDPRT
diff --git a/Rev v0.1/Chassis_X_minus.SLDPRT b/Rev v0.1/Chassis_X_minus.SLDPRT
diff --git a/Rev v0.1/Chassis_X_plus.SLDPRT b/Rev v0.1/Chassis_X_plus.SLDPRT
diff --git a/Rev v0.1/Comm_Board.SLDPRT b/Rev v0.1/Comm_Board.SLDPRT
diff --git a/Rev v0.1/Solar_Panel.SLDPRT b/Rev v0.1/Solar_Panel.SLDPRT
diff --git a/Rev v0.1/Y side.SLDPRT b/Rev v0.1/Y side.SLDPRT
diff --git a/Rev v0.2/2U_CubeSat_v0.2.SLDASM b/Rev v0.2/2U_CubeSat_v0.2.SLDASM
diff --git a/Rev v0.2/2U_CubeSat_v0.2.STEP b/Rev v0.2/2U_CubeSat_v0.2.STEP
diff --git a/Rev v0.2/Assem1.SLDASM b/Rev v0.2/Assem1.SLDASM
diff --git a/Rev v0.2/Backplane.SLDASM b/Rev v0.2/Backplane.SLDASM
diff --git a/Rev v0.2/Comm_Board.SLDPRT b/Rev v0.2/Comm_Board.SLDPRT
diff --git a/Rev v0.2/Cube_Rails.SLDPRT b/Rev v0.2/Cube_Rails.SLDPRT
diff --git a/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 1.CWR b/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 1.CWR
diff --git a/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 2.CWR b/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 2.CWR
diff --git a/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 2.LOG b/Rev v0.2/FEA/Module_Placeholder_PCB_withRF-Static 2.LOG
diff --git a/Rev v0.2/FEA/PerformanceLog.txt b/Rev v0.2/FEA/PerformanceLog.txt
diff --git a/Rev v0.2/FEA/X.BAT b/Rev v0.2/FEA/X.BAT
diff --git a/Rev v0.2/Module_Placeholder_PCB.SLDPRT b/Rev v0.2/Module_Placeholder_PCB.SLDPRT
diff --git a/Rev v0.2/Module_Placeholder_PCB_withRF.SLDPRT b/Rev v0.2/Module_Placeholder_PCB_withRF.SLDPRT
diff --git a/Rev v0.2/Module_RF.SLDASM b/Rev v0.2/Module_RF.SLDASM
diff --git a/Rev v0.2/Module_no-RF.SLDASM b/Rev v0.2/Module_no-RF.SLDASM
diff --git a/Rev v0.2/Panel_PCB_outline/Module_PCB_withRF.PDF b/Rev v0.2/Panel_PCB_outline/Module_PCB_withRF.PDF
diff --git a/Rev v0.2/Panel_PCB_outline/Module_PCB_withRF.SLDDRW b/Rev v0.2/Panel_PCB_outline/Module_PCB_withRF.SLDDRW
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U.PDF b/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U.PDF
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U.SLDDRW b/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U.SLDDRW
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U_Z.PDF b/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U_Z.PDF
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U_Z.SLDDRW b/Rev v0.2/Panel_PCB_outline/Solar_Panel_1U_Z.SLDDRW
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.kicad_pcb b/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.kicad_pcb
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.kicad_pcb-bak b/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.kicad_pcb-bak
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.pro b/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.pro
diff --git a/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.sch b/Rev v0.2/Panel_PCB_outline/Solar_Z/Solar_Z.sch
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		This is the generic PCB. Most of the boards in OreSat will look like this.

		Of course, boards that don't need RF i/o are welcome to omit MMCX connectors. Just be aware that the male connectors will still be sticking out from the backplane.