Restructured repo

.github/workflows/micropython.yml

@@ -69,7 +69,7 @@ jobs:
       RELEASE_FILE: pimoroni-${{matrix.shortname}}-${{github.event.release.tag_name || github.sha}}-micropython
       FIRMWARE_DIR: "$GITHUB_WORKSPACE/yukon/firmware"
       BOARD_DIR: "$GITHUB_WORKSPACE/yukon/firmware/${{matrix.board}}"
-      FILESYSTEM_DIR: "$GITHUB_WORKSPACE/yukon/firmware/filesystem"
+      FILESYSTEM_DIR: "$GITHUB_WORKSPACE/yukon/lib"
       FILESYSTEM_SUFFIX: "with-filesystem"
       BOARD: "PIMORONI_YUKON"
 

firmware/PIMORONI_YUKON/manifest.py

@@ -1,3 +1 @@
 include("$(PORT_DIR)/boards/manifest.py")
-
-freeze("$(BOARD_DIR)/../../lib/")

firmware/filesystem/lib/pimoroni_yukon/errors.py → lib/pimoroni_yukon/errors.py

@@ -1,28 +1,28 @@
-class OverVoltageError(Exception):
-    """Exception to be used when a voltage value exceeds safe levels"""
-    pass
-
-
-class UnderVoltageError(Exception):
-    """Exception to be used when a voltage value falls below safe levels"""
-    pass
-
-
-class OverCurrentError(Exception):
-    """Exception to be used when a current value exceeds safe levels"""
-    pass
-
-
-class OverTemperatureError(Exception):
-    """Exception to be used when a temperature value exceeds safe levels"""
-    pass
-
-
-class FaultError(Exception):
-    """Exception to be used when a part of the system triggers a fault"""
-    pass
-
-
-class VerificationError(Exception):
-    """Exception to be used when there is an issue verifying the installed hardware modules"""
-    pass
+class OverVoltageError(Exception):
+    """Exception to be used when a voltage value exceeds safe levels"""
+    pass
+
+
+class UnderVoltageError(Exception):
+    """Exception to be used when a voltage value falls below safe levels"""
+    pass
+
+
+class OverCurrentError(Exception):
+    """Exception to be used when a current value exceeds safe levels"""
+    pass
+
+
+class OverTemperatureError(Exception):
+    """Exception to be used when a temperature value exceeds safe levels"""
+    pass
+
+
+class FaultError(Exception):
+    """Exception to be used when a part of the system triggers a fault"""
+    pass
+
+
+class VerificationError(Exception):
+    """Exception to be used when there is an issue verifying the installed hardware modules"""
+    pass

firmware/filesystem/lib/pimoroni_yukon/logging.py → lib/pimoroni_yukon/logging.py

@@ -1,21 +1,21 @@
-LOG_NONE = 0
-LOG_WARN = 1
-LOG_INFO = 2
-LOG_DEBUG = 3
-
-level = LOG_INFO
-
-
-def warn(objects='', sep='', end='\n'):
-    if level >= LOG_WARN:
-        print(objects, sep=sep, end=end)
-
-
-def info(objects='', sep='', end='\n'):
-    if level >= LOG_INFO:
-        print(objects, sep=sep, end=end)
-
-
-def debug(objects='', sep='', end='\n'):
-    if level >= LOG_DEBUG:
-        print(objects, sep=sep, end=end)
+LOG_NONE = 0
+LOG_WARN = 1
+LOG_INFO = 2
+LOG_DEBUG = 3
+
+level = LOG_INFO
+
+
+def warn(objects='', sep='', end='\n'):
+    if level >= LOG_WARN:
+        print(objects, sep=sep, end=end)
+
+
+def info(objects='', sep='', end='\n'):
+    if level >= LOG_INFO:
+        print(objects, sep=sep, end=end)
+
+
+def debug(objects='', sep='', end='\n'):
+    if level >= LOG_DEBUG:
+        print(objects, sep=sep, end=end)

firmware/filesystem/lib/pimoroni_yukon/modules/__init__.py → lib/pimoroni_yukon/modules/__init__.py

@@ -1,25 +1,25 @@
-# SPDX-FileCopyrightText: 2023 Christopher Parrott for Pimoroni Ltd
-#
-# SPDX-License-Identifier: MIT
-
-from .common import ADC_LOW, ADC_HIGH, ADC_FLOAT, ADC_ANY, LOW, HIGH
-from .led_strip import LEDStripModule
-from .quad_servo_direct import QuadServoDirectModule
-from .quad_servo_reg import QuadServoRegModule
-from .big_motor import BigMotorModule
-from .dual_motor import DualMotorModule
-from .dual_switched import DualSwitchedModule
-from .bench_power import BenchPowerModule
-from .audio_amp import AudioAmpModule
-from .proto import ProtoPotModule
-
-KNOWN_MODULES = (
-    LEDStripModule,
-    QuadServoDirectModule,
-    QuadServoRegModule,
-    BigMotorModule,
-    DualMotorModule,
-    DualSwitchedModule,
-    BenchPowerModule,
-    AudioAmpModule,
-    ProtoPotModule)
+# SPDX-FileCopyrightText: 2023 Christopher Parrott for Pimoroni Ltd
+#
+# SPDX-License-Identifier: MIT
+
+from .common import ADC_LOW, ADC_HIGH, ADC_FLOAT, ADC_ANY, LOW, HIGH
+from .led_strip import LEDStripModule
+from .quad_servo_direct import QuadServoDirectModule
+from .quad_servo_reg import QuadServoRegModule
+from .big_motor import BigMotorModule
+from .dual_motor import DualMotorModule
+from .dual_switched import DualSwitchedModule
+from .bench_power import BenchPowerModule
+from .audio_amp import AudioAmpModule
+from .proto import ProtoPotModule
+
+KNOWN_MODULES = (
+    LEDStripModule,
+    QuadServoDirectModule,
+    QuadServoRegModule,
+    BigMotorModule,
+    DualMotorModule,
+    DualSwitchedModule,
+    BenchPowerModule,
+    AudioAmpModule,
+    ProtoPotModule)