readme + tried to fix printing loop

README.md

@@ -1,5 +1,6 @@
 # ThermalTests
 
+<<<<<<< HEAD
 Software Test, Telemetry, and Control Prototyping for the SPICEsat thermal testbench.
 
 Work done by Systems Integration & Test 
@@ -16,3 +17,8 @@ All software is in the works.
 Ideally will offer concurrent telemtry read & pid control loop testing.
 
 requirements.txt on the way...
+=======
+Software Test, Telemetry, and Control Prototyping
+
+Work done by Systems Integration & Test 
+>>>>>>> 456571bab87a6c49926cd22ae34cf054a86068e7

multi_sensor_telemetry/README.txt

@@ -0,0 +1,10 @@
+# Multi-Sensor Telemetry Backend (TMP100 Network)
+
+## Repository Structure
+
+.
+├── main.py # Orchestration / CLI
+├── tmpsensor.py # TMPSensor class (real sensor)
+├── fake_tmpsensor.py # FakeTMPSensor class (simulated data)
+├── multi_tmpsensor.py # MultiTMPSensors class (manages multiple sensors)
+└── README.md # Project documentation

multi_sensor_telemetry/main.py

@@ -26,10 +26,19 @@ def main():
 
     parser = argparse.ArgumentParser()
 
+<<<<<<< HEAD
+    try:
+        while True:
+            time.sleep(1)
+    except KeyboardInterrupt:
+        testtmp.stop()
+        testfake.stop()
+=======
     args = parser.parse_args()
 
 
 
 if __name__ == "__main__":
 
-    main()
+    main()
+>>>>>>> 456571bab87a6c49926cd22ae34cf054a86068e7

multi_sensor_telemetry/tmpsensor.py

@@ -46,4 +46,7 @@ def get_buffer(self):
     def get_latest(self):
         return self._latest
 
-    ## only prints one value
+<<<<<<< HEAD
+=======
+    ## only prints one value
+>>>>>>> 456571bab87a6c49926cd22ae34cf054a86068e7