Merge Orpheus edition into main (#55)

Co-authored-by: Michael Pham <[email protected]> Co-authored-by: DeathStar <[email protected]> Co-authored-by: DeathStar <[email protected]> Co-authored-by: Cameron <[email protected]> Co-authored-by: Alex Mariano <[email protected]>
proveskit · Dec 19, 2024 · 1291bdf · 1291bdf
1 parent be164be
commit 1291bdf
Show file tree

Hide file tree

Showing 50 changed files with 9,020 additions and 1,895 deletions.
diff --git a/Batt_Board/can_test.py b/Batt_Board/can_test.py
@@ -1,9 +1,9 @@
-from pysquared_eps import cubesat as c
-import battery_functions
+from pysquared import cubesat as c
+import functions
 import can_bus_helper
 import time
 
-f = battery_functions.functions(c)
+f = functions.functions(c)
 
 cb = can_bus_helper.CanBusHelper(c.can_bus, f, True)
 

diff --git a/Batt_Board/code.py b/Batt_Board/code.py
@@ -13,6 +13,6 @@
 
 except Exception as e:
     print(e)
-    time.sleep(10)
-    microcontroller.on_next_reset(microcontroller.RunMode.NORMAL)
-    microcontroller.reset()
+    # time.sleep(10)
+    # microcontroller.on_next_reset(microcontroller.RunMode.NORMAL)
+    # microcontroller.reset()
diff --git a/Batt_Board/lib/Big_Data.py b/Batt_Board/lib/Big_Data.py