ISSUIUC · mariano-f-r · Jan 10, 2025 · Oct 19, 2023 · Oct 19, 2023 · Oct 19, 2023
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+**/.DS_Store
+.DS_Store
diff --git a/54 mm SRAD Nozzle/Drawings and Cad/54mm_nozzle_updated_oring_groove_1.pdf b/54 mm SRAD Nozzle/Drawings and Cad/54mm_nozzle_updated_oring_groove_1.pdf
diff --git a/54 mm SRAD Nozzle/Drawings and Cad/54mm_nozzle_updated_oring_groove_1.prt b/54 mm SRAD Nozzle/Drawings and Cad/54mm_nozzle_updated_oring_groove_1.prt
diff --git a/54 mm SRAD Nozzle/Styrofoam_Connectprt.prt b/54 mm SRAD Nozzle/Styrofoam_Connectprt.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75 mm aft closure no threading.prt b/75 mm rocket motor/ANSYS/CAD/75 mm aft closure no threading.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75 mm assembly no threading.prt b/75 mm rocket motor/ANSYS/CAD/75 mm assembly no threading.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75 mm forward closure no threading.prt b/75 mm rocket motor/ANSYS/CAD/75 mm forward closure no threading.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75 mm nozzle.prt b/75 mm rocket motor/ANSYS/CAD/75 mm nozzle.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75mm casing no threading.prt b/75 mm rocket motor/ANSYS/CAD/75mm casing no threading.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/75mm phenolic liner.prt b/75 mm rocket motor/ANSYS/CAD/75mm phenolic liner.prt
diff --git a/75 mm rocket motor/ANSYS/CAD/filler b/75 mm rocket motor/ANSYS/CAD/filler
@@ -0,0 +1 @@
+
diff --git a/75 mm rocket motor/CAD/75mm Aft Closure.prt b/75 mm rocket motor/CAD/75mm Aft Closure.prt
diff --git a/75 mm rocket motor/CAD/75mm Casing.prt b/75 mm rocket motor/CAD/75mm Casing.prt
diff --git a/75 mm rocket motor/CAD/75mm Forward Closure.prt b/75 mm rocket motor/CAD/75mm Forward Closure.prt
diff --git a/75 mm rocket motor/CAD/75mm Nozzle.prt b/75 mm rocket motor/CAD/75mm Nozzle.prt
diff --git a/75 mm rocket motor/CAD/75mm_Assembly_finalized.prt b/75 mm rocket motor/CAD/75mm_Assembly_finalized.prt
diff --git a/75 mm rocket motor/CAD/75mm_Phenolic_Liner (1) (1).prt b/75 mm rocket motor/CAD/75mm_Phenolic_Liner (1) (1).prt
diff --git a/75 mm rocket motor/CAD/Draft Sheets/75mmAftClosure.pdf b/75 mm rocket motor/CAD/Draft Sheets/75mmAftClosure.pdf
diff --git a/75 mm rocket motor/CAD/Draft Sheets/75mmCasing.pdf b/75 mm rocket motor/CAD/Draft Sheets/75mmCasing.pdf
diff --git a/75 mm rocket motor/CAD/Draft Sheets/75mmForwardClosure.pdf b/75 mm rocket motor/CAD/Draft Sheets/75mmForwardClosure.pdf
diff --git a/75 mm rocket motor/CAD/Draft Sheets/filler b/75 mm rocket motor/CAD/Draft Sheets/filler
@@ -0,0 +1 @@
+
diff --git a/75 mm rocket motor/CAD/Draft Sheets/nozzle_75mm.pdf b/75 mm rocket motor/CAD/Draft Sheets/nozzle_75mm.pdf
diff --git a/75 mm rocket motor/filler b/75 mm rocket motor/filler
@@ -0,0 +1 @@
+t
diff --git a/Propellant Manufacturing/38mm_mold_assembled.prt b/Propellant Manufacturing/38mm_mold_assembled.prt
diff --git a/Propellant Manufacturing/38mm_mold_firsthalff.prt b/Propellant Manufacturing/38mm_mold_firsthalff.prt
diff --git a/Propellant Manufacturing/38mm_mold_secondhalff.prt b/Propellant Manufacturing/38mm_mold_secondhalff.prt
diff --git a/Propellant Manufacturing/Igniter mold v2.prt b/Propellant Manufacturing/Igniter mold v2.prt
diff --git a/Propellant Manufacturing/Mold_38mm_vskim.prt b/Propellant Manufacturing/Mold_38mm_vskim.prt
diff --git a/README.md b/README.md
@@ -1,4 +1,53 @@
-# Solid_Propulsion
+# Solid Propulsion
 
+> "Don't Let Team Center stop you, cause' we can't stoppin."
+> - The forebears
 
-Don't Let Team Center stop you, cause' we can't stoppin.
+This repo serves as a monolithic repository (a "monorepo") for any and all contributions done for the Solid Propulsion team at the Illinois Space Society
+It serves both to track CAD contributions as snapshots (wherein CAD from older commits can be examined to see older versions) and track code as any normal Git repository.
+At this time, there are no plans to separate CAD and code, although the idea should be strongly considered due to the incompatible semantics of versioning that CAD and code have.
+
+# Contributing
+
+We have a few rules for adding new items to this repository that depend on what manner of contribution you plan to add.
+
+A few general rules of thumb:
+- Do not commit directly to main, open a branch and create a pull request.
+- Do not force merge your pull requests. If the contribution is CAD, it will be automatically by our CI/CD pipeline. If it is code, then your commit should be tested before it gets merged.
+- When creating branches, adhere to the branch structure which is included below.
+
+| Type of Commit   | Branch Prefix  |
+|--------------- | --------------- |
+| CAD   | `cad/`   |
+| New code feature   | `feat/`   |
+| Code refactor   | `<refactor/`   |
+| Bug fix   | `fix/`   |
+| Repository chore | `chore/` |
+
+Note: While we do not presently have more than 1 codebase, in the event we have multiple (which will be an eventuality given we will be storing our in-house Python data analysis software here as well as our firmware), one should prefix all normal code branches with the name of the codebase that you are working on.
+EG: If we had a new feature for our firmware, the branch prefix `firmware/feat/` would be used instead of `feat/` as the feature now exists in the context of one of our codebases.
+
+## For CAD
+
+It would be preferable if none of the files you are adding have spaces in their name, as well as folders.
+Name your branch based on the overall changes you've made. 
+For example, if you were to have created a new part and modified an existing one to create a new crossbeam, name the branch `cad/add-new-crossbeam`.
+Do not name it after any individual changes you've made, rather the sum total.
+Prefer uploading your files directly to using Git from the command line.
+In either case, name your commit as follows `cad: <short description here>`.
+
+## For code
+It is mandatory none of the files you are adding have spaces in their name, as well as folders.
+Name your branch based on the feature you've added, the bug you've fixed, or the item(s) you've refactored.
+
+### Commits
+We follow [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) when doing any squash merge commits when merging a branch.
+When doing normal commits, ensure your commits are reasonably well detailed as to what they change.
+
+#### When starting a new codebase
+Starting a new codebase usually means transitioning from a nonworking prototype to a minimum viable product very rapidly.
+We discourage committing anything until the codebase is in a working state, as zealously logging changes in Git when the code is in such a state of flux hinders productivity.
+
+## Naming Pull Requests
+Prefix your pull requests with the type of branch you've created followed by a short description.
+EG, for a branch named `cad/add-aim9-sidewinder-missile-launcher`, name your pull request `CAD: add AIM-9 sidewinder missile support`.
diff --git a/Test Stand/SETS_3/0.25 inch bolt.prt b/Test Stand/SETS_3/0.25 inch bolt.prt
diff --git a/Test Stand/SETS_3/0.25 inch long bolt.prt b/Test Stand/SETS_3/0.25 inch long bolt.prt
diff --git a/Test Stand/SETS_3/0.25 inch nut.prt b/Test Stand/SETS_3/0.25 inch nut.prt
diff --git a/Test Stand/SETS_3/10.91x10.91x48 rounded block with square hole1.2prt.prt b/Test Stand/SETS_3/10.91x10.91x48 rounded block with square hole1.2prt.prt
diff --git a/Test Stand/SETS_3/10.91x1x1 rounded block with square hole.prt b/Test Stand/SETS_3/10.91x1x1 rounded block with square hole.prt
diff --git a/Test Stand/SETS_3/10.91x2x2 block.prt b/Test Stand/SETS_3/10.91x2x2 block.prt
diff --git a/Test Stand/SETS_3/1m_12M_Threaded_Rod.prt b/Test Stand/SETS_3/1m_12M_Threaded_Rod.prt
diff --git a/Test Stand/SETS_3/1x1x10.91 rounded block with square hole.prt b/Test Stand/SETS_3/1x1x10.91 rounded block with square hole.prt
diff --git a/Test Stand/SETS_3/25 lb block.prt b/Test Stand/SETS_3/25 lb block.prt
diff --git a/Test Stand/SETS_3/7-16 inch nut.prt b/Test Stand/SETS_3/7-16 inch nut.prt
diff --git a/Test Stand/SETS_3/7-16 inch nuttop.prt b/Test Stand/SETS_3/7-16 inch nuttop.prt
diff --git a/Test Stand/SETS_3/7-16 inch threaded rod 1.75 inch.prt b/Test Stand/SETS_3/7-16 inch threaded rod 1.75 inch.prt
diff --git a/Test Stand/SETS_3/7-16 inch threaded rod 3 inch.prt b/Test Stand/SETS_3/7-16 inch threaded rod 3 inch.prt
diff --git a/Test Stand/SETS_3/7-16 inch threaded rod 6 inches top.prt b/Test Stand/SETS_3/7-16 inch threaded rod 6 inches top.prt
diff --git a/Test Stand/SETS_3/7-16 inch threaded rod 6 inches.prt b/Test Stand/SETS_3/7-16 inch threaded rod 6 inches.prt
diff --git a/Test Stand/SETS_3/7-16 inch threaded rod.prt b/Test Stand/SETS_3/7-16 inch threaded rod.prt
diff --git a/Test Stand/SETS_3/7-16 inch washer.prt b/Test Stand/SETS_3/7-16 inch washer.prt
diff --git a/Test Stand/SETS_3/Circle Plate with Holes Top.prt b/Test Stand/SETS_3/Circle Plate with Holes Top.prt
diff --git a/Test Stand/SETS_3/Circle Plate with Holes.prt b/Test Stand/SETS_3/Circle Plate with Holes.prt
diff --git a/Test Stand/SETS_3/CircleTubeSquareBase (1).prt b/Test Stand/SETS_3/CircleTubeSquareBase (1).prt
diff --git a/Test Stand/SETS_3/CircleTubeSquareBaseFinal.prt b/Test Stand/SETS_3/CircleTubeSquareBaseFinal.prt
diff --git a/Test Stand/SETS_3/Hexagonal Nut M12.prt b/Test Stand/SETS_3/Hexagonal Nut M12.prt
diff --git a/Test Stand/SETS_3/Loadcell.prt b/Test Stand/SETS_3/Loadcell.prt
diff --git a/Test Stand/SETS_3/M12 approx in inches threaded rod.prt b/Test Stand/SETS_3/M12 approx in inches threaded rod.prt
diff --git a/Test Stand/SETS_3/M12 approx nut.prt b/Test Stand/SETS_3/M12 approx nut.prt
diff --git a/Test Stand/SETS_3/M12 approx threaded rod.prt b/Test Stand/SETS_3/M12 approx threaded rod.prt
diff --git a/Test Stand/SETS_3/M12 approx washer.prt b/Test Stand/SETS_3/M12 approx washer.prt
diff --git a/Test Stand/SETS_3/M4 Bolt.prt b/Test Stand/SETS_3/M4 Bolt.prt
diff --git a/Test Stand/SETS_3/M4 Nut.prt b/Test Stand/SETS_3/M4 Nut.prt
diff --git a/Test Stand/SETS_3/SETS3.prt b/Test Stand/SETS_3/SETS3.prt
diff --git a/Test Stand/SETS_3/Sets 3 assembly inches.prt b/Test Stand/SETS_3/Sets 3 assembly inches.prt
diff --git a/Test Stand/SETS_3/base stabilizer 3dprint.prt b/Test Stand/SETS_3/base stabilizer 3dprint.prt
diff --git a/Test Stand/SETS_3/centering rings 98mm.prt b/Test Stand/SETS_3/centering rings 98mm.prt
diff --git a/Test Stand/SETS_3/centering rings.prt b/Test Stand/SETS_3/centering rings.prt
diff --git a/Test Stand/SETS_3/epoxy-like-stuff-inches.prt b/Test Stand/SETS_3/epoxy-like-stuff-inches.prt
diff --git a/Test Stand/SETS_3/grainger-25DD03_stp.prt b/Test Stand/SETS_3/grainger-25DD03_stp.prt
diff --git a/Test Stand/SETS_3/grainger-2FE45_stp.prt b/Test Stand/SETS_3/grainger-2FE45_stp.prt
diff --git a/Test Stand/SETS_3/grainger-5NYR7_stp.prt b/Test Stand/SETS_3/grainger-5NYR7_stp.prt
diff --git a/Test Stand/SETS_3/grainger-6CA71_stp.prt b/Test Stand/SETS_3/grainger-6CA71_stp.prt
diff --git a/Test Stand/SETS_3/loadcell hole 3dprint.prt b/Test Stand/SETS_3/loadcell hole 3dprint.prt
diff --git a/Test Stand/SETS_3/metalchannel10in.prt b/Test Stand/SETS_3/metalchannel10in.prt
diff --git a/Test Stand/SETS_3/metalchannel10inbottomholed.prt b/Test Stand/SETS_3/metalchannel10inbottomholed.prt
diff --git a/Test Stand/SETS_3/metalchannel10intop lower.prt b/Test Stand/SETS_3/metalchannel10intop lower.prt
diff --git a/Test Stand/SETS_3/metalchannel10intop lowers.prt b/Test Stand/SETS_3/metalchannel10intop lowers.prt
diff --git a/Test Stand/SETS_3/metalchannel10intop.prt b/Test Stand/SETS_3/metalchannel10intop.prt
diff --git a/Test Stand/SETS_3/metalchannel5ft.prt b/Test Stand/SETS_3/metalchannel5ft.prt
diff --git a/Test Stand/SETS_3/metalchannel5ftupsidedownone.prt b/Test Stand/SETS_3/metalchannel5ftupsidedownone.prt
diff --git a/Test Stand/SETS_3/metalchannel5ftupsidedownonelll.prt b/Test Stand/SETS_3/metalchannel5ftupsidedownonelll.prt
diff --git a/Test Stand/SETS_3/mirror_metalchannel10intop.prt b/Test Stand/SETS_3/mirror_metalchannel10intop.prt
diff --git a/Test Stand/SETS_3/mockmotor.prt b/Test Stand/SETS_3/mockmotor.prt
diff --git a/Test Stand/SETS_3/sets3cage.prt b/Test Stand/SETS_3/sets3cage.prt
diff --git a/Test Stand/SETS_3/steel plate bracket bottom.prt b/Test Stand/SETS_3/steel plate bracket bottom.prt
diff --git a/Test Stand/SETS_3/steel plate bracket.prt b/Test Stand/SETS_3/steel plate bracket.prt
diff --git a/Test Stand/SETS_3/steel security rope draft.prt b/Test Stand/SETS_3/steel security rope draft.prt
diff --git a/Test Stand/SETS_3/steel security rope.prt b/Test Stand/SETS_3/steel security rope.prt
diff --git a/Test Stand/Sets_2/SETS_2 Code/Arduino_HX711.ino b/Test Stand/Sets_2/SETS_2 Code/Arduino_HX711.ino
@@ -0,0 +1,71 @@
+#include <HX711.h>
+
+/*
+ Setup your scale and start the sketch WITHOUT a weight on the scale
+ Once readings are displayed place the weight on the scale
+ Press +/- or a/z to adjust the calibration_factor until the output readings match the known weight
+ OUTDATED 
+ Arduino pin 6 -> HX711 CLK
+ Arduino pin 5 -> HX711 DOUT
+ Arduino pin 5V -> HX711 VCC
+ Arduino pin GND -> HX711 GND 
+*/
+
+#include "HX711.h"
+
+HX711 scale(30, 32); // data pin, clock pin
+
+float calibration_factor = -23.00; // this calibration factor is adjusted according to my load cell
+float units;
+float ounces;
+float newtons;
+
+void setup() {
+  Serial.begin(9600);
+//  Serial.println("HX711 calibration sketch");
+//  Serial.println("Remove all weight from scale");
+//  Serial.println("After readings begin, place known weight on scale");
+//  Serial.println("Press + or a to increase calibration factor");
+//  Serial.println("Press - or z to decrease calibration factor");
+
+  scale.set_scale();
+  scale.tare();  //Reset the scale to 0
+
+  long zero_factor = scale.read_average(); //Get a baseline reading
+//  Serial.print("Zero factor: "); //This can be used to remove the need to tare the scale. Useful in permanent scale projects.
+//  Serial.println(zero_factor);
+}
+
+void loop() {
+  scale.set_scale(calibration_factor); //Adjust to this calibration factor
+
+//  Serial.print("Reading: ");
+  units = scale.get_units(), 10;
+  if (units < 0)
+  {
+    units = 0.00;
+  }
+  ounces = units * 0.035274;
+  // newtons = units * 0.0098;
+  Serial.print(units);
+  Serial.print('\t');
+  Serial.print(units);
+  Serial.print('\t');
+  Serial.print(units);
+  Serial.print('\t');
+  Serial.print(units);
+//  Serial.print(units);
+//  Serial.print(" grams"); 
+//  Serial.print(" calibration_factor: ");
+//  Serial.print(calibration_factor);
+  Serial.println();
+
+  if(Serial.available())
+  {
+    char temp = Serial.read();
+    if(temp == '+' || temp == 'a')
+      calibration_factor += 10;
+    else if(temp == '-' || temp == 'z')
+      calibration_factor -= 10;
+  }
+}