Merge pull request 'dev' (#15) from dev into main

Reviewed-on: #15

diagnostics/FullDiagnostics.py

@@ -4,11 +4,11 @@ from pybricks.parameters import Button, Color, Direction, Port, Side, Stop
 from pybricks.robotics import DriveBase
 from pybricks.tools import wait, StopWatch
 HUB = PrimeHub()
-from battery_diagnostics import BatteryDiagnostics
-from motor_diagnostics import MotorDiagnostics
-from color_sensor_diagnostics import ColorSensorDiagnostics
-from drive_base_diagnostics import DriveBaseDiagnostics
-from hub_diagnostics import HubDiagnostics
+from BatteryDiagnostics import BatteryDiagnostics
+from MotorDiagnostics import MotorDiagnostics
+from ColorSensorDiagnostics import ColorSensorDiagnostics
+from DriveBaseDiagnostics import DriveBaseDiagnostics
+from HubDiagnostics import HubDiagnostics
 battery = BatteryDiagnostics(HUB)
 motor = MotorDiagnostics(HUB, Motor)
 colorsensor = ColorSensorDiagnostics(HUB, ColorSensor)

diagnostics/HubDiagnostics.py

@@ -1,7 +1,7 @@
 from pybricks.tools import wait, StopWatch
 from pybricks import version
-import other_functions as debug
-from micropython_diagnostics import MicroPythonDiagnostics
+import OtherFunctions as debug
+from MicroPythonDiagnostics import MicroPythonDiagnostics
 from pybricks.parameters import Port
 class HubDiagnostics:
     def __init__(self, hub):

diagnostics/MicroPythonDiagnostics.py

@@ -0,0 +1,11 @@
+import usys
+from pybricks import version
+class MicroPythonDiagnostics:
+    def __init__(self, hub):
+        pass
+    def printAll():
+        print("[Hub Diagnostics - MicroPython] Hub version information:", version)
+        print("[Hub Diagnostics - MicroPython] MicroPython version:", usys.version)
+        print("[Hub Diagnostics - MicroPython] Pybricks version information:", usys.version_info)
+        print("[Hub Diagnostics - MicroPython] MicroPython information:", usys.implementation)
+        

diagnostics/micropython_diagnostics.py

@@ -1,42 +0,0 @@
-import usys
-import micropython
-from pybricks import version
-class MicroPythonDiagnostics:
-    def __init__(self, hub):
-        pass
-    def printVersionDiagnostics():
-        print("[Hub Diagnostics - MicroPython - Version] Hub version information:", version)
-        print("[Hub Diagnostics - MicroPython - Version] MicroPython version:", usys.version)
-        print("[Hub Diagnostics - MicroPython - Version] Pybricks version information:", usys.version_info)
-        print("[Hub Diagnostics - MicroPython - Version] MicroPython information:", usys.implementation)
-    def performMemoryDiagnostics():
-        print("[Hub Diagnostics - MicroPython - Memory] Memory information (retrieved from the MicroPython environment):")
-        micropython.mem_info(1)
-        print("[Hub Diagnostics - MicroPython - Memory] Testing heap lock and unlock.")
-        print("[Hub Diagnostics - MicroPython - Memory] Allocating memory while heap is unlocked:")
-        try:
-            x = 5000
-            print("[Hub Diagnostics - MicroPython - Memory] [SUCCESS] There was no MemoryError raised. The value of the new variable x is", x)
-        except MemoryError:
-            print("[Hub Diagnostics - MicroPython - Memory] [FAIL] Allocation failed. Your memory may be faulty.")
-        print("[Hub Diagnostics - MicroPython - Memory] Locking the heap:")
-        micropython.heap_lock()
-        print("[Hub Diagnostics - MicroPython - Memory] Heap was locked. Attempting to allocate memory (this should fail):")
-        try:
-            y = 10000
-            print("[Hub Diagnostics - MicroPython - Memory] [FAIL] There was no MemoryError raised. Heap lock failed.")
-        except MemoryError:
-            print("[Hub Diagnostics - MicroPython - Memory] [SUCCESS] Allocation failed. Test successful. The heap was successfully locked.")
-            # Attempt to add gc to this for memory diagnostics, in addition test machine.soft_reset() and add that first to reset the heap.
-        print("[Hub Diagnostics - MicroPython - Memory] Unlocking the heap:")
-        micropython.heap_unlock()
-        print("[Hub Diagnostics - MicroPython - Memory] Heap was unlocked. Attempting to allocate memory (this should succeed):")
-        try:
-            z = 17000
-            print("[Hub Diagnostics - MicroPython - Memory] [SUCCESS] There was no MemoryError raised. The value of the new variable y is", x)
-        except MemoryError:
-            print("[Hub Diagnostics - MicroPython - Memory] [FAIL] Allocation failed. The heap failed to unlock.")
-    def printAll():
-        printVersionDiagnostics()
-        performMemoryDiagnostics()
-